packages: OpenImageIO/OpenImageIO.spec, OpenImageIO/OpenImageIO-system-dpx....

Sat Nov 26 13:35:57 CET 2011

Author: qboosh                       Date: Sat Nov 26 12:35:57 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added system-dpx patch, use system dpx library in dpx plugin, moved the plugin to subpackage
- added system-libcineon plugin (the plugin is not build currently though)

---- Files affected:
packages/OpenImageIO:
   OpenImageIO.spec (1.4 -> 1.5) , OpenImageIO-system-dpx.patch (NONE -> 1.1)  (NEW), OpenImageIO-system-libcineon.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/OpenImageIO/OpenImageIO.spec
diff -u packages/OpenImageIO/OpenImageIO.spec:1.4 packages/OpenImageIO/OpenImageIO.spec:1.5

--- packages/OpenImageIO/OpenImageIO.spec:1.4	Sat Nov 19 15:38:03 2011
+++ packages/OpenImageIO/OpenImageIO.spec	Sat Nov 26 13:35:51 2011
@@ -1,7 +1,5 @@
 # $Revision$, $Date$
-# TODO if possible:
-# - system libcineon in cineon plugin
-# - system libdpx in dpx plugin
+# NOTE: cineon plugin is not built (code not updated)
 #
 # Conditional build:
 %bcond_without	static_libs	# don't build static libraries
@@ -21,6 +19,8 @@
 Patch2:		%{name}-hdf.patch
 Patch3:		%{name}-system-squish.patch
 Patch4:		%{name}-system-ptex.patch
+Patch5:		%{name}-system-dpx.patch
+Patch6:		%{name}-system-libcineon.patch
 URL:		https://sites.google.com/site/openimageio/home
 BuildRequires:	Field3D-devel
 BuildRequires:	OpenEXR-devel >= 1.6.1
@@ -32,6 +32,7 @@
 BuildRequires:	boost-devel >= 1.35
 BuildRequires:	boost-python-devel >= 1.35
 BuildRequires:	cmake >= 2.6
+BuildRequires:	dpx-devel
 BuildRequires:	glew-devel >= 1.5.1
 BuildRequires:	hdf5-devel
 BuildRequires:	ilmbase-devel >= 1.0.1
@@ -94,6 +95,18 @@
 %description plugin-dds -l pl.UTF-8
 Wtyczka biblioteki OpenImageIO czytająca pliki DDS.
 
+%package plugin-dpx
+Summary:	DPX plugin for OpenImageIO library
+Summary(pl.UTF-8):	Wtyczka DPX dla biblioteki OpenImageIO
+Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description plugin-dpx
+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-field3d
 Summary:	Field3D plugin for OpenImageIO library
 Summary(pl.UTF-8):	Wtyczka Field3D dla biblioteki OpenImageIO
@@ -240,6 +253,8 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %{__rm} -r src/dds.imageio/squish src/ptex.imageio/ptex
 
@@ -285,7 +300,6 @@
 %attr(755,root,root) %{_libdir}/libOpenImageIO.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libOpenImageIO.so.0
 %attr(755,root,root) %{_libdir}/bmp.imageio.so
-%attr(755,root,root) %{_libdir}/dpx.imageio.so
 %attr(755,root,root) %{_libdir}/fits.imageio.so
 %attr(755,root,root) %{_libdir}/hdr.imageio.so
 %attr(755,root,root) %{_libdir}/pnm.imageio.so
@@ -304,6 +318,10 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/dds.imageio.so
 
+%files plugin-dpx
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/dpx.imageio.so
+
 %files plugin-field3d
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/field3d.imageio.so
@@ -354,6 +372,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2011/11/26 12:35:51  qboosh
+- added system-dpx patch, use system dpx library in dpx plugin, moved the plugin to subpackage
+- added system-libcineon plugin (the plugin is not build currently though)
+
 Revision 1.4  2011/11/19 14:38:03  qboosh
 - added system-ptex patch, use system ptex library in ptex plugin, moved the plugin to subpackage
 - don't mention "writing" in description where plugin doesn't support writing

