aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamian Kurek <starfire24680@gmail.com>2021-06-06 10:30:24 +0200
committerLeo <thinkabit.ukim@gmail.com>2021-06-17 12:38:55 +0000
commit600d031d417d921f0438df743788cca52a7c7b2c (patch)
treed145d53576facc6491e8ffc617494a77dd3321da
parentfa6e615f845c5b795d65fc0fbdab02d82856ea96 (diff)
downloadaports-600d031d417d921f0438df743788cca52a7c7b2c.tar.gz
aports-600d031d417d921f0438df743788cca52a7c7b2c.tar.bz2
aports-600d031d417d921f0438df743788cca52a7c7b2c.tar.xz
testing/opencolorio: upgrade to 2.0.1
-rw-r--r--testing/opencolorio/APKBUILD52
-rw-r--r--testing/opencolorio/gcc9.patch26
-rw-r--r--testing/opencolorio/ocio-1.1.0-yamlcpp060.patch46
3 files changed, 27 insertions, 97 deletions
diff --git a/testing/opencolorio/APKBUILD b/testing/opencolorio/APKBUILD
index 6b3294be4b..7f76a6e792 100644
--- a/testing/opencolorio/APKBUILD
+++ b/testing/opencolorio/APKBUILD
@@ -1,23 +1,27 @@
# Contributor: Mark Riedesel <mark@klowner.com>
# Maintainer: Mark Riedesel <mark@klowner.com>
pkgname=opencolorio
-pkgver=1.1.1
-pkgrel=5
+pkgver=2.0.1
+pkgrel=0
pkgdesc="A color management framework for visual effects and animation"
url="https://opencolorio.org"
-arch="all"
+arch="all !armv7 !armhf !mips !mips64 !s390x" # blocked by openimageio
+options="!check"
+# tests in arches other than x86_64 fail but mostly to FP precision
license="BSD-3-Clause AND GPL-2.0-or-later"
-makedepends="boost-dev cmake freeglut-dev glew-dev lcms2-dev python3-dev
- tinyxml-dev yaml-cpp-dev"
+makedepends="cmake freeglut-dev glew-dev python3-dev lcms2-dev yaml-cpp-dev
+ expat-dev py3-pybind11-dev openexr-dev openimageio-dev"
subpackages="py3-$pkgname:py3 $pkgname-dev $pkgname-tools"
-source="$pkgname-$pkgver.tar.gz::https://github.com/imageworks/OpenColorIO/archive/v$pkgver.tar.gz
- ocio-1.1.0-yamlcpp060.patch
- gcc9.patch
- "
+source="$pkgname-$pkgver.tar.gz::https://github.com/imageworks/OpenColorIO/archive/v$pkgver.tar.gz"
builddir="$srcdir/OpenColorIO-$pkgver"
+prepare() {
+ default_prepare
+ find . -name CMakeLists.txt -exec sed -i -e "s/OpenGL::OpenGL/OpenGL::GL/" {} +
+}
+
build() {
- local use_ss2
+ local use_sse2
# Just to be sure we're using Alpine packages.
rm -f ext/lcms* ext/tinyxml* ext/yaml*
@@ -26,27 +30,25 @@ build() {
*) use_sse2=FALSE ;;
esac
- mkdir build
- cd build
-
- cmake .. \
+ cmake -B build \
-DCMAKE_INSTALL_PREFIX=/usr \
- -DOCIO_BUILD_TRUELIGHT=OFF \
+ -DCMAKE_INSTALL_LIBDIR=/usr/lib \
-DOCIO_BUILD_NUKE=OFF \
-DOCIO_BUILD_SHARED=ON \
-DOCIO_BUILD_STATIC=OFF \
+ -DOCIO_BUILD_APPS=ON \
+ -DOCIO_BUILD_GPU_TESTS=OFF \
-DOCIO_USE_SSE="$use_sse2" \
- -DPYTHON=/usr/bin/python3 \
- -DUSE_EXTERNAL_YAML=TRUE \
- -DUSE_EXTERNAL_TINYXML=TRUE \
- -DUSE_EXTERNAL_LCMS=TRUE \
-DCMAKE_CXX_FLAGS="$CXXFLAGS -Wno-error=cast-function-type"
- make
+ make -C build
+}
+
+check() {
+ CTEST_OUTPUT_ON_FAILURE=1 make -C build test
}
package() {
- cd "$builddir"/build
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" -C build install
}
tools() {
@@ -64,6 +66,6 @@ py3() {
mv "$pkgdir"/usr/lib/python* "$subpkgdir"/usr/lib
}
-sha512sums="bed722f9ddce1887d28aacef2882debccd7c3f3c0c708d2723fea58a097de9f02721af9e85453e089ffda5406aef593ab6536c6886307823c132aa787e492e33 opencolorio-1.1.1.tar.gz
-ef4b0e880c587fcd004865fd938e7f1fb1bbb933abf1ccf352260ebe3a50145664e27b9f1119b72ced99afe4d19b49b0b6c249dd95faaec9c1332ffc44bc9811 ocio-1.1.0-yamlcpp060.patch
-b2be3e01d87b3b69fafdd5eff7adc99dd1f222184aaf338956aed5438f43960558423902ec544614cf0677a48849f0f88cd5c74f8dd5a06e20a91aa72a574883 gcc9.patch"
+sha512sums="
+5787cc4cadb0a1832c925712ca0dfef6e843082b9461460e1798326c6fceaa97bee78e5298651e6a8a3662b348eab5ab9791e94c3efcac337da07229fb559338 opencolorio-2.0.1.tar.gz
+"
diff --git a/testing/opencolorio/gcc9.patch b/testing/opencolorio/gcc9.patch
deleted file mode 100644
index e0aca496b5..0000000000
--- a/testing/opencolorio/gcc9.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/src/core/Config.cpp b/src/core/Config.cpp
-index f5cb379..5ea178e 100644
---- a/src/core/Config.cpp
-+++ b/src/core/Config.cpp
-@@ -330,7 +330,7 @@ OCIO_NAMESPACE_ENTER
- sanitytext_ = rhs.sanitytext_;
-
- cacheids_ = rhs.cacheids_;
-- cacheidnocontext_ = cacheidnocontext_;
-+ cacheidnocontext_ = rhs.cacheidnocontext_;
- }
- return *this;
- }
-diff --git a/src/pyglue/PyAllocationTransform.cpp b/src/pyglue/PyAllocationTransform.cpp
-index 20bb50e..06b418a 100644
---- a/src/pyglue/PyAllocationTransform.cpp
-+++ b/src/pyglue/PyAllocationTransform.cpp
-@@ -53,7 +53,6 @@ OCIO_NAMESPACE_ENTER
- ///
-
- int PyOCIO_AllocationTransform_init(PyOCIO_Transform * self, PyObject * args, PyObject * kwds);
-- PyObject * PyOCIO_AllocationTransform_equals(PyObject * self, PyObject * args);
- PyObject * PyOCIO_AllocationTransform_getAllocation(PyObject * self);
- PyObject * PyOCIO_AllocationTransform_setAllocation(PyObject * self, PyObject * args);
- PyObject * PyOCIO_AllocationTransform_getNumVars(PyObject * self);
-
diff --git a/testing/opencolorio/ocio-1.1.0-yamlcpp060.patch b/testing/opencolorio/ocio-1.1.0-yamlcpp060.patch
deleted file mode 100644
index 899ffa7cc0..0000000000
--- a/testing/opencolorio/ocio-1.1.0-yamlcpp060.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- OpenColorIO-1.1.0/src/core/OCIOYaml.cpp 2018-01-04 17:38:27.000000000 -0800
-+++ OpenColorIO-1.1.0/src/core/OCIOYaml.cpp.new 2018-02-19 16:37:56.733948242 -0800
-@@ -30,43 +30,6 @@
-
- #include <OpenColorIO/OpenColorIO.h>
-
--#ifndef WIN32
--
--// fwd declare yaml-cpp visibility
--#pragma GCC visibility push(hidden)
--namespace YAML {
-- class Exception;
-- class BadDereference;
-- class RepresentationException;
-- class EmitterException;
-- class ParserException;
-- class InvalidScalar;
-- class KeyNotFound;
-- template <typename T> class TypedKeyNotFound;
-- template <> class TypedKeyNotFound<OCIO_NAMESPACE::ColorSpace>;
-- template <> class TypedKeyNotFound<OCIO_NAMESPACE::Config>;
-- template <> class TypedKeyNotFound<OCIO_NAMESPACE::Exception>;
-- template <> class TypedKeyNotFound<OCIO_NAMESPACE::GpuShaderDesc>;
-- template <> class TypedKeyNotFound<OCIO_NAMESPACE::ImageDesc>;
-- template <> class TypedKeyNotFound<OCIO_NAMESPACE::Look>;
-- template <> class TypedKeyNotFound<OCIO_NAMESPACE::Processor>;
-- template <> class TypedKeyNotFound<OCIO_NAMESPACE::Transform>;
-- template <> class TypedKeyNotFound<OCIO_NAMESPACE::AllocationTransform>;
-- template <> class TypedKeyNotFound<OCIO_NAMESPACE::CDLTransform>;
-- template <> class TypedKeyNotFound<OCIO_NAMESPACE::ColorSpaceTransform>;
-- template <> class TypedKeyNotFound<OCIO_NAMESPACE::DisplayTransform>;
-- template <> class TypedKeyNotFound<OCIO_NAMESPACE::ExponentTransform>;
-- template <> class TypedKeyNotFound<OCIO_NAMESPACE::FileTransform>;
-- template <> class TypedKeyNotFound<OCIO_NAMESPACE::GroupTransform>;
-- template <> class TypedKeyNotFound<OCIO_NAMESPACE::LogTransform>;
-- template <> class TypedKeyNotFound<OCIO_NAMESPACE::LookTransform>;
-- template <> class TypedKeyNotFound<OCIO_NAMESPACE::MatrixTransform>;
-- template <> class TypedKeyNotFound<OCIO_NAMESPACE::TruelightTransform>;
--}
--#pragma GCC visibility pop
--
--#endif
--
- #ifdef WIN32
- #pragma warning( push )
- #pragma warning( disable: 4146 )