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

diff --git a/OpenImageIO.spec b/OpenImageIO.spec
index e8e6fcf..438f145 100644
--- a/OpenImageIO.spec
+++ b/OpenImageIO.spec
@@ -1,27 +1,29 @@
-# NOTE: cineon plugin is not built (code not updated)
+# 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
 #
 Summary:	Library for reading and writing images
 Summary(pl.UTF-8):	Biblioteka do odczytu i zapisu obrazów
 Name:		OpenImageIO
-Version:	0.10.3
-Release:	4
+Version:	1.0.7
+Release:	5
 License:	BSD
 Group:		Libraries
 Source0:	https://github.com/OpenImageIO/oiio/tarball/Release-%{version}#/%{name}-%{version}.tar.gz
-# Source0-md5:	20c0867864ee6b1cfccc45a0460c12bc
-Patch0:		%{name}-soname.patch
-Patch1:		%{name}-python.patch
+# Source0-md5:	e939f97db2b0cac813c9e166f2353fe6
+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
+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
@@ -35,14 +37,19 @@ 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
 %{?with_tbb:BuildRequires:	tbb-devel}
+BuildRequires:	txt2man
 BuildRequires:	zlib-devel
 Requires:	ilmbase >= 1.0.1
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -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.
@@ -81,6 +89,18 @@ Header files for OpenImageIO library.
 %description devel -l pl.UTF-8
 Pliki nagłówkowe biblioteki OpenImageIO.
 
+%package plugin-cineon
+Summary:	Cineon plugin for OpenImageIO library
+Summary(pl.UTF-8):	Wtyczka Cineon dla biblioteki OpenImageIO
+Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description plugin-cineon
+OpenImageIO plugin to read Cineon files.
+
+%description plugin-cineon -l pl.UTF-8
+Wtyczka biblioteki OpenImageIO czytająca pliki Cineon.
+
 %package plugin-dds
 Summary:	DDS plugin for OpenImageIO library
 Summary(pl.UTF-8):	Wtyczka DDS dla biblioteki OpenImageIO
@@ -181,6 +201,18 @@ OpenImageIO plugin to read and write PNG files.
 %description plugin-png -l pl.UTF-8
 Wtyczka biblioteki OpenImageIO czytająca i zapisująca pliki PNG.
 
+%package plugin-psd
+Summary:	PSD plugin for OpenImageIO library
+Summary(pl.UTF-8):	Wtyczka PSD dla biblioteki OpenImageIO
+Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description plugin-psd
+OpenImageIO plugin to read and write PSD files.
+
+%description plugin-psd -l pl.UTF-8
+Wtyczka biblioteki OpenImageIO czytająca i zapisująca pliki PSD.
+
 %package plugin-ptex
 Summary:	Ptex plugin for OpenImageIO library
 Summary(pl.UTF-8):	Wtyczka Ptex dla biblioteki OpenImageIO
@@ -194,6 +226,18 @@ OpenImageIO plugin to read Ptex files.
 %description plugin-ptex -l pl.UTF-8
 Wtyczka biblioteki OpenImageIO czytająca pliki Ptex.
 
+%package plugin-webp
+Summary:	WebP plugin for OpenImageIO library
+Summary(pl.UTF-8):	Wtyczka WebP dla biblioteki OpenImageIO
+Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description plugin-webp
+OpenImageIO plugin to read and write WebP files.
+
+%description plugin-webp -l pl.UTF-8
+Wtyczka biblioteki OpenImageIO czytająca i zapisująca pliki WebP.
+
 %package plugin-tiff
 Summary:	TIFF plugin for OpenImageIO library
 Summary(pl.UTF-8):	Wtyczka TIFF dla biblioteki OpenImageIO
@@ -246,25 +290,32 @@ Python binding for OpenImageIO library.
 Wiązanie Pythona do biblioteki OpenImageIO.
 
 %prep
-%setup -q -n OpenImageIO-oiio-7d98ca6
+%setup -q -n OpenImageIO-oiio-e9fa4c7
 %patch0 -p1
-%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %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 \
-	-DPYLIBDIR=%{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}
 
@@ -275,10 +326,11 @@ rm -rf $RPM_BUILD_ROOT
 	DESTDIR=$RPM_BUILD_ROOT
 
 # name clash with iv
-mv -f $RPM_BUILD_ROOT%{_bindir}/{iv,oiiv}
+%{__mv} -f $RPM_BUILD_ROOT%{_bindir}/{iv,oiiv}
+%{__mv} -f $RPM_BUILD_ROOT%{_mandir}/man1/{iv,oiiv}.1
 
-%{__rm} $RPM_BUILD_ROOT%{_prefix}/{CHANGES,INSTALL,LICENSE}
-%{__rm} $RPM_BUILD_ROOT%{_prefix}/doc/{CLA-*,openimageio.pdf}
+# installed as %doc
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/doc/openimageio
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -295,23 +347,37 @@ rm -rf $RPM_BUILD_ROOT
 %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.0
+%attr(755,root,root) %ghost %{_libdir}/libOpenImageIO.so.1.0
 %attr(755,root,root) %{_libdir}/bmp.imageio.so
 %attr(755,root,root) %{_libdir}/fits.imageio.so
 %attr(755,root,root) %{_libdir}/hdr.imageio.so
+%attr(755,root,root) %{_libdir}/iff.imageio.so
 %attr(755,root,root) %{_libdir}/pnm.imageio.so
+%attr(755,root,root) %{_libdir}/rla.imageio.so
 %attr(755,root,root) %{_libdir}/sgi.imageio.so
 %attr(755,root,root) %{_libdir}/socket.imageio.so
 %attr(755,root,root) %{_libdir}/softimage.imageio.so
 %attr(755,root,root) %{_libdir}/targa.imageio.so
 %attr(755,root,root) %{_libdir}/zfile.imageio.so
+%{_mandir}/man1/iconvert.1*
+%{_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
 %{_includedir}/OpenImageIO
 
+%files plugin-cineon
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/cineon.imageio.so
+
 %files plugin-dds
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/dds.imageio.so
@@ -344,6 +410,10 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/png.imageio.so
 
+%files plugin-psd
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/psd.imageio.so
+
 %files plugin-ptex
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/ptex.imageio.so
@@ -352,6 +422,10 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/tiff.imageio.so
 
+%files plugin-webp
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/webp.imageio.so
+
 %files apidocs
 %defattr(644,root,root,755)
 %doc src/doc/openimageio.pdf
@@ -359,6 +433,7 @@ rm -rf $RPM_BUILD_ROOT
 %files iv
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/oiiv
+%{_mandir}/man1/oiiv.1*
 
 %files -n python-OpenImageIO
 %defattr(644,root,root,755)