Author: qboosh Date: Sat Nov 19 14:38:08 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- 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
---- Files affected:
packages/OpenImageIO:
OpenImageIO.spec (1.3 -> 1.4) , OpenImageIO-system-ptex.patch (NONE -> 1.1)
(NEW)
---- Diffs:
================================================================
Index: packages/OpenImageIO/OpenImageIO.spec
diff -u packages/OpenImageIO/OpenImageIO.spec:1.3
packages/OpenImageIO/OpenImageIO.spec:1.4
--- packages/OpenImageIO/OpenImageIO.spec:1.3 Sat Nov 19 06:52:47 2011
+++ packages/OpenImageIO/OpenImageIO.spec Sat Nov 19 15:38:03 2011
@@ -2,7 +2,6 @@
# TODO if possible:
# - system libcineon in cineon plugin
# - system libdpx in dpx plugin
-# - system ptex library in ptex plugin
#
# Conditional build:
%bcond_without static_libs # don't build static libraries
@@ -21,6 +20,7 @@
Patch1: %{name}-python.patch
Patch2: %{name}-hdf.patch
Patch3: %{name}-system-squish.patch
+Patch4: %{name}-system-ptex.patch
URL: https://sites.google.com/site/openimageio/home
BuildRequires: Field3D-devel
BuildRequires: OpenEXR-devel >= 1.6.1
@@ -39,6 +39,7 @@
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
BuildRequires: libtiff-devel
+BuildRequires: ptex-devel >= 2
BuildRequires: python-devel >= 1:2.6
BuildRequires: squish-devel >= 1.10
%{?with_tbb:BuildRequires: tbb-devel}
@@ -88,10 +89,10 @@
Requires: squish >= 1.10
%description plugin-dds
-OpenImageIO plugin to read and write DDS files.
+OpenImageIO plugin to read DDS files.
%description plugin-dds -l pl.UTF-8
-Wtyczka biblioteki OpenImageIO czytająca i zapisująca pliki DDS.
+Wtyczka biblioteki OpenImageIO czytająca pliki DDS.
%package plugin-field3d
Summary: Field3D plugin for OpenImageIO library
@@ -100,10 +101,10 @@
Requires: %{name} = %{version}-%{release}
%description plugin-field3d
-OpenImageIO plugin to read and write Field3D files.
+OpenImageIO plugin to read Field3D files.
%description plugin-field3d -l pl.UTF-8
-Wtyczka biblioteki OpenImageIO czytająca i zapisująca pliki Field3D.
+Wtyczka biblioteki OpenImageIO czytająca pliki Field3D.
%package plugin-ico
Summary: ICO plugin for OpenImageIO library
@@ -168,6 +169,19 @@
%description plugin-png -l pl.UTF-8
Wtyczka biblioteki OpenImageIO czytająca i zapisująca pliki PNG.
+%package plugin-ptex
+Summary: Ptex plugin for OpenImageIO library
+Summary(pl.UTF-8): Wtyczka Ptex dla biblioteki OpenImageIO
+Group: Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: ptex >= 2
+
+%description plugin-ptex
+OpenImageIO plugin to read Ptex files.
+
+%description plugin-ptex -l pl.UTF-8
+Wtyczka biblioteki OpenImageIO czytająca pliki Ptex.
+
%package plugin-tiff
Summary: TIFF plugin for OpenImageIO library
Summary(pl.UTF-8): Wtyczka TIFF dla biblioteki OpenImageIO
@@ -225,8 +239,9 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
-%{__rm} -r src/dds.imageio/squish
+%{__rm} -r src/dds.imageio/squish src/ptex.imageio/ptex
%build
install -d build
@@ -236,7 +251,6 @@
-DLIBDIR=%{_libdir} \
-DPYLIBDIR=%{py_sitedir} \
-DPYTHON_VERSION=%{py_ver} \
- -DSOVERSION:STRING=0 \
%{!?with_tbb:-DUSE_TBB=OFF} \
%{__make}
@@ -275,7 +289,6 @@
%attr(755,root,root) %{_libdir}/fits.imageio.so
%attr(755,root,root) %{_libdir}/hdr.imageio.so
%attr(755,root,root) %{_libdir}/pnm.imageio.so
-%attr(755,root,root) %{_libdir}/ptex.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
@@ -315,6 +328,10 @@
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/png.imageio.so
+%files plugin-ptex
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/ptex.imageio.so
+
%files plugin-tiff
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/tiff.imageio.so
@@ -337,6 +354,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+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
+
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
================================================================
Index: packages/OpenImageIO/OpenImageIO-system-ptex.patch
diff -u /dev/null packages/OpenImageIO/OpenImageIO-system-ptex.patch:1.1
--- /dev/null Sat Nov 19 15:38:08 2011
+++ packages/OpenImageIO/OpenImageIO-system-ptex.patch Sat Nov 19 15:38:03 2011
@@ -0,0 +1,39 @@
+--- OpenImageIO-oiio-7d98ca6/src/ptex.imageio/CMakeLists.txt.orig
2011-11-05 08:35:00.000000000 +0100
++++ OpenImageIO-oiio-7d98ca6/src/ptex.imageio/CMakeLists.txt 2011-11-19
14:09:32.265198985 +0100
+@@ -1,13 +1,3 @@
+ add_oiio_plugin (ptexinput.cpp ptexoutput.cpp
+- ptex/PtexCache.cpp
+- ptex/PtexFilters.cpp
+- ptex/PtexHalf.cpp
+- ptex/PtexReader.cpp
+- ptex/PtexSeparableFilter.cpp
+- ptex/PtexSeparableKernel.cpp
+- ptex/PtexTriangleFilter.cpp
+- ptex/PtexTriangleKernel.cpp
+- ptex/PtexUtils.cpp
+- ptex/PtexWriter.cpp
+- )
++ LINK_LIBRARIES Ptex)
+
+--- OpenImageIO-oiio-7d98ca6/src/ptex.imageio/ptexoutput.cpp.orig
2011-11-05 08:35:00.000000000 +0100
++++ OpenImageIO-oiio-7d98ca6/src/ptex.imageio/ptexoutput.cpp 2011-11-19
14:19:10.445218345 +0100
+@@ -28,7 +28,7 @@
+ (This is the Modified BSD License)
+ */
+
+-#include "ptex/PtexWriter.h"
++#include <Ptexture.h>
+
+ #include "typedesc.h"
+ #include "imageio.h"
+--- OpenImageIO-oiio-7d98ca6/src/ptex.imageio/ptexinput.cpp.orig
2011-11-05 08:35:00.000000000 +0100
++++ OpenImageIO-oiio-7d98ca6/src/ptex.imageio/ptexinput.cpp 2011-11-19
14:19:35.705219191 +0100
+@@ -28,7 +28,7 @@
+ (This is the Modified BSD License)
+ */
+
+-#include "ptex/Ptexture.h"
++#include <Ptexture.h>
+
+ #include "dassert.h"
+ #include "typedesc.h"
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/OpenImageIO/OpenImageIO.spec?r1=1.3&r2=1.4&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
