- release 5 (by relup.sh)

[packages/OpenImageIO.git] / OpenImageIO.spec

diff --git a/OpenImageIO.spec b/OpenImageIO.spec
index 492d66189dbe6038b9617b8272604fb30e8aab2d..438f145cf77b05cae03dce8ab50d30ec8686bb33 100644 (file)
--- a/OpenImageIO.spec
+++ b/OpenImageIO.spec
@@ -1,17 +1,15 @@
+# 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
 #
-
-%ifarch i486
-%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:       2
+Release:       5
 License:       BSD
 Group:         Libraries
 Source0:       https://github.com/OpenImageIO/oiio/tarball/Release-%{version}#/%{name}-%{version}.tar.gz
@@ -22,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
@@ -37,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
@@ -79,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.
@@ -294,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}