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


Commits:
496308e2 by loqs at 2024-02-10T16:14:44+00:00
Enable OSL now built with LLVM 16.

- - - - -


1 changed file:

- PKGBUILD


Changes:

=====================================
PKGBUILD
=====================================
@@ -68,6 +68,10 @@ prepare() {
   # https://projects.blender.org/blender/blender/issues/117145
   git cherry-pick -n eb99895c972b6c713294f68a34798aa51d36034a
 
+  # Fix compatibility with OSL 1.13.5
+  # https://projects.blender.org/blender/blender/issues/113157
+  git cherry-pick -n 798a0b301e640e73ae12e6f8a36a66746893bff1
+
   # fix draco
   patch -p1 -i "$srcdir"/force-draco1.patch
   patch -p1 -d scripts/addons -i "$srcdir"/force-draco2.patch
@@ -98,8 +102,6 @@ build() {
   echo 'set(CYCLES_CUDA_BINARIES_ARCH sm_52 sm_53 sm_60 sm_61 sm_62 sm_70 
sm_72 sm_75 sm_80 sm_86 sm_87 sm_89 compute_89 CACHE STRING "CUDA architectures 
to build binaries for" FORCE)' > precache
   echo 'mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH)' >> precache
 
-  # Disable OSL until it's built with LLVM 16 otherwise we get stuff like
-  # 
https://gitlab.archlinux.org/archlinux/packaging/packages/blender/-/issues/2
   cmake \
     -Bbuild \
     -GNinja \
@@ -111,7 +113,7 @@ build() {
     -DHIP_ROOT_DIR=/opt/rocm \
     -DOPTIX_ROOT_DIR="$srcdir" \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DWITH_CYCLES_OSL=OFF \
+    -DWITH_CYCLES_OSL=ON \
     -DCMAKE_BUILD_TYPE=Release \
     -DWITH_INSTALL_PORTABLE=OFF \
     -DWITH_PYTHON_INSTALL=OFF \



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

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


Reply via email to