From d3578009506c46f8ced84f2761e907561d9645d25694662b3fcda9a00bb58fea Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Fri, 13 Aug 2021 09:46:28 +0000 Subject: [PATCH 1/6] Accepting request 911959 from home:pgajdos:openexr3 - version update to 3.1.1 3.1.1 * Patch release that fixes build failures on various systems, introduces CMake CMAKE_CROSSCOMPILING_EMULATOR support, and fixes a few other minor issues. 3.1 * The 3.1 release of OpenEXR introduces a new library, OpenEXRCore, which is the result of a significant re-thinking of how OpenEXR manages file I/O and provides access to image data. It begins to address long-standing scalability issues with multithreaded image reading and writing. 3.0.1 Major release with major build restructing, security improvements, and new features: * Restructuring: - The IlmBase/PyIlmBase submodules have been separated into the Imath project, now included by OpenEXR via a CMake submodule dependency, fetched automatically via CMake's FetchContent if necessary. - The library is now called ``libOpenEXR`` (instead of ``libIlmImf``). No header files have been renamed, they retain the ``Imf`` prefix. - Symbol linkage visibility is limited to specific public symbols. * Build improvements: - No more simultaneous static/shared build option. - Community-provided support for bazel. * New Features: - ID Manifest Attributes, as described in ["A Scheme for Storing Object ID Manifests in OpenEXR Images"](https://doi.org/10.1145/3233085.3233086), Peter Hillman, OBS-URL: https://build.opensuse.org/request/show/911959 OBS-URL: https://build.opensuse.org/package/show/graphics/openexr?expand=0&rev=70 --- ...KE_INSTALL_FULL_LIBDIR-for-libdir-in.patch | 91 ----- _multibuild | 3 - baselibs.conf | 13 +- openexr.changes | 70 ++++ openexr.spec | 341 +++++------------- v2.5.7.tar.gz | 3 - v3.1.1.tar.gz | 3 + 7 files changed, 165 insertions(+), 359 deletions(-) delete mode 100644 0001-Use-absolute-CMAKE_INSTALL_FULL_LIBDIR-for-libdir-in.patch delete mode 100644 _multibuild delete mode 100644 v2.5.7.tar.gz create mode 100644 v3.1.1.tar.gz diff --git a/0001-Use-absolute-CMAKE_INSTALL_FULL_LIBDIR-for-libdir-in.patch b/0001-Use-absolute-CMAKE_INSTALL_FULL_LIBDIR-for-libdir-in.patch deleted file mode 100644 index 4ac5b04..0000000 --- a/0001-Use-absolute-CMAKE_INSTALL_FULL_LIBDIR-for-libdir-in.patch +++ /dev/null @@ -1,91 +0,0 @@ -From e1084440d543f3045038cc4e5fdc0a67eabf06d6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Stefan=20Br=C3=BCns?= -Date: Mon, 10 Feb 2020 18:37:32 +0100 -Subject: [PATCH] Use absolute CMAKE_INSTALL_FULL_LIBDIR for libdir in - pkgconfig files - -According to cmake GNUInstallDirs documentation, CMAKE_INSTALL_LIBDIR -may be either absolute or relative to CMAKE_INSTALL_PREFIX. Use -CMAKE_INSTALL_FULL_LIBDIR, which is always the full absolute path. - -Remove unused exec_prefix variable. - -Fixes https://github.com/AcademySoftwareFoundation/openexr/issues/595 ---- - IlmBase/IlmBase.pc.in | 1 - - IlmBase/config/CMakeLists.txt | 4 ++-- - OpenEXR/OpenEXR.pc.in | 1 - - OpenEXR/config/CMakeLists.txt | 5 ++--- - PyIlmBase/config/CMakeLists.txt | 4 ++-- - 5 files changed, 6 insertions(+), 9 deletions(-) - -Index: openexr-2.5.7/IlmBase/IlmBase.pc.in -=================================================================== ---- openexr-2.5.7.orig/IlmBase/IlmBase.pc.in 2021-06-15 02:15:14.000000000 +0200 -+++ openexr-2.5.7/IlmBase/IlmBase.pc.in 2021-08-03 12:26:33.419242739 +0200 -@@ -4,7 +4,6 @@ - ## - - prefix=@prefix@ --exec_prefix=@exec_prefix@ - libdir=@libdir@ - includedir=@includedir@ - libsuffix=@LIB_SUFFIX_DASH@ -Index: openexr-2.5.7/IlmBase/config/CMakeLists.txt -=================================================================== ---- openexr-2.5.7.orig/IlmBase/config/CMakeLists.txt 2021-08-03 12:26:33.423242767 +0200 -+++ openexr-2.5.7/IlmBase/config/CMakeLists.txt 2021-08-03 12:26:47.735343624 +0200 -@@ -76,8 +76,8 @@ if(ILMBASE_INSTALL_PKG_CONFIG) - function(ilmbase_pkg_config_help pcinfile) - set(prefix ${CMAKE_INSTALL_PREFIX}) - set(exec_prefix "\${prefix}") -- set(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}") -- set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}") -+ set(libdir "${CMAKE_INSTALL_FULL_LIBDIR}") -+ set(includedir "${CMAKE_INSTALL_FULL_INCLUDEDIR}") - string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE) - set(LIB_SUFFIX_DASH ${ILMBASE_LIB_SUFFIX}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX}) - if(TARGET Threads::Threads) -Index: openexr-2.5.7/OpenEXR/OpenEXR.pc.in -=================================================================== ---- openexr-2.5.7.orig/OpenEXR/OpenEXR.pc.in 2021-06-15 02:15:14.000000000 +0200 -+++ openexr-2.5.7/OpenEXR/OpenEXR.pc.in 2021-08-03 12:26:33.423242767 +0200 -@@ -4,7 +4,6 @@ - ## - - prefix=@prefix@ --exec_prefix=@exec_prefix@ - libdir=@libdir@ - includedir=@includedir@ - OpenEXR_includedir=@includedir@/OpenEXR -Index: openexr-2.5.7/OpenEXR/config/CMakeLists.txt -=================================================================== ---- openexr-2.5.7.orig/OpenEXR/config/CMakeLists.txt 2021-08-03 12:26:33.423242767 +0200 -+++ openexr-2.5.7/OpenEXR/config/CMakeLists.txt 2021-08-03 12:27:23.867598269 +0200 -@@ -74,9 +74,8 @@ if(OPENEXR_INSTALL_PKG_CONFIG) - # use a helper function to avoid variable pollution, but pretty simple - function(openexr_pkg_config_help pcinfile) - set(prefix ${CMAKE_INSTALL_PREFIX}) -- set(exec_prefix "\${prefix}") -- set(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}") -- set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}") -+ set(libdir "${CMAKE_INSTALL_FULL_LIBDIR}") -+ set(includedir "${CMAKE_INSTALL_FULL_INCLUDEDIR}") - string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE) - set(LIB_SUFFIX_DASH ${OPENEXR_LIB_SUFFIX}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX}) - if(TARGET Threads::Threads) -Index: openexr-2.5.7/PyIlmBase/config/CMakeLists.txt -=================================================================== ---- openexr-2.5.7.orig/PyIlmBase/config/CMakeLists.txt 2021-08-03 12:26:33.423242767 +0200 -+++ openexr-2.5.7/PyIlmBase/config/CMakeLists.txt 2021-08-03 12:27:01.255438907 +0200 -@@ -16,8 +16,8 @@ if(PYILMBASE_INSTALL_PKG_CONFIG) - function(pyilmbase_pkg_config_help pcinfile) - set(prefix ${CMAKE_INSTALL_PREFIX}) - set(exec_prefix ${CMAKE_INSTALL_BINDIR}) -- set(libdir ${CMAKE_INSTALL_LIBDIR}) -- set(includedir ${CMAKE_INSTALL_INCLUDEDIR}) -+ set(libdir ${CMAKE_INSTALL_FULL_LIBDIR}) -+ set(includedir ${CMAKE_INSTALL_FULL_INCLUDEDIR}) - string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE) - set(LIB_SUFFIX_DASH ${OPENEXR_LIB_SUFFIX}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX}) - string(REPLACE ".in" "" pcout ${pcinfile}) diff --git a/_multibuild b/_multibuild deleted file mode 100644 index 744e503..0000000 --- a/_multibuild +++ /dev/null @@ -1,3 +0,0 @@ - - ilmbase - diff --git a/baselibs.conf b/baselibs.conf index e582e93..4ee88bf 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,9 +1,4 @@ -libIlmImf-2_5-25 -libIlmImfUtil-2_5-25 - obsoletes "OpenEXR- < " -libHalf-2_5-25 -libImath-2_5-25 -libIlmThread-2_5-25 -libIexMath-2_5-25 -libIex-2_5-25 - obsoletes "IlmBase- < " +libOpenEXR-3_0-27 +libOpenEXRUtil-3_0-27 +libIlmThread-3_0-27 +libIex-3_0-27 diff --git a/openexr.changes b/openexr.changes index ac5230f..f4facab 100644 --- a/openexr.changes +++ b/openexr.changes @@ -1,3 +1,73 @@ +------------------------------------------------------------------- +Fri Aug 13 09:43:27 UTC 2021 - pgajdos@suse.com + +- version update to 3.1.1 + 3.1.1 + * Patch release that fixes build failures on various systems, + introduces CMake CMAKE_CROSSCOMPILING_EMULATOR support, and + fixes a few other minor issues. + 3.1 + * The 3.1 release of OpenEXR introduces a new library, OpenEXRCore, + which is the result of a significant re-thinking of how OpenEXR + manages file I/O and provides access to image data. It begins + to address long-standing scalability issues with multithreaded + image reading and writing. + 3.0.1 + Major release with major build restructing, security improvements, and + new features: + + * Restructuring: + - The IlmBase/PyIlmBase submodules have been separated into the + Imath project, now included by OpenEXR via a CMake submodule + dependency, fetched automatically via CMake's FetchContent if + necessary. + - The library is now called ``libOpenEXR`` (instead of + ``libIlmImf``). No header files have been renamed, they retain + the ``Imf`` prefix. + - Symbol linkage visibility is limited to specific public symbols. + + * Build improvements: + - No more simultaneous static/shared build option. + - Community-provided support for bazel. + + * New Features: + - ID Manifest Attributes, as described in ["A Scheme for Storing + Object ID Manifests in OpenEXR + Images"](https://doi.org/10.1145/3233085.3233086), Peter Hillman, + DigiPro 18: Proceedings of the 8th Annual Digital Production + Symposium, August 2018. + - New program: exrcheck validates the contents of an EXR file. + + * Changes: + - EXR files with no channels are no longer allowed. + - Hard limit on the size of deep tile sizes; tiles must be less than + 2^30 pixels. + - Tiled DWAB files used STATIC_HUFFMAN compression. + - ``Int64`` and ``SInt64`` types are deprecated in favor of + ``uint64_t`` and ``int64_t``. + - Header files have been pruned of extraneous ``#include``'s + ("Include What You Use"), which may generate compiler errors in + application source code from undefined symbols or + partially-defined types. These can be resolved by identifying and + including the appropriate header. + - See the [porting + guide](https://github.com/AcademySoftwareFoundation/Imath/blob/master/docs/PortingGuide2-3.md) + for details about differences from previous releases and how to + address them. + - Also refer to the porting guide for details about changes to + Imath + +- deleted patches + - 0001-Use-absolute-CMAKE_INSTALL_FULL_LIBDIR-for-libdir-in.patch, renamed: +- added patches + fix https://github.com/AcademySoftwareFoundation/openexr/issues/595 + + openexr-pkgconfig-fix-libdir.patch +- deleted sources + - _multibuild (not needed) +- see CHANGES.md for details +- deleted patches + - openexr-pkgconfig-fix-libdir.patch (upstreamed) + ------------------------------------------------------------------- Tue Aug 3 10:46:19 UTC 2021 - pgajdos@suse.com diff --git a/openexr.spec b/openexr.spec index 7e37271..e461a7b 100644 --- a/openexr.spec +++ b/openexr.spec @@ -1,5 +1,5 @@ # -# spec file +# spec file for package openexr # # Copyright (c) 2021 SUSE LLC # @@ -17,63 +17,29 @@ %define prjname openexr -%define flavor @BUILD_FLAVOR@%{nil} -%if "%{flavor}" == "" -%define flavor openexr -%endif -# perhaps you want to build against corresponding ilmbase build -%define asan_build 0 +# perhaps you want to build against corresponding Imath build %define debug_build 0 -%define sonum 25 -%global so_suffix -2_5 -Name: %{flavor} -Version: 2.5.7 +%define sonum 30 +%global so_suffix -3_1 +Name: openexr +Version: 3.1.1 Release: 0 -%if "%{flavor}" == "openexr" Summary: Utilities for working with HDR images in OpenEXR format License: BSD-3-Clause Group: Development/Libraries/C and C++ -%endif -%if "%{flavor}" == "ilmbase" -Summary: Base library for ILM software (OpenEXR) -License: BSD-3-Clause -Group: Development/Libraries/C and C++ -%endif URL: http://www.openexr.com/ Source0: https://github.com/openexr/openexr/archive/v%{version}.tar.gz Source2: baselibs.conf -Patch1: 0001-Use-absolute-CMAKE_INSTALL_FULL_LIBDIR-for-libdir-in.patch -BuildRequires: cmake -BuildRequires: gcc-c++ -BuildRequires: pkgconfig -%if "%{flavor}" == "openexr" +BuildRequires: cmake >= 3.12 BuildRequires: fltk-devel BuildRequires: freeglut-devel -BuildRequires: pkgconfig(IlmBase) == %{version} +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: pkgconfig(Imath) BuildRequires: pkgconfig(zlib) -%endif -%if "%{flavor}" == "ilmbase" -BuildRequires: libtool -%endif -%if "%{flavor}" == "openexr" Obsoletes: OpenEXR <= 1.6.1 Provides: OpenEXR = %{version} -%endif -%if "%{flavor}" == "ilmbase" -Obsoletes: IlmBase <= 1.0.1 -Provides: IlmBase = %{version} -%endif -%if %{asan_build} || %{debug_build} -BuildRequires: ilmbase-debugsource -BuildRequires: libHalf%{so_suffix}-%{sonum}-debuginfo -BuildRequires: libIex%{so_suffix}-%{sonum}-debuginfo -BuildRequires: libIexMath%{so_suffix}-%{sonum}-debuginfo -BuildRequires: libIlmThread%{so_suffix}-%{sonum}-debuginfo -BuildRequires: libImath%{so_suffix}-%{sonum}-debuginfo -%endif - -%if "%{flavor}" == "openexr" %description OpenEXR is a high dynamic-range (HDR) image file format developed by @@ -88,35 +54,69 @@ contains a set of utilities to work with this format. * exr2aces, converter to ACES format * exrmultiview, combine two or more images into one multi-view -%package -n libIlmImf%{so_suffix}-%{sonum} +%package -n libIex%{so_suffix}-%{sonum} +Summary: Exception handling library for OpenEXR +License: BSD-3-Clause +Group: System/Libraries + +%description -n libIex%{so_suffix}-%{sonum} +OpenEXR is a high dynamic-range (HDR) image file format developed by +Industrial Light & Magic for use in computer imaging applications. + +This package contains shared library libIex + +%package -n libIlmThread%{so_suffix}-%{sonum} +Summary: Thread abstraction library for OpenEXR +License: BSD-3-Clause +Group: System/Libraries + +%description -n libIlmThread%{so_suffix}-%{sonum} +OpenEXR is a high dynamic-range (HDR) image file format developed by +Industrial Light & Magic for use in computer imaging applications. + +This package contains shared library libIlmThread + +%package -n libOpenEXR%{so_suffix}-%{sonum} Summary: Library to Handle EXR Pictures in 16-Bit Floating-Point Format License: BSD-3-Clause Group: System/Libraries -%description -n libIlmImf%{so_suffix}-%{sonum} +%description -n libOpenEXR%{so_suffix}-%{sonum} OpenEXR is a high dynamic-range (HDR) image file format developed by Industrial Light & Magic for use in computer imaging applications. -This package contains shared library libIlmImf +This package contains shared library libOpenEXR -%package -n libIlmImfUtil%{so_suffix}-%{sonum} +%package -n libOpenEXRCore%{so_suffix}-%{sonum} +Summary: Library to Handle EXR Pictures in 16-Bit Floating-Point Format +License: BSD-3-Clause +Group: System/Libraries + +%description -n libOpenEXRCore%{so_suffix}-%{sonum} +OpenEXR is a high dynamic-range (HDR) image file format developed by +Industrial Light & Magic for use in computer imaging applications. + +This package contains shared library libOpenEXRCore + +%package -n libOpenEXRUtil%{so_suffix}-%{sonum} Summary: Library to simplify development of OpenEXR utilities License: BSD-3-Clause Group: System/Libraries -%description -n libIlmImfUtil%{so_suffix}-%{sonum} +%description -n libOpenEXRUtil%{so_suffix}-%{sonum} OpenEXR is a high dynamic-range (HDR) image file format developed by Industrial Light & Magic for use in computer imaging applications. -This package contains shared library libIlmImfUtil +This package contains shared library libOpenEXRUtil %package devel Summary: Development files for the 16-bit FP EXR picture handling library License: BSD-3-Clause AND GPL-2.0-or-later Group: Development/Libraries/C and C++ -Requires: ilmbase-devel >= 2.3.0 -Requires: libIlmImf%{so_suffix}-%{sonum} = %{version} -Requires: libIlmImfUtil%{so_suffix}-%{sonum} = %{version} +Requires: Imath-devel +Requires: libOpenEXR%{so_suffix}-%{sonum} = %{version} +Requires: libOpenEXRCore%{so_suffix}-%{sonum} = %{version} +Requires: libOpenEXRUtil%{so_suffix}-%{sonum} = %{version} Requires: pkgconfig Requires: pkgconfig(zlib) Obsoletes: OpenEXR-devel <= 1.6.1 @@ -143,148 +143,23 @@ Industrial Light & Magic for use in computer imaging applications. This package contains documentation. -%endif - -%if "%{flavor}" == "ilmbase" - -%description -Base library for Industrial Light & Magic software (OpenEXR). - -* Half is a class that encapsulates our 16-bit floating-point - format. - -* IlmThread is a thread abstraction library for use with OpenEXR and - other software packages. It currently supports pthreads and - Windows threads. - -* Imath implements 2D and 3D vectors, 3x3 and 4x4 matrices, - quaternions and other useful 2D and 3D math functions. - -* Iex is an exception-handling library. - -%package devel -Summary: Base library for ILM software (OpenEXR) -# Renamed to libilmbase6 to met the Shared Library Policy -License: BSD-3-Clause AND GPL-2.0-or-later -Group: Development/Libraries/C and C++ -Requires: libHalf%{so_suffix}-%{sonum} -Requires: libIex%{so_suffix}-%{sonum} -Requires: libIexMath%{so_suffix}-%{sonum} -Requires: libIlmThread%{so_suffix}-%{sonum} -Requires: libImath%{so_suffix}-%{sonum} -Requires: libstdc++-devel - -%description devel -Devel files for ilmbase -Base library for Industrial Light & Magic software (OpenEXR). - -%package -n libHalf%{so_suffix}-%{sonum} -Summary: 16-bit floating-point encapsulation class for OpenEXR -License: BSD-3-Clause -Group: System/Libraries - -%description -n libHalf%{so_suffix}-%{sonum} -%{summary}. - -%package -n libIexMath%{so_suffix}-%{sonum} -Summary: Exception-based vector/matrix library for OpenEXR -License: BSD-3-Clause -Group: System/Libraries - -%description -n libIexMath%{so_suffix}-%{sonum} -%{summary}. - -%package -n libIex%{so_suffix}-%{sonum} -Summary: Exception handling library for OpenEXR -License: BSD-3-Clause -Group: System/Libraries - -%description -n libIex%{so_suffix}-%{sonum} -%{summary}. - -%package -n libIlmThread%{so_suffix}-%{sonum} -Summary: Thread abstraction library for OpenEXR -License: BSD-3-Clause -Group: System/Libraries - -%description -n libIlmThread%{so_suffix}-%{sonum} -%{summary}. - -%package -n libImath%{so_suffix}-%{sonum} -Summary: Vector/matrix library for OpenEXR -License: BSD-3-Clause -Group: System/Libraries - -%description -n libImath%{so_suffix}-%{sonum} -%{summary}. - -%endif - %prep -%setup -q -n %{prjname}-%{version} -%patch1 -p1 +%setup -q -n %{name}-%{version} %build -%if "%{flavor}" == "openexr" -pushd OpenEXR export PTHREAD_LIBS="-lpthread" %if %{debug_build} export CXXFLAGS="%{optflags} -O0" %endif %cmake \ -DCMAKE_INSTALL_DOCDIR="%{_docdir}/%{name}" -%if %{asan_build} -vmemlimit=$(ulimit -v) -if [ $vmemlimit != unlimited ]; then - echo "ulimit -v has to be unlimited (currently $vmemlimit) to run ASAN build" - exit 1 -fi -for i in $(find -name Makefile); do - sed -i -e 's/\(^CXXFLAGS.*\)/\1 -fsanitize=address/' \ - -e 's/\(^LIBS =.*\)/\1 -lasan/' \ - $i -done -%endif %cmake_build -popd -%endif - -%if "%{flavor}" == "ilmbase" -pushd IlmBase -%cmake -%if %{asan_build} -vmemlimit=$(ulimit -v) -if [ $vmemlimit != unlimited ]; then - echo "ulimit -v has to be unlimited (currently $vmemlimit) to run ASAN build" - exit 1 -fi -for i in $(find -name Makefile); do - sed -i -e 's/\(^CXXFLAGS.*\)/\1 -fsanitize=address/' \ - -e 's/\(^LIBS =.*\)/\1 -lasan/' \ - $i -done -%endif -make %{?_smp_mflags} -popd -%endif %install -%if "%{flavor}" == "openexr" -pushd OpenEXR %cmake_install -popd -%endif - -%if "%{flavor}" == "ilmbase" -pushd IlmBase -%cmake_install -popd -%endif %check -%if "%{flavor}" == "openexr" %ifnarch i586 ppc ppc64 s390 s390x -pushd OpenEXR export LD_LIBRARY_PATH="%{buildroot}/%{_libdir}" # tests can take longer than the default timeout of 25 minutes %if 0%{?suse_version} < 1550 @@ -294,34 +169,7 @@ export LD_LIBRARY_PATH="%{buildroot}/%{_libdir}" %else %ctest --timeout 3600 %endif -popd %endif -%endif - -%if "%{flavor}" == "ilmbase" -# https://github.com/openexr/openexr/issues/570 -%ifnarch i586 -pushd IlmBase -export LD_LIBRARY_PATH="$PWD/build/Imath:$PWD/build/Iex:$PWD/build/Half:$LD_LIBRARY_PATH" -%ctest -popd -%endif -%endif - -%if "%{flavor}" == "openexr" -%post -n libIlmImf%{so_suffix}-%{sonum} -p /sbin/ldconfig -%postun -n libIlmImf%{so_suffix}-%{sonum} -p /sbin/ldconfig - -%post -n libIlmImfUtil%{so_suffix}-%{sonum} -p /sbin/ldconfig -%postun -n libIlmImfUtil%{so_suffix}-%{sonum} -p /sbin/ldconfig -%endif - -%if "%{flavor}" == "ilmbase" -%post -n libHalf%{so_suffix}-%{sonum} -p /sbin/ldconfig -%postun -n libHalf%{so_suffix}-%{sonum} -p /sbin/ldconfig - -%post -n libIexMath%{so_suffix}-%{sonum} -p /sbin/ldconfig -%postun -n libIexMath%{so_suffix}-%{sonum} -p /sbin/ldconfig %post -n libIex%{so_suffix}-%{sonum} -p /sbin/ldconfig %postun -n libIex%{so_suffix}-%{sonum} -p /sbin/ldconfig @@ -329,16 +177,21 @@ popd %post -n libIlmThread%{so_suffix}-%{sonum} -p /sbin/ldconfig %postun -n libIlmThread%{so_suffix}-%{sonum} -p /sbin/ldconfig -%post -n libImath%{so_suffix}-%{sonum} -p /sbin/ldconfig -%postun -n libImath%{so_suffix}-%{sonum} -p /sbin/ldconfig -%endif +%post -n libOpenEXR%{so_suffix}-%{sonum} -p /sbin/ldconfig +%postun -n libOpenEXR%{so_suffix}-%{sonum} -p /sbin/ldconfig + +%post -n libOpenEXRCore%{so_suffix}-%{sonum} -p /sbin/ldconfig +%postun -n libOpenEXRCore%{so_suffix}-%{sonum} -p /sbin/ldconfig + +%post -n libOpenEXRUtil%{so_suffix}-%{sonum} -p /sbin/ldconfig +%postun -n libOpenEXRUtil%{so_suffix}-%{sonum} -p /sbin/ldconfig -%if "%{flavor}" == "openexr" %files %license LICENSE.md %doc CHANGES.md CODE_OF_CONDUCT.md CODEOWNERS CONTRIBUTING.md CONTRIBUTORS.md README.md SECURITY.md %{_bindir}/exrenvmap %{_bindir}/exrheader +%{_bindir}/exrinfo %{_bindir}/exrmakepreview %{_bindir}/exrmaketiled %{_bindir}/exrstdattr @@ -348,10 +201,16 @@ popd %files devel %{_includedir}/OpenEXR -%{_libdir}/libIlmImf.so -%{_libdir}/libIlmImf%{so_suffix}.so -%{_libdir}/libIlmImfUtil.so -%{_libdir}/libIlmImfUtil%{so_suffix}.so +%{_libdir}/libIex.so +%{_libdir}/libIex%{so_suffix}.so +%{_libdir}/libIlmThread.so +%{_libdir}/libIlmThread%{so_suffix}.so +%{_libdir}/libOpenEXR.so +%{_libdir}/libOpenEXR%{so_suffix}.so +%{_libdir}/libOpenEXRCore.so +%{_libdir}/libOpenEXRCore%{so_suffix}.so +%{_libdir}/libOpenEXRUtil.so +%{_libdir}/libOpenEXRUtil%{so_suffix}.so %{_libdir}/pkgconfig/OpenEXR.pc %dir %{_libdir}/cmake/OpenEXR %{_libdir}/cmake/OpenEXR/*.cmake @@ -360,48 +219,24 @@ popd %{_docdir}/%{name} %exclude %{_docdir}/%{name}/{CHANGES.md,CODE_OF_CONDUCT.md,CODEOWNERS,CONTRIBUTING.md,CONTRIBUTORS.md,README.md,SECURITY.md} -%files -n libIlmImf%{so_suffix}-%{sonum} -%license LICENSE.md -%{_libdir}/libIlmImf-*.so.* - -%files -n libIlmImfUtil%{so_suffix}-%{sonum} -%license LICENSE.md -%{_libdir}/libIlmImfUtil-*.so.* -%endif - -%if "%{flavor}" == "ilmbase" -%files devel -%doc CHANGES.md CODE_OF_CONDUCT.md CODEOWNERS CONTRIBUTING.md CONTRIBUTORS.md README.md SECURITY.md -%license LICENSE.md -%{_includedir}/OpenEXR -%{_libdir}/libHalf.so -%{_libdir}/libHalf%{so_suffix}.so -%{_libdir}/libIex.so -%{_libdir}/libIex%{so_suffix}.so -%{_libdir}/libImath.so -%{_libdir}/libImath%{so_suffix}.so -%{_libdir}/libIlmThread.so -%{_libdir}/libIlmThread%{so_suffix}.so -%{_libdir}/libIexMath.so -%{_libdir}/libIexMath%{so_suffix}.so -%{_libdir}/pkgconfig/IlmBase.pc -%dir %{_libdir}/cmake/IlmBase/ -%{_libdir}/cmake/IlmBase/*.cmake - -%files -n libHalf%{so_suffix}-%{sonum} -%{_libdir}/libHalf%{so_suffix}.so.* - -%files -n libIexMath%{so_suffix}-%{sonum} -%{_libdir}/libIexMath%{so_suffix}.so.* - %files -n libIex%{so_suffix}-%{sonum} -%{_libdir}/libIex%{so_suffix}.so.* +%license LICENSE.md +%{_libdir}/libIex-*.so.* %files -n libIlmThread%{so_suffix}-%{sonum} -%{_libdir}/libIlmThread%{so_suffix}.so.* +%license LICENSE.md +%{_libdir}/libIlmThread-*.so.* -%files -n libImath%{so_suffix}-%{sonum} -%{_libdir}/libImath%{so_suffix}.so.* -%endif +%files -n libOpenEXR%{so_suffix}-%{sonum} +%license LICENSE.md +%{_libdir}/libOpenEXR-*.so.* + +%files -n libOpenEXRCore%{so_suffix}-%{sonum} +%license LICENSE.md +%{_libdir}/libOpenEXRCore-*.so.* + +%files -n libOpenEXRUtil%{so_suffix}-%{sonum} +%license LICENSE.md +%{_libdir}/libOpenEXRUtil-*.so.* %changelog diff --git a/v2.5.7.tar.gz b/v2.5.7.tar.gz deleted file mode 100644 index 9790d73..0000000 --- a/v2.5.7.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:36ecb2290cba6fc92b2ec9357f8dc0e364b4f9a90d727bf9a57c84760695272d -size 27539574 diff --git a/v3.1.1.tar.gz b/v3.1.1.tar.gz new file mode 100644 index 0000000..2864d12 --- /dev/null +++ b/v3.1.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:045254e201c0f87d1d1a4b2b5815c4ae54845af2e6ec0ab88e979b5fdb30a86e +size 25588029 From cc0ba60af543934bf68fd71bbf09f755844e2875ed0a7e1fd025bf1a1b22718f Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Fri, 13 Aug 2021 10:23:39 +0000 Subject: [PATCH 2/6] - fix baselibs.conf - modified sources % baselibs.conf OBS-URL: https://build.opensuse.org/package/show/graphics/openexr?expand=0&rev=71 --- baselibs.conf | 8 ++++---- openexr.changes | 7 +++++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/baselibs.conf b/baselibs.conf index 4ee88bf..82660d9 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,4 +1,4 @@ -libOpenEXR-3_0-27 -libOpenEXRUtil-3_0-27 -libIlmThread-3_0-27 -libIex-3_0-27 +libOpenEXR-3_1-30 +libOpenEXRUtil-3_1-30 +libIlmThread-3_1-30 +libIex-3_1-30 diff --git a/openexr.changes b/openexr.changes index f4facab..3dab34e 100644 --- a/openexr.changes +++ b/openexr.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Aug 13 10:23:25 UTC 2021 - pgajdos@suse.com + +- fix baselibs.conf +- modified sources + % baselibs.conf + ------------------------------------------------------------------- Fri Aug 13 09:43:27 UTC 2021 - pgajdos@suse.com From 8d5a7785a9a097c65c531fc98ef7c2e00604eb11dba28f9a5141735ca0e3b5f1 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Fri, 13 Aug 2021 10:27:06 +0000 Subject: [PATCH 3/6] - run spec-cleaner OBS-URL: https://build.opensuse.org/package/show/graphics/openexr?expand=0&rev=72 --- openexr.changes | 5 +++++ openexr.spec | 9 ++------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/openexr.changes b/openexr.changes index 3dab34e..fb652f6 100644 --- a/openexr.changes +++ b/openexr.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Aug 13 10:26:55 UTC 2021 - pgajdos@suse.com + +- run spec-cleaner + ------------------------------------------------------------------- Fri Aug 13 10:23:25 UTC 2021 - pgajdos@suse.com diff --git a/openexr.spec b/openexr.spec index e461a7b..5818e43 100644 --- a/openexr.spec +++ b/openexr.spec @@ -17,7 +17,6 @@ %define prjname openexr - # perhaps you want to build against corresponding Imath build %define debug_build 0 %define sonum 30 @@ -28,7 +27,7 @@ Release: 0 Summary: Utilities for working with HDR images in OpenEXR format License: BSD-3-Clause Group: Development/Libraries/C and C++ -URL: http://www.openexr.com/ +URL: https://www.openexr.com/ Source0: https://github.com/openexr/openexr/archive/v%{version}.tar.gz Source2: baselibs.conf BuildRequires: cmake >= 3.12 @@ -144,7 +143,7 @@ Industrial Light & Magic for use in computer imaging applications. This package contains documentation. %prep -%setup -q -n %{name}-%{version} +%setup -q %build export PTHREAD_LIBS="-lpthread" @@ -173,16 +172,12 @@ export LD_LIBRARY_PATH="%{buildroot}/%{_libdir}" %post -n libIex%{so_suffix}-%{sonum} -p /sbin/ldconfig %postun -n libIex%{so_suffix}-%{sonum} -p /sbin/ldconfig - %post -n libIlmThread%{so_suffix}-%{sonum} -p /sbin/ldconfig %postun -n libIlmThread%{so_suffix}-%{sonum} -p /sbin/ldconfig - %post -n libOpenEXR%{so_suffix}-%{sonum} -p /sbin/ldconfig %postun -n libOpenEXR%{so_suffix}-%{sonum} -p /sbin/ldconfig - %post -n libOpenEXRCore%{so_suffix}-%{sonum} -p /sbin/ldconfig %postun -n libOpenEXRCore%{so_suffix}-%{sonum} -p /sbin/ldconfig - %post -n libOpenEXRUtil%{so_suffix}-%{sonum} -p /sbin/ldconfig %postun -n libOpenEXRUtil%{so_suffix}-%{sonum} -p /sbin/ldconfig From 5ecb6d902bff27975196eccbf84d5b8f6f353627db564dc12a727cdb7ab7a582 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Mon, 16 Aug 2021 12:35:03 +0000 Subject: [PATCH 4/6] - openexr-devel now provides/obsoletes ilmbase-devel OBS-URL: https://build.opensuse.org/package/show/graphics/openexr?expand=0&rev=73 --- openexr.changes | 5 +++++ openexr.spec | 2 ++ 2 files changed, 7 insertions(+) diff --git a/openexr.changes b/openexr.changes index fb652f6..2fab119 100644 --- a/openexr.changes +++ b/openexr.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Aug 16 12:34:23 UTC 2021 - pgajdos@suse.com + +- openexr-devel now provides/obsoletes ilmbase-devel + ------------------------------------------------------------------- Fri Aug 13 10:26:55 UTC 2021 - pgajdos@suse.com diff --git a/openexr.spec b/openexr.spec index 5818e43..53b577a 100644 --- a/openexr.spec +++ b/openexr.spec @@ -122,6 +122,8 @@ Obsoletes: OpenEXR-devel <= 1.6.1 Provides: OpenEXR-devel = %{version} Obsoletes: libopenexr-devel <= 1.7.0 Provides: libopenexr-devel = %{version} +Obsoletes: ilmbase-devel < 3.0 +Provides: ilmbase-devel = 3.0 %description devel OpenEXR is a high dynamic-range (HDR) image file format developed by From dc14eb2c92a675fe798406474f674d5545032e91f6d49270a0901dc0f3c98e91 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Mon, 16 Aug 2021 13:14:19 +0000 Subject: [PATCH 5/6] OBS-URL: https://build.opensuse.org/package/show/graphics/openexr?expand=0&rev=74 --- openexr.changes | 5 ----- openexr.spec | 2 -- 2 files changed, 7 deletions(-) diff --git a/openexr.changes b/openexr.changes index 2fab119..fb652f6 100644 --- a/openexr.changes +++ b/openexr.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Mon Aug 16 12:34:23 UTC 2021 - pgajdos@suse.com - -- openexr-devel now provides/obsoletes ilmbase-devel - ------------------------------------------------------------------- Fri Aug 13 10:26:55 UTC 2021 - pgajdos@suse.com diff --git a/openexr.spec b/openexr.spec index 53b577a..5818e43 100644 --- a/openexr.spec +++ b/openexr.spec @@ -122,8 +122,6 @@ Obsoletes: OpenEXR-devel <= 1.6.1 Provides: OpenEXR-devel = %{version} Obsoletes: libopenexr-devel <= 1.7.0 Provides: libopenexr-devel = %{version} -Obsoletes: ilmbase-devel < 3.0 -Provides: ilmbase-devel = 3.0 %description devel OpenEXR is a high dynamic-range (HDR) image file format developed by From 727e813366f9bbd76d234284cdbfd492808c293f06aa8788762754fbbbb4ea49 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Mon, 16 Aug 2021 14:42:51 +0000 Subject: [PATCH 6/6] - devel package obsoletes and provides ilmbase-devel OBS-URL: https://build.opensuse.org/package/show/graphics/openexr?expand=0&rev=75 --- openexr.changes | 5 +++++ openexr.spec | 2 ++ 2 files changed, 7 insertions(+) diff --git a/openexr.changes b/openexr.changes index fb652f6..9b45890 100644 --- a/openexr.changes +++ b/openexr.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Aug 16 14:41:56 UTC 2021 - pgajdos@suse.com + +- devel package obsoletes and provides ilmbase-devel + ------------------------------------------------------------------- Fri Aug 13 10:26:55 UTC 2021 - pgajdos@suse.com diff --git a/openexr.spec b/openexr.spec index 5818e43..8e99958 100644 --- a/openexr.spec +++ b/openexr.spec @@ -122,6 +122,8 @@ Obsoletes: OpenEXR-devel <= 1.6.1 Provides: OpenEXR-devel = %{version} Obsoletes: libopenexr-devel <= 1.7.0 Provides: libopenexr-devel = %{version} +Obsoletes: ilmbase-devel < 3.0 +Provides: ilmbase-devel = %{version} %description devel OpenEXR is a high dynamic-range (HDR) image file format developed by