public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Luya Tshimbalanga <luya@fedoraproject.org>
To: git-commits@fedoraproject.org
Subject: [rpms/blender] f45: Merge branch 'rawhide' into f45
Date: Wed, 23 Sep 2026 00:22:29 GMT	[thread overview]
Message-ID: <179012294971.1.2967019442615425079.rpms-blender-726288213c1e@fedoraproject.org> (raw)

A new commit has been pushed.

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

Log:
Merge branch 'rawhide' into f45

---
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 \

             reply	other threads:[~2026-09-23  0:22 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-09-23  0:22 Luya Tshimbalanga [this message]
  -- strict thread matches above, loose matches on Subject: below --
2026-09-22  0:00 [rpms/blender] f45: Merge branch 'rawhide' into f45 Luya Tshimbalanga
2026-09-21 23:39 Luya Tshimbalanga
2026-09-20  2:19 Luya Tshimbalanga

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=179012294971.1.2967019442615425079.rpms-blender-726288213c1e@fedoraproject.org \
    --to=luya@fedoraproject.org \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox