rpms
/
OpenColorIO
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to 2.1.0.

This commit is contained in:
Richard Shaw 2021-08-31 21:10:47 -05:00
parent c7c7799882
commit e00aceb3ac
8 changed files with 13 additions and 1358 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1173
1432.patch
View File

File diff suppressed because it is too large Load Diff

85
OpenColorIO-setuptools.patch
View File

@ -1,85 +0,0 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,7 +39,8 @@ option(OCIO_PYGLUE_LIB_PREFIX "If ON, pr
if(UNIX AND NOT APPLE)
option(USE_EXTERNAL_YAML "Use system installed yaml-cpp library." OFF)
option(USE_EXTERNAL_TINYXML "Use system installed tinyxml library." OFF)
- option(USE_EXTERNAL_LCMS "Use system install lcms2 library." OFF)
+ option(USE_EXTERNAL_LCMS "Use system installed lcms2 library." OFF)
+ option(USE_EXTERNAL_SETUPTOOLS "Use system installed python setuptools." OFF)
endif()
# This does not include the SOVERSION override, on purpose, so that the
--- a/docs/CMakeLists.txt
+++ b/docs/CMakeLists.txt
@@ -19,18 +19,22 @@ else()
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
-)
+if(USE_EXTERNAL_SETUPTOOLS)
+ add_custom_target(setuptools /usr/bin/true)
+else()
+ # 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} --install-lib=${EXTDIST_PYTHONPATH}
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/setuptools-prefix/src/setuptools
+ )
+endif()
# docutils
# https://pypi.python.org/pypi/docutils
@@ -41,7 +45,7 @@ ExternalProject_Add(docutils
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_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py install --prefix=${PYT_LIB_OUTPUT} --install-lib=${EXTDIST_PYTHONPATH}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/docutils-prefix/src/docutils
)
@@ -54,7 +58,7 @@ ExternalProject_Add(Jinja2
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_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py install --prefix=${PYT_LIB_OUTPUT} --install-lib=${EXTDIST_PYTHONPATH}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Jinja2-prefix/src/Jinja2
)
@@ -67,7 +71,7 @@ ExternalProject_Add(Pygments
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_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py install --prefix=${PYT_LIB_OUTPUT} --install-lib=${EXTDIST_PYTHONPATH}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Pygments-prefix/src/Pygments
)
@@ -81,7 +85,7 @@ ExternalProject_Add(Sphinx
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}
+ INSTALL_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py install --prefix=${PYT_LIB_OUTPUT} --install-scripts=${PYT_EXTDIST_BINPATH} --install-lib=${EXTDIST_PYTHONPATH}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Sphinx-prefix/src/Sphinx
)

13
OpenColorIO.spec
View File

