Make python optional.

3 files changed, 21 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2e6b231166b0..d39fd1ae12d9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -5,26 +5,22 @@ pkgbase = usd
 	url = https://www.openusd.org
 	arch = x86_64
 	license = Apache
+	makedepends = python2
 	makedepends = boost
 	makedepends = cmake
 	makedepends = git
 	makedepends = intel-tbb
 	makedepends = ninja
-	makedepends = python2-jinja
-	makedepends = python2-pyside-tools
 	depends = boost-libs
 	depends = glew
 	depends = openexr
 	depends = opensubdiv
-	depends = python2
-	depends = python2-opengl
-	depends = python2-pyside
 	provides = usd=19.11
 	source = git+https://github.com/PixarAnimationStudios/USD.git#tag=v19.11
 	source = boost_python2.patch
 	source = blender.patch
 	sha256sums = SKIP
-	sha256sums = 39b52f008bcebbd2bb57e165e85622b3452de9f10342b82f38e305d934486f46
+	sha256sums = dec16bd0270c9d682f34c555e38812ea010bee88907a02d6ce60f3f319b21425
 	sha256sums = a4b92e59eb6330109f65d1b168ad0c4b1292c5317f579dcbf0594df22ffbc587
 
 pkgname = usd
diff --git a/PKGBUILD b/PKGBUILD
index aaae0dc296d6..829f3be19d23 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,20 @@
+#!/usr/hint/bash
 # Maintainer : bartus <arch-user-repoᘓbartus.33mail.com>
-# shellcheck disable=SC2034
+# shellcheck disable=SC2034,SC2154 # unused/uninitialized variables.
+# shellcheck disable=SC2191
 
+# Configuration.
 _ver="v19.11" #switch to last blender supported version, latest is "v20.02"
 _fragment="#tag=$_ver"
+if ((DISABLE_PYTHON)); then
+  _CMAKE_FLAGS+=( "-DPXR_ENABLE_PYTHON_SUPPORT:BOOL=OFF" )
+  makedepends+=( python2 )
+else
+  _CMAKE_FLAGS+=( -DPXR_PYTHON_SHEBANG:STRING="/usr/bin/python2" )
+  eval "depends+=( python2{,-opengl,-pyside} )"
+  eval "makedepends+=( python2-{jinja,pyside-tools} )"
+:
+fi
 
 pkgname=usd
 pkgver=${_ver#v}
@@ -11,18 +23,18 @@ pkgdesc="3D VFX pipeline interchange file format."
 arch=('x86_64')
 url="https://www.openusd.org"
 license=('Apache')
-eval depends=('boost-libs' 'glew' 'openexr' 'opensubdiv' "python2{,-opengl,-pyside}")
-eval makedepends=('boost' 'cmake' 'git' 'intel-tbb' 'ninja' "python2-{jinja,pyside-tools}")
+depends+=('boost-libs' 'glew' 'openexr' 'opensubdiv')
+makedepends+=('boost' 'cmake' 'git' 'intel-tbb' 'ninja')
 provides=("usd=${pkgver}")
 source=("git+https://github.com/PixarAnimationStudios/USD.git${_fragment}"
         "boost_python2.patch"
         "blender.patch")
 sha256sums=('SKIP'
-            '39b52f008bcebbd2bb57e165e85622b3452de9f10342b82f38e305d934486f46'
+            'dec16bd0270c9d682f34c555e38812ea010bee88907a02d6ce60f3f319b21425'
             'a4b92e59eb6330109f65d1b168ad0c4b1292c5317f579dcbf0594df22ffbc587')
 
 prepare() {
-  git -C USD apply -v ${srcdir}/{boost_python2,blender}.patch
+  git -C USD apply -v "${srcdir}"/{boost_python2,blender}.patch
 }
 
 #pkgver() {
@@ -33,11 +45,10 @@ build() {
   _CMAKE_FLAGS+=(
     -DCMAKE_INSTALL_PREFIX:PATH=/usr
     -DPXR_BUILD_TESTS:BOOL=OFF
-#   -DPXR_ENABLE_PYTHON_SUPPORT:BOOL=OFF
     -DPXR_BUILD_MONOLITHIC:BOOL=ON          # Required by blender-2.83
-    -DPXR_PYTHON_SHEBANG:STRING="/usr/bin/python2"
                 )
   cmake -S USD -B build -G Ninja "${_CMAKE_FLAGS[@]}"
+# shellcheck disable=SC2046
   ninja -C build $([ -v MAKEFLAGS ] || echo -j1)
 }
 
diff --git a/boost_python2.patch b/boost_python2.patch
index b35028a961f7..82692cf28742 100644
--- a/boost_python2.patch
+++ b/boost_python2.patch
@@ -15,7 +15,7 @@ index 9be215b36..031c64ab0 100644
 +            python27
          REQUIRED
      )
-+    # fix rest of code expecting 'Boost_PYTHON_LIBRAR'
++    # fix rest of code expecting 'Boost_PYTHON_LIBRARY'
 +    set(Boost_PYTHON_LIBRARY "${Boost_PYTHON27_LIBRARY}")
  
      # --Jinja2