packages: OpenImageIO/OpenImageIO.spec, OpenImageIO/OpenImageIO-hdf.patch (...

[qboosh]

Author: qboosh                       Date: Fri Nov 18 20:08:56 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added hdf patch (require only main hdf5 library, without its c++ binding)
- build field3d plugin

---- Files affected:
packages/OpenImageIO:
   OpenImageIO.spec (1.1 -> 1.2) , OpenImageIO-hdf.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/OpenImageIO/OpenImageIO.spec
diff -u packages/OpenImageIO/OpenImageIO.spec:1.1 packages/OpenImageIO/OpenImageIO.spec:1.2
--- packages/OpenImageIO/OpenImageIO.spec:1.1	Fri Nov 18 16:59:01 2011
+++ packages/OpenImageIO/OpenImageIO.spec	Fri Nov 18 21:08:51 2011
@@ -1,7 +1,5 @@
 # $Revision$, $Date$
-# TODO:
-# - Field3D (in progress)
-# and if possible:
+# TODO if possible:
 # - system libcineon in cineon plugin
 # - system libsquish in dds plugin
 # - system libdpx in dpx plugin
@@ -22,7 +20,9 @@
 # Source0-md5:	20c0867864ee6b1cfccc45a0460c12bc
 Patch0:		%{name}-soname.patch
 Patch1:		%{name}-python.patch
+Patch2:		%{name}-hdf.patch
 URL:		https://sites.google.com/site/openimageio/home
+BuildRequires:	Field3D-devel
 BuildRequires:	OpenEXR-devel >= 1.6.1
 BuildRequires:	OpenGL-devel
 BuildRequires:	QtCore-devel
@@ -33,8 +33,7 @@
 BuildRequires:	boost-python-devel >= 1.35
 BuildRequires:	cmake >= 2.6
 BuildRequires:	glew-devel >= 1.5.1
-# for FIELD3D (Field3D/Field.h, -lField3D)
-#BuildRequires:	hdf5-devel
+BuildRequires:	hdf5-devel
 BuildRequires:	ilmbase-devel >= 1.0.1
 BuildRequires:	jasper-devel
 BuildRequires:	libjpeg-devel
@@ -80,6 +79,18 @@
 %description devel -l pl.UTF-8
 Pliki nagłówkowe biblioteki OpenImageIO.
 
+%package plugin-field3d
+Summary:	Field3D plugin for OpenImageIO library
+Summary(pl.UTF-8):	Wtyczka Field3D dla biblioteki OpenImageIO
+Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description plugin-field3d
+OpenImageIO plugin to read and write Field3D files.
+
+%description plugin-field3d -l pl.UTF-8
+Wtyczka biblioteki OpenImageIO czytająca i zapisująca pliki Field3D.
+
 %package plugin-ico
 Summary:	ICO plugin for OpenImageIO library
 Summary(pl.UTF-8):	Wtyczka ICO dla biblioteki OpenImageIO
@@ -198,6 +209,7 @@
 %setup -q -n OpenImageIO-oiio-7d98ca6
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 install -d build
@@ -209,7 +221,6 @@
 	-DPYTHON_VERSION=%{py_ver} \
 	-DSOVERSION:STRING=0 \
 	%{!?with_tbb:-DUSE_TBB=OFF} \
-# FIELD3D ?
 
 %{__make}
 
@@ -260,6 +271,10 @@
 %attr(755,root,root) %{_libdir}/libOpenImageIO.so
 %{_includedir}/OpenImageIO
 
+%files plugin-field3d
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/field3d.imageio.so
+
 %files plugin-ico
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/ico.imageio.so
@@ -302,5 +317,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2011/11/18 20:08:51  qboosh
+- added hdf patch (require only main hdf5 library, without its c++ binding)
+- build field3d plugin
+
 Revision 1.1  2011/11/18 15:59:01  qboosh
 - new

================================================================
Index: packages/OpenImageIO/OpenImageIO-hdf.patch
diff -u /dev/null packages/OpenImageIO/OpenImageIO-hdf.patch:1.1
--- /dev/null	Fri Nov 18 21:08:56 2011
+++ packages/OpenImageIO/OpenImageIO-hdf.patch	Fri Nov 18 21:08:51 2011
@@ -0,0 +1,12 @@
+Field3D uses only C interface of hdf5
+--- OpenImageIO-oiio-7d98ca6/src/cmake/externalpackages.cmake.orig	2011-11-05 08:35:00.000000000 +0100
++++ OpenImageIO-oiio-7d98ca6/src/cmake/externalpackages.cmake	2011-11-18 20:57:50.883126299 +0100
+@@ -195,7 +195,7 @@
+         # variables HDF5_INCLUDE_DIRS and HDF5_LIBRARIES.
+     else ()
+         message (STATUS "Looking for system HDF5")
+-        find_package (HDF5 COMPONENTS CXX)
++        find_package (HDF5)
+     endif ()
+     message (STATUS "HDF5_FOUND=${HDF5_FOUND}")
+     message (STATUS "HDF5_INCLUDE_DIRS=${HDF5_INCLUDE_DIRS}")
================================================================

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