X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=OpenImageIO.spec;h=0a2c2439a3836ae6801a692f9f8e55127c4f2089;hb=1b87700842dfc73b7597b422ac70e1f59363f6b9;hp=4f90f13a3c87a39c48c81d965abac3afde76b6d8;hpb=95b8690f28c7e95ba13ee8c2efead8e95eb37d13;p=packages%2FOpenImageIO.git

diff --git a/OpenImageIO.spec b/OpenImageIO.spec
index 4f90f13..0a2c243 100644
--- a/OpenImageIO.spec
+++ b/OpenImageIO.spec
@@ -1,24 +1,38 @@
+# 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 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.0.7
-Release:	1
+Version:	1.6.8
+Release:	3
 License:	BSD
 Group:		Libraries
-Source0:	https://github.com/OpenImageIO/oiio/tarball/Release-%{version}#/%{name}-%{version}.tar.gz
-# Source0-md5:	e939f97db2b0cac813c9e166f2353fe6
+Source0:	https://github.com/OpenImageIO/oiio/tarball/Release-%{version}/%{name}-%{version}.tar.gz
+# Source0-md5:	1f614ff6129c60bfcadbb4cefe86325d
 Patch0:		%{name}-link.patch
-Patch2:		%{name}-hdf.patch
-Patch3:		%{name}-system-squish.patch
-Patch4:		%{name}-system-ptex.patch
-Patch5:		%{name}-system-dpx.patch
-Patch6:		%{name}-system-libcineon.patch
+Patch1:		%{name}-system-squish.patch
+Patch2:		%{name}-system-ptex.patch
+Patch3:		%{name}-system-dpx.patch
+Patch4:		%{name}-system-libcineon.patch
+Patch5:		%{name}-werror.patch
+Patch6:		system-pugixml.patch
+Patch7:		fix-types.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
@@ -29,6 +43,8 @@ BuildRequires:	boost-devel >= 1.35
 BuildRequires:	boost-python-devel >= 1.35
 BuildRequires:	cmake >= 2.6
 BuildRequires:	dpx-devel
+BuildRequires:	ffmpeg-devel
+BuildRequires:	giflib-devel
 BuildRequires:	glew-devel >= 1.5.1
 BuildRequires:	hdf5-devel
 BuildRequires:	ilmbase-devel >= 1.0.1
@@ -36,9 +52,13 @@ BuildRequires:	jasper-devel
 BuildRequires:	libcineon-devel
 BuildRequires:	libjpeg-devel
 BuildRequires:	libpng-devel
+BuildRequires:	libraw-devel
+BuildRequires:	libstdc++-devel
 BuildRequires:	libtiff-devel
 BuildRequires:	libwebp-devel
+BuildRequires:	openjpeg-devel
 BuildRequires:	ptex-devel >= 2
+BuildRequires:	pugixml-devel
 BuildRequires:	python-devel >= 1:2.6
 BuildRequires:	squish-devel >= 1.10
 %{?with_tbb:BuildRequires:	tbb-devel}
@@ -74,6 +94,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.
@@ -118,6 +139,18 @@ OpenImageIO plugin to read and write DPX files.
 %description plugin-dpx -l pl.UTF-8
 Wtyczka biblioteki OpenImageIO czytająca i zapisująca pliki DPX.
 
+%package plugin-ffmpeg
+Summary:	FFmpeg plugin for OpenImageIO library
+Summary(pl.UTF-8):	Wtyczka FFmpeg dla biblioteki OpenImageIO
+Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description plugin-ffmpeg
+OpenImageIO plugin to read FFmpeg files.
+
+%description plugin-ffmpeg -l pl.UTF-8
+Wtyczka biblioteki OpenImageIO czytająca pliki FFmpeg.
+
 %package plugin-field3d
 Summary:	Field3D plugin for OpenImageIO library
 Summary(pl.UTF-8):	Wtyczka Field3D dla biblioteki OpenImageIO
@@ -130,6 +163,18 @@ OpenImageIO plugin to read Field3D files.
 %description plugin-field3d -l pl.UTF-8
 Wtyczka biblioteki OpenImageIO czytająca pliki Field3D.
 
+%package plugin-gif
+Summary:	Gif plugin for OpenImageIO library
+Summary(pl.UTF-8):	Wtyczka Gif dla biblioteki OpenImageIO
+Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description plugin-gif
+OpenImageIO plugin to read GIF files.
+
+%description plugin-gif -l pl.UTF-8
+Wtyczka biblioteki OpenImageIO czytająca pliki GIF.
+
 %package plugin-ico
 Summary:	ICO plugin for OpenImageIO library
 Summary(pl.UTF-8):	Wtyczka ICO dla biblioteki OpenImageIO
