From a0e28a191a629b29a7f45e931a786c8ba58b8acc Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Mon, 20 Mar 2023 10:32:11 -0400 Subject: [PATCH 01/17] Drop manual dependency on cmake-filesystem, now automatic --- usd.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/usd.spec b/usd.spec index 57f963c..5d5d6a9 100644 --- a/usd.spec +++ b/usd.spec @@ -227,7 +227,6 @@ interchange between graphics applications. %package devel Summary: Development files for USD -Requires: cmake-filesystem Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description devel From e0712ae0002259dcc587fba814623e7dc7804e50 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Mon, 20 Mar 2023 10:32:29 -0400 Subject: [PATCH 02/17] Re-enable OpenShadingLanguage and OpenVDB support --- usd.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usd.spec b/usd.spec index 5d5d6a9..796fa3b 100644 --- a/usd.spec +++ b/usd.spec @@ -9,8 +9,8 @@ %bcond_without embree %bcond_without imaging %bcond_with jemalloc -%bcond_with openshading -%bcond_with openvdb +%bcond_without openshading +%bcond_without openvdb %bcond_without ocio %bcond_without oiio %bcond_without python3 From 6ade62ab423e2319fe4da50c38fe2e3c174a3810 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Mon, 17 Apr 2023 10:11:01 -0400 Subject: [PATCH 03/17] Build with the draco plugin --- usd.spec | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/usd.spec b/usd.spec index 796fa3b..7df6610 100644 --- a/usd.spec +++ b/usd.spec @@ -6,6 +6,7 @@ %bcond_without alembic %bcond_with documentation +%bcond_without draco %bcond_without embree %bcond_without imaging %bcond_with jemalloc @@ -133,6 +134,9 @@ BuildRequires: graphviz # For imaging and usd imaging %if %{with imaging} +%if %{with draco} +BuildRequires: draco-devel +%endif %if %{with embree} BuildRequires: embree-devel %endif @@ -234,7 +238,7 @@ This package contains the C++ header files and symbolic links to the shared libraries for %{name}. If you would like to develop programs using %{name}, you will need to install %{name}-devel. -# For usdview +# For usdview, usdcompress %if %{with python3} %package -n python3-%{name} Summary: %{summary} @@ -369,6 +373,9 @@ flags="${flags} $(pkgconf --cflags Imath)" -DOPENEXR_LOCATION=%{_includedir} \ -DPXR_BUILD_ALEMBIC_PLUGIN=ON \ %endif +%if %{with draco} + -DPXR_BUILD_DRACO_PLUGIN=ON \ +%endif %if %{with embree} -DPXR_BUILD_EMBREE_PLUGIN=ON \ -DEMBREE_LOCATION=%{_prefix} \ @@ -454,7 +461,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.open%{name}.%{nam %if %{with python3} %files -n python3-%{name} -%{python3_sitearch}/pxr +%{python3_sitearch}/pxr/ +%if %{with draco} +%{_bindir}/usdcompress +%endif %if %{with usdview} %{_datadir}/applications/org.open%{name}.%{name}view.desktop %{_bindir}/testusdview From 2cf2df02461678ecadd2fd08b0df2f33d1be69f6 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Mon, 17 Apr 2023 10:51:14 -0400 Subject: [PATCH 04/17] Stop conditionalizing Python --- usd.spec | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/usd.spec b/usd.spec index 7df6610..a77451b 100644 --- a/usd.spec +++ b/usd.spec @@ -14,7 +14,6 @@ %bcond_without openvdb %bcond_without ocio %bcond_without oiio -%bcond_without python3 %bcond_without usdview # TODO: Figure out how to re-enable the tests. Currently these want to install # into /usr/tests and, and there are issues with the launchers finding the @@ -181,9 +180,7 @@ BuildRequires: stb_image_resize-devel >= 0.97 BuildRequires: stb_image_resize-static Requires: %{name}-libs%{?_isa} = %{version}-%{release} -%if %{with python3} Requires: python3-%{name}%{?_isa} = %{version}-%{release} -%endif # This package is only available for x86_64 and aarch64 # Will fail to build on other architectures @@ -239,7 +236,6 @@ libraries for %{name}. If you would like to develop programs using %{name}, you will need to install %{name}-devel. # For usdview, usdcompress -%if %{with python3} %package -n python3-%{name} Summary: %{summary} @@ -264,7 +260,7 @@ Requires: python3dist(pyopengl) %description -n python3-%{name} Python language bindings for the Universal Scene Description (USD) C++ API -%endif + %if %{with documentation} %package doc @@ -281,10 +277,8 @@ Documentation for the Universal Scene Description (USD) C++ API # Convert NOTICE.txt from CRNL line encoding dos2unix NOTICE.txt -%if %{with python3} # Fix all Python shebangs recursively in . %py3_shebang_fix . -%endif # Further drop shebangs line for some py files sed -r -i '1{/^#!/d}' \ @@ -338,9 +332,6 @@ exec uic-qt5 -g python "$@" EOF chmod +x uic-wrapper -# 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 # was needed. Add it globally. @@ -390,13 +381,9 @@ flags="${flags} $(pkgconf --cflags Imath)" -DPXR_ENABLE_OSL_SUPPORT=ON \ %endif -DPYTHON_EXECUTABLE=%{python3} \ -%if %{with python3} -DPXR_USE_PYTHON_3=ON \ -DPYSIDE_AVAILABLE=ON \ -DPYSIDEUICBINARY:PATH=${PWD}/uic-wrapper \ -%else - -DPXR_ENABLE_PYTHON_SUPPORT=OFF \ -%endif -DPXR_BUILD_MONOLITHIC=ON \ -DPXR_ENABLE_MALLOCHOOK_SUPPORT=OFF %cmake_build @@ -459,7 +446,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.open%{name}.%{nam %{_bindir}/usdtree %{_bindir}/usdzip -%if %{with python3} %files -n python3-%{name} %{python3_sitearch}/pxr/ %if %{with draco} @@ -470,7 +456,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.open%{name}.%{nam %{_bindir}/testusdview %{_bindir}/usdview %endif -%endif %files libs %license LICENSE.txt From e1349c1a936aab811f397dcfa745e891709dc1c2 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 21 Apr 2023 08:43:54 -0400 Subject: [PATCH 05/17] Be more explicit that we are on OpenEXR/Imath 3 --- usd.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usd.spec b/usd.spec index a77451b..37cd99c 100644 --- a/usd.spec +++ b/usd.spec @@ -157,8 +157,8 @@ BuildRequires: cmake(OpenColorIO) %if %{with oiio} BuildRequires: pkgconfig(OpenImageIO) %endif -BuildRequires: cmake(OpenEXR) -BuildRequires: cmake(Imath) >= 2.0 +BuildRequires: cmake(OpenEXR) >= 3.0 +BuildRequires: cmake(Imath) >= 3.0 BuildRequires: pkgconfig(Ptex) %endif From 2eb0ca6f919a41b0785ea8d453d3e37281ec43ef Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 21 Apr 2023 08:44:27 -0400 Subject: [PATCH 06/17] Slightly improve handling of compiler/linker flags --- usd.spec | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/usd.spec b/usd.spec index 37cd99c..b382683 100644 --- a/usd.spec +++ b/usd.spec @@ -325,6 +325,8 @@ find . -type f -exec gawk '/embree3/ { print FILENAME }' '{}' '+' | xargs -r sed -r -i 's/(embree)3/\14/' %build +%set_build_flags + # Fix uic-qt5 use cat > uic-wrapper <<'EOF' #!/bin/sh @@ -332,17 +334,20 @@ exec uic-qt5 -g python "$@" EOF chmod +x uic-wrapper -flags="%{optflags} -Wl,--as-needed -DTBB_SUPPRESS_DEPRECATED_MESSAGES=1" \ -# Patch2 was not good enough to get the include path for Imath everywhere it -# was needed. Add it globally. -# https://github.com/PixarAnimationStudios/USD/issues/1591 -flags="${flags} $(pkgconf --cflags Imath)" +# Although upstream supports OpenEXR3 / Imath now, the necessary include path +# is not set everywhere it’s needed. It’s not immediately clear exactly why +# this is happening here or what should be changed upstream. +extra_flags="${extra_flags-} $(pkgconf --cflags Imath)" +# Suppress deprecation warnings from TBB; upstream should act on them +# eventually, but they just add noise here. +extra_flags="${extra_flags-} -DTBB_SUPPRESS_DEPRECATED_MESSAGES=1" %cmake \ - -DCMAKE_CXX_FLAGS_RELEASE="${flags}" \ - -DCMAKE_C_FLAGS_RELEASE="${flags}" \ + -DCMAKE_CXX_FLAGS_RELEASE="${CXXFLAGS-} ${extra_flags}" \ + -DCMAKE_C_FLAGS_RELEASE="${CFLAGS-} ${extra_flags}" \ -DCMAKE_CXX_STANDARD=17 \ - -DCMAKE_EXE_LINKER_FLAGS="-pie" \ + -DCMAKE_EXE_LINKER_FLAGS="${LDFLAGS}" \ + -DCMAKE_SHARED_LINKER_FLAGS="${LDFLAGS}" \ -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_SKIP_INSTALL_RPATH=ON \ -DCMAKE_VERBOSE_MAKEFILE=ON \ From 26288440d60b63a56642a2ae4c6eedc408b6a0cb Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 21 Apr 2023 09:51:47 -0400 Subject: [PATCH 07/17] Write the uic-wrapper script in prep, not build --- usd.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/usd.spec b/usd.spec index b382683..e39b38a 100644 --- a/usd.spec +++ b/usd.spec @@ -324,9 +324,6 @@ sed -i 's|"${CMAKE_INSTALL_PREFIX}"|%{_libdir}/cmake/pxr|g' pxr/CMakeLists.txt find . -type f -exec gawk '/embree3/ { print FILENAME }' '{}' '+' | xargs -r sed -r -i 's/(embree)3/\14/' -%build -%set_build_flags - # Fix uic-qt5 use cat > uic-wrapper <<'EOF' #!/bin/sh @@ -334,6 +331,10 @@ exec uic-qt5 -g python "$@" EOF chmod +x uic-wrapper + +%build +%set_build_flags + # Although upstream supports OpenEXR3 / Imath now, the necessary include path # is not set everywhere it’s needed. It’s not immediately clear exactly why # this is happening here or what should be changed upstream. From 81f473afe184102a554fdbba6dc91c1a1cb72f80 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Mon, 17 Apr 2023 10:54:20 -0400 Subject: [PATCH 08/17] Put all the tools and apps in the base package They were not correctly sorted between Python and non-Python anyway. --- usd.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/usd.spec b/usd.spec index e39b38a..bbf5629 100644 --- a/usd.spec +++ b/usd.spec @@ -441,6 +441,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.open%{name}.%{nam %{_bindir}/usdGenSchema %{_bindir}/usdcat %{_bindir}/usdchecker +%if %{with draco} +%{_bindir}/usdcompress +%endif %{_bindir}/usddiff %{_bindir}/usddumpcrate %{_bindir}/usdedit @@ -451,18 +454,15 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.open%{name}.%{nam %{_bindir}/usdstitchclips %{_bindir}/usdtree %{_bindir}/usdzip - -%files -n python3-%{name} -%{python3_sitearch}/pxr/ -%if %{with draco} -%{_bindir}/usdcompress -%endif %if %{with usdview} %{_datadir}/applications/org.open%{name}.%{name}view.desktop %{_bindir}/testusdview %{_bindir}/usdview %endif +%files -n python3-%{name} +%{python3_sitearch}/pxr/ + %files libs %license LICENSE.txt %doc NOTICE.txt README.md From b0b9b2119ba76000840e376f0947a82b5ecd0791 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sat, 22 Apr 2023 15:03:52 -0400 Subject: [PATCH 09/17] Add generated man pages These are slightly sloppy in places. For example, there is a warning from _DiscoverPlugins mixed into some of them. However, they are of mostly-good quality, are perfectly usable, and are much better than nothing. --- usd.spec | 50 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 47 insertions(+), 3 deletions(-) diff --git a/usd.spec b/usd.spec index bbf5629..145b792 100644 --- a/usd.spec +++ b/usd.spec @@ -116,11 +116,16 @@ Patch: %{forgeurl}/pull/1928.patch Patch: %{forgeurl}/pull/2266.patch # Base +BuildRequires: gcc-c++ + +BuildRequires: cmake + +BuildRequires: dos2unix +BuildRequires: help2man + +BuildRequires: pkgconfig(blosc) BuildRequires: boost-devel BuildRequires: boost-program-options -BuildRequires: cmake -BuildRequires: dos2unix -BuildRequires: gcc-c++ BuildRequires: pkgconfig(blosc) BuildRequires: pkgconfig(tbb) @@ -428,6 +433,21 @@ mv %{buildroot}%{_prefix}/lib/python/pxr/Usdviewq/* \ # https://github.com/PixarAnimationStudios/USD/issues/1088 rm -vrf '%{buildroot}%{_libdir}/cmake' +# Generate and install man pages. While generating the man pages might more +# properly go in %%build, it is generally much easier to do this here in a +# single step, using the entry points installed into the buildroot. This is +# especially true for the entry points that are Python scripts. +install -d '%{buildroot}%{_mandir}/man1' +for cmd in %{buildroot}%{_bindir}/* +do + PYTHONPATH='%{buildroot}%{python3_sitearch}' \ + LD_LIBRARY_PATH='%{buildroot}%{_libdir}' \ + help2man \ + --no-info --no-discard-stderr --version-string='%{version}' \ + --output="%{buildroot}%{_mandir}/man1/$(basename "${cmd}").1" \ + "${cmd}" +done + %check %if %{with usdview} desktop-file-validate %{buildroot}%{_datadir}/applications/org.open%{name}.%{name}view.desktop @@ -436,6 +456,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.open%{name}.%{nam %files %doc NOTICE.txt README.md + %{_bindir}/sdfdump %{_bindir}/sdffilter %{_bindir}/usdGenSchema @@ -460,6 +481,29 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.open%{name}.%{nam %{_bindir}/usdview %endif +%{_mandir}/man1/sdfdump.1* +%{_mandir}/man1/sdffilter.1* +%{_mandir}/man1/usdGenSchema.1* +%{_mandir}/man1/usdcat.1* +%{_mandir}/man1/usdchecker.1* +%if %{with draco} +%{_mandir}/man1/usdcompress.1* +%endif +%{_mandir}/man1/usddiff.1* +%{_mandir}/man1/usddumpcrate.1* +%{_mandir}/man1/usdedit.1* +%{_mandir}/man1/usdgenschemafromsdr.1* +%{_mandir}/man1/usdrecord.1* +%{_mandir}/man1/usdresolve.1* +%{_mandir}/man1/usdstitch.1* +%{_mandir}/man1/usdstitchclips.1* +%{_mandir}/man1/usdtree.1* +%{_mandir}/man1/usdzip.1* +%if %{with usdview} +%{_mandir}/man1/testusdview.1* +%{_mandir}/man1/usdview.1* +%endif + %files -n python3-%{name} %{python3_sitearch}/pxr/ From b3dc28a5d709b36dc265d5e212ecc787b82d2180 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Mon, 24 Apr 2023 17:19:25 -0400 Subject: [PATCH 10/17] Move codegenTemplates from -devel to -libs While headers normally go in -devel packages, these headers and C++ source files are used as data templates for generated code, and it makes sense to package them with the rest of the library resources. --- usd.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/usd.spec b/usd.spec index 145b792..766716d 100644 --- a/usd.spec +++ b/usd.spec @@ -511,14 +511,18 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.open%{name}.%{nam %license LICENSE.txt %doc NOTICE.txt README.md %{_libdir}/lib%{name}_%{name}_ms.so.%{downstream_so_version} -%{_libdir}/%{name} -%exclude %{_libdir}/%{name}/%{name}/resources/codegenTemplates +# While headers normally go in -devel packages, those in +# %%{_libdir}/usd/usd/resources/codegenTemplates/ are used as data (templates +# for generated code), and it makes sense to package them with the rest of the +# library resources. (Technically, these are currently used only by the +# usdGenSchema command-line tool, so they could be moved to the base package, +# but this is probably too fussy.) +%{_libdir}/%{name}/ %files devel %doc BUILDING.md CHANGELOG.md VERSIONS.md %{_includedir}/pxr/ %{_libdir}/lib%{name}_%{name}_ms.so -%{_libdir}/%{name}/%{name}/resources/codegenTemplates/ %if %{with documentation} %files doc From 60ca8fb0f9c598f3a12fd5c344f6967214dee1f6 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Sat, 6 May 2023 20:09:05 -0700 Subject: [PATCH 11/17] Symlink libusd_ms.so library This update includes symlink needed for Blender 3.5.1 --- usd.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/usd.spec b/usd.spec index 766716d..16b58c7 100644 --- a/usd.spec +++ b/usd.spec @@ -402,6 +402,10 @@ extra_flags="${extra_flags-} -DTBB_SUPPRESS_DEPRECATED_MESSAGES=1" %install %cmake_install +# Blender 3.5.1 requires libusd_ms.so +ln -s %{_libdir}/lib%{name}_%{name}_ms.so \ + %{buildroot}%{_libdir}/lib%{name}_ms.so + # Fix python3 files installation mkdir -p %{buildroot}%{python3_sitearch} mv %{buildroot}%{python3_sitelib}/* %{buildroot}%{python3_sitearch} @@ -523,6 +527,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.open%{name}.%{nam %doc BUILDING.md CHANGELOG.md VERSIONS.md %{_includedir}/pxr/ %{_libdir}/lib%{name}_%{name}_ms.so +%{_libdir}/lib%{name}_ms.so %if %{with documentation} %files doc From 6dd424098f59b332191498e77bcf5ce2b6c0b31d Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Wed, 10 May 2023 19:30:14 -0700 Subject: [PATCH 12/17] Rebuild for draco 1.5.6 From 1d6d45546ce86c6d8e6d9efc6bb4f137fa11a92c Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Thu, 11 May 2023 11:17:54 -0700 Subject: [PATCH 13/17] Further symlink library for blender 3.5.1 --- usd.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/usd.spec b/usd.spec index 16b58c7..bc3c405 100644 --- a/usd.spec +++ b/usd.spec @@ -406,6 +406,9 @@ extra_flags="${extra_flags-} -DTBB_SUPPRESS_DEPRECATED_MESSAGES=1" ln -s %{_libdir}/lib%{name}_%{name}_ms.so \ %{buildroot}%{_libdir}/lib%{name}_ms.so +ln -s %{_libdir}/lib%{name}_%{name}_ms.so.%{downstream_so_version} \ + %{buildroot}%{_libdir}/lib%{name}_ms.so.%{downstream_so_version} + # Fix python3 files installation mkdir -p %{buildroot}%{python3_sitearch} mv %{buildroot}%{python3_sitelib}/* %{buildroot}%{python3_sitearch} @@ -515,6 +518,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.open%{name}.%{nam %license LICENSE.txt %doc NOTICE.txt README.md %{_libdir}/lib%{name}_%{name}_ms.so.%{downstream_so_version} +%{_libdir}/lib%{name}_ms.so.%{downstream_so_version} # While headers normally go in -devel packages, those in # %%{_libdir}/usd/usd/resources/codegenTemplates/ are used as data (templates # for generated code), and it makes sense to package them with the rest of the From a16575c7431d2c6c01c6d13dbd877da3e16ec469 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 26 Oct 2023 06:57:42 -0400 Subject: [PATCH 14/17] Add versioned Requires on usd-libs from python3-usd --- usd.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/usd.spec b/usd.spec index bc3c405..89e0f08 100644 --- a/usd.spec +++ b/usd.spec @@ -261,6 +261,9 @@ Requires: python3dist(jinja2) Requires: python3dist(pyside2) %endif Requires: python3dist(pyopengl) + +Requires: usd-libs%{?_isa} = %{version}-%{release} + %py_provides python3-pxr %description -n python3-%{name} From cc92cc5b5c4913edab06737a0ad7675ee015d343 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 25 Oct 2023 12:24:09 -0400 Subject: [PATCH 15/17] Ensure stb_image contains the latest CVE patches --- usd.spec | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/usd.spec b/usd.spec index 89e0f08..e5064c1 100644 --- a/usd.spec +++ b/usd.spec @@ -174,10 +174,19 @@ BuildRequires: hdf5-devel # Header-only library: -static is for tracking per guidelines # -# Enforce the the minimum EVR to contain fixes for all of CVE-2021-28021, -# CVE-2021-42715, CVE-2021-42716, and CVE-2022-28041, plus the null-pointer -# dereference bug https://github.com/nothings/stb/issues/1452. -BuildRequires: stb_image-devel >= 2.28^20230129git5736b15-0.2 +# Enforce the the minimum EVR to contain fixes for all of: +# CVE-2021-28021 +# CVE-2021-42715 +# CVE-2021-42716 +# CVE-2022-28041 +# CVE-2023-43898 +# CVE-2023-45661 +# CVE-2023-45662 +# CVE-2023-45663 +# CVE-2023-45664 +# CVE-2023-45666 +# CVE-2023-45667 +BuildRequires: stb_image-devel >= 2.28^20231011gitbeebb24-12 BuildRequires: stb_image-static BuildRequires: stb_image_write-devel >= 1.16 BuildRequires: stb_image_write-static From 8a8ee165ffb98e013d5099de910ca2888fa3ab63 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Mon, 30 Oct 2023 07:24:43 -0400 Subject: [PATCH 16/17] Break a long line in the spec file [skip changelog] --- usd.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/usd.spec b/usd.spec index e5064c1..2d4ee4a 100644 --- a/usd.spec +++ b/usd.spec @@ -48,7 +48,14 @@ Summary: 3D VFX pipeline interchange file format # # (Certain build system files are also under licenses other than Apache-2.0, but # do not contribute their license terms to the built RPMs.) -License: Apache-2.0 AND BSD-3-Clause AND BSD-2-Clause AND MIT AND (MIT OR Unlicense) AND (Apache-2.0 AND GPL-3.0-or-later WITH Bison-exception-2.2) +License: %{shrink: + Apache-2.0 AND + BSD-3-Clause AND + BSD-2-Clause AND + MIT AND + (MIT OR Unlicense) AND + (Apache-2.0 AND GPL-3.0-or-later WITH Bison-exception-2.2) + } URL: http://www.openusd.org/ %global forgeurl https://github.com/PixarAnimationStudios/%{name} Source0: %{forgeurl}/archive/v%{version}/%{name}-%{version}.tar.gz From 9d8854a2cb27495785fdb6b80de0f9a6b4599c9d Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 10 Nov 2023 07:51:48 -0500 Subject: [PATCH 17/17] =?UTF-8?q?Correct=20license=20to=20Pixar=20AND=20?= =?UTF-8?q?=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The “Modified Apache 2.0” license is not really Apache 2.0. https://gitlab.com/fedora/legal/fedora-license-data/-/issues/304 https://github.com/spdx/license-list-XML/issues/2225 https://github.com/spdx/license-list-XML/pull/2247 --- usd.spec | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/usd.spec b/usd.spec index 2d4ee4a..7f86aae 100644 --- a/usd.spec +++ b/usd.spec @@ -25,8 +25,10 @@ Version: 22.05b Release: %autorelease -b 9 Summary: 3D VFX pipeline interchange file format -# The entire source is Apache-2.0 except: +# The entire source is Pixar except: # +# Apache-2.0: +# - pxr/imaging/hgiVulkan/spirv_reflect.{cpp,h} # BSD-3-Clause: # - pxr/base/gf/ilmbase_* # - pxr/base/js/rapidjson/msinttypes/ @@ -41,20 +43,31 @@ Summary: 3D VFX pipeline interchange file format # - pxr/imaging/hgiVulkan/vk_mem_alloc.h # MIT OR Unlicense: # - pxr/imaging/hio/stb/ -# Apache-2.0 AND GPL-3.0-or-later WITH Bison-exception-2.2: +# Pixar AND GPL-3.0-or-later WITH Bison-exception-2.2: # - pxr/usd/sdf/path.tab.{cpp,h} # - pxr/usd/sdf/textFileFormat.tab.{cpp,h} # - third_party/renderman-24/plugin/hdPrman/virtualStructConditionalGrammar.tab.{cpp,h} # +# Additionally, the following would be listed above but are removed in %%prep: +# +# Apache-2.0: +# - pxr/usdImaging/usdviewq/fonts/Roboto_Mono/ +# - pxr/usdImaging/usdviewq/fonts/Roboto/ +# MIT: +# - docs/doxygen/doxygen-awesome-css/ (except doxygen-awesome-darkmode-toggle.js) +# MIT AND Apache-2.0: +# - docs/doxygen/doxygen-awesome-css/doxygen-awesome-darkmode-toggle.js +# # (Certain build system files are also under licenses other than Apache-2.0, but # do not contribute their license terms to the built RPMs.) License: %{shrink: + Pixar AND Apache-2.0 AND BSD-3-Clause AND BSD-2-Clause AND MIT AND (MIT OR Unlicense) AND - (Apache-2.0 AND GPL-3.0-or-later WITH Bison-exception-2.2) + (Pixar AND GPL-3.0-or-later WITH Bison-exception-2.2) } URL: http://www.openusd.org/ %global forgeurl https://github.com/PixarAnimationStudios/%{name}