Sven-Hendrik Haase pushed to branch main at Arch Linux / Packaging / Packages / 
blender


Commits:
1293eafc by Sven-Hendrik Haase at 2024-11-25T15:02:39+01:00
upgpkg: 17:4.3.0-2: Fix draco patch

Fix #25.

- - - - -


3 changed files:

- .SRCINFO
- PKGBUILD
- force-draco2.patch


Changes:

=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
 pkgbase = blender
        pkgdesc = A fully integrated 3D graphics creation suite
        pkgver = 4.3.0
-       pkgrel = 1
+       pkgrel = 2
        epoch = 17
        url = https://www.blender.org
        arch = x86_64
@@ -109,7 +109,7 @@ pkgbase = blender
        sha512sums = 
01f3054383d12665975600c2ad4dfba1765a6a52a837c944a510c871c51268ab4368110f5ecd21d51670b65dcbbc1cf6f40a7b47bf7636bf414c71d2a7d5dfc1
        sha512sums = 
5502d9df847de12badc702c0444bd4f1f7620460b2235026df2c3133da1e04c148af0f1fc7f345e9a0c009c32f905f66c8d427743445e8864d3a797cdce6a483
        sha512sums = 
96098190ac8d7665047fa1d08a116740cee6669e84780876ea06afd7e505bbcb17820533c2f666a368fb2e2b45dc1ab9cc2d08684649a283fde5b3eb66a8a93b
-       sha512sums = 
17b1e198c3ca069a8e9914b05185714853156a3651ccddcdb75740f1d617009d698065d637e9c8ba6481780eee202da738ca25ec241c32c150fe26aeefe26576
+       sha512sums = 
a3cc13d7fedc4421e9edfa37a29c237c55c74ca29f05d72480369d6bcde4a276f061de0398962d0529decffe69ff3e797b4b2d38e43d7cf73b9d72d1a9d01236
        sha512sums = 
59044954880ce94d7a1da78ccd03e61a9d23382281b2221ca5c9c7eec9caeecf810d10ee07940d5843b7540fa81c00df5a26e8076605410116815e73c60ab9b9
        sha512sums = 
ce67f8cb4857f3cc98759f00c226e1e0f81578a656e5772bd016fd0eee387f1fc0bc8e44b54e4ddef4df226d416f4ba2f7ef9e7ad02db36c968e727c986e3c4e
        sha512sums = 
e1522345d6119ad396f27293b5f67b3a6d1b7352791186a04aeb654f285eeae873937f124461ff8dc9fc8ac5ae820cd8254bd4c3b64dcc06f1e41bee45f9bbe9


=====================================
PKGBUILD
=====================================
@@ -9,7 +9,7 @@
 
 pkgname=blender
 pkgver=4.3.0
-pkgrel=1
+pkgrel=2
 epoch=17
 pkgdesc="A fully integrated 3D graphics creation suite"
 arch=('x86_64')
@@ -125,7 +125,7 @@ 
sha512sums=('c13f4f37a65db6ee98c3d1fda493d7c3d1184eb7ac600c008f9cedbbc3fb61cb0ff
             
'01f3054383d12665975600c2ad4dfba1765a6a52a837c944a510c871c51268ab4368110f5ecd21d51670b65dcbbc1cf6f40a7b47bf7636bf414c71d2a7d5dfc1'
             
'5502d9df847de12badc702c0444bd4f1f7620460b2235026df2c3133da1e04c148af0f1fc7f345e9a0c009c32f905f66c8d427743445e8864d3a797cdce6a483'
             
'96098190ac8d7665047fa1d08a116740cee6669e84780876ea06afd7e505bbcb17820533c2f666a368fb2e2b45dc1ab9cc2d08684649a283fde5b3eb66a8a93b'
-            
'17b1e198c3ca069a8e9914b05185714853156a3651ccddcdb75740f1d617009d698065d637e9c8ba6481780eee202da738ca25ec241c32c150fe26aeefe26576'
+            
'a3cc13d7fedc4421e9edfa37a29c237c55c74ca29f05d72480369d6bcde4a276f061de0398962d0529decffe69ff3e797b4b2d38e43d7cf73b9d72d1a9d01236'
             
'59044954880ce94d7a1da78ccd03e61a9d23382281b2221ca5c9c7eec9caeecf810d10ee07940d5843b7540fa81c00df5a26e8076605410116815e73c60ab9b9'
             
'ce67f8cb4857f3cc98759f00c226e1e0f81578a656e5772bd016fd0eee387f1fc0bc8e44b54e4ddef4df226d416f4ba2f7ef9e7ad02db36c968e727c986e3c4e'
             
'e1522345d6119ad396f27293b5f67b3a6d1b7352791186a04aeb654f285eeae873937f124461ff8dc9fc8ac5ae820cd8254bd4c3b64dcc06f1e41bee45f9bbe9')


=====================================
force-draco2.patch
=====================================
@@ -1,8 +1,16 @@
 diff --git a/scripts/addons_core/io_scene_gltf2/io/com/draco.py 
b/scripts/addons_core/io_scene_gltf2/io/com/draco.py
-index 75e23162c67..a3cad997f73 100644
+index 75e23162c67..a386463a2a9 100644
 --- a/scripts/addons_core/io_scene_gltf2/io/com/draco.py
 +++ b/scripts/addons_core/io_scene_gltf2/io/com/draco.py
-@@ -35,7 +35,7 @@ def dll_path() -> Path:
+@@ -6,6 +6,7 @@ import os
+ import sys
+ from pathlib import Path
+ import bpy
++import site
+ 
+ 
+ def find_draco_dll_in_module(library_name: str) -> Path:
+@@ -35,7 +36,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)
  



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/blender/-/commit/1293eafcced8d418b43581ee872daf619169c12b

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/blender/-/commit/1293eafcced8d418b43581ee872daf619169c12b
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to