Date: Thursday, February 2, 2023 @ 01:09:03 Author: svenstaro Revision: 467788
upgpkg: opencolorio 2.2.1-1 Also get rid of the cyclic dependency and the minizip patch as upstream integrated the ability to use system minizip. Modified: opencolorio/trunk/PKGBUILD Deleted: opencolorio/trunk/use-system-minizip.patch --------------------------+ PKGBUILD | 25 ++++++++----------- use-system-minizip.patch | 59 --------------------------------------------- 2 files changed, 11 insertions(+), 73 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2023-02-01 23:52:08 UTC (rev 467787) +++ PKGBUILD 2023-02-02 01:09:03 UTC (rev 467788) @@ -2,28 +2,19 @@ # Contributor: Dumitru Ursu <[email protected]> pkgname=opencolorio -pkgver=2.2.0 -pkgrel=2 +pkgver=2.2.1 +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' - 'minizip-ng' 'openimageio' 'openshadinglanguage') + 'minizip-ng' 'openimageio') makedepends=('cmake' 'python' 'pybind11' 'ninja') optdepends=('python: python bindings') -source=($pkgname-$pkgver.tar.gz::https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/v$pkgver.tar.gz - use-system-minizip.patch) -sha512sums=('f9fc6991f99f28bb2117ecf6af6ea907310c9ae118d17e54c1bf642ec99e35bf899463d80bccdbaca6cd66bae62e17fdd0417e2fb42c8b8f80c6892e7cbe8770' - 'de760fa88f9680e9bd02c3810957f68f82ef461591763de47e4ffa31739aebd1ebf0793dd7e93582aaef11afd9d4ba088f8911259c749dc6a74b9cf4b163470e') +source=($pkgname-$pkgver.tar.gz::https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/v$pkgver.tar.gz) +sha512sums=('d5f3a4b5bd661af7336c015d07e0feccb286464a08239a3c259a97217001161e7571f5137475fc2f4d1b9af6381bbfa03c0b60f41de282f114307961b8d84fc9') -prepare() { - cd OpenColorIO-$pkgver - - # We don't care about the failures of this patch in this current release - patch -Np1 -i "$srcdir"/use-system-minizip.patch -} - build() { cd OpenColorIO-$pkgver @@ -36,6 +27,12 @@ ninja -C build } +check() { + cd OpenColorIO-$pkgver/build + + ctest -E test_gpu +} + package() { cd OpenColorIO-$pkgver Deleted: use-system-minizip.patch =================================================================== --- use-system-minizip.patch 2023-02-01 23:52:08 UTC (rev 467787) +++ use-system-minizip.patch 2023-02-02 01:09:03 UTC (rev 467788) @@ -1,59 +0,0 @@ -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;
