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-09-08 21:36:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/OpenColorIO (Old) and /work/SRC/openSUSE:Factory/.OpenColorIO.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "OpenColorIO" Wed Sep 8 21:36:37 2021 rev:11 rq:917370 version:2.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/OpenColorIO/OpenColorIO.changes 2021-07-28 19:20:51.963570502 +0200 +++ /work/SRC/openSUSE:Factory/.OpenColorIO.new.1899/OpenColorIO.changes 2021-09-08 21:36:56.717911552 +0200 @@ -1,0 +2,27 @@ +Tue Sep 7 18:09:15 UTC 2021 - Marcus Rueckert <mrueck...@suse.de> + +- only build the documentation in the ocio_tools case: + - move BuildRequires into the %if + - explicitely disable doc building in the library build case + +------------------------------------------------------------------- +Tue Sep 7 17:02:01 UTC 2021 - Marcus Rueckert <mrueck...@suse.de> + +- A probably better fix for solving the build cycle. First build + will only build all the libraries, 2nd build the cmdline tools + +------------------------------------------------------------------- +Tue Sep 7 08:47:01 UTC 2021 - Dominique Leuenberger <dims...@opensuse.org> + +- Do not depends on OpenImageIO, in order to break up a build + cycle (boo#1190237). + +------------------------------------------------------------------- +Fri Aug 20 08:19:26 UTC 2021 - pgaj...@suse.com + +- fix build with openexr3 +- added patches + https://aur.archlinux.org/cgit/aur.git/tree/opencolorio-openexr3.patch?h=opencolorio-qfix + + OpenColorIO-openexr3.patch + +------------------------------------------------------------------- Old: ---- OpenColorIO-2.0.1.tar.gz New: ---- OpenColorIO-openexr3.patch _multibuild v2.0.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenColorIO.spec ++++++ --- /var/tmp/diff_new_pack.YGLJZC/_old 2021-09-08 21:36:57.585912569 +0200 +++ /var/tmp/diff_new_pack.YGLJZC/_new 2021-09-08 21:36:57.585912569 +0200 @@ -16,43 +16,59 @@ # +%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) +%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 Name: OpenColorIO +%endif Version: 2.0.1 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: %{name}-%{version}.tar.gz +Source0: https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/v2.0.1.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 BuildRequires: cmake >= 3.12 BuildRequires: doxygen BuildRequires: gcc-c++ -BuildRequires: ilmbase-devel >= 2.4.0 BuildRequires: libboost_headers-devel BuildRequires: libexpat-devel >= 2.2.8 BuildRequires: liblcms2-devel >= 2.2 BuildRequires: openexr-devel BuildRequires: pkgconfig BuildRequires: pystring-devel >= 1.1.3 -BuildRequires: python3-MarkupSafe -BuildRequires: python3-Sphinx -BuildRequires: python3-breathe BuildRequires: python3-devel BuildRequires: python3-pybind11-devel -BuildRequires: python3-recommonmark -BuildRequires: python3-setuptools -BuildRequires: python3-sphinx-tabs -BuildRequires: python3-sphinx_press_theme -BuildRequires: python3-testresources BuildRequires: yaml-cpp-devel >= 0.6.3 -Recommends: %{name}-doc = %{version} +Recommends: %{pkg_name}-doc = %{version} %description OpenColorIO (OCIO) is a color management solution geared towards motion picture @@ -65,18 +81,18 @@ Summary: Development Files for OpenColorIO Group: Development/Libraries/C and C++ Requires: libOpenColorIO%{so_ver} = %{version} -Recommends: %{name}-doc = %{version} +Recommends: %{pkg_name}-doc = %{version} %description devel This package provides development libraries and headers needed to build software using OpenColorIO. -%package doc +%package -n %{pkg_name}-doc Summary: Documentation for OpenColorIO Group: Documentation/Other BuildArch: noarch -%description doc +%description -n %{pkg_name}-doc This package contains documentation for OpenColorIO. %package -n libOpenColorIO%{so_ver} @@ -102,7 +118,8 @@ This package contains python bindings for OpenColorIO. %prep -%setup -q +%setup -q -n %{pkg_name}-%{version} +%patch0 -p1 # Fix library install location sed -i 's|DESTINATION lib|DESTINATION %_lib|' src/OpenColorIO/CMakeLists.txt @@ -112,42 +129,65 @@ %ifnarch x86_64 -DOCIO_USE_SSE=OFF \ %endif +%if %{with ocio_tools} -DOCIO_BUILD_DOCS=ON +%else + -DOCIO_BUILD_DOCS=OFF +%endif %cmake_build %install %cmake_install # Remove stray static lib -rm %{buildroot}/usr/lib/libOpenColorIOoiiohelpers.a +rm -f %{buildroot}/usr/lib/libOpenColorIOoiiohelpers.a # Move documentation to the right location -mkdir -p %{buildroot}%{_docdir}/%{name} -mv %{buildroot}%{_datadir}/doc/OpenColorIO/html/ %{buildroot}%{_docdir}/%{name}/ +mkdir -p %{buildroot}%{_docdir}/%{pkg_name} +cp *.md %{buildroot}%{_docdir}/%{pkg_name} + +# this shouldn't be needed +rm %{buildroot}%{_datadir}/ocio/setup_ocio.sh + +%if %{without ocio_tools} +rm -rv %{buildroot}%{_docdir}/%{pkg_name}/ %{buildroot}%{_bindir} +%else +mv %{buildroot}%{_datadir}/doc/OpenColorIO/html/ %{buildroot}%{_docdir}/%{pkg_name}/ rmdir %{buildroot}%{_datadir}/doc/OpenColorIO +rm -rv %{buildroot}%{_libdir} %{buildroot}%{_includedir} +%endif + %post -n libOpenColorIO%{so_ver} -p /sbin/ldconfig %postun -n libOpenColorIO%{so_ver} -p /sbin/ldconfig +%if %{with ocio_tools} + %files %license LICENSE -%doc *.md -%exclude %{_docdir}/%{name}/html/ %{_bindir}/* +%doc %{_docdir}/%{pkg_name}/ +%exclude %{_docdir}/%{pkg_name}/html/ %{_datadir}/ocio/ +%files -n %{pkg_name}-doc +%{_docdir}/%{pkg_name}/html/ + +%else + %files devel %{_includedir}/OpenColorIO/ %{_libdir}/pkgconfig/OpenColorIO.pc %{_libdir}/libOpenColorIO.so -%files doc -%{_docdir}/%{name}/html/ - %files -n libOpenColorIO%{so_ver} +%license LICENSE %{_libdir}/libOpenColorIO.so.* %files -n python3-OpenColorIO +%license LICENSE %{python3_sitearch}/PyOpenColorIO.so +%endif + %changelog ++++++ OpenColorIO-openexr3.patch ++++++ Index: OpenColorIO-2.0.1/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 @@ -34,7 +34,7 @@ find_package(yaml-cpp 0.6.3 REQUIRED) # Half (OpenEXR/IlmBase) # https://github.com/openexr/openexr -find_package(Half 2.4.0 REQUIRED) +find_package(Imath 3.0 REQUIRED) # pystring # https://github.com/imageworks/pystring Index: OpenColorIO-2.0.1/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 @@ -7,7 +7,7 @@ #include <OpenColorIO/OpenColorIO.h> -#include "OpenEXR/half.h" +#include "Imath/half.h" namespace OCIO_NAMESPACE Index: OpenColorIO-2.0.1/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 PRIVATE expat::expat - IlmBase::Half + Imath::Imath pystring::pystring sampleicc::sampleicc utils::strings Index: OpenColorIO-2.0.1/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 @@ -9,7 +9,7 @@ #include <OpenColorIO/OpenColorIO.h> -#include "OpenEXR/half.h" +#include "Imath/half.h" namespace OCIO_NAMESPACE { Index: OpenColorIO-2.0.1/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 @@ -7,7 +7,7 @@ #include <OpenColorIO/OpenColorIO.h> #include "GpuShaderUtils.h" -#include "OpenEXR/half.h" +#include "Imath/half.h" #include "HashUtils.h" #include "MathUtils.h" #include "ops/lut1d/Lut1DOpData.h" Index: OpenColorIO-2.0.1/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 @@ -6,7 +6,7 @@ #include <OpenColorIO/OpenColorIO.h> -#include "OpenEXR/half.h" +#include "Imath/half.h" #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 =================================================================== --- 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 @@ -4,7 +4,7 @@ #include <OpenColorIO/OpenColorIO.h> -#include "OpenEXR/half.h" +#include "Imath/half.h" #include "ops/lut1d/Lut1DOp.h" #include "transforms/builtins/OpHelpers.h" Index: OpenColorIO-2.0.1/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 @@ -27,7 +27,7 @@ set_target_properties(ocioconvert PROPER target_link_libraries(ocioconvert PRIVATE apputils - IlmBase::Half + Imath::Imath ${OCIO_GL_LIB} oiiohelpers OpenColorIO Index: OpenColorIO-2.0.1/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 @@ -24,7 +24,7 @@ namespace OIIO = OIIO_NAMESPACE; #endif // OCIO_GPU_ENABLED #include "oiiohelpers.h" -#include "OpenEXR/half.h" +#include "Imath/half.h" // Array of non OpenColorIO arguments. Index: OpenColorIO-2.0.1/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 @@ -20,7 +20,7 @@ set_target_properties(ocioperf PROPERTIE target_link_libraries(ocioperf PRIVATE apputils - IlmBase::Half + Imath::Imath oiiohelpers OpenColorIO OpenImageIO::OpenImageIO Index: OpenColorIO-2.0.1/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 @@ -11,7 +11,7 @@ namespace OIIO = OIIO_NAMESPACE; #endif #include "apputils/argparse.h" -#include "OpenEXR/half.h" +#include "Imath/half.h" #include "oiiohelpers.h" #include "utils/StringUtils.h" Index: OpenColorIO-2.0.1/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 @@ -31,7 +31,7 @@ target_link_libraries(oiiohelpers PRIVATE OpenColorIO - IlmBase::Half + Imath::Imath utils::strings ) Index: OpenColorIO-2.0.1/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 @@ -5,7 +5,7 @@ #include <OpenColorIO/OpenColorIO.h> -#include "OpenEXR/half.h" +#include "Imath/half.h" #include "oiiohelpers.h" #include "utils/StringUtils.h" Index: OpenColorIO-2.0.1/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 @@ -18,7 +18,7 @@ function(add_ocio_test NAME SOURCES PRIV public_api PRIVATE expat::expat - IlmBase::Half + Imath::Imath pystring::pystring sampleicc::sampleicc unittest_data ++++++ _multibuild ++++++ <multibuild> <package>ocio_tools</package> </multibuild>
