The package rpms/usd.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/usd.git/commit/?id=8fe82bd7638133...
https://src.fedoraproject.org/cgit/rpms/usd.git/commit/?id=e5162bfc1a0211....
Change:
+ExclusiveArch: aarch64 x86_64
+ExclusiveArch: x86_64 %{arm64}
Thanks.
Full change:
============
commit b366e41a8a608aa65265c4943336dead68be6779
Merge: 8fe82bd 5af127c
Author: Luya Tshimbalanga <luya(a)fedoraproject.org>
Date: Thu Oct 7 00:28:42 2021 -0700
Actually support aarch64
commit 8fe82bd7638133de676ee28c1f014f099795ba6f
Author: Luya Tshimbalanga <luya(a)fedoraproject.org>
Date: Wed Oct 6 23:23:29 2021 -0700
Actually enable aarch64 support
diff --git a/usd.spec b/usd.spec
index 6bff5ce..1f59818 100644
--- a/usd.spec
+++ b/usd.spec
@@ -124,7 +124,7 @@ Provides: bundled(stb_image_write) = 1.09
# This package is only available for x86_64 and aarch64
# Will fail to build on other architectures
#
https://bugzilla.redhat.com/show_bug.cgi?id=1960848
-ExclusiveArch: x86_64 %{arm64}
+ExclusiveArch: aarch64 x86_64
%description
Universal Scene Description (USD) is a time-sampled scene
commit e5162bfc1a0211f03bdb1a88ac796fc05b62f870
Author: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Wed Oct 6 09:47:22 2021 -0400
Enable aarch64
diff --git a/usd.spec b/usd.spec
index 576ec66..6bff5ce 100644
--- a/usd.spec
+++ b/usd.spec
@@ -121,10 +121,10 @@ Provides: bundled(VulkanMemoryAllocator) = 3.0.0~development
Provides: bundled(stb_image) = 2.19
Provides: bundled(stb_image_write) = 1.09
-# This package is only available for x86_64
+# This package is only available for x86_64 and aarch64
# Will fail to build on other architectures
#
https://bugzilla.redhat.com/show_bug.cgi?id=1960848
-ExclusiveArch: x86_64
+ExclusiveArch: x86_64 %{arm64}
%description
Universal Scene Description (USD) is a time-sampled scene
commit 057bb664367f656fe07a7a5dbe41d63e878c19f4
Author: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Mon Aug 23 11:43:16 2021 -0400
Unbundle stb_image_resize
diff --git a/usd.spec b/usd.spec
index fe5ec21..576ec66 100644
--- a/usd.spec
+++ b/usd.spec
@@ -97,6 +97,10 @@ BuildRequires: cmake(Alembic)
BuildRequires: hdf5-devel
%endif
+# Header-only library: -static is for tracking per guidelines
+BuildRequires: stb_image_resize-devel
+BuildRequires: stb_image_resize-static
+
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%if %{with python3}
Requires: python3-%{name}%{?_isa} = %{version}-%{release}
@@ -111,18 +115,19 @@ Provides: bundled(lz4) = 1.9.2
Provides: bundled(pugixml) = 1.9
Provides: bundled(rapidjson) = 1.0.2
Provides: bundled(SPIRV-Reflect) = 1.0
+Provides: bundled(VulkanMemoryAllocator) = 3.0.0~development
+# Both of these are packaged in Fedora, but USD uses patched versions, so they
+# must be bundled.
Provides: bundled(stb_image) = 2.19
-Provides: bundled(stb_image_resize) = 0.95
Provides: bundled(stb_image_write) = 1.09
-Provides: bundled(VulkanMemoryAllocator) = 3.0.0~development
-
+
# This package is only available for x86_64
# Will fail to build on other architectures
#
https://bugzilla.redhat.com/show_bug.cgi?id=1960848
ExclusiveArch: x86_64
%description
-Universal Scene Description (USD) is a time-sampled scene
+Universal Scene Description (USD) is a time-sampled scene
description for interchange between graphics applications.
%package libs
@@ -172,7 +177,7 @@ Python language bindings for the Universal Scene Description (USD) C++
API
%package doc
Summary: Documentation for usd
BuildArch: noarch
-
+
%description doc
Documentation for the Universal Scene Description (USD) C++ API
%endif
@@ -180,7 +185,7 @@ Documentation for the Universal Scene Description (USD) C++ API
%prep
%autosetup -p1 -n %{srcname}-%{version}
-# Convert NOTICE.txt from CRNL line encoding
+# Convert NOTICE.txt from CRNL line encoding
dos2unix NOTICE.txt
%if %{with python3}
@@ -200,6 +205,9 @@ ln -s %{_datadir}/fonts/google-roboto
pxr/usdImaging/usdviewq/fonts/Roboto
ln -s %{_datadir}/fonts/google-roboto-mono \
pxr/usdImaging/usdviewq/fonts/Roboto_Mono
+# Unbundle stb_image_resize:
+ln -svf %{_includedir}/stb_image_resize.h pxr/imaging/hio/stb/
+
# Use c++17 standard otherwise build fails
sed -i 's|set(CMAKE_CXX_STANDARD 14)|set(CMAKE_CXX_STANDARD 17)|g' \
cmake/defaults/CXXDefaults.cmake
@@ -215,7 +223,7 @@ sed -i 's|lib/usd|%{_libdir}/usd|g' cmake/macros/Public.cmake
sed -i 's|"lib"|%{_libdir}|g' cmake/macros/Public.cmake
sed -i 's|plugin/usd|%{_libdir}/usd/plugin|g' \
cmake/macros/Public.cmake
-
+
# Fix cmake directory destination
sed -i 's|"${CMAKE_INSTALL_PREFIX}"|%{_libdir}/cmake/pxr|g'
pxr/CMakeLists.txt
@@ -228,8 +236,8 @@ exec uic-qt5 -g python "$@"
EOF
chmod +x uic-wrapper
-# Fix python3 support
-#
https://github.com/PixarAnimationStudios/USD/issues/1419
+# Fix python3 support
+#
https://github.com/PixarAnimationStudios/USD/issues/1419
flags="%{optflags} -Wl,--as-needed -DTBB_SUPPRESS_DEPRECATED_MESSAGES=1" \
# Patch2 was not good enough to get the include path for Imath everywhere it
@@ -298,7 +306,7 @@ mv %{buildroot}%{python3_sitelib}/* %{buildroot}%{python3_sitearch}
desktop-file-install \
--dir=%{buildroot}%{_datadir}/applications \
%{SOURCE1}
-
+
# Remove arch-specific code in /usr/share
find %{buildroot}%{_datadir}/%{name}/examples -name '*.so' -print -delete
@@ -307,7 +315,7 @@ mv %{buildroot}%{_prefix}/lib/python/pxr/*.* \
%{buildroot}%{python3_sitearch}/pxr/
mv %{buildroot}%{_prefix}/lib/python/pxr/Usdviewq/* \
%{buildroot}%{python3_sitearch}/pxr/Usdviewq/
-
+
%check
desktop-file-validate
%{buildroot}%{_datadir}/applications/org.open%{name}.%{name}view.desktop
%{?with_test:%ctest}
commit 707a0e357019e1149f63088b36c67d99cfe25f72
Author: Luya Tshimbalanga <luya(a)fedoraproject.org>
Date: Sat Aug 21 10:32:17 2021 -0700
Disable oiio and openvdb
diff --git a/usd.spec b/usd.spec
index 30d7023..fe5ec21 100644
--- a/usd.spec
+++ b/usd.spec
@@ -9,8 +9,9 @@
#
https://github.com/PixarAnimationStudios/USD/issues/1592.
%bcond_without jemalloc
%bcond_with openshading
+%bcond_with openvdb
%bcond_with ocio
-%bcond_without oiio
+%bcond_with oiio
%bcond_without python3
%bcond_with test
@@ -73,7 +74,9 @@ BuildRequires: openshadinglanguage
BuildRequires: pkgconfig(oslexec)
%endif
BuildRequires: opensubdiv-devel
+%if %{with openvdb}
BuildRequires: openvdb-devel
+%endif
BuildRequires: pkgconfig(dri)
%if %{with jemalloc}
BuildRequires: pkgconfig(jemalloc)
@@ -249,7 +252,9 @@ flags="${flags} $(pkgconf --cflags Imath)"
-DPXR_BUILD_EXAMPLES=OFF \
-DPXR_BUILD_TUTORIALS=OFF \
-DPXR_BUILD_TESTS=%{?with_test:ON}%{!?with_test:OFF} \
+%if %{with openvdb}
-DPXR_ENABLE_OPENVDB_SUPPORT=ON \
+%endif
-DPXR_INSTALL_LOCATION="%{_libdir}/%{name}/plugin" \
%if %{with jemalloc}
-DPXR_MALLOC_LIBRARY="%{_libdir}/libjemalloc.so" \
commit 9fc07f9c2c0484219ca6b93e55139fd432f26da2
Author: Luya Tshimbalanga <luya(a)fedoraproject.org>
Date: Sat Aug 21 10:31:56 2021 -0700
Disable oiio and openvdb
commit 48ab077a75dbb71563af38aeb7d648d9ab7a5756
Author: Luya Tshimbalanga <luya(a)fedoraproject.org>
Date: Sat Aug 21 10:30:20 2021 -0700
Disable oiio and openvdb
commit 1f6e7e4b55e74fba067e80a9fe8608d5465da952
Author: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Sat Aug 21 11:38:06 2021 -0400
Remove an unused patch from dist-git
diff --git a/usd-21.02-demangle-fix.patch b/usd-21.02-demangle-fix.patch
deleted file mode 100644
index a59efc6..0000000
--- a/usd-21.02-demangle-fix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- USD-21.02/pxr/base/arch/demangle.cpp.orig 2021-01-20 09:13:57.000000000 +0900
-+++ USD-21.02/pxr/base/arch/demangle.cpp 2021-02-05 16:37:27.154126908 +0900
-@@ -36,6 +36,7 @@ using std::string;
- #if (ARCH_COMPILER_GCC_MAJOR == 3 && ARCH_COMPILER_GCC_MINOR >= 1) || \
- ARCH_COMPILER_GCC_MAJOR > 3 || defined(ARCH_COMPILER_CLANG)
- #define _AT_LEAST_GCC_THREE_ONE_OR_CLANG
-+#include <cxxabi.h>
- #endif
-
- PXR_NAMESPACE_OPEN_SCOPE
-@@ -138,7 +139,6 @@ _StripPxrInternalNamespace(string* name)
- #endif
-
- #if defined(_AT_LEAST_GCC_THREE_ONE_OR_CLANG)
--#include <cxxabi.h>
-
- /*
- * This routine doesn't work when you get to gcc3.4.