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

qboosh qboosh at pld-linux.org
Sat Nov 19 06:52:53 CET 2011


Author: qboosh                       Date: Sat Nov 19 05:52:53 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added system-squish patch, use system squish in dds plugin, moved the plugin to subpackage

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

---- Diffs:

================================================================
Index: packages/OpenImageIO/OpenImageIO.spec
diff -u packages/OpenImageIO/OpenImageIO.spec:1.2 packages/OpenImageIO/OpenImageIO.spec:1.3
--- packages/OpenImageIO/OpenImageIO.spec:1.2	Fri Nov 18 21:08:51 2011
+++ packages/OpenImageIO/OpenImageIO.spec	Sat Nov 19 06:52:47 2011
@@ -1,7 +1,6 @@
 # $Revision$, $Date$
 # TODO if possible:
 # - system libcineon in cineon plugin
-# - system libsquish in dds plugin
 # - system libdpx in dpx plugin
 # - system ptex library in ptex plugin
 #
@@ -21,6 +20,7 @@
 Patch0:		%{name}-soname.patch
 Patch1:		%{name}-python.patch
 Patch2:		%{name}-hdf.patch
+Patch3:		%{name}-system-squish.patch
 URL:		https://sites.google.com/site/openimageio/home
 BuildRequires:	Field3D-devel
 BuildRequires:	OpenEXR-devel >= 1.6.1
@@ -40,6 +40,7 @@
 BuildRequires:	libpng-devel
 BuildRequires:	libtiff-devel
 BuildRequires:	python-devel >= 1:2.6
+BuildRequires:	squish-devel >= 1.10
 %{?with_tbb:BuildRequires:	tbb-devel}
 BuildRequires:	zlib-devel
 Requires:	ilmbase >= 1.0.1
@@ -79,6 +80,19 @@
 %description devel -l pl.UTF-8
 Pliki nagłówkowe biblioteki OpenImageIO.
 
+%package plugin-dds
+Summary:	DDS plugin for OpenImageIO library
+Summary(pl.UTF-8):	Wtyczka DDS dla biblioteki OpenImageIO
+Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
+Requires:	squish >= 1.10
+
+%description plugin-dds
+OpenImageIO plugin to read and write DDS files.
+
+%description plugin-dds -l pl.UTF-8
+Wtyczka biblioteki OpenImageIO czytająca i zapisująca pliki DDS.
+
 %package plugin-field3d
 Summary:	Field3D plugin for OpenImageIO library
 Summary(pl.UTF-8):	Wtyczka Field3D dla biblioteki OpenImageIO
@@ -210,6 +224,9 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+
+%{__rm} -r src/dds.imageio/squish
 
 %build
 install -d build
@@ -254,7 +271,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}/dds.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
@@ -271,6 +287,10 @@
 %attr(755,root,root) %{_libdir}/libOpenImageIO.so
 %{_includedir}/OpenImageIO
 
+%files plugin-dds
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/dds.imageio.so
+
 %files plugin-field3d
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/field3d.imageio.so
@@ -317,6 +337,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2011/11/19 05:52:47  qboosh
+- added system-squish patch, use system squish in dds plugin, moved the plugin to subpackage
+
 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

================================================================
Index: packages/OpenImageIO/OpenImageIO-system-squish.patch
diff -u /dev/null packages/OpenImageIO/OpenImageIO-system-squish.patch:1.1
--- /dev/null	Sat Nov 19 06:52:53 2011
+++ packages/OpenImageIO/OpenImageIO-system-squish.patch	Sat Nov 19 06:52:47 2011
@@ -0,0 +1,16 @@
+--- OpenImageIO-oiio-7d98ca6/src/dds.imageio/CMakeLists.txt.orig	2011-11-05 08:35:00.000000000 +0100
++++ OpenImageIO-oiio-7d98ca6/src/dds.imageio/CMakeLists.txt	2011-11-18 21:22:02.993174921 +0100
+@@ -1 +1 @@
+-add_oiio_plugin (ddsinput.cpp ddsoutput.cpp squish/alpha.cpp squish/clusterfit.cpp squish/colourblock.cpp squish/colourfit.cpp squish/colourset.cpp squish/maths.cpp squish/rangefit.cpp squish/singlecolourfit.cpp squish/squish.cpp)
++add_oiio_plugin (ddsinput.cpp ddsoutput.cpp LINK_LIBRARIES squish)
+--- OpenImageIO-oiio-7d98ca6/src/dds.imageio/ddsinput.cpp.orig	2011-11-05 08:35:00.000000000 +0100
++++ OpenImageIO-oiio-7d98ca6/src/dds.imageio/ddsinput.cpp	2011-11-18 21:30:04.823191054 +0100
+@@ -39,7 +39,7 @@
+ #include "imageio.h"
+ #include "fmath.h"
+ 
+-#include "squish/squish.h"
++#include <squish.h>
+ 
+ OIIO_PLUGIN_NAMESPACE_BEGIN
+ 
================================================================

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



More information about the pld-cvs-commit mailing list