Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opencolorio-2.2.1

Browse Source
This commit is contained in:
Rmys
2023-10-24 01:02:01 +03:00
committed by GitHub
parent 9a72ac8550
commit 90bd56168a
3 changed files with 114 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
multimedia/misc/opencolorio/files/minizip-ng-4.patch
+69
View File
@@ -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<uint8_t> getFileStringFromArchiveFile(const std::string & filepath,
std::vector<uint8_t> 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());
multimedia/misc/opencolorio/files/yaml-cpp-0.8.patch
+36
View File
@@ -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)
multimedia/misc/opencolorio/pspec.xml
+9 -5
View File
@@ -12,7 +12,7 @@
<IsA>app</IsA>
<Summary>Enables color transforms and image display across graphics apps</Summary>
<Description>Grafik uygulamalarında renk dönüşümlerini ve görüntü ekranını etkinleştirir</Description>
<Archive sha1sum="48ec026abe2e1da5799a5be07c7f0bce4e05c052" type="targz">https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/refs/tags/v2.1.0.tar.gz</Archive>
<Archive sha1sum="99e15d58ddb79b1cba39d6cf0645e545d4875979" type="targz">https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/refs/tags/v2.2.1.tar.gz</Archive>
<BuildDependencies>
<!-- <Dependency>git</Dependency> -->
<Dependency>cmake</Dependency>
@@ -27,10 +27,12 @@
<Dependency>tinyxml-devel</Dependency>
<Dependency>python3-devel</Dependency>
<Dependency>imath-devel</Dependency>
<Dependency>minizip-ng-devel</Dependency>
<!--Dependency>openimageio-devel</Dependency-->
</BuildDependencies>
<Patches>
<!-- <Patch level="1">opencolorio-openexr3.patch</Patch> -->
<Patch level="1">minizip-ng-4.patch</Patch>
<Patch level="1">yaml-cpp-0.8.patch</Patch>
</Patches>
</Source>
@@ -45,10 +47,12 @@
<Dependency>libgcc</Dependency>
<Dependency>imath</Dependency>
<Dependency>lcms2</Dependency>
<Dependency>yaml-cpp</Dependency>
<Dependency>freeglut</Dependency>
<Dependency>libglvnd</Dependency>
<Dependency>mesa-glu</Dependency>
<Dependency>pystring</Dependency>
<Dependency>minizip-ng</Dependency>
<!--Dependency>openimageio</Dependency-->
</RuntimeDependencies>
<Files>
@@ -74,9 +78,9 @@
<History>
<Update release="4">
<Date>2023-10-24</Date>
<Version>2.1.0</Version>
<Comment>Rebuild</Comment>
<Date>2023-10-23</Date>
<Version>2.2.1</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>