[packages/OpenImageIO] System dpx does not have k255 = 255 definiton Fix linking with libdl Updated files

baggins baggins at pld-linux.org
Wed Jul 11 20:27:26 CEST 2012


commit 40b0de7c931bbb2ebb034abc19e7e89c65a98117
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed Jul 11 20:25:15 2012 +0200

    System dpx does not have k255 = 255 definiton
    Fix linking with libdl
    Updated files

 OpenImageIO-link.patch       | 11 +++++++++++
 OpenImageIO-system-dpx.patch |  9 +++++++++
 OpenImageIO.spec             |  9 ++++-----
 3 files changed, 24 insertions(+), 5 deletions(-)
---
diff --git a/OpenImageIO-link.patch b/OpenImageIO-link.patch
new file mode 100644
index 0000000..967f2a0
--- /dev/null
+++ b/OpenImageIO-link.patch
@@ -0,0 +1,11 @@
+--- OpenImageIO-oiio-0cae52b/src/libOpenImageIO/CMakeLists.txt.orig	2012-07-09 08:28:46.000000000 +0200
++++ OpenImageIO-oiio-0cae52b/src/libOpenImageIO/CMakeLists.txt	2012-07-11 20:20:34.235460584 +0200
+@@ -197,7 +197,7 @@
+ else ()
+     add_library (OpenImageIO SHARED ${libOpenImageIO_srcs})
+ endif ()
+-target_link_libraries (OpenImageIO ${Boost_LIBRARIES})
++target_link_libraries (OpenImageIO ${Boost_LIBRARIES} ${CMAKE_DL_LIBS})
+ 
+ 
+ 
diff --git a/OpenImageIO-system-dpx.patch b/OpenImageIO-system-dpx.patch
index a00367c..adb3f85 100644
--- a/OpenImageIO-system-dpx.patch
+++ b/OpenImageIO-system-dpx.patch
@@ -18,6 +18,15 @@
  #include "libdpx/DPXColorConverter.h"
  
  #include "typedesc.h"
+@@ -499,7 +499,7 @@
+         case dpx::k1125LineProgressive169AR:
+             tmpstr = "YCbCr 1125p, 16:9 (SMPTE 274M)";
+             break;
+-        case dpx::k255:
++        case 255:
+             // don't set the attribute at all
+             break;
+         default:
 --- 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 @@
diff --git a/OpenImageIO.spec b/OpenImageIO.spec
index 7b8eb43..47db9dc 100644
--- a/OpenImageIO.spec
+++ b/OpenImageIO.spec
@@ -13,6 +13,7 @@ License:	BSD
 Group:		Libraries
 Source0:	https://github.com/OpenImageIO/oiio/tarball/Release-%{version}#/%{name}-%{version}.tar.gz
 # Source0-md5:	5a24c19c38d48b3e90cf94258fc0256b
+Patch0:		%{name}-link.patch
 Patch2:		%{name}-hdf.patch
 Patch3:		%{name}-system-squish.patch
 Patch4:		%{name}-system-ptex.patch
@@ -246,6 +247,7 @@ Wiązanie Pythona do biblioteki OpenImageIO.
 
 %prep
 %setup -q -n OpenImageIO-oiio-0cae52b
+%patch0 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
@@ -272,10 +274,7 @@ rm -rf $RPM_BUILD_ROOT
 	DESTDIR=$RPM_BUILD_ROOT
 
 # name clash with iv
-mv -f $RPM_BUILD_ROOT%{_bindir}/{iv,oiiv}
-
-%{__rm} $RPM_BUILD_ROOT%{_prefix}/{CHANGES,INSTALL,LICENSE}
-%{__rm} $RPM_BUILD_ROOT%{_prefix}/doc/{CLA-*,openimageio.pdf}
+%{__mv} -f $RPM_BUILD_ROOT%{_bindir}/{iv,oiiv}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -293,7 +292,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/iprocess
 %attr(755,root,root) %{_bindir}/maketx
 %attr(755,root,root) %{_libdir}/libOpenImageIO.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libOpenImageIO.so.0
+%attr(755,root,root) %ghost %{_libdir}/libOpenImageIO.so.1.0
 %attr(755,root,root) %{_libdir}/bmp.imageio.so
 %attr(755,root,root) %{_libdir}/fits.imageio.so
 %attr(755,root,root) %{_libdir}/hdr.imageio.so


More information about the pld-cvs-commit mailing list