Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package OpenImageIO for openSUSE:Factory checked in at 2022-10-22 14:13:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/OpenImageIO (Old) and /work/SRC/openSUSE:Factory/.OpenImageIO.new.2275 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "OpenImageIO" Sat Oct 22 14:13:06 2022 rev:31 rq:1030498 version:2.4.4.2 Changes: -------- --- /work/SRC/openSUSE:Factory/OpenImageIO/OpenImageIO.changes 2022-07-21 11:33:49.090972876 +0200 +++ /work/SRC/openSUSE:Factory/.OpenImageIO.new.2275/OpenImageIO.changes 2022-10-22 14:13:41.112823053 +0200 @@ -1,0 +2,41 @@ +Sat Oct 22 08:22:19 UTC 2022 - Hans-Peter Jansen <hpj@urpla.net> + +- Provide testdata oiio-images-*.tar.xz as a service +- Make sure, testsuite can find the images + +------------------------------------------------------------------- +Fri Oct 21 10:09:03 UTC 2022 - Hans-Peter Jansen <hpj@urpla.net> + +- Clarify testsuite python requirements +- Streamline %check directives +- Enable ptex_broken test + +------------------------------------------------------------------- +Thu Oct 20 17:56:44 UTC 2022 - Stefan Br��ns <stefan.bruens@rwth-aachen.de> + +- Fix and reenable testsuite +- Some minor spec file cleanup + +------------------------------------------------------------------- +Thu Oct 20 16:14:45 UTC 2022 - Stefan Br��ns <stefan.bruens@rwth-aachen.de> + +- Add memory (3GByte), memoryperjob (600 MByte) constraints, avoid + build failures on hosts with high core count and low memory. + +------------------------------------------------------------------- +Wed Oct 19 15:23:48 UTC 2022 - Stefan Br��ns <stefan.bruens@rwth-aachen.de> + +- Add explicit build dependency for boost::atomic, fixes build + on Leap. + +------------------------------------------------------------------- +Fri Oct 14 22:07:00 UTC 2022 - Hans-Peter Jansen <hpj@urpla.net> + +- update to 2.4.4.2 + * too many changes, check: https://github.com/OpenImageIO/oiio/releases/ +- add oiio-images.tar.xz for checks +- ignore check results +- adjust libver to 2.4 +- minor build adjustments + +------------------------------------------------------------------- Old: ---- oiio-2.3.15.0.tar.gz New: ---- _constraints _service oiio-2.4.4.2.tar.gz oiio-images-20221017T102353.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenImageIO.spec ++++++ --- /var/tmp/diff_new_pack.kEXDW0/_old 2022-10-22 14:13:44.428830911 +0200 +++ /var/tmp/diff_new_pack.kEXDW0/_new 2022-10-22 14:13:44.436830930 +0200 @@ -31,16 +31,19 @@ %bcond_with apidocs %bcond_with ptex -%define so_ver 2_3 -%define major_minor_ver 2.3 +%define images_ts 20221017T102353 +%define so_ver 2_4 +%define major_minor_ver 2.4 Name: OpenImageIO -Version: 2.3.15.0 +Version: 2.4.4.2 Release: 0 Summary: Library for Reading and Writing Images License: BSD-3-Clause Group: Productivity/Graphics/Other URL: https://www.openimageio.org/ Source0: https://github.com/OpenImageIO/oiio/archive/refs/tags/v%{version}.tar.gz#/oiio-%{version}.tar.gz +# this contains the actual test images, only used during build +Source1: oiio-images-%{images_ts}.tar.xz # NOTE: Please don't uncomment a build requirement unless you have submitted the package to factory and it exists #BuildRequires: Field3D-devel BuildRequires: cmake >= 3.12 @@ -53,6 +56,7 @@ BuildRequires: gcc-c++ BuildRequires: giflib-devel BuildRequires: hdf5-devel +BuildRequires: libboost_atomic-devel BuildRequires: libboost_filesystem-devel BuildRequires: libboost_system-devel BuildRequires: libboost_thread-devel @@ -64,6 +68,8 @@ %if %{with python_bindings} BuildRequires: python3-devel BuildRequires: python3-pybind11-devel +# required for testsuite +BuildRequires: python3-numpy %endif BuildRequires: robin-map-devel BuildRequires: tbb-devel @@ -165,7 +171,7 @@ This package contains python bindings for OpenImageIO. %prep -%setup -q -n oiio-%{version} +%setup -q -n oiio-%{version} -a 1 %autopatch -p1 # Make sure that bundled libraries are not used @@ -173,6 +179,8 @@ src/include/pugixml.hpp rm -rf src/include/tbb/ +for i in $(grep -rl "%{_bindir}/env python$"); do sed -i '1s@^#!.*@#!%{_bindir}/python3@' ${i}; done + %build %cmake \ %ifarch ppc @@ -186,9 +194,11 @@ -DLINKSTATIC:BOOL=OFF \ -DUSE_EXTERNAL_PUGIXML:BOOL=ON \ -DUSE_FFMPEG:BOOL=ON \ + -DUSE_Nuke:BOOL=OFF \ -DCMAKE_SKIP_RPATH:BOOL=ON \ - -DUSE_OPENCV:BOOL=%{?with_opencv:ON}%{?without_opencv:OFF} \ - -DUSE_PYTHON:BOOL=%{?with_python_bindings:ON}%{?without_python_bindings:OFF} \ + -DUSE_OPENCV:BOOL=%{?with_opencv:ON}%{!?with_opencv:OFF} \ + -DUSE_PYTHON:BOOL=%{?with_python_bindings:ON}%{!?with_python_bindings:OFF} \ + -DUSE_Ptex:BOOL=%{?with_ptex:ON}%{!?with_ptex:OFF} \ -DPYTHON_EXECUTABLE:PATH=%{_bindir}/python3 \ -DPLUGIN_SEARCH_PATH:PATH=%{_libdir}/%{name}-%{major_minor_ver} \ .. @@ -215,19 +225,26 @@ %fdupes -s %{buildroot} %check -# Make sure testsuite can find required fonts -mkdir -p build/fonts -ln -s ../../src/fonts/Droid_Serif/DroidSerif.ttf build/fonts/DroidSerif.ttf -ln -s ../../src/fonts/Droid_Sans/DroidSans.ttf build/fonts/DroidSans.ttf +# Make sure, testsuite can find required test images and fonts +ln -sf $(pwd)/oiio-images-%{images_ts} build/testsuite/oiio-images +mkdir -p ~/fonts +ln -sf $(pwd)/src/fonts/Droid_Serif/DroidSerif.ttf ~/fonts/DroidSerif.ttf +ln -sf $(pwd)/src/fonts/Droid_Sans/DroidSans.ttf ~/fonts/DroidSans.ttf +export LD_LIBRARY_PATH=%{buildroot}%{_libdir} +# used as suffix for python binary +export PYTHON_VERSION=3 +export PYTHONPATH=%{buildroot}%{python3_sitearch} +export PYTHONDONTWRITEBYTECODE=1 # Exclude known broken tests # timer tests won't do reliably in OBS %ifarch x86_64 -%ctest '-E' 'broken|texture-icwrite|unit_timer|unit_simd|heif|cmake-consumer' +%ctest '-E' 'ptex-broken|texture-icwrite|unit_timer|unit_simd|heif|cmake-consumer' %ctest '-R' 'texture-icwrite' || true #%%ctest '-j1' '-R' 'unit_timer' %else # Many test cases are failing on PPC, ARM, ix64 ... ignore for now -%ctest '-E' 'broken|texture-icwrite|unit_timer' || true +%ctest '-E' 'ptex-broken|texture-icwrite|unit_timer|unit_simd|heif|cmake-consumer' || true +%ctest '-R' 'texture-icwrite' || true #%%ctest '-j1' '-R' 'unit_timer' %endif @@ -264,7 +281,9 @@ %if %{with python_bindings} %files -n python3-%{name} -%{python3_sitearch}/%{name}.*.so +%dir %{python3_sitearch}/%{name} +%{python3_sitearch}/%{name}/__init__.py +%{python3_sitearch}/%{name}/%{name}.*.so %endif %changelog ++++++ _constraints ++++++ <constraints> <hardware> <memoryperjob> <size unit="M">600</size> </memoryperjob> <memory> <size unit="G">3</size> </memory> </hardware> </constraints> ++++++ _service ++++++ <services> <service name="tar_scm" mode="disabled"> <param name="scm">git</param> <param name="url">https://github.com/OpenImageIO/oiio-images</param> <param name="revision">master</param> <param name="versionformat">%ci</param> <param name="exclude">.git</param> </service> <service name="recompress" mode="disabled"> <param name="compression">xz</param> <param name="file">*.tar</param> </service> </services> ++++++ oiio-2.3.15.0.tar.gz -> oiio-2.4.4.2.tar.gz ++++++ /work/SRC/openSUSE:Factory/OpenImageIO/oiio-2.3.15.0.tar.gz /work/SRC/openSUSE:Factory/.OpenImageIO.new.2275/oiio-2.4.4.2.tar.gz differ: char 13, line 1