diff --git a/abi_symbols b/abi_symbols --- a/abi_symbols +++ b/abi_symbols @@ -224,6 +224,7 @@ libOpenColorIO.so.1:_ZN11OpenColorIO2v128TransformDirectionFromStringEPKc libOpenColorIO.so.1:_ZN11OpenColorIO2v129ColorSpaceDirectionFromStringEPKc libOpenColorIO.so.1:_ZN11OpenColorIO2v14Look12setTransformERKNSt3tr110shared_ptrIKNS0_9TransformEEE +libOpenColorIO.so.1:_ZN11OpenColorIO2v14Look14setDescriptionEPKc libOpenColorIO.so.1:_ZN11OpenColorIO2v14Look15setProcessSpaceEPKc libOpenColorIO.so.1:_ZN11OpenColorIO2v14Look19setInverseTransformERKNSt3tr110shared_ptrIKNS0_9TransformEEE libOpenColorIO.so.1:_ZN11OpenColorIO2v14Look6CreateEv @@ -262,15 +263,16 @@ libOpenColorIO.so.1:_ZN11OpenColorIO2v16Config14CreateFromFileEPKc libOpenColorIO.so.1:_ZN11OpenColorIO2v16Config14setActiveViewsEPKc libOpenColorIO.so.1:_ZN11OpenColorIO2v16Config14setDescriptionEPKc +libOpenColorIO.so.1:_ZN11OpenColorIO2v16Config15loadEnvironmentEv libOpenColorIO.so.1:_ZN11OpenColorIO2v16Config16CreateFromStreamERSi libOpenColorIO.so.1:_ZN11OpenColorIO2v16Config16clearColorSpacesEv libOpenColorIO.so.1:_ZN11OpenColorIO2v16Config17addEnvironmentVarEPKcS3_ libOpenColorIO.so.1:_ZN11OpenColorIO2v16Config17setActiveDisplaysEPKc +libOpenColorIO.so.1:_ZN11OpenColorIO2v16Config18setEnvironmentModeENS0_15EnvironmentModeE libOpenColorIO.so.1:_ZN11OpenColorIO2v16Config19setDefaultLumaCoefsEPKf libOpenColorIO.so.1:_ZN11OpenColorIO2v16Config20clearEnvironmentVarsEv libOpenColorIO.so.1:_ZN11OpenColorIO2v16Config23setStrictParsingEnabledEb libOpenColorIO.so.1:_ZN11OpenColorIO2v16Config4Impl13resetCacheIDsEv -libOpenColorIO.so.1:_ZN11OpenColorIO2v16Config4Impl4loadERSiPKc libOpenColorIO.so.1:_ZN11OpenColorIO2v16Config6CreateEv libOpenColorIO.so.1:_ZN11OpenColorIO2v16Config7addLookERKNSt3tr110shared_ptrIKNS0_4LookEEE libOpenColorIO.so.1:_ZN11OpenColorIO2v16Config7deleterEPS1_ @@ -440,6 +442,7 @@ libOpenColorIO.so.1:_ZNK11OpenColorIO2v119ColorSpaceTransform6getDstEv libOpenColorIO.so.1:_ZNK11OpenColorIO2v119ColorSpaceTransform6getSrcEv libOpenColorIO.so.1:_ZNK11OpenColorIO2v14Look12getTransformEv +libOpenColorIO.so.1:_ZNK11OpenColorIO2v14Look14getDescriptionEv libOpenColorIO.so.1:_ZNK11OpenColorIO2v14Look15getProcessSpaceEv libOpenColorIO.so.1:_ZNK11OpenColorIO2v14Look18createEditableCopyEv libOpenColorIO.so.1:_ZNK11OpenColorIO2v14Look19getInverseTransformEv @@ -484,6 +487,7 @@ libOpenColorIO.so.1:_ZNK11OpenColorIO2v16Config17getDefaultDisplayEv libOpenColorIO.so.1:_ZNK11OpenColorIO2v16Config17getNumColorSpacesEv libOpenColorIO.so.1:_ZNK11OpenColorIO2v16Config18createEditableCopyEv +libOpenColorIO.so.1:_ZNK11OpenColorIO2v16Config18getEnvironmentModeEv libOpenColorIO.so.1:_ZNK11OpenColorIO2v16Config18getLookNameByIndexEi libOpenColorIO.so.1:_ZNK11OpenColorIO2v16Config19getDefaultLumaCoefsEPf libOpenColorIO.so.1:_ZNK11OpenColorIO2v16Config21getIndexForColorSpaceEPKc diff --git a/abi_used_libs b/abi_used_libs --- a/abi_used_libs +++ b/abi_used_libs @@ -3,3 +3,5 @@ liblcms2.so.2 libm.so.6 libstdc++.so.6 +libtinyxml.so.0 +libyaml-cpp.so.0.6 diff --git a/component.xml b/component.xml deleted file mode 100644 --- a/component.xml +++ /dev/null @@ -1,4 +0,0 @@ - - multimedia.video - - diff --git a/files/CMake-disable-Werror.patch b/files/CMake-disable-Werror.patch new file mode 100644 --- /dev/null +++ b/files/CMake-disable-Werror.patch @@ -0,0 +1,35 @@ +--- a/src/pyglue/CMakeLists.txt ++++ b/src/pyglue/CMakeLists.txt +@@ -20,12 +20,6 @@ + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275") + endif() + +-# Process all warnings as errors +-# Unfortunately Windows still has a warning +-if(UNIX) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror") +-endif() +- + find_package(PythonLibs) + if(NOT PYTHONLIBS_FOUND) + message(FATAL "Python libraries were not found, exiting.") +--- a/src/core/CMakeLists.txt ++++ b/src/core/CMakeLists.txt +@@ -16,17 +16,6 @@ + ${CMAKE_BINARY_DIR}/export/OpenColorABI.h @ONLY) + list(APPEND core_export_headers ${CMAKE_BINARY_DIR}/export/OpenColorABI.h) + +-# Process all warnings as errors +- +-if(WIN32) +- # On debug mode there are other kinds of warning... +- if("${CMAKE_BUILD_TYPE}" STREQUAL "Release") +- set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} /WX") +- endif() +-else() +- set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} -Werror") +-endif() +- + # SHARED + + if(OCIO_BUILD_SHARED) diff --git a/files/install-CMake-modules-in-usr-lib-cmake.patch b/files/install-CMake-modules-in-usr-lib-cmake.patch new file mode 100644 --- /dev/null +++ b/files/install-CMake-modules-in-usr-lib-cmake.patch @@ -0,0 +1,17 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -596,7 +596,7 @@ + set(OCIO_STATIC_COMPILE_DEFINITIONS ) + endif() + endif() +-install(EXPORT OpenColorIO DESTINATION cmake) ++install(EXPORT OpenColorIO DESTINATION lib${LIB_SUFFIX}/cmake/OpenColorIO) + file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" + " + get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH) +@@ -646,4 +646,4 @@ + message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND}) + " + ) +-install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .) ++install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION lib${LIB_SUFFIX}/cmake) diff --git a/files/yaml-cpp-visibility-from-hidden-to-default.patch b/files/yaml-cpp-visibility-from-hidden-to-default.patch new file mode 100644 --- /dev/null +++ b/files/yaml-cpp-visibility-from-hidden-to-default.patch @@ -0,0 +1,11 @@ +--- a/src/core/OCIOYaml.cpp ++++ b/src/core/OCIOYaml.cpp +@@ -32,7 +32,7 @@ + #ifndef WIN32 + + // fwd declare yaml-cpp visibility +-#pragma GCC visibility push(hidden) ++#pragma GCC visibility push(default) + namespace YAML { + class Exception; + class BadDereference; diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,22 +1,37 @@ name : opencolorio -version : 1.0.9 -release : 3 +version : 1.1.1 +release : 4 source : - - https://github.com/imageworks/OpenColorIO/archive/v1.0.9.tar.gz : 27c81e691c15753cd2b560c2ca4bd5679a60c2350eedd43c99d44ca25d65ea7f -license : + - https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/v1.1.1.tar.gz : c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8 +homepage : https://opencolorio.org/ +license : - BSD-3-Clause - - ZLib - BSD-4-Clause -clang : no -summary : A color management framework for visual effects and animation. + - ZLib +component : multimedia.library +summary : A color management framework for visual effects and animation description: | - A color management framework for visual effects and animation. + OpenColorIO (OCIO) is a complete color management solution geared towards motion picture production with an emphasis on visual effects and computer animation. OCIO provides a straightforward and consistent user experience across all supporting applications while allowing for sophisticated back-end configuration options suitable for high-end production usage. OCIO is compatible with the Academy Color Encoding Specification (ACES) and is LUT-format agnostic, supporting many popular formats. builddeps : - pkgconfig(lcms2) - - g++ + - pkgconfig(python3) + - pkgconfig(tinyxml) + - pkgconfig(yaml-cpp) + - libboost-devel + - pybind11 setup : | - %cmake . + %patch -p1 < $pkgfiles/yaml-cpp-visibility-from-hidden-to-default.patch + %patch -p1 < $pkgfiles/install-CMake-modules-in-usr-lib-cmake.patch + %patch -p1 < $pkgfiles/CMake-disable-Werror.patch + + %cmake_ninja \ + -DOCIO_BUILD_STATIC=OFF \ + -DLIB_SUFFIX=64 \ + -DUSE_EXTERNAL_YAML=ON \ + -DUSE_EXTERNAL_LCMS=ON \ + -DUSE_EXTERNAL_TINYXML=ON \ + -DPYTHON=python3 build : | - %make + %ninja_build install : | - %make_install + %ninja_install diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -1,54 +1,64 @@ opencolorio + https://opencolorio.org/ - Ikey Doherty - ikey@solus-project.com + Martin Reboredo + yakoyoku@gmail.com BSD-3-Clause - ZLib BSD-4-Clause - A color management framework for visual effects and animation. - A color management framework for visual effects and animation. + ZLib + multimedia.library + A color management framework for visual effects and animation + OpenColorIO (OCIO) is a complete color management solution geared towards motion picture production with an emphasis on visual effects and computer animation. OCIO provides a straightforward and consistent user experience across all supporting applications while allowing for sophisticated back-end configuration options suitable for high-end production usage. OCIO is compatible with the Academy Color Encoding Specification (ACES) and is LUT-format agnostic, supporting many popular formats. - https://solus-project.com/sources/README.Solus + https://getsol.us/sources/README.Solus - opencolorio-devel - Development files for opencolorio - A color management framework for visual effects and animation. + opencolorio + A color management framework for visual effects and animation + OpenColorIO (OCIO) is a complete color management solution geared towards motion picture production with an emphasis on visual effects and computer animation. OCIO provides a straightforward and consistent user experience across all supporting applications while allowing for sophisticated back-end configuration options suitable for high-end production usage. OCIO is compatible with the Academy Color Encoding Specification (ACES) and is LUT-format agnostic, supporting many popular formats. - programming.devel - - opencolorio - + multimedia.library - /usr/include - /usr/lib/lib*.a - /usr/lib/lib*.so - /usr/lib/pkgconfig + /usr/bin/ociobakelut + /usr/bin/ociocheck + /usr/lib64/libOpenColorIO.so.1 + /usr/lib64/libOpenColorIO.so.1.1.1 + /usr/lib64/python3.7/site-packages/PyOpenColorIO.so + /usr/share/ocio/setup_ocio.sh - opencolorio - A color management framework for visual effects and animation. - A color management framework for visual effects and animation. + opencolorio-devel + Development files for opencolorio + OpenColorIO (OCIO) is a complete color management solution geared towards motion picture production with an emphasis on visual effects and computer animation. OCIO provides a straightforward and consistent user experience across all supporting applications while allowing for sophisticated back-end configuration options suitable for high-end production usage. OCIO is compatible with the Academy Color Encoding Specification (ACES) and is LUT-format agnostic, supporting many popular formats. - multimedia.video + programming.devel + + opencolorio + - /usr/lib/lib*.so.* - /usr/lib/python2.7 - /usr/bin - /usr/share/ocio + /usr/include/OpenColorIO/OpenColorABI.h + /usr/include/OpenColorIO/OpenColorIO.h + /usr/include/OpenColorIO/OpenColorTransforms.h + /usr/include/OpenColorIO/OpenColorTypes.h + /usr/include/PyOpenColorIO/PyOpenColorIO.h + /usr/lib64/cmake/OpenColorIO/OpenColorIO-relwithdebinfo.cmake + /usr/lib64/cmake/OpenColorIO/OpenColorIO.cmake + /usr/lib64/cmake/OpenColorIOConfig.cmake + /usr/lib64/libOpenColorIO.so + /usr/lib64/pkgconfig/OpenColorIO.pc - - 2015-11-01 - 1.0.9 + + 2021-01-11 + 1.1.1 Packaging update - Ikey Doherty - ikey@solus-project.com + Martin Reboredo + yakoyoku@gmail.com \ No newline at end of file