@@ -153,8 +198,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
@@ -218,6 +263,18 @@ OpenImageIO plugin to read Ptex files.
 %description plugin-ptex -l pl.UTF-8
 Wtyczka biblioteki OpenImageIO czytająca pliki Ptex.
 
+%package plugin-raw
+Summary:	RAW plugin for OpenImageIO library
+Summary(pl.UTF-8):	Wtyczka RAW dla biblioteki OpenImageIO
+Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description plugin-raw
+OpenImageIO plugin to readTRAW files.
+
+%description plugin-raw -l pl.UTF-8
+Wtyczka biblioteki OpenImageIO czytająca pliki RAW.
+
 %package plugin-webp
 Summary:	WebP plugin for OpenImageIO library
 Summary(pl.UTF-8):	Wtyczka WebP dla biblioteki OpenImageIO
@@ -246,6 +303,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.
@@ -282,25 +342,37 @@ Python binding for OpenImageIO library.
 Wiązanie Pythona do biblioteki OpenImageIO.
 
 %prep
-%setup -q -n OpenImageIO-oiio-e9fa4c7
+%setup -q -n %{name}-oiio-4070df8
 %patch0 -p1
+%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %{__rm} -r src/dds.imageio/squish src/ptex.imageio/ptex
+# when using system pugixml, don't use hacked headers
+%{__rm} src/include/OpenImageIO/pugi*.{c,h}pp
 
 %build
 install -d build
 cd build
-%cmake ../src \
+CXXFLAGS="%{rpmcxxflags} -std=c++11" \
+%cmake ../ \
+%ifarch i386 i486
+	-DNOTHREADS=1 \
+%endif
 	-DEMBEDPLUGINS=OFF \
-	-DPYLIB_INSTALL_DIR=%{py_sitedir} \
+	-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} \
-	%{!?with_tbb:-DUSE_TBB=OFF} \
+	-DUSE_EXTERNAL_PUGIXML=ON \
+	%{!?with_ocio:-DUSE_OCIO=OFF} \
+	%{!?with_tbb:-DUSE_TBB=OFF}
 
 %{__make}
 
@@ -315,7 +387,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
@@ -325,16 +397,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc CHANGES CREDITS LICENSE README
+%doc CHANGES CREDITS LICENSE README.rst
 %attr(755,root,root) %{_bindir}/iconvert
 %attr(755,root,root) %{_bindir}/idiff
 %attr(755,root,root) %{_bindir}/igrep
 %attr(755,root,root) %{_bindir}/iinfo
-%attr(755,root,root) %{_bindir}/iprocess
 %attr(755,root,root) %{_bindir}/maketx
 %attr(755,root,root) %{_bindir}/oiiotool
 %attr(755,root,root) %{_libdir}/libOpenImageIO.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libOpenImageIO.so.1.0
+%attr(755,root,root) %ghost %{_libdir}/libOpenImageIO.so.1.6
+%attr(755,root,root) %{_libdir}/libOpenImageIO_Util.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libOpenImageIO_Util.so.1.6
 %attr(755,root,root) %{_libdir}/bmp.imageio.so
 %attr(755,root,root) %{_libdir}/fits.imageio.so
 %attr(755,root,root) %{_libdir}/hdr.imageio.so
@@ -350,13 +423,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/idiff.1*
 %{_mandir}/man1/igrep.1*
 %{_mandir}/man1/iinfo.1*
-%{_mandir}/man1/iprocess.1*
 %{_mandir}/man1/maketx.1*
 %{_mandir}/man1/oiiotool.1*
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libOpenImageIO.so
+%attr(755,root,root) %{_libdir}/libOpenImageIO_Util.so
 %{_includedir}/OpenImageIO
 
 %files plugin-cineon
@@ -371,10 +444,18 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/dpx.imageio.so
 
+%files plugin-ffmpeg
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/ffmpeg.imageio.so
+
 %files plugin-field3d
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/field3d.imageio.so
 
+%files plugin-gif
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/gif.imageio.so
+
 %files plugin-ico
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/ico.imageio.so
@@ -403,6 +484,10 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/ptex.imageio.so
 
+%files plugin-raw
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/raw.imageio.so
+
 %files plugin-tiff
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/tiff.imageio.so