Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package OpenColorIO for openSUSE:Factory checked in at 2021-12-18 20:30:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/OpenColorIO (Old) and /work/SRC/openSUSE:Factory/.OpenColorIO.new.2520 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "OpenColorIO" Sat Dec 18 20:30:10 2021 rev:12 rq:941305 version:2.0.2 Changes: -------- --- /work/SRC/openSUSE:Factory/OpenColorIO/OpenColorIO.changes 2021-09-08 21:36:56.717911552 +0200 +++ /work/SRC/openSUSE:Factory/.OpenColorIO.new.2520/OpenColorIO.changes 2021-12-18 20:30:56.838265910 +0100 @@ -1,0 +2,19 @@ +Wed Dec 8 16:42:29 UTC 2021 - Guillaume GARDET <guillaume.gar...@opensuse.org> + +- Add patch to fix build on armv6/7: + * fix-armv7.patch + +------------------------------------------------------------------- +Mon Dec 6 10:17:48 UTC 2021 - Dirk M??ller <dmuel...@suse.com> + +- update to 2.0.2: + This is an ABI compatible update for the 2.0.x series that includes the + relevant bug fixes from the 2.1 release. + Noteworthy bug fixes and enhancements: + * Allow apps to use getColorSpaceFromFilePath even for v1 configs and + deprecate parseColorSpaceFromString + * Fix problem rendering to integer pixel layouts when there is a no-op + * Update CLF test files, add Python scripts for CLF implemenation guide +- Rebased OpenColorIO-openexr3.patch. + +------------------------------------------------------------------- Old: ---- v2.0.1.tar.gz New: ---- fix-armv7.patch v2.0.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenColorIO.spec ++++++ --- /var/tmp/diff_new_pack.NIx3cm/_old 2021-12-18 20:30:57.918266510 +0100 +++ /var/tmp/diff_new_pack.NIx3cm/_new 2021-12-18 20:30:57.922266512 +0100 @@ -17,45 +17,32 @@ %define build_flavor @BUILD_FLAVOR@%{nil} - %if "%{build_flavor}" == "ocio_tools" %bcond_without ocio_tools %else %bcond_with ocio_tools %endif - # Ensure that libyaml-cpp version is the one that is built against # See boo#1160171 %define yamlrequires %(rpm -q --requires yaml-cpp-devel | grep libyaml || echo aaa_base) %define so_ver 2_0 %define pkg_name OpenColorIO - -%if %{with ocio_tools} -Name: OpenColorIO-tools -%else +%if %{without ocio_tools} Name: OpenColorIO +%else +Name: OpenColorIO-tools %endif -Version: 2.0.1 +Version: 2.0.2 Release: 0 Summary: Color Management Solution Geared Towards Motion Picture Production License: BSD-3-Clause AND GPL-2.0-or-later Group: Productivity/Graphics/Other URL: https://opencolorio.org/ -Source0: https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/v2.0.1.tar.gz +Source0: https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/v%{version}.tar.gz # https://aur.archlinux.org/cgit/aur.git/tree/opencolorio-openexr3.patch?h=opencolorio-qfix Patch0: OpenColorIO-openexr3.patch -%if %{with ocio_tools} -BuildRequires: OpenImageIO >= 2.1.9 -BuildRequires: OpenImageIO-devel >= 2.1.9 -BuildRequires: python3-MarkupSafe -BuildRequires: python3-Sphinx -BuildRequires: python3-breathe -BuildRequires: python3-recommonmark -BuildRequires: python3-setuptools -BuildRequires: python3-sphinx-tabs -BuildRequires: python3-sphinx_press_theme -BuildRequires: python3-testresources -%endif +# PATCH-FIX-UPSTREAM - https://github.com/AcademySoftwareFoundation/OpenColorIO/issues/1465 +Patch1: fix-armv7.patch BuildRequires: cmake >= 3.12 BuildRequires: doxygen BuildRequires: gcc-c++ @@ -69,6 +56,18 @@ BuildRequires: python3-pybind11-devel BuildRequires: yaml-cpp-devel >= 0.6.3 Recommends: %{pkg_name}-doc = %{version} +%if %{with ocio_tools} +BuildRequires: OpenImageIO >= 2.1.9 +BuildRequires: OpenImageIO-devel >= 2.1.9 +BuildRequires: python3-MarkupSafe +BuildRequires: python3-Sphinx +BuildRequires: python3-breathe +BuildRequires: python3-recommonmark +BuildRequires: python3-setuptools +BuildRequires: python3-sphinx-tabs +BuildRequires: python3-sphinx_press_theme +BuildRequires: python3-testresources +%endif %description OpenColorIO (OCIO) is a color management solution geared towards motion picture @@ -120,9 +119,10 @@ %prep %setup -q -n %{pkg_name}-%{version} %patch0 -p1 +%patch1 -p1 # Fix library install location -sed -i 's|DESTINATION lib|DESTINATION %_lib|' src/OpenColorIO/CMakeLists.txt +sed -i 's|DESTINATION lib|DESTINATION %{_lib}|' src/OpenColorIO/CMakeLists.txt %build %cmake \ @@ -140,7 +140,7 @@ %cmake_install # Remove stray static lib -rm -f %{buildroot}/usr/lib/libOpenColorIOoiiohelpers.a +rm -f %{buildroot}%{_prefix}/lib/libOpenColorIOoiiohelpers.a # Move documentation to the right location mkdir -p %{buildroot}%{_docdir}/%{pkg_name} @@ -154,7 +154,6 @@ %else mv %{buildroot}%{_datadir}/doc/OpenColorIO/html/ %{buildroot}%{_docdir}/%{pkg_name}/ rmdir %{buildroot}%{_datadir}/doc/OpenColorIO - rm -rv %{buildroot}%{_libdir} %{buildroot}%{_includedir} %endif @@ -162,7 +161,6 @@ %postun -n libOpenColorIO%{so_ver} -p /sbin/ldconfig %if %{with ocio_tools} - %files %license LICENSE %{_bindir}/* @@ -178,6 +176,7 @@ %files devel %{_includedir}/OpenColorIO/ %{_libdir}/pkgconfig/OpenColorIO.pc +%{_libdir}/cmake/OpenColorIO/ %{_libdir}/libOpenColorIO.so %files -n libOpenColorIO%{so_ver} @@ -187,7 +186,6 @@ %files -n python3-OpenColorIO %license LICENSE %{python3_sitearch}/PyOpenColorIO.so - %endif %changelog ++++++ OpenColorIO-openexr3.patch ++++++ --- /var/tmp/diff_new_pack.NIx3cm/_old 2021-12-18 20:30:57.942266524 +0100 +++ /var/tmp/diff_new_pack.NIx3cm/_new 2021-12-18 20:30:57.946266526 +0100 @@ -1,7 +1,7 @@ -Index: OpenColorIO-2.0.1/share/cmake/modules/FindExtPackages.cmake +Index: OpenColorIO-2.0.2/share/cmake/modules/FindExtPackages.cmake =================================================================== ---- OpenColorIO-2.0.1.orig/share/cmake/modules/FindExtPackages.cmake 2021-05-04 06:36:34.000000000 +0200 -+++ OpenColorIO-2.0.1/share/cmake/modules/FindExtPackages.cmake 2021-08-20 10:01:11.136153574 +0200 +--- OpenColorIO-2.0.2.orig/share/cmake/modules/FindExtPackages.cmake ++++ OpenColorIO-2.0.2/share/cmake/modules/FindExtPackages.cmake @@ -34,7 +34,7 @@ find_package(yaml-cpp 0.6.3 REQUIRED) # Half (OpenEXR/IlmBase) @@ -11,10 +11,10 @@ # pystring # https://github.com/imageworks/pystring -Index: OpenColorIO-2.0.1/src/OpenColorIO/BitDepthUtils.h +Index: OpenColorIO-2.0.2/src/OpenColorIO/BitDepthUtils.h =================================================================== ---- OpenColorIO-2.0.1.orig/src/OpenColorIO/BitDepthUtils.h 2021-08-20 10:01:11.136153574 +0200 -+++ OpenColorIO-2.0.1/src/OpenColorIO/BitDepthUtils.h 2021-08-20 10:03:12.320984596 +0200 +--- OpenColorIO-2.0.2.orig/src/OpenColorIO/BitDepthUtils.h ++++ OpenColorIO-2.0.2/src/OpenColorIO/BitDepthUtils.h @@ -7,7 +7,7 @@ #include <OpenColorIO/OpenColorIO.h> @@ -24,12 +24,12 @@ namespace OCIO_NAMESPACE -Index: OpenColorIO-2.0.1/src/OpenColorIO/CMakeLists.txt +Index: OpenColorIO-2.0.2/src/OpenColorIO/CMakeLists.txt =================================================================== ---- OpenColorIO-2.0.1.orig/src/OpenColorIO/CMakeLists.txt 2021-05-04 06:36:34.000000000 +0200 -+++ OpenColorIO-2.0.1/src/OpenColorIO/CMakeLists.txt 2021-08-20 10:01:11.136153574 +0200 -@@ -207,7 +207,7 @@ target_link_libraries(OpenColorIO - public_api +--- OpenColorIO-2.0.2.orig/src/OpenColorIO/CMakeLists.txt ++++ OpenColorIO-2.0.2/src/OpenColorIO/CMakeLists.txt +@@ -204,7 +204,7 @@ target_link_libraries(OpenColorIO + OpenColorIOHeaders PRIVATE expat::expat - IlmBase::Half @@ -37,10 +37,10 @@ pystring::pystring sampleicc::sampleicc utils::strings -Index: OpenColorIO-2.0.1/src/OpenColorIO/MathUtils.h +Index: OpenColorIO-2.0.2/src/OpenColorIO/MathUtils.h =================================================================== ---- OpenColorIO-2.0.1.orig/src/OpenColorIO/MathUtils.h 2021-05-04 06:36:34.000000000 +0200 -+++ OpenColorIO-2.0.1/src/OpenColorIO/MathUtils.h 2021-08-20 10:01:11.136153574 +0200 +--- OpenColorIO-2.0.2.orig/src/OpenColorIO/MathUtils.h ++++ OpenColorIO-2.0.2/src/OpenColorIO/MathUtils.h @@ -9,7 +9,7 @@ #include <OpenColorIO/OpenColorIO.h> @@ -50,10 +50,10 @@ namespace OCIO_NAMESPACE { -Index: OpenColorIO-2.0.1/src/OpenColorIO/ops/range/RangeOp.cpp +Index: OpenColorIO-2.0.2/src/OpenColorIO/ops/range/RangeOp.cpp =================================================================== ---- OpenColorIO-2.0.1.orig/src/OpenColorIO/ops/range/RangeOp.cpp 2021-05-04 06:36:34.000000000 +0200 -+++ OpenColorIO-2.0.1/src/OpenColorIO/ops/range/RangeOp.cpp 2021-08-20 10:01:11.136153574 +0200 +--- OpenColorIO-2.0.2.orig/src/OpenColorIO/ops/range/RangeOp.cpp ++++ OpenColorIO-2.0.2/src/OpenColorIO/ops/range/RangeOp.cpp @@ -7,7 +7,7 @@ #include <OpenColorIO/OpenColorIO.h> @@ -63,10 +63,10 @@ #include "HashUtils.h" #include "MathUtils.h" #include "ops/lut1d/Lut1DOpData.h" -Index: OpenColorIO-2.0.1/src/OpenColorIO/transforms/builtins/ACES.cpp +Index: OpenColorIO-2.0.2/src/OpenColorIO/transforms/builtins/ACES.cpp =================================================================== ---- OpenColorIO-2.0.1.orig/src/OpenColorIO/transforms/builtins/ACES.cpp 2021-05-04 06:36:34.000000000 +0200 -+++ OpenColorIO-2.0.1/src/OpenColorIO/transforms/builtins/ACES.cpp 2021-08-20 10:01:11.136153574 +0200 +--- OpenColorIO-2.0.2.orig/src/OpenColorIO/transforms/builtins/ACES.cpp ++++ OpenColorIO-2.0.2/src/OpenColorIO/transforms/builtins/ACES.cpp @@ -6,7 +6,7 @@ #include <OpenColorIO/OpenColorIO.h> @@ -76,10 +76,10 @@ #include "ops/fixedfunction/FixedFunctionOp.h" #include "ops/gradingrgbcurve/GradingRGBCurveOp.h" #include "ops/log/LogOp.h" -Index: OpenColorIO-2.0.1/src/OpenColorIO/transforms/builtins/OpHelpers.cpp +Index: OpenColorIO-2.0.2/src/OpenColorIO/transforms/builtins/OpHelpers.cpp =================================================================== ---- OpenColorIO-2.0.1.orig/src/OpenColorIO/transforms/builtins/OpHelpers.cpp 2021-05-04 06:36:34.000000000 +0200 -+++ OpenColorIO-2.0.1/src/OpenColorIO/transforms/builtins/OpHelpers.cpp 2021-08-20 10:01:11.136153574 +0200 +--- OpenColorIO-2.0.2.orig/src/OpenColorIO/transforms/builtins/OpHelpers.cpp ++++ OpenColorIO-2.0.2/src/OpenColorIO/transforms/builtins/OpHelpers.cpp @@ -4,7 +4,7 @@ #include <OpenColorIO/OpenColorIO.h> @@ -89,10 +89,10 @@ #include "ops/lut1d/Lut1DOp.h" #include "transforms/builtins/OpHelpers.h" -Index: OpenColorIO-2.0.1/src/apps/ocioconvert/CMakeLists.txt +Index: OpenColorIO-2.0.2/src/apps/ocioconvert/CMakeLists.txt =================================================================== ---- OpenColorIO-2.0.1.orig/src/apps/ocioconvert/CMakeLists.txt 2021-05-04 06:36:34.000000000 +0200 -+++ OpenColorIO-2.0.1/src/apps/ocioconvert/CMakeLists.txt 2021-08-20 10:01:11.136153574 +0200 +--- OpenColorIO-2.0.2.orig/src/apps/ocioconvert/CMakeLists.txt ++++ OpenColorIO-2.0.2/src/apps/ocioconvert/CMakeLists.txt @@ -27,7 +27,7 @@ set_target_properties(ocioconvert PROPER target_link_libraries(ocioconvert PRIVATE @@ -102,10 +102,10 @@ ${OCIO_GL_LIB} oiiohelpers OpenColorIO -Index: OpenColorIO-2.0.1/src/apps/ocioconvert/main.cpp +Index: OpenColorIO-2.0.2/src/apps/ocioconvert/main.cpp =================================================================== ---- OpenColorIO-2.0.1.orig/src/apps/ocioconvert/main.cpp 2021-05-04 06:36:34.000000000 +0200 -+++ OpenColorIO-2.0.1/src/apps/ocioconvert/main.cpp 2021-08-20 10:01:11.136153574 +0200 +--- OpenColorIO-2.0.2.orig/src/apps/ocioconvert/main.cpp ++++ OpenColorIO-2.0.2/src/apps/ocioconvert/main.cpp @@ -24,7 +24,7 @@ namespace OIIO = OIIO_NAMESPACE; #endif // OCIO_GPU_ENABLED @@ -115,10 +115,10 @@ // Array of non OpenColorIO arguments. -Index: OpenColorIO-2.0.1/src/apps/ocioperf/CMakeLists.txt +Index: OpenColorIO-2.0.2/src/apps/ocioperf/CMakeLists.txt =================================================================== ---- OpenColorIO-2.0.1.orig/src/apps/ocioperf/CMakeLists.txt 2021-05-04 06:36:34.000000000 +0200 -+++ OpenColorIO-2.0.1/src/apps/ocioperf/CMakeLists.txt 2021-08-20 10:01:11.136153574 +0200 +--- OpenColorIO-2.0.2.orig/src/apps/ocioperf/CMakeLists.txt ++++ OpenColorIO-2.0.2/src/apps/ocioperf/CMakeLists.txt @@ -20,7 +20,7 @@ set_target_properties(ocioperf PROPERTIE target_link_libraries(ocioperf PRIVATE @@ -128,10 +128,10 @@ oiiohelpers OpenColorIO OpenImageIO::OpenImageIO -Index: OpenColorIO-2.0.1/src/apps/ocioperf/main.cpp +Index: OpenColorIO-2.0.2/src/apps/ocioperf/main.cpp =================================================================== ---- OpenColorIO-2.0.1.orig/src/apps/ocioperf/main.cpp 2021-05-04 06:36:34.000000000 +0200 -+++ OpenColorIO-2.0.1/src/apps/ocioperf/main.cpp 2021-08-20 10:01:11.136153574 +0200 +--- OpenColorIO-2.0.2.orig/src/apps/ocioperf/main.cpp ++++ OpenColorIO-2.0.2/src/apps/ocioperf/main.cpp @@ -11,7 +11,7 @@ namespace OIIO = OIIO_NAMESPACE; #endif @@ -141,10 +141,10 @@ #include "oiiohelpers.h" #include "utils/StringUtils.h" -Index: OpenColorIO-2.0.1/src/libutils/oiiohelpers/CMakeLists.txt +Index: OpenColorIO-2.0.2/src/libutils/oiiohelpers/CMakeLists.txt =================================================================== ---- OpenColorIO-2.0.1.orig/src/libutils/oiiohelpers/CMakeLists.txt 2021-08-20 10:01:11.136153574 +0200 -+++ OpenColorIO-2.0.1/src/libutils/oiiohelpers/CMakeLists.txt 2021-08-20 10:02:46.500807544 +0200 +--- OpenColorIO-2.0.2.orig/src/libutils/oiiohelpers/CMakeLists.txt ++++ OpenColorIO-2.0.2/src/libutils/oiiohelpers/CMakeLists.txt @@ -31,7 +31,7 @@ target_link_libraries(oiiohelpers PRIVATE @@ -154,10 +154,10 @@ utils::strings ) -Index: OpenColorIO-2.0.1/src/libutils/oiiohelpers/oiiohelpers.cpp +Index: OpenColorIO-2.0.2/src/libutils/oiiohelpers/oiiohelpers.cpp =================================================================== ---- OpenColorIO-2.0.1.orig/src/libutils/oiiohelpers/oiiohelpers.cpp 2021-08-20 10:01:11.136153574 +0200 -+++ OpenColorIO-2.0.1/src/libutils/oiiohelpers/oiiohelpers.cpp 2021-08-20 10:02:17.476608508 +0200 +--- OpenColorIO-2.0.2.orig/src/libutils/oiiohelpers/oiiohelpers.cpp ++++ OpenColorIO-2.0.2/src/libutils/oiiohelpers/oiiohelpers.cpp @@ -5,7 +5,7 @@ #include <OpenColorIO/OpenColorIO.h> @@ -167,12 +167,12 @@ #include "oiiohelpers.h" #include "utils/StringUtils.h" -Index: OpenColorIO-2.0.1/tests/cpu/CMakeLists.txt +Index: OpenColorIO-2.0.2/tests/cpu/CMakeLists.txt =================================================================== ---- OpenColorIO-2.0.1.orig/tests/cpu/CMakeLists.txt 2021-05-04 06:36:34.000000000 +0200 -+++ OpenColorIO-2.0.1/tests/cpu/CMakeLists.txt 2021-08-20 10:01:11.136153574 +0200 +--- OpenColorIO-2.0.2.orig/tests/cpu/CMakeLists.txt ++++ OpenColorIO-2.0.2/tests/cpu/CMakeLists.txt @@ -18,7 +18,7 @@ function(add_ocio_test NAME SOURCES PRIV - public_api + OpenColorIOHeaders PRIVATE expat::expat - IlmBase::Half ++++++ fix-armv7.patch ++++++ >From 545ed45840b30fa80f43f5534a06ef44c71c22f4 Mon Sep 17 00:00:00 2001 From: Patrick Hodoul <patrick.hod...@autodesk.com> Date: Tue, 24 Aug 2021 09:49:46 -0400 Subject: [PATCH] Adsk Contrib - Fix template double instantiation Signed-off-by: Patrick Hodoul <patrick.hod...@autodesk.com> --- src/OpenColorIO/Config.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/OpenColorIO/Config.cpp b/src/OpenColorIO/Config.cpp index 2a93d95ca..f80c8968e 100644 --- a/src/OpenColorIO/Config.cpp +++ b/src/OpenColorIO/Config.cpp @@ -1073,7 +1073,7 @@ class Config::Impl // Instantiate the cache with the right types. -template class ProcessorCache<std::size_t, ProcessorRcPtr>; +extern template class ProcessorCache<std::size_t, ProcessorRcPtr>; /////////////////////////////////////////////////////////////////////////// ++++++ v2.0.1.tar.gz -> v2.0.2.tar.gz ++++++ /work/SRC/openSUSE:Factory/OpenColorIO/v2.0.1.tar.gz /work/SRC/openSUSE:Factory/.OpenColorIO.new.2520/v2.0.2.tar.gz differ: char 18, line 1