Date: Saturday, November 5, 2022 @ 22:20:43 Author: svenstaro Revision: 460729
upgpkg: opencolorio 2.2.0-1 Added: opencolorio/trunk/use-system-minizip.patch Modified: opencolorio/trunk/PKGBUILD Deleted: opencolorio/trunk/opencolorio-openexr3.patch ----------------------------+ PKGBUILD | 13 +-- opencolorio-openexr3.patch | 182 ------------------------------------------- use-system-minizip.patch | 59 +++++++++++++ 3 files changed, 66 insertions(+), 188 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-11-05 21:53:54 UTC (rev 460728) +++ PKGBUILD 2022-11-05 22:20:43 UTC (rev 460729) @@ -2,25 +2,26 @@ # Contributor: Dumitru Ursu <[email protected]> pkgname=opencolorio -pkgver=2.1.2 +pkgver=2.2.0 pkgrel=1 pkgdesc="A color management framework for visual effects and animation" arch=('x86_64') url="https://opencolorio.org"; license=('BSD') -depends=('freeglut' 'glew' 'lcms2' 'tinyxml' 'yaml-cpp' 'imath' 'pystring') +depends=('freeglut' 'glew' 'lcms2' 'tinyxml' 'yaml-cpp' 'imath' 'pystring' + 'minizip-ng' 'openimageio' 'openshadinglanguage') makedepends=('cmake' 'python' 'pybind11' 'ninja') optdepends=('python: python bindings') source=($pkgname-$pkgver.tar.gz::https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/v$pkgver.tar.gz - https://github.com/AcademySoftwareFoundation/OpenColorIO/commit/4fa94918c2cf572dcaf61ca07016f3b5c231c14c.patch) -sha512sums=('594e808fb1c175d5b14eb540be0dfb6f41cd37b5bf7df8c2d24d44dfe4986643ea68e52d0282eb3b25283489789001a57a201de1eecc1560fc9461780c7da353' - 'baffedf7d81c67c9a14f5977379a86eeed3d9891069ad810e4303994369b500e78c43e4c0fcbe5bd7f7ba16163c16b6796884f4250ff6200a162ed29d60780fb') + use-system-minizip.patch) +sha512sums=('f9fc6991f99f28bb2117ecf6af6ea907310c9ae118d17e54c1bf642ec99e35bf899463d80bccdbaca6cd66bae62e17fdd0417e2fb42c8b8f80c6892e7cbe8770' + 'de760fa88f9680e9bd02c3810957f68f82ef461591763de47e4ffa31739aebd1ebf0793dd7e93582aaef11afd9d4ba088f8911259c749dc6a74b9cf4b163470e') prepare() { cd OpenColorIO-$pkgver # We don't care about the failures of this patch in this current release - patch -Np1 -i "$srcdir"/4fa94918c2cf572dcaf61ca07016f3b5c231c14c.patch || true + patch -Np1 -i "$srcdir"/use-system-minizip.patch } build() { Deleted: opencolorio-openexr3.patch =================================================================== --- opencolorio-openexr3.patch 2022-11-05 21:53:54 UTC (rev 460728) +++ opencolorio-openexr3.patch 2022-11-05 22:20:43 UTC (rev 460729) @@ -1,182 +0,0 @@ -diff --git a/share/cmake/modules/FindExtPackages.cmake b/share/cmake/modules/FindExtPackages.cmake -index c98e0af3..5f685935 100644 ---- a/share/cmake/modules/FindExtPackages.cmake -+++ b/share/cmake/modules/FindExtPackages.cmake -@@ -34,7 +34,7 @@ find_package(yaml-cpp 0.6.3 REQUIRED) - - # Half (OpenEXR/IlmBase) - # https://github.com/openexr/openexr --find_package(Half 2.4.0 REQUIRED) -+find_package(Imath 3.0 REQUIRED) - - # pystring - # https://github.com/imageworks/pystring -diff --git a/src/OpenColorIO/BitDepthUtils.h b/src/OpenColorIO/BitDepthUtils.h -index a8b3cbd9..bb0163bf 100644 ---- a/src/OpenColorIO/BitDepthUtils.h -+++ b/src/OpenColorIO/BitDepthUtils.h -@@ -7,7 +7,7 @@ - - #include <OpenColorIO/OpenColorIO.h> - --#include "OpenEXR/half.h" -+#include "Imath/half.h" - - - namespace OCIO_NAMESPACE -diff --git a/src/OpenColorIO/CMakeLists.txt b/src/OpenColorIO/CMakeLists.txt -index 2ce801e6..824f8a98 100755 ---- a/src/OpenColorIO/CMakeLists.txt -+++ b/src/OpenColorIO/CMakeLists.txt -@@ -207,7 +207,7 @@ target_link_libraries(OpenColorIO - public_api - PRIVATE - expat::expat -- IlmBase::Half -+ Imath::Imath - pystring::pystring - sampleicc::sampleicc - utils::strings -diff --git a/src/OpenColorIO/MathUtils.h b/src/OpenColorIO/MathUtils.h -index 309c6244..0873d490 100644 ---- a/src/OpenColorIO/MathUtils.h -+++ b/src/OpenColorIO/MathUtils.h -@@ -9,7 +9,7 @@ - - #include <OpenColorIO/OpenColorIO.h> - --#include "OpenEXR/half.h" -+#include "Imath/half.h" - - namespace OCIO_NAMESPACE - { -diff --git a/src/OpenColorIO/ops/range/RangeOp.cpp b/src/OpenColorIO/ops/range/RangeOp.cpp -index 9ec863e2..444dac75 100644 ---- a/src/OpenColorIO/ops/range/RangeOp.cpp -+++ b/src/OpenColorIO/ops/range/RangeOp.cpp -@@ -7,7 +7,7 @@ - #include <OpenColorIO/OpenColorIO.h> - - #include "GpuShaderUtils.h" --#include "OpenEXR/half.h" -+#include "Imath/half.h" - #include "HashUtils.h" - #include "MathUtils.h" - #include "ops/lut1d/Lut1DOpData.h" -diff --git a/src/OpenColorIO/transforms/builtins/ACES.cpp b/src/OpenColorIO/transforms/builtins/ACES.cpp -index 20968c0d..9ee2ac27 100644 ---- a/src/OpenColorIO/transforms/builtins/ACES.cpp -+++ b/src/OpenColorIO/transforms/builtins/ACES.cpp -@@ -6,7 +6,7 @@ - - #include <OpenColorIO/OpenColorIO.h> - --#include "OpenEXR/half.h" -+#include "Imath/half.h" - #include "ops/fixedfunction/FixedFunctionOp.h" - #include "ops/gradingrgbcurve/GradingRGBCurveOp.h" - #include "ops/log/LogOp.h" -diff --git a/src/OpenColorIO/transforms/builtins/OpHelpers.cpp b/src/OpenColorIO/transforms/builtins/OpHelpers.cpp -index 04b8fbd4..288ca566 100644 ---- a/src/OpenColorIO/transforms/builtins/OpHelpers.cpp -+++ b/src/OpenColorIO/transforms/builtins/OpHelpers.cpp -@@ -4,7 +4,7 @@ - - #include <OpenColorIO/OpenColorIO.h> - --#include "OpenEXR/half.h" -+#include "Imath/half.h" - #include "ops/lut1d/Lut1DOp.h" - #include "transforms/builtins/OpHelpers.h" - -diff --git a/src/apps/ocioconvert/CMakeLists.txt b/src/apps/ocioconvert/CMakeLists.txt -index 68a5db17..6fea394a 100755 ---- a/src/apps/ocioconvert/CMakeLists.txt -+++ b/src/apps/ocioconvert/CMakeLists.txt -@@ -27,7 +27,7 @@ set_target_properties(ocioconvert PROPERTIES - target_link_libraries(ocioconvert - PRIVATE - apputils -- IlmBase::Half -+ Imath::Imath - ${OCIO_GL_LIB} - oiiohelpers - OpenColorIO -diff --git a/src/apps/ocioconvert/main.cpp b/src/apps/ocioconvert/main.cpp -index b56d4999..7e8af7d0 100644 ---- a/src/apps/ocioconvert/main.cpp -+++ b/src/apps/ocioconvert/main.cpp -@@ -24,7 +24,7 @@ namespace OIIO = OIIO_NAMESPACE; - #endif // OCIO_GPU_ENABLED - - #include "oiiohelpers.h" --#include "OpenEXR/half.h" -+#include "Imath/half.h" - - - // Array of non OpenColorIO arguments. -diff --git a/src/apps/ocioperf/CMakeLists.txt b/src/apps/ocioperf/CMakeLists.txt -index 69e9ba4c..bcbe47be 100644 ---- a/src/apps/ocioperf/CMakeLists.txt -+++ b/src/apps/ocioperf/CMakeLists.txt -@@ -20,7 +20,7 @@ set_target_properties(ocioperf PROPERTIES - target_link_libraries(ocioperf - PRIVATE - apputils -- IlmBase::Half -+ Imath::Imath - oiiohelpers - OpenColorIO - OpenImageIO::OpenImageIO -diff --git a/src/apps/ocioperf/main.cpp b/src/apps/ocioperf/main.cpp -index 6427860d..f6e4a63c 100644 ---- a/src/apps/ocioperf/main.cpp -+++ b/src/apps/ocioperf/main.cpp -@@ -11,7 +11,7 @@ namespace OIIO = OIIO_NAMESPACE; - #endif - - #include "apputils/argparse.h" --#include "OpenEXR/half.h" -+#include "Imath/half.h" - #include "oiiohelpers.h" - #include "utils/StringUtils.h" - -diff --git a/src/libutils/oiiohelpers/CMakeLists.txt b/src/libutils/oiiohelpers/CMakeLists.txt -index 6ef7c368..5f4a5113 100644 ---- a/src/libutils/oiiohelpers/CMakeLists.txt -+++ b/src/libutils/oiiohelpers/CMakeLists.txt -@@ -31,7 +31,7 @@ target_link_libraries(oiiohelpers - - PRIVATE - OpenColorIO -- IlmBase::Half -+ Imath::Imath - utils::strings - ) - -diff --git a/src/libutils/oiiohelpers/oiiohelpers.cpp b/src/libutils/oiiohelpers/oiiohelpers.cpp -index be1a937d..e7db652c 100644 ---- a/src/libutils/oiiohelpers/oiiohelpers.cpp -+++ b/src/libutils/oiiohelpers/oiiohelpers.cpp -@@ -5,7 +5,7 @@ - #include <OpenColorIO/OpenColorIO.h> - - --#include "OpenEXR/half.h" -+#include "Imath/half.h" - #include "oiiohelpers.h" - #include "utils/StringUtils.h" - -diff --git a/tests/cpu/CMakeLists.txt b/tests/cpu/CMakeLists.txt -index 67389962..8e8dd900 100755 ---- a/tests/cpu/CMakeLists.txt -+++ b/tests/cpu/CMakeLists.txt -@@ -18,7 +18,7 @@ function(add_ocio_test NAME SOURCES PRIVATE_INCLUDES) - public_api - PRIVATE - expat::expat -- IlmBase::Half -+ Imath::Imath - pystring::pystring - sampleicc::sampleicc - unittest_data Added: use-system-minizip.patch =================================================================== --- use-system-minizip.patch (rev 0) +++ use-system-minizip.patch 2022-11-05 22:20:43 UTC (rev 460729) @@ -0,0 +1,59 @@ +diff --git a/src/OpenColorIO/OCIOZArchive.cpp b/src/OpenColorIO/OCIOZArchive.cpp +index 52e292ef..4430b2d8 100644 +--- a/src/OpenColorIO/OCIOZArchive.cpp ++++ b/src/OpenColorIO/OCIOZArchive.cpp +@@ -17,16 +17,16 @@ + + #include "OCIOZArchive.h" + +-#include "minizip-ng/mz.h" +-#include "minizip-ng/mz_os.h" +-#include "minizip-ng/mz_strm.h" +-#include "minizip-ng/mz_strm_buf.h" +-#include "minizip-ng/mz_strm_mem.h" +-#include "minizip-ng/mz_strm_os.h" +-#include "minizip-ng/mz_strm_split.h" +-#include "minizip-ng/mz_strm_zlib.h" +-#include "minizip-ng/mz_zip.h" +-#include "minizip-ng/mz_zip_rw.h" ++#include "mz.h" ++#include "mz_os.h" ++#include "mz_strm.h" ++#include "mz_strm_buf.h" ++#include "mz_strm_mem.h" ++#include "mz_strm_os.h" ++#include "mz_strm_split.h" ++#include "mz_strm_zlib.h" ++#include "mz_zip.h" ++#include "mz_zip_rw.h" + + namespace OCIO_NAMESPACE + { +@@ -630,4 +630,4 @@ void CIOPOciozArchive::buildEntries() + getEntriesMappingFromArchiveFile(m_archiveAbsPath, m_entries); + } + +-} // namespace OCIO_NAMESPACE +\ No newline at end of file ++} // namespace OCIO_NAMESPACE +diff --git a/src/apps/ocioarchive/main.cpp b/src/apps/ocioarchive/main.cpp +index bf222fc8..190cadee 100644 +--- a/src/apps/ocioarchive/main.cpp ++++ b/src/apps/ocioarchive/main.cpp +@@ -13,11 +13,11 @@ namespace OCIO = OCIO_NAMESPACE; + #include "apputils/argparse.h" + + // Config archive functionality. +-#include "minizip-ng/mz.h" +-#include "minizip-ng/mz_os.h" +-#include "minizip-ng/mz_strm.h" +-#include "minizip-ng/mz_zip.h" +-#include "minizip-ng/mz_zip_rw.h" ++#include "mz.h" ++#include "mz_os.h" ++#include "mz_strm.h" ++#include "mz_zip.h" ++#include "mz_zip_rw.h" + + // Array of non OpenColorIO arguments. + static std::vector<std::string> args;
