- up to 2.1.1

diff --git a/OpenColorIO-java.patch b/OpenColorIO-java.patch
deleted file mode 100644 (file)
index d938689..0000000
--- a/OpenColorIO-java.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- imageworks-OpenColorIO-a16d9ac/CMakeLists.txt.orig 2012-07-28 20:56:34.841655834 +0200
-+++ imageworks-OpenColorIO-a16d9ac/CMakeLists.txt      2012-07-29 08:42:26.369878509 +0200
-@@ -278,7 +278,7 @@
- 
- if(OCIO_BUILD_JNIGLUE)
-     OCIOFindJava()
--    if(Java_FOUND)
-+    if(JAVA_FOUND)
-       add_subdirectory(src/jniglue)
-     else()
-       messageonce("Java bindings will not be built as we can't find Java")
---- imageworks-OpenColorIO-a16d9ac/src/jniglue/JNIUtil.h.orig  2012-03-12 20:13:59.000000000 +0100
-+++ imageworks-OpenColorIO-a16d9ac/src/jniglue/JNIUtil.h       2012-07-29 08:50:30.273191536 +0200
-@@ -29,6 +29,7 @@
- #ifndef INCLUDED_OCIO_JNIUTIL_H
- #define INCLUDED_OCIO_JNIUTIL_H
- 
-+#include <stdint.h>
- #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-libsuffix.patch b/OpenColorIO-libsuffix.patch
deleted file mode 100644 (file)
index 3ddd1b6..0000000
--- a/OpenColorIO-libsuffix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- OpenColorIO-1.1.0/src/core/CMakeLists.txt.orig     2018-06-25 19:35:05.841127458 +0200
-+++ OpenColorIO-1.1.0/src/core/CMakeLists.txt  2018-06-25 19:59:35.564444007 +0200
-@@ -94,7 +94,7 @@
-         VERSION ${OCIO_VERSION}
-         SOVERSION ${SOVERSION})
-     
--    install(TARGETS OpenColorIO_STATIC EXPORT OpenColorIO ARCHIVE DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/lib/static)
-+    install(TARGETS OpenColorIO_STATIC EXPORT OpenColorIO ARCHIVE DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/lib${LIB_SUFFIX})
- endif()
- 
- macro(target_link_OCIO target)

