From 90bd56168af34a52334981a346b9c57f3fe7e349 Mon Sep 17 00:00:00 2001 From: Rmys Date: Tue, 24 Oct 2023 01:02:01 +0300 Subject: [PATCH] opencolorio-2.2.1 --- .../misc/opencolorio/files/minizip-ng-4.patch | 69 +++++++++++++++++++ .../misc/opencolorio/files/yaml-cpp-0.8.patch | 36 ++++++++++ multimedia/misc/opencolorio/pspec.xml | 14 ++-- 3 files changed, 114 insertions(+), 5 deletions(-) create mode 100644 multimedia/misc/opencolorio/files/minizip-ng-4.patch create mode 100644 multimedia/misc/opencolorio/files/yaml-cpp-0.8.patch diff --git a/multimedia/misc/opencolorio/files/minizip-ng-4.patch b/multimedia/misc/opencolorio/files/minizip-ng-4.patch new file mode 100644 index 0000000000..079a199351 --- /dev/null +++ b/multimedia/misc/opencolorio/files/minizip-ng-4.patch @@ -0,0 +1,69 @@ +diff --git a/src/OpenColorIO/OCIOZArchive.cpp b/src/OpenColorIO/OCIOZArchive.cpp +index 85fc7bb7..5b77685f 100644 +--- a/src/OpenColorIO/OCIOZArchive.cpp ++++ b/src/OpenColorIO/OCIOZArchive.cpp +@@ -225,7 +225,7 @@ void archiveConfig(std::ostream & ostream, const Config & config, const char * c + std::string configStr = ss.str(); + + // Write zip to memory stream. +- mz_stream_mem_create(&write_mem_stream); ++ write_mem_stream = mz_stream_mem_create(); + mz_stream_mem_set_grow_size(write_mem_stream, 128 * 1024); + mz_stream_open(write_mem_stream, NULL, MZ_OPEN_MODE_CREATE); + +@@ -237,7 +237,7 @@ void archiveConfig(std::ostream & ostream, const Config & config, const char * c + options.compress_level = ArchiveCompressionLevels::BEST; + + // Create the writer handle. +- mz_zip_writer_create(&archiver); ++ archiver = mz_zip_writer_create(); + + // Archive options. + // Compression method +@@ -332,7 +332,7 @@ void ExtractOCIOZArchive(const char * archivePath, const char * destination) + std::string outputDestination = pystring::os::path::normpath(destination); + + // Create zip reader. +- mz_zip_reader_create(&extracter); ++ extracter = mz_zip_reader_create(); + + MinizipNgHandlerGuard extracterGuard(extracter, false, false); + +@@ -450,7 +450,7 @@ std::vector getFileStringFromArchiveFile(const std::string & filepath, + std::vector buffer; + + // Create the reader object. +- mz_zip_reader_create(&reader); ++ reader = mz_zip_reader_create(); + + MinizipNgHandlerGuard extracterGuard(reader, false, true); + +@@ -510,7 +510,7 @@ void getEntriesMappingFromArchiveFile(const std::string & archivePath, + void *reader = NULL; + + // Create the reader object. +- mz_zip_reader_create(&reader); ++ reader = mz_zip_reader_create(); + + MinizipNgHandlerGuard extracterGuard(reader, false, false); + +@@ -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 190cadee..93c622dc 100644 +--- a/src/apps/ocioarchive/main.cpp ++++ b/src/apps/ocioarchive/main.cpp +@@ -235,7 +235,7 @@ int main(int argc, const char **argv) + } + + std::string path = args[0]; +- mz_zip_reader_create(&reader); ++ reader = mz_zip_reader_create(); + struct tm tmu_date; + + err = mz_zip_reader_open_file(reader, path.c_str()); diff --git a/multimedia/misc/opencolorio/files/yaml-cpp-0.8.patch b/multimedia/misc/opencolorio/files/yaml-cpp-0.8.patch new file mode 100644 index 0000000000..e3b5fa08ae --- /dev/null +++ b/multimedia/misc/opencolorio/files/yaml-cpp-0.8.patch @@ -0,0 +1,36 @@ +diff --git a/share/cmake/modules/FindExtPackages.cmake b/share/cmake/modules/FindExtPackages.cmake +index 8787b872a..f37340a08 100644 +--- a/share/cmake/modules/FindExtPackages.cmake ++++ b/share/cmake/modules/FindExtPackages.cmake +@@ -30,7 +30,7 @@ find_package(expat 2.2.8 REQUIRED) + + # yaml-cpp + # https://github.com/jbeder/yaml-cpp +-find_package(yaml-cpp 0.7.0 REQUIRED) ++find_package(yaml-cpp 0.8.0 REQUIRED) + + # pystring + # https://github.com/imageworks/pystring +diff --git a/share/cmake/modules/Findyaml-cpp.cmake b/share/cmake/modules/Findyaml-cpp.cmake +index 59558ce6..c5e051ac 100644 +--- a/share/cmake/modules/Findyaml-cpp.cmake ++++ b/share/cmake/modules/Findyaml-cpp.cmake +@@ -42,10 +42,6 @@ if(NOT OCIO_INSTALL_EXT_PACKAGES STREQUAL ALL) + find_package(yaml-cpp ${yaml-cpp_FIND_VERSION} CONFIG QUIET) + endif() + +- if(yaml-cpp_FOUND) +- get_target_property(yaml-cpp_LIBRARY yaml-cpp LOCATION) +- else() +- + # As yaml-cpp-config.cmake search fails, search an installed library + # using yaml-cpp.pc . + +@@ -111,7 +107,6 @@ if(NOT OCIO_INSTALL_EXT_PACKAGES STREQUAL ALL) + if(PC_yaml-cpp_FOUND) + set(yaml-cpp_VERSION "${PC_yaml-cpp_VERSION}") + endif() +- endif() + + # Override REQUIRED if package can be installed + if(OCIO_INSTALL_EXT_PACKAGES STREQUAL MISSING) diff --git a/multimedia/misc/opencolorio/pspec.xml b/multimedia/misc/opencolorio/pspec.xml index b304dc8fa2..cd09346c9d 100644 --- a/multimedia/misc/opencolorio/pspec.xml +++ b/multimedia/misc/opencolorio/pspec.xml @@ -12,7 +12,7 @@ app Enables color transforms and image display across graphics apps Grafik uygulamalarında renk dönüşümlerini ve görüntü ekranını etkinleştirir - https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/refs/tags/v2.1.0.tar.gz + https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/refs/tags/v2.2.1.tar.gz cmake @@ -27,10 +27,12 @@ tinyxml-devel python3-devel imath-devel + minizip-ng-devel - + minizip-ng-4.patch + yaml-cpp-0.8.patch @@ -45,10 +47,12 @@ libgcc imath lcms2 + yaml-cpp freeglut libglvnd mesa-glu pystring + minizip-ng @@ -74,9 +78,9 @@ - 2023-10-24 - 2.1.0 - Rebuild + 2023-10-23 + 2.2.1 + Version bump. Mustafa Cinasal muscnsl@gmail.com