[arch-commits] Commit in blender/trunk (3 files)

[Sven-Hendrik Haase]

    Date: Thursday, February 17, 2022 @ 00:34:55
  Author: svenstaro
Revision: 1133611

upgpkg: blender 17:3.0.1-5: Enable glTF compression (FS#73415)

Added:
  blender/trunk/force-draco1.patch
  blender/trunk/force-draco2.patch
Modified:
  blender/trunk/PKGBUILD

--------------------+
 PKGBUILD           |   22 +++++++++++++++++-----
 force-draco1.patch |   15 +++++++++++++++
 force-draco2.patch |   21 +++++++++++++++++++++
 3 files changed, 53 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-02-16 23:58:30 UTC (rev 1133610)
+++ PKGBUILD	2022-02-17 00:34:55 UTC (rev 1133611)
@@ -8,7 +8,7 @@
 
 pkgname=blender
 pkgver=3.0.1
-pkgrel=4
+pkgrel=5
 epoch=17
 pkgdesc="A fully integrated 3D graphics creation suite"
 arch=('x86_64')
@@ -18,7 +18,8 @@
          'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'glew' 'openjpeg2' 'python-numpy'
          'freetype2' 'openal' 'ffmpeg4.4' 'fftw' 'boost-libs' 'opencollada' 'alembic' 'openxr'
          'openimageio' 'libsndfile' 'jack' 'opencolorio' 'openshadinglanguage' 'openimagedenoise'
-         'jemalloc' 'libspnav' 'ptex' 'opensubdiv' 'openvdb' 'log4cplus' 'sdl2' 'embree' 'libharu')
+         'jemalloc' 'libspnav' 'ptex' 'opensubdiv' 'openvdb' 'log4cplus' 'sdl2' 'embree' 'libharu'
+         'draco')
 makedepends=('cmake' 'boost' 'mesa' 'git' 'llvm' 'cuda' 'ninja')
 optdepends=('cuda: cycles renderer cuda support')
 options=(!strip)
@@ -28,7 +29,9 @@
         "git+https://git.blender.org/blender-translations.git"
         "git+https://git.blender.org/blender-dev-tools.git"
         https://developer.download.nvidia.com/redist/optix/v7.3/OptiX-7.3.0-Include.zip
-        blender-openexr3.patch)
+        blender-openexr3.patch
+        force-draco1.patch
+        force-draco2.patch)
 sha512sums=('SKIP'
             'SKIP'
             'SKIP'
@@ -35,7 +38,9 @@
             'SKIP'
             'SKIP'
             'd842e989bf86f4ae932f8708f6340861de4ea33b21435cceeb9a5e3135ef2ddb671e19fe11c397bddbf85894ba312194eac5acc21cbec70607120c0bda0100ef'
-            'e2dd7210d26b70445e9ae8e33dea35111ad0b0aca9d3b4ded3df560d0fcc8dc044868f729e0f090a04b6f316f083b5505a7056ce088e8702065add87b9b457e5')
+            'e2dd7210d26b70445e9ae8e33dea35111ad0b0aca9d3b4ded3df560d0fcc8dc044868f729e0f090a04b6f316f083b5505a7056ce088e8702065add87b9b457e5'
+            'e239da4f3906f1b54265435181cf770bae3d269c8d915df9a73861e6ee71ec70bf2339426e7c81a91e5a567273b3b3742d7a99feefd3398d821b26e1ff3a56d0'
+            '527ab66e5eace777de0043c1ca5787a488f6471450ce67fd6d08137ad0ef56177bc0c17696f30a5fca23fa55d8ca9c3f30cb7b17550dba2dbd8e89ca0b361990')
 
 prepare() {
   cd "$pkgname"
@@ -48,7 +53,9 @@
   git submodule update
   git submodule foreach git checkout v${pkgver}
 
-  patch -p1 < "$srcdir"/blender-openexr3.patch # Fix build with OpenEXR 3
+  patch -p1 -i "$srcdir"/blender-openexr3.patch # Fix build with OpenEXR 3
+  patch -p1 -i "$srcdir"/force-draco1.patch
+  patch -p1 -d release/scripts/addons -i "$srcdir"/force-draco2.patch
 }
 
 build() {
@@ -86,4 +93,9 @@
 
   # Manually install additional scripts (See FS#69351)
   cp -r release/scripts/addons_contrib/* "${pkgdir}"/usr/share/blender/3*/scripts/addons_contrib/
+
+  # Manually install draco bindings (See FS#73415)
+  mkdir -p "${pkgdir}"/usr/lib/python3.10/
+  mv "${pkgdir}"/usr/share/blender/3*/python/lib/* "${pkgdir}"/usr/lib/
+  rm -r "${pkgdir}"/usr/share/blender/3*/python
 }

Added: force-draco1.patch
===================================================================
--- force-draco1.patch	                        (rev 0)
+++ force-draco1.patch	2022-02-17 00:34:55 UTC (rev 1133611)
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 75f5795db68..d50686adfb0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -754,10 +754,6 @@ endif()
+ set_and_warn_dependency(WITH_PYTHON WITH_CYCLES        OFF)
+ set_and_warn_dependency(WITH_PYTHON WITH_DRACO         OFF)
+ 
+-if(WITH_DRACO AND NOT WITH_PYTHON_INSTALL)
+-  message(STATUS "WITH_DRACO requires WITH_PYTHON_INSTALL to be ON, disabling WITH_DRACO for now")
+-  set(WITH_DRACO OFF)
+-endif()
+ 
+ # enable boost for cycles, audaspace or i18n
+ # otherwise if the user disabled

Added: force-draco2.patch
===================================================================
--- force-draco2.patch	                        (rev 0)
+++ force-draco2.patch	2022-02-17 00:34:55 UTC (rev 1133611)
@@ -0,0 +1,21 @@
+diff --git a/io_scene_gltf2/io/com/gltf2_io_draco_compression_extension.py b/io_scene_gltf2/io/com/gltf2_io_draco_compression_extension.py
+index e7518ac4..c0d78564 100644
+--- a/io_scene_gltf2/io/com/gltf2_io_draco_compression_extension.py
++++ b/io_scene_gltf2/io/com/gltf2_io_draco_compression_extension.py
+@@ -13,6 +13,7 @@
+ # limitations under the License.
+ 
+ import os
++import site
+ import sys
+ from pathlib import Path
+ import bpy
+@@ -30,7 +31,7 @@ def dll_path() -> Path:
+     python_lib = Path('{v[0]}.{v[1]}/python/lib'.format(v=bpy.app.version))
+     python_version = 'python{v[0]}.{v[1]}'.format(v=sys.version_info)
+ 
+-    path = os.environ.get('BLENDER_EXTERN_DRACO_LIBRARY_PATH')
++    path = site.getsitepackages()[0]
+     if path is None:
+         path = {
+             'win32': blender_root / python_lib / 'site-packages',