diff options
| author |   Sam James <sam@gentoo.org> | 2021-10-31 08:13:48 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2021-10-31 08:37:31 +0000 |
| commit | c694e446bc9a0e73dd9cc0586c82c05c2a5c2734 (patch) | |
| tree | 2d7e8e58592f3ec3697bd326ef24502a92e705b5 /media-libs | |
| parent | www-client/chromium: security cleanup (diff) | |
| download | gentoo-c694e446bc9a0e73dd9cc0586c82c05c2a5c2734.tar.gz gentoo-c694e446bc9a0e73dd9cc0586c82c05c2a5c2734.tar.bz2 gentoo-c694e446bc9a0e73dd9cc0586c82c05c2a5c2734.zip | |
media-libs/openimageio: work towards enabling test suite in 2.3.8.0
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/openimageio/Manifest | 2 | ||||
| -rw-r--r-- | media-libs/openimageio/openimageio-2.3.8.0.ebuild | 26 |
2 files changed, 19 insertions, 9 deletions
diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest index 3731c47b59b0..5b5969d5dd7c 100644 --- a/media-libs/openimageio/Manifest +++ b/media-libs/openimageio/Manifest @@ -5,3 +5,5 @@ DIST openimageio-2.2.15.0.tar.gz 29238071 BLAKE2B f74f779635b7ff068f87ab6231756c DIST openimageio-2.2.15.1.tar.gz 29237852 BLAKE2B 0f5050e888e82721aa7012cc5c5eb229b5ac314b067406ef003369431241228d91904fbe455da8423ff978411052b2c960b0688a6b943a0e2bfdb47c489d26a5 SHA512 c06df310f91938b25f1f66cd98d995dcaba51c6a0041b47882c52f5ad4a098a9016fc99f41de250dd1b1b7af3ad22f6ed63d5e76f95f1f1cf0f45c80eee9c8e0 DIST openimageio-2.2.18.0.tar.gz 29246567 BLAKE2B cb7297028b39b1616962b94aff61f0240b88beeae216c6e39f450cb860660b2c844393a759302dfd325ba95336e06944ad72acfb0e87aa2b1cadfe658bd6bdaa SHA512 22a61e8b1ca098c2293e972372d02f0ac8ce54b46eb957b1ffcacb9e0ca4ff13f560d67804e0db0a898d8bec2fdb73f3cdcd1ee1867f92f97f84c1c111e535be DIST openimageio-2.3.8.0.tar.gz 29233320 BLAKE2B 3ad92641a336588941ff18637d6c72bc4765068438ea14b12e067ed7c104f26068c037fe2b38c58806143ff703c894bb97cbc78c3138e9798f063a93ec6626b3 SHA512 3ee9755f1dac6fdb63f582abe71e14e1abc50ebd3f8b9ffa66dc356dfb9905575385cb22c47386c0c0ec303db3e8897b4c8cf88a0f7cdc802408916db4b101e0 +DIST openimageio-oexr-test-image-f17e353fbfcde3406fe02675f4d92aeae422a560.tar.gz 252226183 BLAKE2B b94fb08515e18821e5b88c10031ca53675c56f96397e00b4e186d8dfb9f8557bc935ff102d61835590dca6deeef90dba03b81fd76a7958ab4d0592c042c2130a SHA512 26b9b2cda9d48554b8a53f06bc20301f8ff77dc5e1d7caf9ec45aaaefd8578d3d4d4b2e0a1d1b0f697805fdc0c5d4bae4948cea21821df3006ac0f8b9020f85f +DIST openimageio-oiio-test-image-b85d7a3a10a3256b50325ad310c33e7f7cf2c6cb.tar.gz 137513393 BLAKE2B ebde02d57daaa58c08c7aab2251c39eefd5b736e1cc4a6d28603d8ee52b7828fa7529c9616207b8b0bcb04d88cd4c60c6325e6f09b4f3410dd6e61c5532b04ad SHA512 840a6785779d85f5da052cb635a92c27451e464414fefd2faaf5fc7a6b78936ff05a6a960c07bb968d7c18e753053ff0f425505de54577d30620fbff9be043fb diff --git a/media-libs/openimageio/openimageio-2.3.8.0.ebuild b/media-libs/openimageio/openimageio-2.3.8.0.ebuild index 69127747774d..76bdf3609e24 100644 --- a/media-libs/openimageio/openimageio-2.3.8.0.ebuild +++ b/media-libs/openimageio/openimageio-2.3.8.0.ebuild @@ -5,11 +5,18 @@ EAPI=7 FONT_PN=OpenImageIO PYTHON_COMPAT=( python3_{8..10} ) + +TEST_OIIO_IMAGE_COMMIT="b85d7a3a10a3256b50325ad310c33e7f7cf2c6cb" +TEST_OEXR_IMAGE_COMMIT="f17e353fbfcde3406fe02675f4d92aeae422a560" inherit cmake font python-single-r1 DESCRIPTION="A library for reading and writing images" HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO" SRC_URI="https://github.com/OpenImageIO/oiio/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" test? ( + https://github.com/OpenImageIO/oiio-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz + https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz + )" S="${WORKDIR}/oiio-${PV}" LICENSE="BSD" @@ -22,12 +29,11 @@ X86_CPU_FEATURES=( ) CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} ) -IUSE="dicom doc ffmpeg field3d gif jpeg2k opencv opengl openvdb ptex python qt5 raw +truetype ${CPU_FEATURES[@]%:*}" +IUSE="dicom doc ffmpeg field3d gif jpeg2k opencv opengl openvdb ptex python qt5 raw test +truetype ${CPU_FEATURES[@]%:*}" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -# test data in separate repo -# second repo has no structure whatsoever -RESTRICT="test" +# Not quite working yet +RESTRICT="!test? ( test ) test" BDEPEND=" doc? ( @@ -97,12 +103,14 @@ pkg_setup() { } src_prepare() { - sed -i \ - -e 's/find_package(OpenEXR CONFIG)/find_package(OpenEXR-3 CONFIG)/' \ - src/cmake/modules/FindOpenEXR.cmake || die - cmake_src_prepare cmake_comment_add_subdirectory src/fonts + + if use test ; then + mkdir -p "${BUILD_DIR}"/testsuite || die + mv "${WORKDIR}"/oiio-images-${TEST_OIIO_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/oiio-images || die + mv "${WORKDIR}"/openexr-images-${TEST_OEXR_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/openexr-images || die + fi } src_configure() { @@ -118,7 +126,7 @@ src_configure() { local mycmakeargs=( -DVERBOSE=ON - -DOIIO_BUILD_TESTS=OFF + -DOIIO_BUILD_TESTS=$(usex test) -DINSTALL_FONTS=OFF -DBUILD_DOCS=$(usex doc) -DINSTALL_DOCS=$(usex doc) |