- release 8 (by relup.sh)

[packages/OpenImageIO.git] / OpenImageIO.spec

diff --git a/OpenImageIO.spec b/OpenImageIO.spec
index 0fc288645cac52ebc6a5dc8753b592944b5df1cb..1124dd00df5f78258b85ae8f2db090ac61127b05 100644 (file)
--- a/OpenImageIO.spec
+++ b/OpenImageIO.spec
@@ -5,22 +5,33 @@
 %bcond_without static_libs     # don't build static libraries
 %bcond_without tbb             # Threading Building Blocks
 #
+%ifarch i386 i486
+# https://github.com/OpenImageIO/oiio/issues/583
+%undefine      with_tbb
+%endif
+%ifnarch %{ix86} %{x8664} %{arm} ia64 ppc ppc64
+%undefine      with_tbb
+%endif
+#
 Summary:       Library for reading and writing images
 Summary(pl.UTF-8):     Biblioteka do odczytu i zapisu obrazów
 Name:          OpenImageIO
-Version:       1.0.7
-Release:       7
+Version:       1.2.3
+Release:       8
 License:       BSD
 Group:         Libraries
-Source0:       https://github.com/OpenImageIO/oiio/tarball/Release-%{version}#/%{name}-%{version}.tar.gz
-# Source0-md5: e939f97db2b0cac813c9e166f2353fe6
+Source0:       https://github.com/OpenImageIO/oiio/tarball/Release-%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 20066ae0e9026717242f64f107f7ee8e
 Patch0:                %{name}-link.patch
-Patch2:                %{name}-hdf.patch
+
+Patch2:                %{name}-build.patch
 Patch3:                %{name}-system-squish.patch
 Patch4:                %{name}-system-ptex.patch
 Patch5:                %{name}-system-dpx.patch
 Patch6:                %{name}-system-libcineon.patch
-Patch7:                no-gcc-atomics.patch
+Patch7:                %{name}-werror.patch
+Patch8:                0002-Fix_IlmBase_issue.patch
+Patch9:                0003-Fix_multiarch_paths.patch
 URL:           https://sites.google.com/site/openimageio/home
 BuildRequires: Field3D-devel
 %{?with_ocio:BuildRequires:    OpenColorIO-devel}
@@ -44,6 +55,7 @@ BuildRequires:        libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: libtiff-devel
 BuildRequires: libwebp-devel
+BuildRequires: openjpeg-devel
 BuildRequires: pugixml-devel
 BuildRequires: ptex-devel >= 2
 BuildRequires: python-devel >= 1:2.6
@@ -290,16 +302,17 @@ Python binding for OpenImageIO library.
 Wiązanie Pythona do biblioteki OpenImageIO.
 
 %prep
-%setup -q -n OpenImageIO-oiio-e9fa4c7
+%setup -q -n OpenImageIO-oiio-bcdad81
 %patch0 -p1
+
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%ifarch i486
 %patch7 -p1
-%endif
+%patch8 -p1
+%patch9 -p1
 
 %{__rm} -r src/dds.imageio/squish src/ptex.imageio/ptex
 # when using system pugixml, don't use hacked headers
@@ -309,8 +322,13 @@ Wiązanie Pythona do biblioteki OpenImageIO.
 install -d build
 cd build
 %cmake ../src \
+%ifarch i386 i486
+       -DNOTHREADS=1 \
+%endif
        -DEMBEDPLUGINS=OFF \
+       -DOPENJPEG_INCLUDE_DIR=%{_includedir}/openjpeg-1.5 \
        -DINCLUDE_INSTALL_DIR=%{_includedir}/%{name} \
+       -DLIB_INSTALL_DIR:PATH=%{_libdir} \
        -DPYLIB_INSTALL_DIR=%{py_sitedir} \
        -DPYTHON_VERSION=%{py_ver} \
        -DUSE_EXTERNAL_PUGIXML=ON \
@@ -340,16 +358,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc CHANGES CREDITS LICENSE README
+%doc CHANGES CREDITS LICENSE README.rst
 %attr(755,root,root) %{_bindir}/iconvert
 %attr(755,root,root) %{_bindir}/idiff
 %attr(755,root,root) %{_bindir}/igrep
 %attr(755,root,root) %{_bindir}/iinfo
-%attr(755,root,root) %{_bindir}/iprocess
 %attr(755,root,root) %{_bindir}/maketx
 %attr(755,root,root) %{_bindir}/oiiotool
 %attr(755,root,root) %{_libdir}/libOpenImageIO.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libOpenImageIO.so.1.0
+%attr(755,root,root) %ghost %{_libdir}/libOpenImageIO.so.1.2
 %attr(755,root,root) %{_libdir}/bmp.imageio.so
 %attr(755,root,root) %{_libdir}/fits.imageio.so
 %attr(755,root,root) %{_libdir}/hdr.imageio.so
@@ -365,7 +382,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/idiff.1*
 %{_mandir}/man1/igrep.1*
 %{_mandir}/man1/iinfo.1*
-%{_mandir}/man1/iprocess.1*
 %{_mandir}/man1/maketx.1*
 %{_mandir}/man1/oiiotool.1*