Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package OpenColorIO for openSUSE:Factory checked in at 2022-07-19 17:19:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/OpenColorIO (Old) and /work/SRC/openSUSE:Factory/.OpenColorIO.new.1523 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "OpenColorIO" Tue Jul 19 17:19:14 2022 rev:17 rq:990051 version:2.1.2 Changes: -------- --- /work/SRC/openSUSE:Factory/OpenColorIO/OpenColorIO.changes 2022-06-07 11:45:17.799244018 +0200 +++ /work/SRC/openSUSE:Factory/.OpenColorIO.new.1523/OpenColorIO.changes 2022-07-19 17:19:15.896358885 +0200 @@ -1,0 +2,19 @@ +Mon Jul 18 15:52:09 UTC 2022 - Hans-Peter Jansen <[email protected]> + +- explicitly conflict the wrongly named libs +- don't build tools in basic build stage + +------------------------------------------------------------------- +Sun Jul 17 06:12:06 UTC 2022 - Hans-Peter Jansen <[email protected]> + +- raise c++ standard to 17 +- disable rpath, resulting in a hard build failure now +- add opengl deps for gpu support +- broaden stray static libs removal (due to gpu enablement) + +------------------------------------------------------------------- +Sat Jul 16 19:12:50 UTC 2022 - Hans-Peter Jansen <[email protected]> + +- fix so version pkg naming + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenColorIO.spec ++++++ --- /var/tmp/diff_new_pack.sFxcah/_old 2022-07-19 17:19:16.388359541 +0200 +++ /var/tmp/diff_new_pack.sFxcah/_new 2022-07-19 17:19:16.392359546 +0200 @@ -25,7 +25,7 @@ # 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 so_ver 2_1 %define pkg_name OpenColorIO %if %{without ocio_tools} Name: OpenColorIO @@ -55,6 +55,8 @@ BuildRequires: yaml-cpp-devel >= 0.6.3 Recommends: %{pkg_name}-doc = %{version} %if %{with ocio_tools} +# This BuildIgnore should be removed, when libOCIO2_0 disappeares from repos +#!BuildIgnore: libOpenColorIO2_0 BuildRequires: OpenImageIO >= 2.1.9 BuildRequires: OpenImageIO-devel >= 2.1.9 BuildRequires: python3-MarkupSafe @@ -65,6 +67,9 @@ BuildRequires: python3-sphinx-tabs BuildRequires: python3-sphinx_press_theme BuildRequires: python3-testresources +BuildRequires: pkgconfig(gl) +BuildRequires: pkgconfig(glew) +BuildRequires: pkgconfig(glut) %endif %description @@ -96,6 +101,9 @@ Summary: Complete Color Management Solution Geared Towards Motion Picture Production Group: System/Libraries Requires: %{yamlrequires} +# this is unfortunate and a fallout of properly naming the lib after fixing so_ver +Conflicts: libOpenColorIO2_0 = 2.1.1 +Conflicts: libOpenColorIO2_0 = 2.1.2 %description -n libOpenColorIO%{so_ver} OpenColorIO (OCIO) is a color management solution geared towards motion picture @@ -123,12 +131,15 @@ %build %cmake \ + -DCMAKE_CXX_STANDARD=17 \ + -DCMAKE_SKIP_RPATH=ON \ %ifnarch x86_64 -DOCIO_USE_SSE=OFF \ %endif %if %{with ocio_tools} -DOCIO_BUILD_DOCS=ON %else + -DOCIO_BUILD_APPS=OFF \ -DOCIO_BUILD_DOCS=OFF %endif %cmake_build @@ -136,8 +147,8 @@ %install %cmake_install -# Remove stray static lib -rm -f %{buildroot}%{_prefix}/lib/libOpenColorIOoiiohelpers.a +# Remove stray static libs +rm -f %{buildroot}%{_libdir}/*.a # Move documentation to the right location mkdir -p %{buildroot}%{_docdir}/%{pkg_name} @@ -147,11 +158,12 @@ rm %{buildroot}%{_datadir}/ocio/setup_ocio.sh %if %{without ocio_tools} -rm -rv %{buildroot}%{_docdir}/%{pkg_name}/ %{buildroot}%{_bindir} +rm -rf %{buildroot}%{_docdir}/%{pkg_name}/ %else mv %{buildroot}%{_datadir}/doc/OpenColorIO/html/ %{buildroot}%{_docdir}/%{pkg_name}/ rmdir %{buildroot}%{_datadir}/doc/OpenColorIO -rm -rv %{buildroot}%{_libdir} %{buildroot}%{_includedir} +rm -rf %{buildroot}%{_libdir} +rm -rf %{buildroot}%{_includedir} %endif %post -n libOpenColorIO%{so_ver} -p /sbin/ldconfig