@ -4,7 +4,7 @@
%endif
Name: OpenColorIO
Version: 2.0.1
Version: 2.1.0
Release: 1%{?dist}
Summary: Enables color transforms and image display across graphics apps
@ -15,13 +15,6 @@ Source0: https://github.com/AcademySoftwareFoundation/OpenColorIO/archive
# https://github.com/AcademySoftwareFoundation/OpenColorIO/issues/1296
Patch0: ocio-install.patch
# For OpenEXR/Imath 3
# https://github.com/AcademySoftwareFoundation/OpenColorIO/pull/1432
Patch1: 1432.patch
# Violates c++11 (definition shall appear at most one in a program)
Patch2: ocio-cpp11.patch
# OIIO is only built for these arches due to Libraw
%if 0%{?rhel} >= 8
ExclusiveArch: x86_64 ppc64le
@ -170,11 +163,15 @@ popd
%files devel
%{_includedir}/OpenColorIO/
%{_libdir}/cmake/%{name}/
%{_libdir}/*.so
%{_libdir}/pkgconfig/%{name}.pc
%changelog
* Wed Sep 01 2021 Richard Shaw <hobbes1069@gmail.com> - 2.1.0-1
- Update to 2.1.0.
* Fri Aug 13 2021 Richard Shaw <hobbes1069@gmail.com> - 2.0.1-1
- Update to 2.0.1.

46
ocio-1.1.0-yamlcpp060.patch
View File

@ -1,46 +0,0 @@
--- a/src/core/OCIOYaml.cpp
+++ b/src/core/OCIOYaml.cpp
@@ -30,43 +30,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
#include <OpenColorIO/OpenColorIO.h>
-#ifndef WIN32
-
-// fwd declare yaml-cpp visibility
-#pragma GCC visibility push(hidden)
-namespace YAML {
- class Exception;
- class BadDereference;
- class RepresentationException;
- class EmitterException;
- class ParserException;
- class InvalidScalar;
- class KeyNotFound;
- template <typename T> class TypedKeyNotFound;
- template <> class TypedKeyNotFound<OCIO_NAMESPACE::ColorSpace>;
- template <> class TypedKeyNotFound<OCIO_NAMESPACE::Config>;
- template <> class TypedKeyNotFound<OCIO_NAMESPACE::Exception>;
- template <> class TypedKeyNotFound<OCIO_NAMESPACE::GpuShaderDesc>;
- template <> class TypedKeyNotFound<OCIO_NAMESPACE::ImageDesc>;
- template <> class TypedKeyNotFound<OCIO_NAMESPACE::Look>;
- template <> class TypedKeyNotFound<OCIO_NAMESPACE::Processor>;
- template <> class TypedKeyNotFound<OCIO_NAMESPACE::Transform>;
- template <> class TypedKeyNotFound<OCIO_NAMESPACE::AllocationTransform>;
- template <> class TypedKeyNotFound<OCIO_NAMESPACE::CDLTransform>;
- template <> class TypedKeyNotFound<OCIO_NAMESPACE::ColorSpaceTransform>;
- template <> class TypedKeyNotFound<OCIO_NAMESPACE::DisplayTransform>;
- template <> class TypedKeyNotFound<OCIO_NAMESPACE::ExponentTransform>;
- template <> class TypedKeyNotFound<OCIO_NAMESPACE::FileTransform>;
- template <> class TypedKeyNotFound<OCIO_NAMESPACE::GroupTransform>;
- template <> class TypedKeyNotFound<OCIO_NAMESPACE::LogTransform>;
- template <> class TypedKeyNotFound<OCIO_NAMESPACE::LookTransform>;
- template <> class TypedKeyNotFound<OCIO_NAMESPACE::MatrixTransform>;
- template <> class TypedKeyNotFound<OCIO_NAMESPACE::TruelightTransform>;
-}
-#pragma GCC visibility pop
-
-#endif
-
#ifdef WIN32
#pragma warning( push )
#pragma warning( disable: 4146 )

13
ocio-cpp11.patch
View File

@ -1,13 +0,0 @@
Index: OpenColorIO-2.0.1/src/OpenColorIO/Config.cpp
===================================================================
--- OpenColorIO-2.0.1.orig/src/OpenColorIO/Config.cpp
+++ OpenColorIO-2.0.1/src/OpenColorIO/Config.cpp
@@ -1141,7 +1141,7 @@ public:
// Instantiate the cache with the right types.
-template class ProcessorCache<std::size_t, ProcessorRcPtr>;
+extern template class ProcessorCache<std::size_t, ProcessorRcPtr>;
///////////////////////////////////////////////////////////////////////////

10
ocio-glext_h.patch
View File

@ -1,10 +0,0 @@
--- a/src/apps/ociodisplay/main.cpp
+++ b/src/apps/ociodisplay/main.cpp
@@ -56,7 +56,6 @@ namespace OCIO = OCIO_NAMESPACE;
#else
#include <GL/glew.h>
#include <GL/gl.h>
-#include <GL/glext.h>
#include <GL/glut.h>
#endif

16
ocio-install.patch
View File

@ -1,15 +1,15 @@
Index: OpenColorIO-2.0.1/src/OpenColorIO/CMakeLists.txt
Index: OpenColorIO-2.1.0/src/OpenColorIO/CMakeLists.txt
===================================================================
--- OpenColorIO-2.0.1.orig/src/OpenColorIO/CMakeLists.txt
+++ OpenColorIO-2.0.1/src/OpenColorIO/CMakeLists.txt
@@ -279,7 +279,7 @@ if(MSVC AND BUILD_SHARED_LIBS)
endif()
--- OpenColorIO-2.1.0.orig/src/OpenColorIO/CMakeLists.txt
+++ OpenColorIO-2.1.0/src/OpenColorIO/CMakeLists.txt
@@ -293,7 +293,7 @@ endif()
install(TARGETS OpenColorIO
EXPORT ${PROJECT_NAME}_EXPORTED_TARGETS
- LIBRARY DESTINATION lib
- RUNTIME DESTINATION bin
- ARCHIVE DESTINATION lib
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
)

15
ocio-null_pointer.patch
View File

@ -1,15 +0,0 @@
Index: OpenColorIO-1.1.1/src/core/ImageDesc.cpp
===================================================================
--- OpenColorIO-1.1.1.orig/src/core/ImageDesc.cpp
+++ OpenColorIO-1.1.1/src/core/ImageDesc.cpp
@@ -57,8 +57,8 @@ OCIO_NAMESPACE_ENTER
os << "gData=" << planarImg->getGData() << ", ";
os << "bData=" << planarImg->getBData() << ", ";
os << "aData=" << planarImg->getAData() << ", ";
- os << "width=" << packedImg->getWidth() << ", ";
- os << "height=" << packedImg->getHeight() << ", ";
+ os << "width=" << planarImg->getWidth() << ", ";
+ os << "height=" << planarImg->getHeight() << ", ";
os << "yStrideBytes=" << planarImg->getYStrideBytes() << "";
os << ">";
}