[packages/OpenImageIO] - enable OpenColorIO support by default (+ocio bcond to disable) - use system pugixml

qboosh qboosh at pld-linux.org
Sun Jul 29 12:33:42 CEST 2012


commit 4f07e9d7949e4f9212b54ff079d3de19194ce0f9
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Jul 29 12:33:48 2012 +0200

    - enable OpenColorIO support by default (+ocio bcond to disable)
    - use system pugixml

 OpenImageIO.spec | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/OpenImageIO.spec b/OpenImageIO.spec
index 5445582..1b3c8bd 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
 #
@@ -20,6 +23,7 @@ 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
@@ -33,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
@@ -75,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.
@@ -295,16 +302,20 @@ Wiązanie Pythona do biblioteki OpenImageIO.
 %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}
 


More information about the pld-cvs-commit mailing list