diff --git a/OpenImageIO.spec b/OpenImageIO.spec index e4f318b..e7451e7 100644 --- a/OpenImageIO.spec +++ b/OpenImageIO.spec @@ -1,16 +1,13 @@ -%global subname oiio -#global beta beta1 - Name: OpenImageIO Version: 1.7.17 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Library for reading and writing images Group: Development/Libraries License: BSD URL: https://sites.google.com/site/openimageio/home -Source0: https://github.com/%{name}/%{subname}/archive/Release-%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source0: https://github.com/%{name}/oiio/archive/Release-%{version}.tar.gz#/%{name}-%{version}.tar.gz # Images for test suite #Source1: oiio-images.tar.gz @@ -25,7 +22,8 @@ BuildRequires: boost-devel BuildRequires: glew-devel BuildRequires: OpenEXR-devel ilmbase-devel BuildRequires: python2-devel -BuildRequires: libpng-devel libtiff-devel libjpeg-turbo-devel giflib-devel +BuildRequires: libpng-devel libtiff-devel libjpeg-turbo-devel openjpeg2-devel +BuildRequires: giflib-devel %if ! 0%{?rhel} BuildRequires: libwebp-devel BuildRequires: Field3D-devel @@ -45,7 +43,7 @@ BuildRequires: OpenColorIO-devel # We don't want to provide private python extension libs %{?filter_setup: -%filter_provides_in %{python_sitearch}/.*\.so$ +%filter_provides_in %{python2_sitearch}/.*\.so$ %filter_setup } @@ -125,7 +123,7 @@ rm -rf build/linux && mkdir -p build/linux && pushd build/linux %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_SKIP_RPATH:BOOL=TRUE \ -DINCLUDE_INSTALL_DIR:PATH=/usr/include/%{name} \ - -DPYLIB_INSTALL_DIR:PATH=%{python_sitearch} \ + -DPYLIB_INSTALL_DIR:PATH=%{python2_sitearch} \ -DINSTALL_DOCS:BOOL=FALSE \ -DINSTALL_FONTS:BOOL=FALSE \ -DUSE_EXTERNAL_PUGIXML:BOOL=TRUE \ @@ -137,6 +135,8 @@ rm -rf build/linux && mkdir -p build/linux && pushd build/linux %ifarch ppc ppc64 -DNOTHREADS:BOOL=FALSE \ %endif + -DJPEG_INCLUDE_DIR=%{_includedir} \ + -DOPENJPEG_INCLUDE_DIR=$(pkgconf --variable=includedir libopenjp2) \ -DVERBOSE=TRUE \ ../../ @@ -168,7 +168,7 @@ cp -a src/doc/*.1 %{buildroot}%{_mandir}/man1 %{_libdir}/libOpenImageIO_Util.so.* %files -n python2-openimageio -%{python_sitearch}/OpenImageIO.so +%{python2_sitearch}/OpenImageIO.so %files utils %exclude %{_bindir}/iv @@ -188,6 +188,9 @@ cp -a src/doc/*.1 %{buildroot}%{_mandir}/man1 %changelog +* Thu Jan 18 2018 Richard Shaw - 1.7.17-3 +- Add openjpeg2 to build requirements. + * Mon Sep 04 2017 Richard Shaw - 1.7.17-2 - Add patch to remove opencv qt5 dependency.