diff --git a/.gitignore b/.gitignore index e69de29..15319b5 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1,84 @@ +/OpenImageIO-oiio-Release-0.10.0-12-g8055b0f.tar.gz +/OpenImageIO-oiio-Release-0.10.1-0-g8c102cf.tar.gz +/OpenImageIO-oiio-Release-0.10.2-0-g7a6cba8.tar.gz +/OpenImageIO-oiio-Release-0.10.3-0-ge93cd33.tar.gz +/OpenImageIO-oiio-Release-0.10.4-0-gad1950d.tar.gz +/OpenImageIO-oiio-Release-1.0.0-0-g5b37f1c.tar.gz +/OpenImageIO-oiio-Release-1.0.3-0-gdffc74e.tar.gz +clog +/OpenImageIO-oiio-Release-1.0.4-0-g513d0dd.tar.gz +/OpenImageIO-oiio-Release-1.0.5-0-g28ba675.tar.gz +/OpenImageIO-oiio-Release-1.0.6-0-g47d4346.tar.gz +/OpenImageIO-oiio-Release-1.0.7-0-g0cae52b.tar.gz +/OpenImageIO-oiio-Release-1.0.8-0-g187bb9b.tar.gz +/OpenImageIO-oiio-Release-1.0.9-0-g0b78dec.tar.gz +/oiio-Release-1.1.3.tar.gz +/oiio-Release-1.1.10.tar.gz +/oiio-Release-1.1.11.tar.gz +/oiio-Release-1.1.13.tar.gz +/oiio-Release-1.2.0.tar.gz +/oiio-Release-1.2.1.tar.gz +/oiio-Release-1.2.3.tar.gz +/oiio-Release-1.3.11.tar.gz +/oiio-Release-1.4.7.tar.gz +/oiio-Release-1.4.12.tar.gz +/oiio-Release-1.4.14.tar.gz +/oiio-Release-1.4.15.tar.gz +/oiio-Release-1.4.16.tar.gz +/oiio-Release-1.5.10.tar.gz +/oiio-Release-1.5.11.tar.gz +/oiio-Release-1.5.12.tar.gz +/oiio-Release-1.5.13.tar.gz +/oiio-Release-1.5.14.tar.gz +/oiio-Release-1.5.17.tar.gz +/oiio-Release-1.5.18.tar.gz +/oiio-Release-1.5.20.tar.gz +/OpenImageIO-1.5.21.tar.gz +/OpenImageIO-1.5.22.tar.gz +/OpenImageIO-1.6.8.tar.gz +/OpenImageIO-1.6.9.tar.gz +/OpenImageIO-1.6.10.tar.gz +/OpenImageIO-1.6.11.tar.gz +/OpenImageIO-1.6.12.tar.gz +/OpenImageIO-1.6.13.tar.gz +/OpenImageIO-1.6.14.tar.gz +/OpenImageIO-1.6.15.tar.gz +/OpenImageIO-1.6.16.tar.gz +/OpenImageIO-1.7.7.tar.gz +/OpenImageIO-1.7.9.tar.gz +/OpenImageIO-1.7.10.tar.gz +/OpenImageIO-1.7.11.tar.gz +/OpenImageIO-1.7.12.tar.gz +/OpenImageIO-1.7.13.tar.gz +/OpenImageIO-1.7.14.tar.gz +/OpenImageIO-1.7.15.tar.gz +/OpenImageIO-1.7.17.tar.gz +/OpenImageIO-1.8.5.tar.gz +/OpenImageIO-1.8.6.tar.gz +/OpenImageIO-1.8.7.tar.gz +/OpenImageIO-1.8.8.tar.gz +/OpenImageIO-1.8.9.tar.gz +/OpenImageIO-1.8.10.tar.gz +/OpenImageIO-1.8.12.tar.gz +/OpenImageIO-1.8.14.tar.gz +/OpenImageIO-1.8.15.tar.gz +/OpenImageIO-1.8.16.tar.gz +/OpenImageIO-1.8.17.tar.gz +/OpenImageIO-2.0.3.tar.gz +/OpenImageIO-2.0.4.tar.gz +/OpenImageIO-2.0.5.tar.gz +/OpenImageIO-2.0.6.tar.gz +/OpenImageIO-2.0.7.tar.gz +/OpenImageIO-2.0.8.tar.gz +/OpenImageIO-2.0.9.tar.gz +/OpenImageIO-2.0.10.tar.gz +/OpenImageIO-2.0.11.tar.gz +/OpenImageIO-2.0.12.tar.gz +/OpenImageIO-2.0.13.tar.gz +/OpenImageIO-2.1.10.1.tar.gz +/OpenImageIO-2.1.11.0.tar.gz +/OpenImageIO-2.1.11.1.tar.gz +/OpenImageIO-2.1.12.0.tar.gz +/OpenImageIO-2.1.13.0.tar.gz +/OpenImageIO-2.1.14.0.tar.gz +/OpenImageIO-2.1.15.0.tar.gz diff --git a/OpenImageIO.spec b/OpenImageIO.spec index 67ad440..375de68 100644 --- a/OpenImageIO.spec +++ b/OpenImageIO.spec @@ -1,51 +1,69 @@ -%global sover 2.0 +%global sover 2.1 Name: OpenImageIO -Version: 2.0.10 +Version: 2.1.15.0 Release: 2%{?dist} Summary: Library for reading and writing images -License: BSD +# The included fmtlib is MIT licensed +# src/include/OpenImageIO/fmt +License: BSD and MIT + URL: https://sites.google.com/site/openimageio/home + Source0: https://github.com/%{name}/oiio/archive/Release-%{version}/%{name}-%{version}.tar.gz # Images for test suite #Source1: oiio-images.tar.gz +Patch0: oiio-cmake_compat.patch + # Needed until LibRaw is available on s390x and aarch64 %if 0%{?rhel} >= 8 ExclusiveArch: x86_64 ppc64le %endif -BuildRequires: cmake gcc-c++ -BuildRequires: qt5-qtbase-devel +# Utilities +BuildRequires: cmake +BuildRequires: gcc-c++ +BuildRequires: txt2man +# Libraries BuildRequires: boost-devel BuildRequires: boost-python3-devel -BuildRequires: glew-devel -BuildRequires: OpenEXR-devel ilmbase-devel -BuildRequires: python3-devel -BuildRequires: libpng-devel libtiff-devel libjpeg-turbo-devel openjpeg2-devel -BuildRequires: giflib-devel -BuildRequires: libwebp-devel -BuildRequires: Field3D-devel -BuildRequires: hdf5-devel -# Not currently in epel8 -%if ! 0%{?rhel} >= 8 +BuildRequires: bzip2-devel +# Not currently in RHEL/EPEL +%if ! 0%{?rhel} BuildRequires: dcmtk-devel %endif -BuildRequires: txt2man -BuildRequires: zlib-devel +BuildRequires: Field3D-devel +BuildRequires: fmt-devel +BuildRequires: freetype-devel +BuildRequires: giflib-devel +BuildRequires: glew-devel +BuildRequires: hdf5-devel +BuildRequires: ilmbase-devel BuildRequires: jasper-devel -BuildRequires: pugixml-devel -BuildRequires: opencv-devel +BuildRequires: libjpeg-turbo-devel +BuildRequires: libpng-devel BuildRequires: LibRaw-devel +BuildRequires: libsquish-devel +BuildRequires: libtiff-devel +BuildRequires: libwebp-devel +BuildRequires: opencv-devel +BuildRequires: OpenEXR-devel ilmbase-devel +BuildRequires: openjpeg2-devel BuildRequires: openssl-devel -BuildRequires: robin-map-devel +BuildRequires: openvdb-devel +BuildRequires: pugixml-devel BuildRequires: pybind11-devel +BuildRequires: python3-devel +BuildRequires: qt5-qtbase-devel +BuildRequires: robin-map-devel +BuildRequires: tbb-devel +BuildRequires: zlib-devel # WARNING: OpenColorIO and OpenImageIO are cross dependent. # If an ABI incompatible update is done in one, the other also needs to be # rebuilt. -# Temporarily disable for bootstrap build. BuildRequires: OpenColorIO-devel @@ -91,6 +109,7 @@ with any formats for which plugins are available). %package devel Summary: Documentation for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: OpenEXR-devel %description devel Development files for package %{name} @@ -116,7 +135,7 @@ sed -i "s/SET CMP0046 OLD/SET CMP0046 NEW/" CMakeLists.txt %build -rm -rf build/linux && mkdir -p build/linux && pushd build/linux +mkdir -p build/linux && pushd build/linux # CMAKE_SKIP_RPATH is OK here because it is set to FALSE internally and causes # CMAKE_INSTALL_RPATH to be cleared, which is the desiered result. %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \ @@ -137,6 +156,9 @@ rm -rf build/linux && mkdir -p build/linux && pushd build/linux -DJPEG_INCLUDE_DIR=%{_includedir} \ -DOPENJPEG_INCLUDE_DIR=$(pkgconf --variable=includedir libopenjp2) \ -DOpenGL_GL_PREFERENCE=GLVND \ +%if 0%{rhel} + -DCMAKE_COMPAT=TRUE \ +%endif -DVERBOSE=TRUE \ ../../ @@ -147,11 +169,9 @@ rm -rf build/linux && mkdir -p build/linux && pushd build/linux pushd build/linux %make_install -%if ! 0%{?rhel} >= 8 # Move man pages to the right directory mkdir -p %{buildroot}%{_mandir}/man1 cp -a src/doc/*.1 %{buildroot}%{_mandir}/man1 -%endif %check @@ -171,25 +191,72 @@ cp -a src/doc/*.1 %{buildroot}%{_mandir}/man1 %files utils %exclude %{_bindir}/iv %{_bindir}/* -#exclude %{_mandir}/man1/iv.1.gz -#{_mandir}/man1/*.1.gz +%exclude %{_mandir}/man1/iv.1.gz +%{_mandir}/man1/*.1.gz %files iv %{_bindir}/iv -#{_mandir}/man1/iv.1.gz +%{_mandir}/man1/iv.1.gz %files devel -%doc src/doc/*.pdf %{_libdir}/libOpenImageIO.so %{_libdir}/libOpenImageIO_Util.so +%{_libdir}/cmake/%{name}/*.cmake %{_libdir}/pkgconfig/%{name}.pc %{_datadir}/cmake/Modules/FindOpenImageIO.cmake %{_includedir}/%{name}/ %changelog -* Fri Feb 14 2020 Richard Shaw - 2.0.10-2 -- Rebuild with OpenColorIO. +* Mon May 11 2020 Gwyn Ciesla - 2.1.15.0-2 +- Rebuild for new LibRaw + +* Mon May 11 2020 Richard Shaw - 2.1.15.0-1 +- Update to 2.1.15.0. +- Adds support for libRaw 0.20, fixes RHBZ#1833450. + +* Sat May 02 2020 Richard Shaw - 2.1.14.0-1 +- Update to 2.1.14.0. + +* Sun Apr 12 2020 Richard Shaw - 2.1.13.0-2 +- Rebuild for funky depdendency problem in Rawhide/33. + +* Thu Apr 02 2020 Richard Shaw - 2.1.13.0-1 +- Update to 2.1.13. + +* Tue Mar 03 2020 Richard Shaw - 2.1.12.0-1 +- Update to 2.1.12.0. + +* Wed Feb 12 2020 Richard Shaw - 2.1.11.1-1 +- Update to 2.1.11.0. + +* Tue Jan 28 2020 Nicolas Chauvet - 2.1.10.1-3 +- Rebuild for OpenCV 4.2 + +* Tue Jan 28 2020 Fedora Release Engineering - 2.1.10.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Mon Jan 27 2020 Richard Shaw - 2.1.10.1-1 +- Update to 2.1.10.1. + +* Fri Jan 03 2020 Richard Shaw - 2.1.10.0-1 +- Update to 2.1.10. + +* Sun Dec 29 2019 Nicolas Chauvet - 2.0.13-2 +- Rebuilt for opencv4 + +* Wed Dec 04 2019 Richard Shaw - 2.0.13-1 +- Update to 2.0.13. + +* Fri Nov 29 2019 Richard Shaw - 2.0.12-1 +- Update to 2.0.12. +- Add proper attribution for bundled fmtlib. + +* Wed Oct 02 2019 Richard Shaw - 2.0.11-1 +- Update to 2.0.11. + +* Mon Aug 19 2019 Miro Hrončok - 2.0.10-2 +- Rebuilt for Python 3.8 * Sun Aug 04 2019 Richard Shaw - 2.0.10-1 - Update to 2.0.10. diff --git a/STATUS b/STATUS deleted file mode 100644 index 17da891..0000000 --- a/STATUS +++ /dev/null @@ -1,4 +0,0 @@ -Missing dependencies: - -DEBUG util.py:585: BUILDSTDERR: No matching package to install: 'pybind11-devel' -DEBUG util.py:585: BUILDSTDERR: No matching package to install: 'txt2man' diff --git a/oiio-cmake_compat.patch b/oiio-cmake_compat.patch new file mode 100644 index 0000000..98c156a --- /dev/null +++ b/oiio-cmake_compat.patch @@ -0,0 +1,22 @@ +Index: oiio-Release-2.1.15.0/CMakeLists.txt +=================================================================== +--- oiio-Release-2.1.15.0.orig/CMakeLists.txt ++++ oiio-Release-2.1.15.0/CMakeLists.txt +@@ -2,10 +2,17 @@ + # SPDX-License-Identifier: BSD-3-Clause + # https://github.com/OpenImageIO/oiio/blob/master/LICENSE.md + ++if(CMAKE_COMPAT) ++ cmake_policy(SET CMP0048 NEW) ++ cmake_policy(SET CMP0057 NEW) ++ project (OpenImageIO VERSION 2.1.15.0 ++ LANGUAGES CXX C) ++else() + cmake_minimum_required (VERSION 3.12) + project (OpenImageIO VERSION 2.1.15.0 + HOMEPAGE_URL "https://openimageio.org" + LANGUAGES CXX C) ++endif() + set (PROJ_NAME OIIO) # short name, caps + string (TOLOWER ${PROJ_NAME} PROJ_NAME_LOWER) # short name lower case + string (TOUPPER ${PROJ_NAME} PROJ_NAME_UPPER) # short name upper case diff --git a/sources b/sources index 1d6b8ac..ba74894 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (OpenImageIO-2.0.10.tar.gz) = 3747610c947e243560ed1ff93817eb0fb60162734355d63151e94da6248326f44a112d81ad9c06d88a24cd82324fffd065081ba0a8f75c79856bd8718e2cd5f1 +SHA512 (OpenImageIO-2.1.15.0.tar.gz) = 9099beeab9bda87a2ec576e9c6b61486ed65806be2bce384fea54786a5900845bc286a1cd44d7341f9062a20d791a883231f5e00852c880438c9f3b3fb060f28