Page MenuHomeSolus

D10333.id.diff
No OneTemporary

D10333.id.diff

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 @@
-<PISI>
- <Name>multimedia.video</Name>
-</PISI>
-
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 @@
<PISI>
<Source>
<Name>opencolorio</Name>
+ <Homepage>https://opencolorio.org/</Homepage>
<Packager>
- <Name>Ikey Doherty</Name>
- <Email>ikey@solus-project.com</Email>
+ <Name>Martin Reboredo</Name>
+ <Email>yakoyoku@gmail.com</Email>
</Packager>
<License>BSD-3-Clause</License>
- <License>ZLib</License>
<License>BSD-4-Clause</License>
- <Summary xml:lang="en">A color management framework for visual effects and animation.</Summary>
- <Description xml:lang="en">A color management framework for visual effects and animation.
+ <License>ZLib</License>
+ <PartOf>multimedia.library</PartOf>
+ <Summary xml:lang="en">A color management framework for visual effects and animation</Summary>
+ <Description xml:lang="en">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.
</Description>
- <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://solus-project.com/sources/README.Solus</Archive>
+ <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://getsol.us/sources/README.Solus</Archive>
</Source>
<Package>
- <Name>opencolorio-devel</Name>
- <Summary xml:lang="en">Development files for opencolorio</Summary>
- <Description xml:lang="en">A color management framework for visual effects and animation.
+ <Name>opencolorio</Name>
+ <Summary xml:lang="en">A color management framework for visual effects and animation</Summary>
+ <Description xml:lang="en">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.
</Description>
- <PartOf>programming.devel</PartOf>
- <RuntimeDependencies>
- <Dependency release="current">opencolorio</Dependency>
- </RuntimeDependencies>
+ <PartOf>multimedia.library</PartOf>
<Files>
- <Path fileType="header">/usr/include</Path>
- <Path fileType="library">/usr/lib/lib*.a</Path>
- <Path fileType="library">/usr/lib/lib*.so</Path>
- <Path fileType="data">/usr/lib/pkgconfig</Path>
+ <Path fileType="executable">/usr/bin/ociobakelut</Path>
+ <Path fileType="executable">/usr/bin/ociocheck</Path>
+ <Path fileType="library">/usr/lib64/libOpenColorIO.so.1</Path>
+ <Path fileType="library">/usr/lib64/libOpenColorIO.so.1.1.1</Path>
+ <Path fileType="library">/usr/lib64/python3.7/site-packages/PyOpenColorIO.so</Path>
+ <Path fileType="data">/usr/share/ocio/setup_ocio.sh</Path>
</Files>
</Package>
<Package>
- <Name>opencolorio</Name>
- <Summary xml:lang="en">A color management framework for visual effects and animation.</Summary>
- <Description xml:lang="en">A color management framework for visual effects and animation.
+ <Name>opencolorio-devel</Name>
+ <Summary xml:lang="en">Development files for opencolorio</Summary>
+ <Description xml:lang="en">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.
</Description>
- <PartOf>multimedia.video</PartOf>
+ <PartOf>programming.devel</PartOf>
+ <RuntimeDependencies>
+ <Dependency release="4">opencolorio</Dependency>
+ </RuntimeDependencies>
<Files>
- <Path fileType="library">/usr/lib/lib*.so.*</Path>
- <Path fileType="library">/usr/lib/python2.7</Path>
- <Path fileType="executable">/usr/bin</Path>
- <Path fileType="data">/usr/share/ocio</Path>
+ <Path fileType="header">/usr/include/OpenColorIO/OpenColorABI.h</Path>
+ <Path fileType="header">/usr/include/OpenColorIO/OpenColorIO.h</Path>
+ <Path fileType="header">/usr/include/OpenColorIO/OpenColorTransforms.h</Path>
+ <Path fileType="header">/usr/include/OpenColorIO/OpenColorTypes.h</Path>
+ <Path fileType="header">/usr/include/PyOpenColorIO/PyOpenColorIO.h</Path>
+ <Path fileType="library">/usr/lib64/cmake/OpenColorIO/OpenColorIO-relwithdebinfo.cmake</Path>
+ <Path fileType="library">/usr/lib64/cmake/OpenColorIO/OpenColorIO.cmake</Path>
+ <Path fileType="library">/usr/lib64/cmake/OpenColorIOConfig.cmake</Path>
+ <Path fileType="library">/usr/lib64/libOpenColorIO.so</Path>
+ <Path fileType="data">/usr/lib64/pkgconfig/OpenColorIO.pc</Path>
</Files>
</Package>
<History>
- <Update release="3">
- <Date>2015-11-01</Date>
- <Version>1.0.9</Version>
+ <Update release="4">
+ <Date>2021-01-11</Date>
+ <Version>1.1.1</Version>
<Comment>Packaging update</Comment>
- <Name>Ikey Doherty</Name>
- <Email>ikey@solus-project.com</Email>
+ <Name>Martin Reboredo</Name>
+ <Email>yakoyoku@gmail.com</Email>
</Update>
</History>
</PISI>
\ No newline at end of file

File Metadata

Mime Type
text/plain
Expires
Fri, Aug 11, 3:48 PM (3 h, 7 m ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5794251
Default Alt Text
D10333.id.diff (14 KB)

Event Timeline