X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=OpenImageIO.spec;h=443e7528e3ef5a7f01fe5133bc1516cad7058b45;hb=c3e5ad9758408e8fdbb032f2dff8a370f8c6ae4f;hp=3c65dcdbf9cd5f95812c1d814fba89a2a4469879;hpb=aa41c492ff2b3259e5e1cc6d6c2055d913cf9b9d;p=packages%2FOpenImageIO.git

diff --git a/OpenImageIO.spec b/OpenImageIO.spec
index 3c65dcd..443e752 100644
--- 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:	13
 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}
@@ -38,16 +48,16 @@ BuildRequires:	dpx-devel
 BuildRequires:	glew-devel >= 1.5.1
 BuildRequires:	hdf5-devel
 BuildRequires:	ilmbase-devel >= 1.0.1
-BuildRequires:	libstdc++-devel
 BuildRequires:	jasper-devel
 BuildRequires:	libcineon-devel
 BuildRequires:	libjpeg-devel
 BuildRequires:	libpng-devel
+BuildRequires:	libstdc++-devel
 BuildRequires:	libtiff-devel
 BuildRequires:	libwebp-devel
 BuildRequires:	openjpeg-devel
-BuildRequires:	pugixml-devel
 BuildRequires:	ptex-devel >= 2
+BuildRequires:	pugixml-devel
 BuildRequires:	python-devel >= 1:2.6
 BuildRequires:	squish-devel >= 1.10
 %{?with_tbb:BuildRequires:	tbb-devel}
@@ -163,8 +173,8 @@ OpenImageIO plugin to read and write JPEG files (with TIFF/EXIF
 information).
 
 %description plugin-jpeg -l pl.UTF-8
-Wtyczka biblioteki OpenImageIO czytająca i zapisująca pliki JPEG
-(wraz z informacjami TIFF/EXIF).
+Wtyczka biblioteki OpenImageIO czytająca i zapisująca pliki JPEG (wraz
+z informacjami TIFF/EXIF).
 
 %package plugin-jpeg2000
 Summary:	JPEG2000 plugin for OpenImageIO library
@@ -256,6 +266,9 @@ Wtyczka biblioteki OpenImageIO czytająca i zapisująca pliki TIFF.
 Summary:	Programmer documentation for OpenImageIO library
 Summary(pl.UTF-8):	Dokumentacja programisty do biblioteki OpenImageIO
 Group:		Documentation
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
 
 %description apidocs
 Programmer documentation for OpenImageIO library.
@@ -292,17 +305,17 @@ Python binding for OpenImageIO library.
 Wiązanie Pythona do biblioteki OpenImageIO.
 
 %prep
-%setup -q -n OpenImageIO-oiio-f4d79c0
+%setup -q -n %{name}-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,9 +325,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 \
@@ -334,7 +351,7 @@ rm -rf $RPM_BUILD_ROOT
 %{__mv} -f $RPM_BUILD_ROOT%{_mandir}/man1/{iv,oiiv}.1
 
 # installed as %doc
-%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/doc/openimageio
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/openimageio
 
 %clean
 rm -rf $RPM_BUILD_ROOT