public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/blender] rawhide: Fix Hydra configuration when USD is disabled
@ 2026-09-23  0:22 Luya Tshimbalanga
  0 siblings, 0 replies; only message in thread
From: Luya Tshimbalanga @ 2026-09-23  0:22 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/blender
            Branch : rawhide
            Commit : c7abdae0ac833f2abc1b30647170c3b7392e3e85
            Author : Luya Tshimbalanga <luya@fedoraproject.org>
            Date   : 2026-09-22T17:18:36-07:00
            Stats  : +5/-3 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/blender/c/c7abdae0ac833f2abc1b30647170c3b7392e3e85?branch=rawhide

            Log:
            Fix Hydra configuration when USD is disabled

Tie WITH_HYDRA to the USD build conditional. This prevents Blender's
CMake dependency check from aborting on ppc64le and in explicit
--without usd builds.

---
diff --git a/blender.spec b/blender.spec
index 373724a..3372f12 100644
--- a/blender.spec
+++ b/blender.spec
@@ -20,7 +20,7 @@
 %{error:--with clang requires --with llvm}
 %endif
 
-# Cycles are available on Fedora's supported 64-bit little-endian
+# Cycles and USD are available on Fedora's supported 64-bit little-endian
 # architectures.
 %ifarch x86_64 aarch64 ppc64le
 %global cyclesflag ON
@@ -28,7 +28,7 @@
 %global cyclesflag OFF
 %endif
 
-# Embree, HIDAPI and USD are available on x86_64 and aarch64.
+# Embree and HIDAPI are available on x86_64 and aarch64.
 %ifarch x86_64 aarch64
 %bcond embree 1
 %bcond hidapi 1
@@ -420,7 +420,8 @@ export HIP_CLANG_PATH=$(hipconfig -l)
 # Non-portable installs do not install Blender's CPU-check helper. Blender's
 # legacy FindGflags module conflicts with the gflags state imported by Ceres on
 # Fedora, so use Blender's bundled gflags as Fedora's package does. Ceres still
-# uses the system gflags library through its own imported target.
+# uses the system gflags library through its own imported target. Hydra requires
+# USD, so keep both options synchronized on architectures where USD is disabled.
 %cmake \
     -DBUILD_SHARED_LIBS=OFF \
     -DCMAKE_BUILD_TYPE=Release \
@@ -460,6 +461,7 @@ export HIP_CLANG_PATH=$(hipconfig -l)
     -DWITH_DOC_MANPAGE=%{with manpage} \
     -DWITH_FRIBIDI=%{with fribidi} \
     -DWITH_HARFBUZZ=%{with harfbuzz} \
+    -DWITH_HYDRA=%{with usd} \
     -DWITH_MATERIALX=%{with materialx} \
 %if %{with openshading}
     -DOSL_COMPILER=%{_bindir}/oslc \

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-09-23  0:22 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-23  0:22 [rpms/blender] rawhide: Fix Hydra configuration when USD is disabled Luya Tshimbalanga

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox