| 1 |
commit: c694e446bc9a0e73dd9cc0586c82c05c2a5c2734 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Oct 31 08:13:48 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 31 08:37:31 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c694e446 |
| 7 |
|
| 8 |
media-libs/openimageio: work towards enabling test suite in 2.3.8.0 |
| 9 |
|
| 10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 11 |
|
| 12 |
media-libs/openimageio/Manifest | 2 ++ |
| 13 |
media-libs/openimageio/openimageio-2.3.8.0.ebuild | 26 +++++++++++++++-------- |
| 14 |
2 files changed, 19 insertions(+), 9 deletions(-) |
| 15 |
|
| 16 |
diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest |
| 17 |
index 3731c47b59b..5b5969d5dd7 100644 |
| 18 |
--- a/media-libs/openimageio/Manifest |
| 19 |
+++ b/media-libs/openimageio/Manifest |
| 20 |
@@ -5,3 +5,5 @@ DIST openimageio-2.2.15.0.tar.gz 29238071 BLAKE2B f74f779635b7ff068f87ab6231756c |
| 21 |
DIST openimageio-2.2.15.1.tar.gz 29237852 BLAKE2B 0f5050e888e82721aa7012cc5c5eb229b5ac314b067406ef003369431241228d91904fbe455da8423ff978411052b2c960b0688a6b943a0e2bfdb47c489d26a5 SHA512 c06df310f91938b25f1f66cd98d995dcaba51c6a0041b47882c52f5ad4a098a9016fc99f41de250dd1b1b7af3ad22f6ed63d5e76f95f1f1cf0f45c80eee9c8e0 |
| 22 |
DIST openimageio-2.2.18.0.tar.gz 29246567 BLAKE2B cb7297028b39b1616962b94aff61f0240b88beeae216c6e39f450cb860660b2c844393a759302dfd325ba95336e06944ad72acfb0e87aa2b1cadfe658bd6bdaa SHA512 22a61e8b1ca098c2293e972372d02f0ac8ce54b46eb957b1ffcacb9e0ca4ff13f560d67804e0db0a898d8bec2fdb73f3cdcd1ee1867f92f97f84c1c111e535be |
| 23 |
DIST openimageio-2.3.8.0.tar.gz 29233320 BLAKE2B 3ad92641a336588941ff18637d6c72bc4765068438ea14b12e067ed7c104f26068c037fe2b38c58806143ff703c894bb97cbc78c3138e9798f063a93ec6626b3 SHA512 3ee9755f1dac6fdb63f582abe71e14e1abc50ebd3f8b9ffa66dc356dfb9905575385cb22c47386c0c0ec303db3e8897b4c8cf88a0f7cdc802408916db4b101e0 |
| 24 |
+DIST openimageio-oexr-test-image-f17e353fbfcde3406fe02675f4d92aeae422a560.tar.gz 252226183 BLAKE2B b94fb08515e18821e5b88c10031ca53675c56f96397e00b4e186d8dfb9f8557bc935ff102d61835590dca6deeef90dba03b81fd76a7958ab4d0592c042c2130a SHA512 26b9b2cda9d48554b8a53f06bc20301f8ff77dc5e1d7caf9ec45aaaefd8578d3d4d4b2e0a1d1b0f697805fdc0c5d4bae4948cea21821df3006ac0f8b9020f85f |
| 25 |
+DIST openimageio-oiio-test-image-b85d7a3a10a3256b50325ad310c33e7f7cf2c6cb.tar.gz 137513393 BLAKE2B ebde02d57daaa58c08c7aab2251c39eefd5b736e1cc4a6d28603d8ee52b7828fa7529c9616207b8b0bcb04d88cd4c60c6325e6f09b4f3410dd6e61c5532b04ad SHA512 840a6785779d85f5da052cb635a92c27451e464414fefd2faaf5fc7a6b78936ff05a6a960c07bb968d7c18e753053ff0f425505de54577d30620fbff9be043fb |
| 26 |
|
| 27 |
diff --git a/media-libs/openimageio/openimageio-2.3.8.0.ebuild b/media-libs/openimageio/openimageio-2.3.8.0.ebuild |
| 28 |
index 69127747774..76bdf3609e2 100644 |
| 29 |
--- a/media-libs/openimageio/openimageio-2.3.8.0.ebuild |
| 30 |
+++ b/media-libs/openimageio/openimageio-2.3.8.0.ebuild |
| 31 |
@@ -5,11 +5,18 @@ EAPI=7 |
| 32 |
|
| 33 |
FONT_PN=OpenImageIO |
| 34 |
PYTHON_COMPAT=( python3_{8..10} ) |
| 35 |
+ |
| 36 |
+TEST_OIIO_IMAGE_COMMIT="b85d7a3a10a3256b50325ad310c33e7f7cf2c6cb" |
| 37 |
+TEST_OEXR_IMAGE_COMMIT="f17e353fbfcde3406fe02675f4d92aeae422a560" |
| 38 |
inherit cmake font python-single-r1 |
| 39 |
|
| 40 |
DESCRIPTION="A library for reading and writing images" |
| 41 |
HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO" |
| 42 |
SRC_URI="https://github.com/OpenImageIO/oiio/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
| 43 |
+SRC_URI+=" test? ( |
| 44 |
+ https://github.com/OpenImageIO/oiio-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz |
| 45 |
+ https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz |
| 46 |
+ )" |
| 47 |
S="${WORKDIR}/oiio-${PV}" |
| 48 |
|
| 49 |
LICENSE="BSD" |
| 50 |
@@ -22,12 +29,11 @@ X86_CPU_FEATURES=( |
| 51 |
) |
| 52 |
CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} ) |
| 53 |
|
| 54 |
-IUSE="dicom doc ffmpeg field3d gif jpeg2k opencv opengl openvdb ptex python qt5 raw +truetype ${CPU_FEATURES[@]%:*}" |
| 55 |
+IUSE="dicom doc ffmpeg field3d gif jpeg2k opencv opengl openvdb ptex python qt5 raw test +truetype ${CPU_FEATURES[@]%:*}" |
| 56 |
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 57 |
|
| 58 |
-# test data in separate repo |
| 59 |
-# second repo has no structure whatsoever |
| 60 |
-RESTRICT="test" |
| 61 |
+# Not quite working yet |
| 62 |
+RESTRICT="!test? ( test ) test" |
| 63 |
|
| 64 |
BDEPEND=" |
| 65 |
doc? ( |
| 66 |
@@ -97,12 +103,14 @@ pkg_setup() { |
| 67 |
} |
| 68 |
|
| 69 |
src_prepare() { |
| 70 |
- sed -i \ |
| 71 |
- -e 's/find_package(OpenEXR CONFIG)/find_package(OpenEXR-3 CONFIG)/' \ |
| 72 |
- src/cmake/modules/FindOpenEXR.cmake || die |
| 73 |
- |
| 74 |
cmake_src_prepare |
| 75 |
cmake_comment_add_subdirectory src/fonts |
| 76 |
+ |
| 77 |
+ if use test ; then |
| 78 |
+ mkdir -p "${BUILD_DIR}"/testsuite || die |
| 79 |
+ mv "${WORKDIR}"/oiio-images-${TEST_OIIO_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/oiio-images || die |
| 80 |
+ mv "${WORKDIR}"/openexr-images-${TEST_OEXR_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/openexr-images || die |
| 81 |
+ fi |
| 82 |
} |
| 83 |
|
| 84 |
src_configure() { |
| 85 |
@@ -118,7 +126,7 @@ src_configure() { |
| 86 |
|
| 87 |
local mycmakeargs=( |
| 88 |
-DVERBOSE=ON |
| 89 |
- -DOIIO_BUILD_TESTS=OFF |
| 90 |
+ -DOIIO_BUILD_TESTS=$(usex test) |
| 91 |
-DINSTALL_FONTS=OFF |
| 92 |
-DBUILD_DOCS=$(usex doc) |
| 93 |
-DINSTALL_DOCS=$(usex doc) |
Archives