[packages/OpenColorIO] - updated to 1.0.9 - added missing patch (missing file for jniglue) - one more fix to java patch
qboosh
qboosh at pld-linux.org
Thu Nov 7 21:14:45 CET 2013
commit d8e33fed6178f992ac2b797ef82673081d3d53b0
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Thu Nov 7 21:15:02 2013 +0100
- updated to 1.0.9
- added missing patch (missing file for jniglue)
- one more fix to java patch
OpenColorIO-java.patch | 11 +++++++++
OpenColorIO-missing.patch | 47 ++++++++++++++++++++++++++++++++++++++
OpenColorIO-system-libs.patch | 53 +++++++++++++++++++++++--------------------
OpenColorIO.spec | 13 +++++++----
4 files changed, 95 insertions(+), 29 deletions(-)
---
diff --git a/OpenColorIO.spec b/OpenColorIO.spec
index c0976a4..2189d2a 100644
--- a/OpenColorIO.spec
+++ b/OpenColorIO.spec
@@ -15,17 +15,18 @@
Summary: Complete color management solution
Summary(pl.UTF-8): Kompletny pakiet do zarządzania kolorami
Name: OpenColorIO
-Version: 1.0.8
-Release: 3
+Version: 1.0.9
+Release: 1
License: BSD
Group: Libraries
Source0: https://github.com/imageworks/OpenColorIO/tarball/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 9838f5f1cf624a3d1253241f22e2179a
+# Source0-md5: ad3c4ea59c010a18d79276ab9d83af95
Patch0: %{name}-system-libs.patch
Patch1: %{name}-java.patch
Patch2: %{name}-libsuffix.patch
+Patch3: %{name}-missing.patch
# for yaml-cpp 0.5.0 (unfinished)
-Patch3: %{name}-yaml-cpp.patch
+Patch4: %{name}-yaml-cpp.patch
URL: http://opencolorio.org/
# g++ with tr1 support or...
#BuildRequires: boost-devel >= 1.34
@@ -161,10 +162,11 @@ Header file for PyOpenColorIO API.
Plik nagłówkowy API PyOpenColorIO.
%prep
-%setup -q -n imageworks-OpenColorIO-8883824
+%setup -q -n imageworks-OpenColorIO-2b12063
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%build
# required for cmake to find JNI headers/libs when lib64 is in use
@@ -219,6 +221,7 @@ rm -rf $RPM_BUILD_ROOT
%files convert
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/ocioconvert
+%attr(755,root,root) %{_bindir}/ociolutimage
%endif
%if %{with oiio} && %{with opengl}
diff --git a/OpenColorIO-java.patch b/OpenColorIO-java.patch
index 06bef7f..d938689 100644
--- a/OpenColorIO-java.patch
+++ b/OpenColorIO-java.patch
@@ -19,3 +19,14 @@
#include <sstream>
#include <vector>
#include "OpenColorIOJNI.h"
+--- imageworks-OpenColorIO-2b12063/src/jniglue/CMakeLists.txt.orig 2013-10-09 00:59:34.000000000 +0200
++++ imageworks-OpenColorIO-2b12063/src/jniglue/CMakeLists.txt 2013-11-07 20:11:29.503699385 +0100
+@@ -71,7 +71,7 @@
+ add_custom_command(OUTPUT ${JNIOCIO_HEADERS}
+ COMMAND cmake -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/org/OpenColorIO
+ COMMAND ${Java_JAVAC_EXECUTABLE} -cp ${CMAKE_CURRENT_BINARY_DIR} -d ${CMAKE_CURRENT_BINARY_DIR} ${JNIOCIO_JAVAS}
+- COMMAND ${Java_JAVAH_EXECUTABLE} -jni -force ${JNIOCIO_CLASSES}
++ COMMAND ${Java_JAVAH_EXECUTABLE} -jni -force -classpath ${CMAKE_CURRENT_BINARY_DIR} ${JNIOCIO_CLASSES}
+ COMMAND ${Java_JAR_EXECUTABLE} vcfm ${JNIOCIO_JAR} Manifest.txt org
+ IMPLICIT_DEPENDS ${JNIOCIO_JAVAS}
+ COMMENT "Compiling .java files, packaged .jar and creating jni C headers")
diff --git a/OpenColorIO-missing.patch b/OpenColorIO-missing.patch
new file mode 100644
index 0000000..b936fec
--- /dev/null
+++ b/OpenColorIO-missing.patch
@@ -0,0 +1,47 @@
+--- imageworks-OpenColorIO-2b12063/src/jniglue/org/OpenColorIO/EnvironmentMode.java.orig 1970-01-01 01:00:00.000000000 +0100
++++ imageworks-OpenColorIO-2b12063/src/jniglue/org/OpenColorIO/EnvironmentMode.java 2013-10-09 00:59:34.000000000 +0200
+@@ -0,0 +1,44 @@
++/*
++Copyright (c) 2003-2010 Sony Pictures Imageworks Inc., et al.
++All Rights Reserved.
++
++Redistribution and use in source and binary forms, with or without
++modification, are permitted provided that the following conditions are
++met:
++* Redistributions of source code must retain the above copyright
++ notice, this list of conditions and the following disclaimer.
++* Redistributions in binary form must reproduce the above copyright
++ notice, this list of conditions and the following disclaimer in the
++ documentation and/or other materials provided with the distribution.
++* Neither the name of Sony Pictures Imageworks nor the names of its
++ contributors may be used to endorse or promote products derived from
++ this software without specific prior written permission.
++THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
++"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
++LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
++A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
++OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
++SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
++LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
++DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
++THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
++OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++*/
++
++package org.OpenColorIO;
++import org.OpenColorIO.*;
++
++public class EnvironmentMode extends LoadLibrary
++{
++ private final int m_enum;
++ protected EnvironmentMode(int type) { super(); m_enum = type; }
++ public native String toString();
++ public native boolean equals(Object obj);
++ public static final EnvironmentMode
++ ENV_ENVIRONMENT_UNKNOWN = new EnvironmentMode(0);
++ public static final EnvironmentMode
++ ENV_ENVIRONMENT_LOAD_PREDEFINED = new EnvironmentMode(1);
++ public static final EnvironmentMode
++ ENV_ENVIRONMENT_LOAD_ALL = new EnvironmentMode(2);
++}
diff --git a/OpenColorIO-system-libs.patch b/OpenColorIO-system-libs.patch
index e7186d8..3095276 100644
--- a/OpenColorIO-system-libs.patch
+++ b/OpenColorIO-system-libs.patch
@@ -1,79 +1,84 @@
---- 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 @@
+--- imageworks-OpenColorIO-2b12063/docs/CMakeLists.txt.orig 2013-10-09 00:59:34.000000000 +0200
++++ imageworks-OpenColorIO-2b12063/docs/CMakeLists.txt 2013-11-06 18:54:00.644187011 +0100
+@@ -1,68 +1,5 @@
###############################################################################
-### External Doc Apps ###
-
-# setuptools
--set(SETUPTOOLS_VERSION 0.6c11)
+-# https://pypi.python.org/pypi/setuptools
+-set(SETUPTOOLS_VERSION 1.1.6)
-ExternalProject_Add(setuptools
- URL ${CMAKE_SOURCE_DIR}/ext/setuptools-${SETUPTOOLS_VERSION}.tar.gz
- BUILD_IN_SOURCE 1
- CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
-- BUILD_COMMAND PYTHONPATH=${PYTHONPATH} python setup.py build
-- INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} python setup.py install --prefix=${EXTDIST_ROOT}
+- BUILD_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py build
+- INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py install --prefix=${EXTDIST_ROOT}
-)
-
-# docutils
--set(DOCUTILS_VERSION 0.7)
+-# https://pypi.python.org/pypi/docutils
+-set(DOCUTILS_VERSION 0.11)
-ExternalProject_Add(docutils
- DEPENDS setuptools
- URL ${CMAKE_SOURCE_DIR}/ext/docutils-${DOCUTILS_VERSION}.tar.gz
- BUILD_IN_SOURCE 1
- CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
-- BUILD_COMMAND PYTHONPATH=${PYTHONPATH} python setup.py build
-- INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} python setup.py install --prefix=${EXTDIST_ROOT}
+- BUILD_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py build
+- INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py install --prefix=${EXTDIST_ROOT}
-)
-
-# jinja2
--set(JINJA2_VERSION 2.5.5)
+-# https://pypi.python.org/pypi/Jinja2
+-set(JINJA2_VERSION 2.7.1)
-ExternalProject_Add(Jinja2
- DEPENDS setuptools
- URL ${CMAKE_SOURCE_DIR}/ext/Jinja2-${JINJA2_VERSION}.tar.gz
- BUILD_IN_SOURCE 1
- CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
-- BUILD_COMMAND PYTHONPATH=${PYTHONPATH} python setup.py build
-- INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} python setup.py install --prefix=${EXTDIST_ROOT}
+- BUILD_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py build
+- INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py install --prefix=${EXTDIST_ROOT}
-)
-
-# Pygments
--set(PYGMENTS_VERSION 1.3.1)
+-# https://pypi.python.org/pypi/Pygments
+-set(PYGMENTS_VERSION 1.6)
-ExternalProject_Add(Pygments
- DEPENDS setuptools
- URL ${CMAKE_SOURCE_DIR}/ext/Pygments-${PYGMENTS_VERSION}.tar.gz
- BUILD_IN_SOURCE 1
- CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
-- BUILD_COMMAND PYTHONPATH=${PYTHONPATH} python setup.py build
-- INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} python setup.py install --prefix=${EXTDIST_ROOT}
+- BUILD_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py build
+- INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py install --prefix=${EXTDIST_ROOT}
-)
-
-# sphinx
--set(SPHINX_VERSION f52b631f501a) # 1.1pre
+-# https://pypi.python.org/pypi/Sphinx
+-set(SPHINX_VERSION 1.2b3)
-ExternalProject_Add(Sphinx
- DEPENDS setuptools docutils Jinja2 Pygments
-- URL ${CMAKE_SOURCE_DIR}/ext/sphinx-${SPHINX_VERSION}.tar.gz
-- PATCH_COMMAND patch -p1 < ${CMAKE_SOURCE_DIR}/ext/sphinx-${SPHINX_VERSION}.patch
+- URL ${CMAKE_SOURCE_DIR}/ext/Sphinx-${SPHINX_VERSION}.tar.gz
+- PATCH_COMMAND patch -p1 < ${CMAKE_SOURCE_DIR}/ext/Sphinx-${SPHINX_VERSION}.patch
- BUILD_IN_SOURCE 1
- CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
-- BUILD_COMMAND PYTHONPATH=${PYTHONPATH} python setup.py build
-- INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} python setup.py install --prefix=${EXTDIST_ROOT} --install-scripts=${EXTDIST_ROOT}/bin
+- BUILD_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py build
+- INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py install --prefix=${EXTDIST_ROOT} --install-scripts=${EXTDIST_ROOT}/bin
-)
-
-###############################################################################
### Create Doc Targets ###
message(STATUS "Create sphinx conf.py from conf.py.in")
-@@ -61,7 +61,7 @@
- COMMENT "Creating PyOther.rst")
+@@ -93,7 +30,7 @@
+ ExtractRstCPP(${CMAKE_SOURCE_DIR}/export/OpenColorIO/OpenColorTypes.h developers/api/OpenColorTypes.rst)
add_custom_target(doc ALL
- COMMAND PYTHONPATH=${PYTHONPATH} ${EXTDIST_BINPATH}/sphinx-build -b html . ${CMAKE_CURRENT_BINARY_DIR}/build-html
+ COMMAND PYTHONPATH=${PYTHONPATH} sphinx-build -b html . ${CMAKE_CURRENT_BINARY_DIR}/build-html
DEPENDS
OpenColorIO
- ${CMAKE_BINARY_DIR}/docs/conf.py
-@@ -97,7 +97,7 @@
+ PyOpenColorIO
+@@ -118,7 +55,7 @@
if(PDFLATEX_COMPILER)
add_custom_target(latex
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/OpenColorIO.git/commitdiff/d8e33fed6178f992ac2b797ef82673081d3d53b0
More information about the pld-cvs-commit
mailing list