[OpenColorIO/el6] Another fix for the cmake version in EL6.

Richard Shaw hobbes1069 at fedoraproject.org
Fri May 4 20:02:55 UTC 2012


commit 7d594e5efd6d8244814adec40ae4e0f2ade2c9e3
Author: Richard M. Shaw <hobbes1069 at gmail.com>
Date:   Fri May 4 15:02:53 2012 -0500

    Another fix for the cmake version in EL6.

 OpenColorIO-1.0.7-link-yaml_cpp.patch |   11 +++++++++++
 OpenColorIO.spec                      |    4 ++++
 2 files changed, 15 insertions(+), 0 deletions(-)
---
diff --git a/OpenColorIO-1.0.7-link-yaml_cpp.patch b/OpenColorIO-1.0.7-link-yaml_cpp.patch
new file mode 100644
index 0000000..b4e8965
--- /dev/null
+++ b/OpenColorIO-1.0.7-link-yaml_cpp.patch
@@ -0,0 +1,11 @@
+diff -Naur imageworks-OpenColorIO-b3cb224.orig/src/apps/ociocheck/CMakeLists.txt imageworks-OpenColorIO-b3cb224/src/apps/ociocheck/CMakeLists.txt
+--- imageworks-OpenColorIO-b3cb224.orig/src/apps/ociocheck/CMakeLists.txt	2012-04-17 19:08:16.000000000 -0500
++++ imageworks-OpenColorIO-b3cb224/src/apps/ociocheck/CMakeLists.txt	2012-05-04 15:00:26.292732699 -0500
+@@ -12,6 +12,7 @@
+ 
+ target_link_libraries(ociocheck
+     OpenColorIO
++    ${YAML_CPP_LIBRARIES}
+     )
+ 
+ install(TARGETS ociocheck DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/bin)
diff --git a/OpenColorIO.spec b/OpenColorIO.spec
index 62f4ab5..ebed183 100644
--- a/OpenColorIO.spec
+++ b/OpenColorIO.spec
@@ -20,6 +20,7 @@ Source0:        imageworks-%{name}-v%{version}-0-%{githash1}.tar.gz
 
 Patch0:         OpenColorIO-1.0.7-pylib_no_soname.patch
 Patch1:         OpenColorIO-1.0.7-docfix.patch
+Patch2:         OpenColorIO-1.0.7-link-yaml_cpp.patch
 
 # Utilities
 BuildRequires:  cmake
@@ -80,6 +81,9 @@ Development libraries and headers for %{name}.
 %patch0 -p1 -b .pylib
 # Exclude hidden files from being packaged.
 %patch1 -p1 -b .docfix
+# Fix for proper linking with cmake 2.6.
+%patch2 -p1 -b .link_yaml
+
 
 # Remove what bundled libraries
 rm -f ext/lcms*


More information about the scm-commits mailing list