================================================================
Index: packages/OpenImageIO/OpenImageIO-system-dpx.patch
diff -u /dev/null packages/OpenImageIO/OpenImageIO-system-dpx.patch:1.1
--- /dev/null	Sat Nov 26 13:35:57 2011
+++ packages/OpenImageIO/OpenImageIO-system-dpx.patch	Sat Nov 26 13:35:51 2011
@@ -0,0 +1,42 @@
+--- OpenImageIO-oiio-7d98ca6/src/dpx.imageio/CMakeLists.txt.orig	2011-11-05 08:35:00.000000000 +0100
++++ OpenImageIO-oiio-7d98ca6/src/dpx.imageio/CMakeLists.txt	2011-11-26 09:02:29.701499722 +0100
+@@ -1,4 +1,3 @@
+ add_oiio_plugin (dpxinput.cpp dpxoutput.cpp
+-  libdpx/DPX.cpp libdpx/OutStream.cpp libdpx/RunLengthEncoding.cpp
+-  libdpx/Codec.cpp libdpx/Reader.cpp libdpx/Writer.cpp libdpx/DPXHeader.cpp
+-  libdpx/ElementReadStream.cpp libdpx/InStream.cpp libdpx/DPXColorConverter.cpp)
++  libdpx/DPXColorConverter.cpp
++  LINK_LIBRARIES dpx)
+--- OpenImageIO-oiio-7d98ca6/src/dpx.imageio/dpxinput.cpp.orig	2011-11-05 08:35:00.000000000 +0100
++++ OpenImageIO-oiio-7d98ca6/src/dpx.imageio/dpxinput.cpp	2011-11-26 09:03:24.121501545 +0100
+@@ -28,7 +28,7 @@
+   (This is the Modified BSD License)
+ */
+ 
+-#include "libdpx/DPX.h"
++#include <DPX.h>
+ #include "libdpx/DPXColorConverter.h"
+ 
+ #include "typedesc.h"
+--- OpenImageIO-oiio-7d98ca6/src/dpx.imageio/dpxoutput.cpp.orig	2011-11-05 08:35:00.000000000 +0100
++++ OpenImageIO-oiio-7d98ca6/src/dpx.imageio/dpxoutput.cpp	2011-11-26 09:03:35.934835274 +0100
+@@ -33,7 +33,7 @@
+ #include <cmath>
+ #include <boost/algorithm/string.hpp>
+ 
+-#include "libdpx/DPX.h"
++#include <DPX.h>
+ #include "libdpx/DPXColorConverter.h"
+ 
+ #include "typedesc.h"
+--- OpenImageIO-oiio-7d98ca6/src/dpx.imageio/libdpx/DPXColorConverter.h.orig	2011-11-05 08:35:00.000000000 +0100
++++ OpenImageIO-oiio-7d98ca6/src/dpx.imageio/libdpx/DPXColorConverter.h	2011-11-26 09:05:17.444838673 +0100
+@@ -37,7 +37,7 @@
+ #define _DPX_COLORCONVERTER_H 1
+ 
+ 
+-#include "DPX.h"
++#include <DPX.h>
+ 
+ 
+ namespace dpx

================================================================
Index: packages/OpenImageIO/OpenImageIO-system-libcineon.patch
diff -u /dev/null packages/OpenImageIO/OpenImageIO-system-libcineon.patch:1.1
--- /dev/null	Sat Nov 26 13:35:57 2011
+++ packages/OpenImageIO/OpenImageIO-system-libcineon.patch	Sat Nov 26 13:35:51 2011
@@ -0,0 +1,30 @@
+--- OpenImageIO-oiio-7d98ca6/src/cineon.imageio/CMakeLists.txt.orig	2011-11-05 08:35:00.000000000 +0100
++++ OpenImageIO-oiio-7d98ca6/src/cineon.imageio/CMakeLists.txt	2011-11-26 09:06:45.788174965 +0100
+@@ -1,4 +1,2 @@
+ add_oiio_plugin (cineoninput.cpp cineonoutput.cpp
+-  libcineon/Cineon.cpp libcineon/OutStream.cpp libcineon/Codec.cpp libcineon/Reader.cpp
+-  libcineon/Writer.cpp libcineon/CineonHeader.cpp libcineon/ElementReadStream.cpp
+-  libcineon/InStream.cpp)
++  LINK_LIBRARIES cineon)
+--- OpenImageIO-oiio-7d98ca6/src/cineon.imageio/cineoninput.cpp.orig	2011-11-05 08:35:00.000000000 +0100
++++ OpenImageIO-oiio-7d98ca6/src/cineon.imageio/cineoninput.cpp	2011-11-26 09:07:11.938175840 +0100
+@@ -28,7 +28,7 @@
+   (This is the Modified BSD License)
+ */
+ 
+-#include "libcineon/Cineon.h"
++#include <Cineon.h>
+ 
+ #include "dassert.h"
+ #include "typedesc.h"
+--- OpenImageIO-oiio-7d98ca6/src/cineon.imageio/cineonoutput.cpp.orig	2011-11-05 08:35:00.000000000 +0100
++++ OpenImageIO-oiio-7d98ca6/src/cineon.imageio/cineonoutput.cpp	2011-11-26 09:07:19.938176107 +0100
+@@ -28,7 +28,7 @@
+   (This is the Modified BSD License)
+ */
+ 
+-#include "libcineon/Cineon.h"
++#include <Cineon.h>
+ 
+ #include "typedesc.h"
+ #include "imageio.h"
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/OpenImageIO/OpenImageIO.spec?r1=1.4&r2=1.5&f=u

