commit 57720a490196bffedba9bd000c72c42dab292699
Author: Jan Rękorajski <bagg...@pld-linux.org>
Date: Sun May 12 11:41:29 2013 +0200
- updated to 1.0.8
OpenColorIO-system-libs.patch | 67 -------------------------------------------
OpenColorIO.spec | 12 ++++----
2 files changed, 7 insertions(+), 72 deletions(-)
---
diff --git a/OpenColorIO.spec b/OpenColorIO.spec
index f570368..47a9801 100644
--- a/OpenColorIO.spec
+++ b/OpenColorIO.spec
@@ -15,12 +15,12 @@
Summary: Complete color management solution
Summary(pl.UTF-8): Kompletny pakiet do zarządzania kolorami
Name: OpenColorIO
-Version: 1.0.6
-Release: 2
+Version: 1.0.8
+Release: 1
License: BSD
Group: Libraries
-Source0:
https://github.com/imageworks/OpenColorIO/tarball/v%{version}#/%{name}-%{version}.tar.gz
-# Source0-md5: 7bd5521d8671be9f9f92339b32497908
+Source0:
https://github.com/imageworks/OpenColorIO/tarball/v%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 9838f5f1cf624a3d1253241f22e2179a
Patch0: %{name}-system-libs.patch
Patch1: %{name}-java.patch
Patch2: %{name}-libsuffix.patch
@@ -155,7 +155,7 @@ Header file for PyOpenColorIO API.
Plik nagłówkowy API PyOpenColorIO.
%prep
-%setup -q -n imageworks-OpenColorIO-a16d9ac
+%setup -q -n imageworks-OpenColorIO-8883824
%patch0 -p1
%patch1 -p1
%patch2 -p1
@@ -173,6 +173,8 @@ cd build
-DOCIO_STATIC_JNIGLUE=OFF \
%endif
%{!?with_sse2:-DOCIO_USE_SSE=OFF} \
+ -DUSE_EXTERNAL_TINYXML=ON \
+ -DUSE_EXTERNAL_YAML=ON \
-DPYTHON_INCLUDE_LIB_PREFIX=ON
%{__make}
diff --git a/OpenColorIO-system-libs.patch b/OpenColorIO-system-libs.patch
index 9f9e329..e7186d8 100644
--- a/OpenColorIO-system-libs.patch
+++ b/OpenColorIO-system-libs.patch
@@ -1,70 +1,3 @@
---- imageworks-OpenColorIO-a16d9ac/CMakeLists.txt.orig 2012-03-12
20:13:59.000000000 +0100
-+++ imageworks-OpenColorIO-a16d9ac/CMakeLists.txt 2012-07-28
17:59:51.035434167 +0200
-@@ -136,51 +136,6 @@
- messageonce("Setting EXTDIST_PYTHONPATH: ${EXTDIST_PYTHONPATH}")
-
-
###############################################################################
--### tinyxml ###
--
--set(TINYXML_VERSION 2_6_1)
--set(TINYXML_CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PROJECT_BINARY_DIR}/ext/dist)
--if(CMAKE_TOOLCHAIN_FILE)
-- set(TINYXML_CMAKE_ARGS ${TINYXML_CMAKE_ARGS}
-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE})
--endif()
--ExternalProject_Add(tinyxml
-- URL ${CMAKE_SOURCE_DIR}/ext/tinyxml_${TINYXML_VERSION}.tar.gz
-- PATCH_COMMAND patch -f -p1 <
${CMAKE_SOURCE_DIR}/ext/tinyxml_${TINYXML_VERSION}.patch
-- BINARY_DIR ext/build/tinyxml
-- INSTALL_DIR ext/dist
-- CMAKE_ARGS ${TINYXML_CMAKE_ARGS}
--)
--if(WIN32)
-- set(TINYXML_STATIC_LIBRARIES
${PROJECT_BINARY_DIR}/ext/dist/lib/tinyxml.lib)
--else()
-- set(TINYXML_STATIC_LIBRARIES
${PROJECT_BINARY_DIR}/ext/dist/lib/libtinyxml.a)
--endif()
--
--###############################################################################
--### YAML ###
--
--set(YAML_CPP_VERSION r482)
--set(YAML_CPP_CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PROJECT_BINARY_DIR}/ext/dist
-DYAML_CPP_BUILD_TOOLS:BOOL=FALSE)
--if(CMAKE_TOOLCHAIN_FILE)
-- set(YAML_CPP_CMAKE_ARGS ${YAML_CPP_CMAKE_ARGS}
-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE})
--endif()
--ExternalProject_Add(YAML_CPP_LOCAL
-- URL ${CMAKE_SOURCE_DIR}/ext/yaml-cpp-${YAML_CPP_VERSION}.tar.gz
-- BINARY_DIR ext/build/yaml-cpp
-- PATCH_COMMAND patch -p1 <
${CMAKE_SOURCE_DIR}/ext/yaml-cpp-${YAML_CPP_VERSION}.patch
-- INSTALL_DIR ext/dist
-- CMAKE_ARGS ${YAML_CPP_CMAKE_ARGS}
--)
--set(YAML_CPP_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ext/dist/include)
--set(YAML_CPP_LIBRARY_DIRS ${PROJECT_BINARY_DIR}/ext/dist/lib)
--if(WIN32)
-- set(YAML_CPP_STATIC_DEBUG_LIBRARIES
${PROJECT_BINARY_DIR}/ext/dist/lib/libyaml-cppmdd.lib)
-- set(YAML_CPP_STATIC_OPTIMIZED_LIBRARIES
${PROJECT_BINARY_DIR}/ext/dist/lib/libyaml-cppmd.lib)
--else()
-- set(YAML_CPP_STATIC_GENERAL_LIBRARIES
${PROJECT_BINARY_DIR}/ext/dist/lib/libyaml-cpp.a)
--endif()
--
--###############################################################################
- ### Externals ###
-
- set(EXTERNAL_INCLUDE_DIRS ${EXTERNAL_INCLUDE_DIRS}
${PROJECT_BINARY_DIR}/ext/dist/include)
-@@ -201,9 +156,9 @@
-
- set(EXTERNAL_LINK_FLAGS "")
- set(EXTERNAL_LIBRARY_DIRS ${PROJECT_BINARY_DIR}/ext/dist/lib)
--set(EXTERNAL_DEBUG_LIBRARIES ${YAML_CPP_STATIC_DEBUG_LIBRARIES})
--set(EXTERNAL_OPTIMIZED_LIBRARIES ${YAML_CPP_STATIC_OPTIMIZED_LIBRARIES})
--set(EXTERNAL_GENERAL_LIBRARIES ${TINYXML_STATIC_LIBRARIES}
${YAML_CPP_STATIC_GENERAL_LIBRARIES})
-+set(EXTERNAL_DEBUG_LIBRARIES "")
-+set(EXTERNAL_OPTIMIZED_LIBRARIES "")
-+set(EXTERNAL_GENERAL_LIBRARIES tinyxml yaml-cpp)
-
-
###############################################################################
- ### Documentation ###
--- imageworks-OpenColorIO-a16d9ac/docs/CMakeLists.txt.orig 2012-03-12
20:13:59.000000000 +0100
+++ imageworks-OpenColorIO-a16d9ac/docs/CMakeLists.txt 2012-07-28
20:49:28.808340379 +0200
@@ -1,63 +1,5 @@
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/OpenColorIO.git/commitdiff/57720a490196bffedba9bd000c72c42dab292699
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
