* update opencolorio to 2.4.0-1
This commit is contained in:
parent
1907d78423
commit
dc34f8a8fb
@ -1,7 +1,7 @@
|
||||
pkgbase = opencolorio
|
||||
pkgdesc = A color management framework for visual effects and animation
|
||||
pkgver = 2.3.2
|
||||
pkgrel = 3.1
|
||||
pkgver = 2.4.0
|
||||
pkgrel = 1
|
||||
url = https://opencolorio.org
|
||||
arch = x86_64
|
||||
arch = powerpc64le
|
||||
@ -21,7 +21,7 @@ pkgbase = opencolorio
|
||||
depends = minizip-ng
|
||||
depends = openexr
|
||||
optdepends = python: python bindings
|
||||
source = opencolorio-2.3.2.tar.gz::https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/v2.3.2.tar.gz
|
||||
sha512sums = 4c7547960623b058398a86d9c8335d31f2354a1ee7ba58fbc2d1ace698132b99e8f823c9b443a77545721da076569228f502f1f3f4deba44659571c6d12db133
|
||||
source = opencolorio-2.4.0.tar.gz::https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/v2.4.0.tar.gz
|
||||
sha512sums = 11ad89b3ac30700be58181a0bdd4154a3ae2bf59651edb48629c51c7f1fadf221394abb285efd9b6c259195821a4e531043b266eea36d8fa4382f23c3b54ab6d
|
||||
|
||||
pkgname = opencolorio
|
||||
|
||||
@ -3,8 +3,8 @@
|
||||
# Contributor: Dumitru Ursu <dima@ceata.org>
|
||||
|
||||
pkgname=opencolorio
|
||||
pkgver=2.3.2
|
||||
pkgrel=3.1
|
||||
pkgver=2.4.0
|
||||
pkgrel=1
|
||||
pkgdesc="A color management framework for visual effects and animation"
|
||||
arch=(x86_64 powerpc64le)
|
||||
url="https://opencolorio.org"
|
||||
@ -14,7 +14,7 @@ makedepends=('cmake' 'python' 'pybind11' 'ninja')
|
||||
checkdepends=('openimageio')
|
||||
optdepends=('python: python bindings')
|
||||
source=($pkgname-$pkgver.tar.gz::https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/v$pkgver.tar.gz)
|
||||
sha512sums=('4c7547960623b058398a86d9c8335d31f2354a1ee7ba58fbc2d1ace698132b99e8f823c9b443a77545721da076569228f502f1f3f4deba44659571c6d12db133')
|
||||
sha512sums=('11ad89b3ac30700be58181a0bdd4154a3ae2bf59651edb48629c51c7f1fadf221394abb285efd9b6c259195821a4e531043b266eea36d8fa4382f23c3b54ab6d')
|
||||
|
||||
build() {
|
||||
cd OpenColorIO-$pkgver
|
||||
|
||||
@ -1,69 +0,0 @@
|
||||
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());
|
||||
@ -1,21 +0,0 @@
|
||||
From: Bernd Feige <Bernd.Feige@gmx.net>
|
||||
https://bugs.gentoo.org/914716#c12
|
||||
|
||||
Index: OpenColorIO-2.3.0/share/cmake/modules/Findyaml-cpp.cmake
|
||||
===================================================================
|
||||
--- OpenColorIO-2.3.0.orig/share/cmake/modules/Findyaml-cpp.cmake
|
||||
+++ OpenColorIO-2.3.0/share/cmake/modules/Findyaml-cpp.cmake
|
||||
@@ -50,7 +50,12 @@ if(NOT OCIO_INSTALL_EXT_PACKAGES STREQUA
|
||||
endif()
|
||||
|
||||
if(yaml-cpp_FOUND)
|
||||
- get_target_property(yaml-cpp_LIBRARY yaml-cpp LOCATION)
|
||||
+ if(TARGET yaml-cpp::yaml-cpp)
|
||||
+ # yaml-cpp >= 0.8
|
||||
+ get_target_property(yaml-cpp::yaml-cpp_LIBRARY yaml-cpp::yaml-cpp LOCATION)
|
||||
+ else()
|
||||
+ get_target_property(yaml-cpp_LIBRARY yaml-cpp LOCATION)
|
||||
+ endif()
|
||||
else()
|
||||
|
||||
# As yaml-cpp-config.cmake search fails, search an installed library
|
||||
@ -1,23 +0,0 @@
|
||||
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)
|
||||
Loading…
x
Reference in New Issue
Block a user