X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=OpenImageIO.spec;h=c662c4a6d5e3edeaac1aee8d749dbdbd526fbbff;hb=62a9206d1ceb168c94d73d4d61524f1bd24f00ed;hp=b04b10f943cce11d8660d1b1620fd18b918ca6db;hpb=8128cc57aae204e58c3f61a28328cb3cade0aa7f;p=packages%2FOpenImageIO.git

diff --git a/OpenImageIO.spec b/OpenImageIO.spec
index b04b10f..c662c4a 100644
--- a/OpenImageIO.spec
+++ b/OpenImageIO.spec
@@ -16,22 +16,16 @@
 Summary:	Library for reading and writing images
 Summary(pl.UTF-8):	Biblioteka do odczytu i zapisu obrazów
 Name:		OpenImageIO
-Version:	1.2.3
-Release:	18
+Version:	2.0.7
+Release:	5
 License:	BSD
 Group:		Libraries
 Source0:	https://github.com/OpenImageIO/oiio/tarball/Release-%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	20066ae0e9026717242f64f107f7ee8e
+# Source0-md5:	3d722173d84cc705f4aead0679fa2393
 Patch0:		%{name}-link.patch
-
-Patch2:		%{name}-build.patch
-Patch3:		%{name}-system-squish.patch
-Patch4:		%{name}-system-ptex.patch
-Patch5:		%{name}-system-dpx.patch
-Patch6:		%{name}-system-libcineon.patch
-Patch7:		%{name}-werror.patch
-Patch8:		0002-Fix_IlmBase_issue.patch
-Patch9:		0003-Fix_multiarch_paths.patch
+Patch1:		%{name}-system-squish.patch
+Patch2:		%{name}-system-libcineon.patch
+Patch3:		no-clang-format.patch
 URL:		https://sites.google.com/site/openimageio/home
 BuildRequires:	Field3D-devel
 %{?with_ocio:BuildRequires:	OpenColorIO-devel}
@@ -44,7 +38,9 @@ BuildRequires:	QtOpenGL-devel
 BuildRequires:	boost-devel >= 1.35
 BuildRequires:	boost-python-devel >= 1.35
 BuildRequires:	cmake >= 2.6
-BuildRequires:	dpx-devel
+BuildRequires:	dcmtk-devel
+BuildRequires:	ffmpeg-devel
+BuildRequires:	giflib-devel
 BuildRequires:	glew-devel >= 1.5.1
 BuildRequires:	hdf5-devel
 BuildRequires:	ilmbase-devel >= 1.0.1
@@ -52,13 +48,16 @@ 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:	openjpeg2-devel
+BuildRequires:	ptex-devel >= 2.1
 BuildRequires:	pugixml-devel
 BuildRequires:	python-devel >= 1:2.6
+BuildRequires:	python-pybind11
+BuildRequires:	robin-map-devel
 BuildRequires:	squish-devel >= 1.10
 %{?with_tbb:BuildRequires:	tbb-devel}
 BuildRequires:	txt2man
@@ -113,6 +112,19 @@ OpenImageIO plugin to read Cineon files.
 %description plugin-cineon -l pl.UTF-8
 Wtyczka biblioteki OpenImageIO czytająca pliki Cineon.
 
+%package plugin-dicom
+Summary:	DICOM plugin for OpenImageIO library
+Summary(pl.UTF-8):	Wtyczka DICOM dla biblioteki OpenImageIO
+Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
+Requires:	squish >= 1.10
+
+%description plugin-dicom
+OpenImageIO plugin to read DICOM files.
+
+%description plugin-dicom -l pl.UTF-8
+Wtyczka biblioteki OpenImageIO czytająca pliki DICOM.
+
 %package plugin-dds
 Summary:	DDS plugin for OpenImageIO library
 Summary(pl.UTF-8):	Wtyczka DDS dla biblioteki OpenImageIO
