From: Jakub Bogusz Date: Sat, 19 Nov 2011 14:38:03 +0000 (+0000) Subject: - added system-ptex patch, use system ptex library in ptex plugin, moved the plugin... X-Git-Tag: auto/th/OpenImageIO-0_10_3-1~2 X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=d46df4d134a3c483ed65fd76d80bcf32eb76f50a;p=packages%2FOpenImageIO.git - 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 Changed files: OpenImageIO-system-ptex.patch -> 1.1 OpenImageIO.spec -> 1.4 --- diff --git a/OpenImageIO-system-ptex.patch b/OpenImageIO-system-ptex.patch new file mode 100644 index 0000000..559aaa6 --- /dev/null +++ b/OpenImageIO-system-ptex.patch @@ -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 + + #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 + + #include "dassert.h" + #include "typedesc.h" diff --git a/OpenImageIO.spec b/OpenImageIO.spec index 4d3b8a0..e2cf6ae 100644 --- a/OpenImageIO.spec +++ b/OpenImageIO.spec @@ -1,7 +1,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 @@ -20,6 +19,7 @@ Patch0: %{name}-soname.patch 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 @@ -38,6 +38,7 @@ BuildRequires: jasper-devel 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} @@ -87,10 +88,10 @@ Requires: %{name} = %{version}-%{release} 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 @@ -99,10 +100,10 @@ Group: Libraries 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 @@ -167,6 +168,19 @@ OpenImageIO plugin to read and write PNG files. %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 @@ -224,8 +238,9 @@ Wiązanie Pythona do biblioteki OpenImageIO. %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 @@ -235,7 +250,6 @@ cd build -DLIBDIR=%{_libdir} \ -DPYLIBDIR=%{py_sitedir} \ -DPYTHON_VERSION=%{py_ver} \ - -DSOVERSION:STRING=0 \ %{!?with_tbb:-DUSE_TBB=OFF} \ %{__make} @@ -274,7 +288,6 @@ rm -rf $RPM_BUILD_ROOT %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 @@ -314,6 +327,10 @@ rm -rf $RPM_BUILD_ROOT %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