From e6c0c2dd9fe7597f0c11a92e6bae996d77d05fa2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 22:37:14 +0000 Subject: [PATCH 1/3] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- opensubdiv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/opensubdiv.spec b/opensubdiv.spec index cd26f06..da06ba0 100644 --- a/opensubdiv.spec +++ b/opensubdiv.spec @@ -5,7 +5,7 @@ Name: opensubdiv Version: 3.4.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: High performance subdivision surface libraries License: ASL 2.0 @@ -125,6 +125,9 @@ find %{buildroot} -name '*.a' -delete %{_docdir}/%{name}/* %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 3.4.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Sep 21 2020 Luya Tshimbalanga - 3.4.3-2 - Enable Ptex From 082d628026a65aa37d2b1853a6e1d63e4f5064e6 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Sat, 6 Feb 2021 22:22:08 -0800 Subject: [PATCH 2/3] Update to 3.4.4 RC1 Enable ptex support --- .gitignore | 1 + opensubdiv-3.4.3-fix-dlopen-linking.patch | 39 ----------------------- opensubdiv.spec | 32 ++++++++----------- sources | 2 +- 4 files changed, 16 insertions(+), 58 deletions(-) delete mode 100644 opensubdiv-3.4.3-fix-dlopen-linking.patch diff --git a/.gitignore b/.gitignore index 3948782..87081f0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /opensubdiv-3.4.0.tar.gz /opensubdiv-3.4.3.tar.gz +/opensubdiv-3.4.4.RC1.tar.gz diff --git a/opensubdiv-3.4.3-fix-dlopen-linking.patch b/opensubdiv-3.4.3-fix-dlopen-linking.patch deleted file mode 100644 index ebaff21..0000000 --- a/opensubdiv-3.4.3-fix-dlopen-linking.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -up OpenSubdiv-3_4_3/opensubdiv/CMakeLists.txt.dlopen OpenSubdiv-3_4_3/opensubdiv/CMakeLists.txt ---- OpenSubdiv-3_4_3/opensubdiv/CMakeLists.txt.dlopen 2020-09-13 10:19:54.656579747 +0200 -+++ OpenSubdiv-3_4_3/opensubdiv/CMakeLists.txt 2020-09-13 11:17:38.342004515 +0200 -@@ -160,7 +160,7 @@ if (NOT NO_LIB) - set_target_properties(osd_static_gpu PROPERTIES OUTPUT_NAME osdGPU CLEAN_DIRECT_OUTPUT 1) - - target_link_libraries(osd_static_gpu -- ${PLATFORM_CPU_LIBRARIES} ${PLATFORM_GPU_LIBRARIES} -+ ${PLATFORM_CPU_LIBRARIES} ${PLATFORM_GPU_LIBRARIES} ${CMAKE_DL_LIBS} - ) - - install( TARGETS osd_static_gpu DESTINATION "${CMAKE_LIBDIR_BASE}" ) -@@ -232,7 +232,7 @@ if (NOT NO_LIB) - - target_link_libraries(osd_dynamic_gpu - osd_dynamic_cpu -- ${PLATFORM_CPU_LIBRARIES} ${PLATFORM_GPU_LIBRARIES} -+ ${PLATFORM_CPU_LIBRARIES} ${PLATFORM_GPU_LIBRARIES} ${CMAKE_DL_LIBS} - ) - - install( TARGETS osd_dynamic_gpu LIBRARY DESTINATION "${CMAKE_LIBDIR_BASE}" ) -@@ -294,7 +294,7 @@ if (NOT NO_LIB) - ) - - target_link_libraries(osd_static_framework -- ${PLATFORM_CPU_LIBRARIES} ${PLATFORM_GPU_LIBRARIES} -+ ${PLATFORM_CPU_LIBRARIES} ${PLATFORM_GPU_LIBRARIES} ${CMAKE_DL_LIBS} - ) - - install( TARGETS osd_static_framework -@@ -329,7 +329,7 @@ if (NOT NO_LIB) - ) - - target_link_libraries(osd_dynamic_framework -- ${PLATFORM_CPU_LIBRARIES} ${PLATFORM_GPU_LIBRARIES} -+ ${PLATFORM_CPU_LIBRARIES} ${PLATFORM_GPU_LIBRARIES} ${CMAKE_DL_LIBS} - ) - - install( TARGETS osd_dynamic_framework diff --git a/opensubdiv.spec b/opensubdiv.spec index da06ba0..8dfccad 100644 --- a/opensubdiv.spec +++ b/opensubdiv.spec @@ -1,32 +1,30 @@ # Force out of source build %undefine __cmake_in_source_build -%global upstream_version 3_4_3 +%global upstream_version 3_4_4 +%global prerelease RC1 Name: opensubdiv -Version: 3.4.3 -Release: 3%{?dist} +Version: 3.4.4 +Release: 0.1.%{?prerelease}%{?dist} Summary: High performance subdivision surface libraries License: ASL 2.0 #URL: http://graphics.pixar.com/%%{name} Url: https://github.com/PixarAnimationStudios/OpenSubdiv -Source0: https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v%{upstream_version}/%{name}-%{version}.tar.gz +Source: https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v%{upstream_version}_%{?prerelease}/%{name}-%{version}.%{?prerelease}.tar.gz # fix linking against libdl (see https://github.com/PixarAnimationStudios/OpenSubdiv/issues/1196) -Patch0: %{name}-rpath.patch -# Use Mageia patch for switching to python3 -Patch1: %{name}-3.4.0-python3-doc.patch +Patch: %{name}-rpath.patch -BuildRequires: make BuildRequires: cmake BuildRequires: doxygen BuildRequires: gcc-c++ BuildRequires: graphviz-devel BuildRequires: pkgconfig(glew) BuildRequires: pkgconfig(glfw3) -#BuildRequires: pkgconfig(OpenCL) -BuildRequires: pkgconfig(Ptex) +BuildRequires: pkgconfig(OpenCL) +BuildRequires: pkgconfig(Ptex) BuildRequires: pkgconfig(python3) BuildRequires: pkgconfig(tbb) BuildRequires: pkgconfig(zlib) @@ -46,7 +44,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %description libs %{summary} - %package devel Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} @@ -70,7 +67,7 @@ frame rates. This package includes the documentation of OpenSubdiv. %prep -%autosetup -p1 -n OpenSubdiv-%{upstream_version} +%autosetup -p1 -n OpenSubdiv-%{upstream_version}_%{?prerelease} # work around linking glitch # https://github.com/PixarAnimationStudios/OpenSubdiv/issues/1196 @@ -86,8 +83,9 @@ sed -i 's|${PLATFORM_GPU_LIBRARIES}|${PLATFORM_GPU_LIBRARIES} ${CMAKE_DL_LIBS}|' -DNO_CUDA=1 \ -DNO_EXAMPLES=1 \ -DNO_GLFW_X11=1 \ - -DNO_METAL=1 \ -DNO_OPENCL=1 \ + -DNO_PTEX=0 \ + -DNO_METAL=1 \ -DNO_REGRESSION=1 \ -DNO_TUTORIALS=1 \ -DOpenGL_GL_PREFERENCE=GLVND \ @@ -125,11 +123,9 @@ find %{buildroot} -name '*.a' -delete %{_docdir}/%{name}/* %changelog -* Tue Jan 26 2021 Fedora Release Engineering - 3.4.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Sep 21 2020 Luya Tshimbalanga - 3.4.3-2 -- Enable Ptex +* Mon Sep 21 2020 Luya Tshimbalanga - 3.4.4-0.1.RC1 +- Update to 3.4.4 RC1 +- Enable ptex support * Mon Sep 21 2020 Luya Tshimbalanga - 3.4.3-1 - Update to 3.4.3 diff --git a/sources b/sources index 78c4a5e..b8e1afe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (opensubdiv-3.4.3.tar.gz) = 44fd1361d9e7f48c3fa84f3420ed34743571220602aefb082a42f769ca5b8e9ac21907ce8714f6e3a2caadd75adae03c535a1949a8e6450dfea9ae7a2247cfc2 +SHA512 (opensubdiv-3.4.4.RC1.tar.gz) = fddce2633c4aa40a1ce589469aa4c744f0a39ece851cc6cacb2dd679746a1bd51cb58f69a58a831d46f332b1b3c4066c76012cfb8df853da1183cefa736a518c From 0bda181f1b7dd066708b2706505d130144dfb5b5 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Wed, 19 May 2021 23:34:31 -0700 Subject: [PATCH 3/3] Update to 3.4.4 Rebuild for ptex 2.4.0 --- .gitignore | 1 + opensubdiv.spec | 15 +++++++++------ sources | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 87081f0..5de9b8d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /opensubdiv-3.4.0.tar.gz /opensubdiv-3.4.3.tar.gz /opensubdiv-3.4.4.RC1.tar.gz +/opensubdiv-3.4.4.tar.gz diff --git a/opensubdiv.spec b/opensubdiv.spec index 8dfccad..49909a7 100644 --- a/opensubdiv.spec +++ b/opensubdiv.spec @@ -2,17 +2,17 @@ %undefine __cmake_in_source_build %global upstream_version 3_4_4 -%global prerelease RC1 +#%%global prerelease RC1 Name: opensubdiv Version: 3.4.4 -Release: 0.1.%{?prerelease}%{?dist} +Release: 1%{?prerelease}%{?dist} Summary: High performance subdivision surface libraries License: ASL 2.0 #URL: http://graphics.pixar.com/%%{name} Url: https://github.com/PixarAnimationStudios/OpenSubdiv -Source: https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v%{upstream_version}_%{?prerelease}/%{name}-%{version}.%{?prerelease}.tar.gz +Source: https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v%{upstream_version}%{?prerelease}/%{name}-%{version}%{?prerelease}.tar.gz # fix linking against libdl (see https://github.com/PixarAnimationStudios/OpenSubdiv/issues/1196) Patch: %{name}-rpath.patch @@ -67,7 +67,7 @@ frame rates. This package includes the documentation of OpenSubdiv. %prep -%autosetup -p1 -n OpenSubdiv-%{upstream_version}_%{?prerelease} +%autosetup -p1 -n OpenSubdiv-%{upstream_version}%{?prerelease} # work around linking glitch # https://github.com/PixarAnimationStudios/OpenSubdiv/issues/1196 @@ -84,7 +84,6 @@ sed -i 's|${PLATFORM_GPU_LIBRARIES}|${PLATFORM_GPU_LIBRARIES} ${CMAKE_DL_LIBS}|' -DNO_EXAMPLES=1 \ -DNO_GLFW_X11=1 \ -DNO_OPENCL=1 \ - -DNO_PTEX=0 \ -DNO_METAL=1 \ -DNO_REGRESSION=1 \ -DNO_TUTORIALS=1 \ @@ -123,7 +122,11 @@ find %{buildroot} -name '*.a' -delete %{_docdir}/%{name}/* %changelog -* Mon Sep 21 2020 Luya Tshimbalanga - 3.4.4-0.1.RC1 +* Wed May 19 2021 Luya Tshimbalanga - 3.4.4-1 +- Update to 3.4.4 +- Rebuild for ptex 2.4.0 + +* Fri Feb 05 2021 Luya Tshimbalanga - 3.4.4-0.1.RC1 - Update to 3.4.4 RC1 - Enable ptex support diff --git a/sources b/sources index b8e1afe..6440821 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (opensubdiv-3.4.4.RC1.tar.gz) = fddce2633c4aa40a1ce589469aa4c744f0a39ece851cc6cacb2dd679746a1bd51cb58f69a58a831d46f332b1b3c4066c76012cfb8df853da1183cefa736a518c +SHA512 (opensubdiv-3.4.4.tar.gz) = fc8f28b79347015c8991150535c1339e695d96947c72fadd4fa27b546a0813c1125cd175ee03bed5aacdb3609f74c4e526ef70103d1195ba9f7df041e73ea9fb