X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=OpenImageIO.spec;h=438f145cf77b05cae03dce8ab50d30ec8686bb33;hb=dbd0ba33391f09e2028c65db018e902940feac4d;hp=4b4fdd3df5ce8bf79bb572fc84dc55d2ae5cc0ce;hpb=5bef7fef4797094e54297350f3f388d0fbc6537d;p=packages%2FOpenImageIO.git

diff --git a/OpenImageIO.spec b/OpenImageIO.spec
index 4b4fdd3..438f145 100644
--- a/OpenImageIO.spec
+++ b/OpenImageIO.spec
@@ -1,4 +1,7 @@
+# to bootstrap: build OpenColorIO --without oiio, build OpenImageIO, rebuild OpenColorIO
+#
 # Conditional build:
+%bcond_without	ocio		# OpenColorIO support in library
 %bcond_without	static_libs	# don't build static libraries
 %bcond_without	tbb		# Threading Building Blocks
 #
@@ -6,7 +9,7 @@ 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:	0.1
+Release:	5
 License:	BSD
 Group:		Libraries
 Source0:	https://github.com/OpenImageIO/oiio/tarball/Release-%{version}#/%{name}-%{version}.tar.gz
@@ -17,8 +20,10 @@ 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
 URL:		https://sites.google.com/site/openimageio/home
 BuildRequires:	Field3D-devel
+%{?with_ocio:BuildRequires:	OpenColorIO-devel}
 BuildRequires:	OpenEXR-devel >= 1.6.1
 BuildRequires:	OpenGL-devel
 BuildRequires:	QtCore-devel
@@ -32,12 +37,14 @@ 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:	libtiff-devel
 BuildRequires:	libwebp-devel
+BuildRequires:	pugixml-devel
 BuildRequires:	ptex-devel >= 2
 BuildRequires:	python-devel >= 1:2.6
 BuildRequires:	squish-devel >= 1.10
@@ -74,6 +81,7 @@ Summary:	Header files for OpenImageIO library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki OpenImageIO
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+Requires:	libstdc++-devel
 
 %description devel
 Header files for OpenImageIO library.
@@ -289,18 +297,25 @@ Wiązanie Pythona do biblioteki OpenImageIO.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%ifarch i486
+%patch7 -p1
+%endif
 
 %{__rm} -r src/dds.imageio/squish src/ptex.imageio/ptex
+# when using system pugixml, don't use hacked headers
+%{__rm} src/include/pugi*.hpp
 
 %build
 install -d build
 cd build
 %cmake ../src \
 	-DEMBEDPLUGINS=OFF \
-	-DPYLIB_INSTALL_DIR=%{py_sitedir} \
 	-DINCLUDE_INSTALL_DIR=%{_includedir}/%{name} \
+	-DPYLIB_INSTALL_DIR=%{py_sitedir} \
 	-DPYTHON_VERSION=%{py_ver} \
-	%{!?with_tbb:-DUSE_TBB=OFF} \
+	-DUSE_EXTERNAL_PUGIXML=ON \
+	%{!?with_ocio:-DUSE_OCIO=OFF} \
+	%{!?with_tbb:-DUSE_TBB=OFF}
 
 %{__make}