@@ -138,6 +150,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
@@ -150,6 +174,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
@@ -238,6 +274,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
@@ -305,36 +353,33 @@ Python binding for OpenImageIO library.
 Wiązanie Pythona do biblioteki OpenImageIO.
 
 %prep
-%setup -q -n %{name}-oiio-bcdad81
+%setup -q -n %{name}-oiio-7f79c70
 %patch0 -p1
-
+%patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-
-%{__rm} -r src/dds.imageio/squish src/ptex.imageio/ptex
+
+%{__rm} -r src/dds.imageio/squish
 # when using system pugixml, don't use hacked headers
-%{__rm} src/include/pugi*.hpp
+%{__rm} src/include/OpenImageIO/pugi*.{c,h}pp
 
 %build
 install -d build
 cd build
-%cmake ../src \
+%cmake ../ \
 %ifarch i386 i486
 	-DNOTHREADS=1 \
 %endif
 	-DEMBEDPLUGINS=OFF \
-	-DOPENJPEG_INCLUDE_DIR=%{_includedir}/openjpeg-1.5 \
+	-DOPENJPEG_INCLUDE_DIR=%{_includedir}/openjpeg-2.3 \
 	-DINCLUDE_INSTALL_DIR=%{_includedir}/%{name} \
 	-DLIB_INSTALL_DIR:PATH=%{_libdir} \
 	-DPYLIB_INSTALL_DIR=%{py_sitedir} \
 	-DPYTHON_VERSION=%{py_ver} \
 	-DUSE_EXTERNAL_PUGIXML=ON \
+	-DSTOP_ON_WARNING=OFF \
+	-DPYBIND11_HOME:PATH=%{py_incdir} \
+	-DCMAKE_INSTALL_MANDIR=%{_mandir}/man1 \
 	%{!?with_ocio:-DUSE_OCIO=OFF} \
 	%{!?with_tbb:-DUSE_TBB=OFF}
 
@@ -347,11 +392,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%{_mandir}/man1/{iv,oiiv}.1
+%{__mv} $RPM_BUILD_ROOT%{_bindir}/{iv,oiiv}
+%{__mv} $RPM_BUILD_ROOT%{_mandir}/man1/{iv,oiiv}.1
 
 # installed as %doc
-%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/openimageio
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -361,7 +406,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc CHANGES CREDITS LICENSE README.rst
+%doc CHANGES.md CREDITS.md LICENSE.md README.md
 %attr(755,root,root) %{_bindir}/iconvert
 %attr(755,root,root) %{_bindir}/idiff
 %attr(755,root,root) %{_bindir}/igrep
@@ -369,7 +414,9 @@ rm -rf $RPM_BUILD_ROOT
 %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.2
+%attr(755,root,root) %ghost %{_libdir}/libOpenImageIO.so.2.0
+%attr(755,root,root) %{_libdir}/libOpenImageIO_Util.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libOpenImageIO_Util.so.2.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
@@ -381,6 +428,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/softimage.imageio.so
 %attr(755,root,root) %{_libdir}/targa.imageio.so
 %attr(755,root,root) %{_libdir}/zfile.imageio.so
+%attr(755,root,root) %{_libdir}/null.imageio.so
 %{_mandir}/man1/iconvert.1*
 %{_mandir}/man1/idiff.1*
 %{_mandir}/man1/igrep.1*
@@ -391,12 +439,19 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libOpenImageIO.so
+%attr(755,root,root) %{_libdir}/libOpenImageIO_Util.so
 %{_includedir}/OpenImageIO
+%{_pkgconfigdir}/OpenImageIO.pc
+%{_datadir}/cmake/Modules/FindOpenImageIO.cmake
 
 %files plugin-cineon
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/cineon.imageio.so
 
+%files plugin-dicom
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/dicom.imageio.so
+
 %files plugin-dds
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/dds.imageio.so
@@ -405,10 +460,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
@@ -437,6 +500,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