- more complete (non-tbb, non-threads) archs lists

[packages/OpenImageIO.git] / OpenImageIO.spec

diff --git a/OpenImageIO.spec b/OpenImageIO.spec
index 3c65dcdbf9cd5f95812c1d814fba89a2a4469879..24d6920922db6f9b8b655789a31cee7f51a35662 100644 (file)
--- a/OpenImageIO.spec
+++ b/OpenImageIO.spec
@@ -5,23 +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.2.0
-Release:       1
+Version:       1.2.3
+Release:       4
 License:       BSD
 Group:         Libraries
 Source0:       https://github.com/OpenImageIO/oiio/tarball/Release-%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 8738dd9b24fc4f0cb3eebb094347104a
+# 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
-Patch8:                %{name}-werror.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}
@@ -292,17 +302,17 @@ Python binding for OpenImageIO library.
 Wiązanie Pythona do biblioteki OpenImageIO.
 
 %prep
-%setup -q -n OpenImageIO-oiio-f4d79c0
+%setup -q -n OpenImageIO-oiio-bcdad81
 %patch0 -p1
+
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%ifarch i386 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
@@ -312,6 +322,9 @@ 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} \