diff --git a/OpenColorIO-missing.patch b/OpenColorIO-missing.patch
deleted file mode 100644 (file)
index b936fec..0000000
--- a/OpenColorIO-missing.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- 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
deleted file mode 100644 (file)
index bc9c52f..0000000
--- a/OpenColorIO-system-libs.patch
+++ /dev/null
@@ -1,93 +0,0 @@
---- OpenColorIO-1.1.0/docs/CMakeLists.txt.orig 2018-06-25 19:34:32.201127838 +0200
-+++ OpenColorIO-1.1.0/docs/CMakeLists.txt      2018-06-25 19:34:37.424461113 +0200
-@@ -19,72 +19,6 @@
-     set(PYT_EXTDIST_BINPATH ${EXTDIST_BINPATH})
- endif()
- 
--# setuptools
--# 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 ${PYT_PRE_CMD} ${PYTHON} setup.py build
--    INSTALL_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py install --prefix=${PYT_LIB_OUTPUT}
--    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/setuptools-prefix/src/setuptools
--)
--
--# docutils
--# 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 ${PYT_PRE_CMD} ${PYTHON} setup.py build
--    INSTALL_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py install --prefix=${PYT_LIB_OUTPUT}
--    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/docutils-prefix/src/docutils
--)
--
--# jinja2
--# 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 ${PYT_PRE_CMD} ${PYTHON} setup.py build
--    INSTALL_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py install --prefix=${PYT_LIB_OUTPUT}
--    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Jinja2-prefix/src/Jinja2
--)
--
--# Pygments
--# 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 ${PYT_PRE_CMD} ${PYTHON} setup.py build
--    INSTALL_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py install --prefix=${PYT_LIB_OUTPUT}
--    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Pygments-prefix/src/Pygments
--)
--
--# sphinx
--# 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
--    BUILD_IN_SOURCE 1
--    CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
--    BUILD_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py build
--    INSTALL_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py install --prefix=${PYT_LIB_OUTPUT} --install-scripts=${PYT_EXTDIST_BINPATH}
--    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Sphinx-prefix/src/Sphinx
--)
--
- ###############################################################################
- ### Create Doc Targets ###
- 
-@@ -122,7 +56,7 @@
- endif()
- 
- add_custom_target(doc ALL
--    COMMAND ${PYT_PRE_CMD} ${EXTDIST_BINPATH}/sphinx-build -b html . ${CMAKE_CURRENT_BINARY_DIR}/build-html
-+    COMMAND sphinx-build -b html . ${CMAKE_CURRENT_BINARY_DIR}/build-html
-     DEPENDS
-         ${DEPLIBS}
-         ${CMAKE_BINARY_DIR}/docs/conf.py
-@@ -146,7 +80,7 @@
- if(PDFLATEX_COMPILER)
-     
-     add_custom_target(latex
--        COMMAND ${PYT_PRE_CMD} ${EXTDIST_BINPATH}/sphinx-build -b latex . ${CMAKE_CURRENT_BINARY_DIR}/build-latex
-+        COMMAND sphinx-build -b latex . ${CMAKE_CURRENT_BINARY_DIR}/build-latex
-         DEPENDS
-             OpenColorIO
-             ${CMAKE_BINARY_DIR}/docs/conf.py

diff --git a/OpenColorIO.spec b/OpenColorIO.spec
index db2b95fa72c7543e0af0b62427a6290675b8dbe9..1fb2d356499758a3c0ed12ab7bb71133ddcb7aa6 100644 (file)
--- a/OpenColorIO.spec
+++ b/OpenColorIO.spec
@@ -5,8 +5,8 @@
 # Conditional build:
 %bcond_without oiio    # OpenImageIO-dependent apps (ocioconvert,ociodisplay)
 %bcond_without opengl  # OpenGL-dependent app (ociodisplay)
-%bcond_without java    # JNI glue
-%bcond_without doc     # documentation
+%bcond_with    java    # JNI glue
+%bcond_with    doc     # documentation
 %bcond_with    sse2    # use SSE2 instructions
 #
 %ifarch %{x8664} pentrium4
@@ -15,29 +15,29 @@
 Summary:       Complete color management solution
 Summary(pl.UTF-8):     Kompletny pakiet do zarządzania kolorami
 Name:          OpenColorIO
-Version:       1.1.1
-Release:       3
+Version:       2.1.1
+Release:       0.1
 License:       BSD
 Group:         Libraries
 #Source0Download: https://github.com/imageworks/OpenColorIO/releases
 Source0:       https://github.com/imageworks/OpenColorIO/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 23d8b9ac81599305539a5a8674b94a3d
-Patch0:                %{name}-system-libs.patch
-Patch1:                %{name}-java.patch
-Patch2:                %{name}-libsuffix.patch
-Patch3:                %{name}-missing.patch
+# Source0-md5: 604f562e073f23d88ce89ed4f7f709ba
 Patch4:                %{name}-yaml-cpp.patch
 Patch5:                %{name}-no-Werror.patch
 Patch6:                %{name}-oiio.patch
 Patch7:                %{name}-cmake-dir.patch
 Patch8:                %{name}-disable-latex.patch
 URL:           http://opencolorio.org/
+BuildRequires: Imath-devel >= 3.1.2
 BuildRequires: cmake >= 2.8
 %{?with_java:BuildRequires:    jdk}
 BuildRequires: libstdc++-devel >= 6:4.7
 BuildRequires: pkgconfig
-BuildRequires: python-devel
+BuildRequires: python3-devel
+BuildRequires: python3-pybind11 >= 2.6.1
 %if %{with doc}
+BuildRequires: python3-recommonmark
+BuildRequires: python3-testresources
 BuildRequires: sphinx-pdg >= 1.1
 %endif
 BuildRequires: tinyxml-devel >= 2.6.1
@@ -51,6 +51,7 @@ BuildRequires:        glew-devel >= 1.5.1
 BuildRequires: OpenImageIO-devel
 BuildRequires: lcms2-devel >= 2.1
 %endif
+BuildRequires: rpmbuild(macros) >= 1.742
 Requires:      tinyxml >= 2.6.1
 Requires:      yaml-cpp >= 0.3.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -113,18 +114,6 @@ Header files for OpenColorIO library.
 %description devel -l pl.UTF-8
 Pliki nagłówkowe biblioteki OpenColorIO.
 
-%package static
-Summary:       Static OpenColorIO library
-Summary(pl.UTF-8):     Statyczna biblioteka OpenColorIO
-Group:         Development/Libraries
-Requires:      %{name}-devel = %{version}-%{release}
-
-%description static
-Static OpenColorIO library.
-
-%description static -l pl.UTF-8
-Statyczna biblioteka OpenColorIO.
-
 %package -n java-OpenColorIO
 Summary:       Java binding for OpenColorIO library
 Summary(pl.UTF-8):     Wiązanie Javy do biblioteki OpenColorIO
@@ -137,42 +126,25 @@ Java binding for OpenColorIO library.
 %description -n java-OpenColorIO -l pl.UTF-8
 Wiązanie Javy do biblioteki OpenColorIO.
 
-%package -n python-OpenColorIO
+%package -n python3-OpenColorIO
 Summary:       Python binding for OpenColorIO library
 Summary(pl.UTF-8):     Wiązanie Pythona do biblioteki OpenColorIO
 Group:         Libraries/Python
 Requires:      %{name} = %{version}-%{release}
 
-%description -n python-OpenColorIO
+%description -n python3-OpenColorIO
 Python binding for OpenColorIO library.
 
-%description -n python-OpenColorIO -l pl.UTF-8
+%description -n python3-OpenColorIO -l pl.UTF-8
 Wiązanie Pythona do biblioteki OpenColorIO.
 
-%package -n python-OpenColorIO-devel
-Summary:       Header file for PyOpenColorIO API
-Summary(pl.UTF-8):     Plik nagłówkowy API PyOpenColorIO
-Group:         Development/Libraries
-Requires:      %{name}-devel = %{version}-%{release}
-Requires:      python-OpenColorIO = %{version}-%{release}
-
-%description -n python-OpenColorIO-devel
-Header file for PyOpenColorIO API.
-
-%description -n python-OpenColorIO-devel -l pl.UTF-8
-Plik nagłówkowy API PyOpenColorIO.
-
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
+#%patch4 -p1
+#%patch5 -p1
+#%patch6 -p1
+#%patch7 -p1
+#%patch8 -p1
 
 %build
 # required for cmake to find JNI headers/libs when lib64 is in use
@@ -183,12 +155,10 @@ cd build
 # yaml-cpp 0.6.x requires C++11
 CXXFLAGS="%{rpmcxxflags} -std=c++11"
 %cmake .. \
+       -DCMAKE_CONFIGURATION_TYPES=PLD \
+       %cmake_on_off doc OCIO_BUILD_DOCS \
+       %cmake_on_off java OCIO_BUILD_JAVA \
        %{!?with_oiio:-DDISABLE_OIIO=ON} \
-       -DOCIO_BUILD_DOCS=ON \
-%if %{with java}
-       -DOCIO_BUILD_JNIGLUE=ON \
-       -DOCIO_STATIC_JNIGLUE=OFF \
-%endif
        %{!?with_sse2:-DOCIO_USE_SSE=OFF} \
        -DUSE_EXTERNAL_LCMS=ON \
        -DUSE_EXTERNAL_TINYXML=ON \
@@ -204,8 +174,6 @@ rm -rf $RPM_BUILD_ROOT
 
 # not needed when installing to /usr
 %{__rm} $RPM_BUILD_ROOT%{_datadir}/ocio/setup_ocio.sh
-# packaged as %doc
-%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/OpenColorIO
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -216,16 +184,19 @@ rm -rf $RPM_BUILD_ROOT
 %post  -n java-OpenColorIO -p /sbin/ldconfig
 %postun        -n java-OpenColorIO -p /sbin/ldconfig
 
-%post  -n python-OpenColorIO -p /sbin/ldconfig
-%postun        -n python-OpenColorIO -p /sbin/ldconfig
+%post  -n python3-OpenColorIO -p /sbin/ldconfig
+%postun        -n python3-OpenColorIO -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog LICENSE README.md
+%doc CHANGELOG.md LICENSE README.md
 %attr(755,root,root) %{_bindir}/ociobakelut
 %attr(755,root,root) %{_bindir}/ociocheck
+%attr(755,root,root) %{_bindir}/ociochecklut
+%attr(755,root,root) %{_bindir}/ociomakeclf
+%attr(755,root,root) %{_bindir}/ociowrite
 %attr(755,root,root) %{_libdir}/libOpenColorIO.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libOpenColorIO.so.1
+%attr(755,root,root) %ghost %{_libdir}/libOpenColorIO.so.2.1
 
 %if %{with oiio}
 %files convert
@@ -242,16 +213,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
-%doc build/docs/build-html/*
+%{?with_doc:%doc build/docs/build-html/*}
 %attr(755,root,root) %{_libdir}/libOpenColorIO.so
+%{_libdir}/libOpenColorIOoglapphelpers.a
 %{_includedir}/OpenColorIO
 %{_pkgconfigdir}/OpenColorIO.pc
 %{_libdir}/cmake/OpenColorIO
 
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/libOpenColorIO.a
-
 %if %{with java}
 %files -n java-OpenColorIO
 %defattr(644,root,root,755)
@@ -262,10 +230,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/ocio/OpenColorIO-%{version}.jar
 %endif
 
-%files -n python-OpenColorIO
-%defattr(644,root,root,755)
-%attr(755,root,root) %{py_sitedir}/PyOpenColorIO.so
-
-%files -n python-OpenColorIO-devel
+%files -n python3-OpenColorIO
 %defattr(644,root,root,755)
-%{_includedir}/PyOpenColorIO
+%attr(755,root,root) %{py3_sitedir}/PyOpenColorIO.so