Drop usd patch: not required for system usd package

3 files changed, 2 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9072f2526394..da88fab199fa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -44,7 +44,7 @@ pkgbase = blender-git
 	depends = libepoxy
 	optdepends = cuda: CUDA support in Cycles
 	optdepends = optix>=7.4.0: OptiX support in Cycles
-	optdepends = usd=21.05: USD export Scene
+	optdepends = usd: USD export Scene
 	optdepends = openpgl: Intel Path Guiding library in Cycles
 	optdepends = openimagedenoise: Intel Open Image Denoise support in compositing
 	optdepends = materialx: MaterialX materials
@@ -64,7 +64,6 @@ pkgbase = blender-git
 	source = blender/dev_tools::git+https://github.com/blender/blender-dev-tools
 	source = blender/assets::svn+https://svn.blender.org/svnroot/bf-blender/trunk/lib/assets
 	source = 0001-Use-github.com-for-make-update-git.patch
-	source = 0003-usd_python.patch
 	source = 0004-fix-opencollada-pcre.patch
 	sha256sums = SKIP
 	sha256sums = SKIP
@@ -73,7 +72,6 @@ pkgbase = blender-git
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = 52da80b721efb6a6d579adf531640becfac1955a88857ca46ca16030a52c3b1c
-	sha256sums = c2db51a83a8d573aa76c760f10e541c84b108d64d05c9647681c4e633b3d0397
 	sha256sums = 6beedc541e33288a282f57cd2bd09860f333154027b6175e9f61cce49b8db5df
 
 pkgname = blender-git
diff --git a/0003-usd_python.patch b/0003-usd_python.patch
deleted file mode 100644
index e0537d8cb921..000000000000
--- a/0003-usd_python.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake
-index 787d0f87002..659938a45b2 100644
---- a/build_files/cmake/platform/platform_unix.cmake
-+++ b/build_files/cmake/platform/platform_unix.cmake
-@@ -329,6 +329,10 @@ if(WITH_OPENVDB)
- endif()
- add_bundled_libraries(openvdb/lib)
- 
-+if(WITH_USD)
-+  list(APPEND __boost_packages python)
-+endif()
-+
- if(WITH_NANOVDB)
-   find_package_wrapper(NanoVDB)
-   set_and_warn_library_found("NanoVDB" NANOVDB_FOUND WITH_NANOVDB)
-diff --git a/source/blender/io/usd/CMakeLists.txt b/source/blender/io/usd/CMakeLists.txt
-index ebd292782c0..02486e72461 100644
---- a/source/blender/io/usd/CMakeLists.txt
-+++ b/source/blender/io/usd/CMakeLists.txt
-@@ -55,6 +55,7 @@ set(INC
- set(INC_SYS
-   ${USD_INCLUDE_DIRS}
-   ${BOOST_INCLUDE_DIR}
-+  ${PYTHON_INCLUDE_DIRS}
-   ${TBB_INCLUDE_DIR}
-   ${PYTHON_INCLUDE_DIR}
- )
diff --git a/PKGBUILD b/PKGBUILD
index 53162012613c..4f941da9c917 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -29,7 +29,7 @@ depends+=('alembic' 'embree' 'libgl' 'python' 'python-numpy' 'openjpeg2' 'libhar
 depends+=('libdecor' 'libepoxy')
 optdepends=('cuda: CUDA support in Cycles'
             'optix>=7.4.0: OptiX support in Cycles'
-            'usd=21.05: USD export Scene'
+            'usd: USD export Scene'
             'openpgl: Intel Path Guiding library in Cycles'
             'openimagedenoise: Intel Open Image Denoise support in compositing'
             'materialx: MaterialX materials'
@@ -53,7 +53,6 @@ source=("blender::git+https://github.com/blender/blender${_fragment}"
         'blender/assets::svn+https://svn.blender.org/svnroot/bf-blender/trunk/lib/assets'
         # Patches...
         '0001-Use-github.com-for-make-update-git.patch'
-        '0003-usd_python.patch' #add missing python headers when building against python enabled usd.
         '0004-fix-opencollada-pcre.patch' #fix broken search for opencollada pcre
         )
 sha256sums=('SKIP'
@@ -63,7 +62,6 @@ sha256sums=('SKIP'
             'SKIP'
             'SKIP'
             '52da80b721efb6a6d579adf531640becfac1955a88857ca46ca16030a52c3b1c'
-            'c2db51a83a8d573aa76c760f10e541c84b108d64d05c9647681c4e633b3d0397'
             '6beedc541e33288a282f57cd2bd09860f333154027b6175e9f61cce49b8db5df')
 
 pkgver() {