summaryrefslogtreecommitdiff
path: root/media-libs
diff options
context:
space:
mode:
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/Manifest.gzbin66304 -> 66292 bytes
-rw-r--r--media-libs/libgphoto2/Manifest2
-rw-r--r--media-libs/libgphoto2/metadata.xml1
-rw-r--r--media-libs/openimageio/Manifest13
-rw-r--r--media-libs/openimageio/openimageio-2.3.12.0-r3.ebuild175
-rw-r--r--media-libs/openimageio/openimageio-2.3.15.0.ebuild175
-rw-r--r--media-libs/openimageio/openimageio-2.3.20.0.ebuild (renamed from media-libs/openimageio/openimageio-2.3.16.0.ebuild)12
-rw-r--r--media-libs/openimageio/openimageio-2.4.4.1.ebuild (renamed from media-libs/openimageio/openimageio-2.3.13.0.ebuild)25
-rw-r--r--media-libs/osl/Manifest4
-rw-r--r--media-libs/osl/osl-1.12.6.2.ebuild (renamed from media-libs/osl/osl-1.12.4.1-r2.ebuild)37
10 files changed, 59 insertions, 385 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index a16fc72bd98e..e3860a58bb00 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
Binary files differ
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index 6938bf33ef92..62e4a79765f7 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -1,3 +1,3 @@
DIST libgphoto2-2.5.30.tar.xz 5890196 BLAKE2B 4da7a650bec695a9d8356d1014081786eb6d31641c4f36f75ba7171b2b395a5e8bf6f59d452adad6d9faa30eea77abeb52e62e645d963bcec2709b3eb5094a4a SHA512 969e5765dc5de9e5fb8156eda679aca069f568e744cc48b643846175eb3cff78bc6ec3a848150a4c636d948018de022f2988da7b94029f103589384f9144b7ed
EBUILD libgphoto2-2.5.30.ebuild 6255 BLAKE2B e734f6d47914d6469ae4724bb05337bfe5a32227701f3d3444bb251a6ee230cbb08b4446c48ca5ff00d9997c22ff2085d206cf4ee1cbe66830cd53ebdfdba193 SHA512 cdbde5cf9404ea28dc1c8c6d9f66d828a6105d5f563db0becc60984a280c3a4e07672491646d425e0e7ef0d9a6f290e6c656cd38ffc8f751c385a876b6ce9cf6
-MISC metadata.xml 401 BLAKE2B 114b82879f1ab00f4b6b0784a675fc50ba303fee05355f5d6edf32e3f5d3e3015f43e8f300fb9ff45b9dc9100a30431d0458ea8fe1c868090ad739e83587053e SHA512 87a96a6120a0a29c1b05aa43c1548cea9d7fcf0ff3c5815c3369dac7545c8ca05f5a7795f870566bd264cb2873fdf6a79a7dea92d318fca8078d8ec6d8c6a2e3
+MISC metadata.xml 458 BLAKE2B 944547ab787583b1cd6678e3183a3f6cd76cf95461fb05758887ccfd41ceb8fc0bf7278fe786fd36fe2eee3664876fe4692d849a88bff58c3707e57f256b67b0 SHA512 a6c0af734aa579d486cb4f707f84b6b6beb26121092ced9976d05a6428a8096f79591b842d3ad906e5cb76ea1c8cd2bc2d21d587d6cb03041cc3ba72905f76be
diff --git a/media-libs/libgphoto2/metadata.xml b/media-libs/libgphoto2/metadata.xml
index f99b55563f3b..56c76a00492c 100644
--- a/media-libs/libgphoto2/metadata.xml
+++ b/media-libs/libgphoto2/metadata.xml
@@ -10,5 +10,6 @@
</use>
<upstream>
<remote-id type="sourceforge">gphoto</remote-id>
+ <remote-id type="github">gphoto/libgphoto2</remote-id>
</upstream>
</pkgmetadata>
diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index cada8fc0e831..cadac1ab0b95 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -1,15 +1,12 @@
-DIST openimageio-2.3.12.0.tar.gz 32452689 BLAKE2B f5fd428c597b573586a4749b56225ad3c035ab1c2122ff3e93df8e90be5796cc57978aa9fc5b102f2cf64d2407e70a11683b5bbee118c9fac3536b965ed044cc SHA512 c8ec0ead8396717b218d937b9193ef9162c68446f6f1d477f3f0ee4b5656c3d7d53b58bf55aa300fbf57d367a47d795861b5683157e0d0271e0ea56f0460c58d
-DIST openimageio-2.3.13.0.tar.gz 32456755 BLAKE2B 897a7db0eabb9a7cc29ab8fea368c32fc70b63b5ecebbcfa8d1fffe55c2435d9638f8a1f69069c45fad3723a2b7dc40e83971f48892afc631a7593a7629fb92a SHA512 fbefa341a11fd502ec9313ca48a0fe433c5822699e4934f6a14089f670314cbe1c9c0b9a491b1d1927bda0223e38a62192c6ddeec6c4c5e6215a8b3fb6900dd8
-DIST openimageio-2.3.15.0.tar.gz 32626322 BLAKE2B 1367e40dbed3d43b53db1b7117c563782396b255e366ea9586438a5c81cb8ae96ff42a0e445c7932bc92dc327adae921b383c2e6d787dc6e67cf71946d6174c1 SHA512 8ed0303fd9314e01cbf6d45627eb6e88e3fd356387a7657a4b31bbe455a4a493f88a2b511c1d5cf86a9c00346dbc03f9b32d2a6df9da033e7e78e86142ce888c
-DIST openimageio-2.3.16.0.tar.gz 32632560 BLAKE2B bde9d46b74135f03215cc3741c0378580dc34381da041b3d06ff50154627edd69b93e1a714bc99c7800fe952300f752cb9d8ca62b042ec91569dbbc9bc10950f SHA512 2249dfc7f9c4ede563d5ed05ed76557e0b81c35054832b4de2a7820c8619886afa3f260cd26b5f4291f74c9d9c16b9a2ac3772e23b5b70bc87c2c7a0d0c10726
DIST openimageio-2.3.17.0.tar.gz 32640557 BLAKE2B 6e3df687e51615687b2e1f445b9a241fa703fec14f0f93e80c50ce6c2e035489be751656e62dd685bac59f983942615fe8a33eeae7e83fd93b037e58d86a248b SHA512 25cb1a671e7cd5154e363eef178ab091fd7d55868746a4394340567a794f6c6f0295e58721a5b4ee8bf66b4cc0e6a01c3e82f9cc9de9953ae349d45738a04700
DIST openimageio-2.3.19.0.tar.gz 32641108 BLAKE2B f4fd3ca79beecd839b2510a03856d47a59312b33885e8561e60650c896de05738bf757805bea7f2fb659581bb19ffbd6894513dc925e0af80235da4a5c31c9ce SHA512 f59068d9935ea43e07532e24c45752dc206054034ac79a8ae3ce698343695a4faac7b71ea39bc856946eb084b4287413d75fc5700c59c8d6b409722f47f53072
+DIST openimageio-2.3.20.0.tar.gz 32641238 BLAKE2B a2e266b9c982026370b9472fa7e1875d4c653a20182024bfa886ff0dda982081897241234a6bdff9a764ac0dda0c42a4c4565ca5bbefe44318b1a882870a6291 SHA512 2dbbfa43b2072c8016102b131207f25738a96834373739b004e9dfb76f4630de8badd3b0104f9f6a3e6778899d13c0da4036faad3fdf6c5b12d51340eb2080b8
+DIST openimageio-2.4.4.1.tar.gz 31884126 BLAKE2B e09cc98b9da00ec0a00feaa5c7a41e9dcd9d4799a3b4eb0a123f4864f1d19eb55b0923ca5532f41e93b16891c5a4e27ea0f16ac0bfa97fdee53202d18241c5a8 SHA512 a1fa4d8ef44675bc95e67f9fb5549af96768f295251375fedea5d354df9b70b2a879bba332fa408a6466b25f84e29b67e7e7550e5c13593cf86e421e444d2eab
DIST openimageio-oexr-test-image-f17e353fbfcde3406fe02675f4d92aeae422a560.tar.gz 252226183 BLAKE2B b94fb08515e18821e5b88c10031ca53675c56f96397e00b4e186d8dfb9f8557bc935ff102d61835590dca6deeef90dba03b81fd76a7958ab4d0592c042c2130a SHA512 26b9b2cda9d48554b8a53f06bc20301f8ff77dc5e1d7caf9ec45aaaefd8578d3d4d4b2e0a1d1b0f697805fdc0c5d4bae4948cea21821df3006ac0f8b9020f85f
+DIST openimageio-oiio-test-image-245e50edede2792205080eadc1dedce33ff5c1e4.tar.gz 137901071 BLAKE2B 1e260eeba062026c719499425a3f7e3c2ccc7bd662725b6cceab4332d2d026bacc7df4c904cb776637ea60f9e2ba854d6e5010ffdc2a1621ad943b166d8402d3 SHA512 e7f7741d1cfadb3ea9ec5bab0b2556c58424c2dd89f938d5e93aeb99bff55479b11faa19cda4a481339be60de73317faa95e190d34d493c7825f706f4e57e73c
DIST openimageio-oiio-test-image-b85d7a3a10a3256b50325ad310c33e7f7cf2c6cb.tar.gz 137513393 BLAKE2B ebde02d57daaa58c08c7aab2251c39eefd5b736e1cc4a6d28603d8ee52b7828fa7529c9616207b8b0bcb04d88cd4c60c6325e6f09b4f3410dd6e61c5532b04ad SHA512 840a6785779d85f5da052cb635a92c27451e464414fefd2faaf5fc7a6b78936ff05a6a960c07bb968d7c18e753053ff0f425505de54577d30620fbff9be043fb
-EBUILD openimageio-2.3.12.0-r3.ebuild 4633 BLAKE2B 56cb142c5d962d7d84f7a76180d72805d3b9692b7f3a52a4e13624c80585b7c5cdea618ef8e261cbc8c216d553476b492fd7769f1cba0d13d773ff96706ac608 SHA512 fcf49431e396094527e2668a7710a7d7f559d73545202e84ab54c821da572431d907972d721e2cc4c01a592af57769dd062f93428f231bfae715fa46cbb14ea4
-EBUILD openimageio-2.3.13.0.ebuild 4647 BLAKE2B 60643b8195accd80ab6edea8dac315025cd0c380efe0945ee8784fc576ff96c929a8a9be381aa4519b6e5dd106a7426c066975f156e8533770410d9f32c549d6 SHA512 e98309dfc5d5f14f86aa58a28c231ee4ee52c9d7e6d62f7e4c9ffb41dabf910422017050368fe3251fab09902a115e1c000c6cf6055a469c38c3658aa18d0646
-EBUILD openimageio-2.3.15.0.ebuild 4645 BLAKE2B d243bbb4e839d3d05f9fad6a7e7aabddbd11800e82f8e1552e03bd3188b18f5ba2d5374bff4b8411096d93f2afafda20f374c7df38ddc15de750c92626f782c3 SHA512 e77b06dda8a9f99f853cff9161dd7b49db20c565ec2f35f9f30255766f8056e02a120f3cc6159ee75f39ffd6e5263c3813fda93dab2d68cd6985b048c07f1b06
-EBUILD openimageio-2.3.16.0.ebuild 4647 BLAKE2B a4347189879e50539fdf20840a7485e45b3d46a50588ed8d4b99d23e677971fb629613f70a72d262c742e15f66642eb1e56f0cf5d3a9399e04570866e904aac3 SHA512 a65e58c8371ed08d9e4db86aacf130000ee894f19e8786249944b23cf5d96691e576d75398ce187292d094953135c03278e27c57426c22e7ba78aecfcc6cd289
EBUILD openimageio-2.3.17.0.ebuild 4645 BLAKE2B 2502e0f959e2c11461e8dee961a1c4f1168e8803ca017b5350cb0a7313d3e7320a03cfb8004b27ca6448bd9a2f0e79b146e67ed6119c3afad002a9fcad588f6e SHA512 a29233608bb70379242ba0ada644e98030b527d178acddf6abbf7cf276a39a3deec488003b5fe4837e6a66f2f2fd4021336289570095553316c1707752d02f31
EBUILD openimageio-2.3.19.0.ebuild 4647 BLAKE2B a4347189879e50539fdf20840a7485e45b3d46a50588ed8d4b99d23e677971fb629613f70a72d262c742e15f66642eb1e56f0cf5d3a9399e04570866e904aac3 SHA512 a65e58c8371ed08d9e4db86aacf130000ee894f19e8786249944b23cf5d96691e576d75398ce187292d094953135c03278e27c57426c22e7ba78aecfcc6cd289
+EBUILD openimageio-2.3.20.0.ebuild 4896 BLAKE2B 6b5f2ac2ad0b0d2771889def16899a1cc5d4bce8cd013a76b1c22efd9a5d689e4fe1af77fe63950db16cf2411baad965833c265b21dba1234dd80b4b35d4cefa SHA512 836201f3a028440f5ab4747bb495d5e277a98f6468d3dd567abad774c4b7db45ee0b2bfbecab32cc0509c93eacf73f674165a62d6c5fe37cb56b1dfb46464541
+EBUILD openimageio-2.4.4.1.ebuild 5464 BLAKE2B cb303e8afc4ae1cc79b38e88db41df78f9e5a28691432bb02ddc72a60d36292fd48dd5e57b60c4be08e2a2f50e7a6b170c4dcf68f6830ee82f230af18bb170fa SHA512 369dd8489080853d478e3cbcb1b9bbbf769c89de3c5fa7710c29c3b82bc62f17ee1e04bbc5034a555cae3357ffeb9fd4c2b01f7fe8d7fe830c0e7b697efb595f
MISC metadata.xml 724 BLAKE2B 057b0c63428b1860a3b11442b9687b136a749935e3d0bb2e27eca00245d1d9e6f3e40aa796b723664b9b320d8c958a345812199ed04f8d1a476364a80c76e355 SHA512 5243cd4cac10b569e1488226b61c98012af13f50e32c023176e6a2ba29f7804e164b4774957b35f212bad62f496bb466b242d6bc1be44ca3ea0909371b9d5415
diff --git a/media-libs/openimageio/openimageio-2.3.12.0-r3.ebuild b/media-libs/openimageio/openimageio-2.3.12.0-r3.ebuild
deleted file mode 100644
index caf798e06340..000000000000
--- a/media-libs/openimageio/openimageio-2.3.12.0-r3.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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"
-# TODO: drop .1 on next SONAME change (2.3 -> 2.4?) as we needed to nudge it
-# for changing to openexr 3 which broke ABI.
-SLOT="0/$(ver_cut 1-2).1"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-
-X86_CPU_FEATURES=(
- aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
- avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
-)
-CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
-
-IUSE="dicom doc ffmpeg gif jpeg2k opencv opengl openvdb ptex python qt5 raw test +truetype ${CPU_FEATURES[@]%:*}"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Not quite working yet
-RESTRICT="!test? ( test ) test"
-
-BDEPEND="
- doc? (
- app-doc/doxygen
- dev-texlive/texlive-bibtexextra
- dev-texlive/texlive-fontsextra
- dev-texlive/texlive-fontutils
- dev-texlive/texlive-latex
- dev-texlive/texlive-latexextra
- )
-"
-RDEPEND="
- dev-libs/boost:=
- dev-cpp/robin-map
- dev-libs/libfmt:=
- dev-libs/pugixml:=
- >=media-libs/libheif-1.7.0:=
- media-libs/libpng:0=
- >=media-libs/libwebp-0.2.1:=
- >=dev-libs/imath-3.1.2-r4:=
- >=media-libs/opencolorio-2.1.1-r4:=
- >=media-libs/openexr-3:0=
- media-libs/tiff:0=
- sys-libs/zlib:=
- virtual/jpeg:0
- dicom? ( sci-libs/dcmtk )
- ffmpeg? ( media-video/ffmpeg:= )
- gif? ( media-libs/giflib:0= )
- jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
- opencv? ( media-libs/opencv:= )
- opengl? (
- media-libs/glew:=
- virtual/glu
- virtual/opengl
- )
- openvdb? (
- dev-cpp/tbb:=
- media-gfx/openvdb:=
- )
- ptex? ( media-libs/ptex:= )
- python? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-libs/boost:=[python,${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/pybind11[${PYTHON_USEDEP}]
- ')
- )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- opengl? ( dev-qt/qtopengl:5 )
- )
- raw? ( media-libs/libraw:= )
- truetype? ( media-libs/freetype:2= )
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( CHANGES.md CREDITS.md README.md )
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- 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() {
- # Build with SIMD support
- local cpufeature
- local mysimd=()
- for cpufeature in "${CPU_FEATURES[@]}"; do
- use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
- done
-
- # If no CPU SIMDs were used, completely disable them
- [[ -z ${mysimd} ]] && mysimd=("0")
-
- local mycmakeargs=(
- -DVERBOSE=ON
- -DBUILD_TESTING=$(usex test)
- -DOIIO_BUILD_TESTS=$(usex test)
- -DINSTALL_FONTS=OFF
- -DBUILD_DOCS=$(usex doc)
- -DINSTALL_DOCS=$(usex doc)
- -DSTOP_ON_WARNING=OFF
- -DUSE_CCACHE=OFF
- -DUSE_DCMTK=$(usex dicom)
- -DUSE_EXTERNAL_PUGIXML=ON
- -DUSE_JPEGTURBO=ON
- -DUSE_NUKE=OFF # not in Gentoo
- -DUSE_FFMPEG=$(usex ffmpeg)
- -DUSE_GIF=$(usex gif)
- -DUSE_OPENJPEG=$(usex jpeg2k)
- -DUSE_OPENCV=$(usex opencv)
- -DUSE_OPENGL=$(usex opengl)
- -DUSE_OPENVDB=$(usex openvdb)
- -DUSE_PTEX=$(usex ptex)
- -DUSE_PYTHON=$(usex python)
- -DUSE_QT=$(usex qt5)
- -DUSE_LIBRAW=$(usex raw)
- -DUSE_FREETYPE=$(usex truetype)
- -DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
- )
- if use python; then
- mycmakeargs+=(
- -DPYTHON_VERSION=${EPYTHON#python}
- -DPYTHON_SITE_DIR=$(python_get_sitedir)
- )
- fi
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
- # can't use font_src_install
- # it does directory hierarchy recreation
- FONT_S=(
- "${S}/src/fonts/Droid_Sans"
- "${S}/src/fonts/Droid_Sans_Mono"
- "${S}/src/fonts/Droid_Serif"
- )
- insinto ${FONTDIR}
- for dir in "${FONT_S[@]}"; do
- doins "${dir}"/*.ttf
- done
-}
diff --git a/media-libs/openimageio/openimageio-2.3.15.0.ebuild b/media-libs/openimageio/openimageio-2.3.15.0.ebuild
deleted file mode 100644
index 28c46cd540b3..000000000000
--- a/media-libs/openimageio/openimageio-2.3.15.0.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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"
-# TODO: drop .1 on next SONAME change (2.3 -> 2.4?) as we needed to nudge it
-# for changing to openexr 3 which broke ABI.
-SLOT="0/$(ver_cut 1-2).1"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-
-X86_CPU_FEATURES=(
- aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
- avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
-)
-CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
-
-IUSE="dicom doc ffmpeg gif jpeg2k opencv opengl openvdb ptex python qt5 raw test +truetype ${CPU_FEATURES[@]%:*}"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Not quite working yet
-RESTRICT="!test? ( test ) test"
-
-BDEPEND="
- doc? (
- app-doc/doxygen
- dev-texlive/texlive-bibtexextra
- dev-texlive/texlive-fontsextra
- dev-texlive/texlive-fontutils
- dev-texlive/texlive-latex
- dev-texlive/texlive-latexextra
- )
-"
-RDEPEND="
- dev-libs/boost:=
- dev-cpp/robin-map
- dev-libs/libfmt:=
- dev-libs/pugixml:=
- >=media-libs/libheif-1.7.0:=
- media-libs/libjpeg-turbo:=
- media-libs/libpng:0=
- >=media-libs/libwebp-0.2.1:=
- >=dev-libs/imath-3.1.2-r4:=
- >=media-libs/opencolorio-2.1.1-r4:=
- >=media-libs/openexr-3:0=
- media-libs/tiff:0=
- sys-libs/zlib:=
- dicom? ( sci-libs/dcmtk )
- ffmpeg? ( media-video/ffmpeg:= )
- gif? ( media-libs/giflib:0= )
- jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
- opencv? ( media-libs/opencv:= )
- opengl? (
- media-libs/glew:=
- virtual/glu
- virtual/opengl
- )
- openvdb? (
- dev-cpp/tbb:=
- media-gfx/openvdb:=
- )
- ptex? ( media-libs/ptex:= )
- python? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-libs/boost:=[python,${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/pybind11[${PYTHON_USEDEP}]
- ')
- )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- opengl? ( dev-qt/qtopengl:5 )
- )
- raw? ( media-libs/libraw:= )
- truetype? ( media-libs/freetype:2= )
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( CHANGES.md CREDITS.md README.md )
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- 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() {
- # Build with SIMD support
- local cpufeature
- local mysimd=()
- for cpufeature in "${CPU_FEATURES[@]}"; do
- use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
- done
-
- # If no CPU SIMDs were used, completely disable them
- [[ -z ${mysimd} ]] && mysimd=("0")
-
- local mycmakeargs=(
- -DVERBOSE=ON
- -DBUILD_TESTING=$(usex test)
- -DOIIO_BUILD_TESTS=$(usex test)
- -DINSTALL_FONTS=OFF
- -DBUILD_DOCS=$(usex doc)
- -DINSTALL_DOCS=$(usex doc)
- -DSTOP_ON_WARNING=OFF
- -DUSE_CCACHE=OFF
- -DUSE_DCMTK=$(usex dicom)
- -DUSE_EXTERNAL_PUGIXML=ON
- -DUSE_JPEGTURBO=ON
- -DUSE_NUKE=OFF # not in Gentoo
- -DUSE_FFMPEG=$(usex ffmpeg)
- -DUSE_GIF=$(usex gif)
- -DUSE_OPENJPEG=$(usex jpeg2k)
- -DUSE_OPENCV=$(usex opencv)
- -DUSE_OPENGL=$(usex opengl)
- -DUSE_OPENVDB=$(usex openvdb)
- -DUSE_PTEX=$(usex ptex)
- -DUSE_PYTHON=$(usex python)
- -DUSE_QT=$(usex qt5)
- -DUSE_LIBRAW=$(usex raw)
- -DUSE_FREETYPE=$(usex truetype)
- -DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
- )
- if use python; then
- mycmakeargs+=(
- -DPYTHON_VERSION=${EPYTHON#python}
- -DPYTHON_SITE_DIR=$(python_get_sitedir)
- )
- fi
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
- # can't use font_src_install
- # it does directory hierarchy recreation
- FONT_S=(
- "${S}/src/fonts/Droid_Sans"
- "${S}/src/fonts/Droid_Sans_Mono"
- "${S}/src/fonts/Droid_Serif"
- )
- insinto ${FONTDIR}
- for dir in "${FONT_S[@]}"; do
- doins "${dir}"/*.ttf
- done
-}
diff --git a/media-libs/openimageio/openimageio-2.3.16.0.ebuild b/media-libs/openimageio/openimageio-2.3.20.0.ebuild
index f4ed9a26cc11..b63857d89012 100644
--- a/media-libs/openimageio/openimageio-2.3.16.0.ebuild
+++ b/media-libs/openimageio/openimageio-2.3.20.0.ebuild
@@ -6,7 +6,7 @@ EAPI=8
FONT_PN=OpenImageIO
PYTHON_COMPAT=( python3_{8..10} )
-TEST_OIIO_IMAGE_COMMIT="b85d7a3a10a3256b50325ad310c33e7f7cf2c6cb"
+TEST_OIIO_IMAGE_COMMIT="245e50edede2792205080eadc1dedce33ff5c1e4"
TEST_OEXR_IMAGE_COMMIT="f17e353fbfcde3406fe02675f4d92aeae422a560"
inherit cmake font python-single-r1
@@ -149,6 +149,7 @@ src_configure() {
-DUSE_FREETYPE=$(usex truetype)
-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
)
+
if use python; then
mycmakeargs+=(
-DPYTHON_VERSION=${EPYTHON#python}
@@ -159,6 +160,15 @@ src_configure() {
cmake_src_configure
}
+src_test() {
+ # TODO: investigate failures
+ local myctestargs=(
+ -E "(openexr-damaged|openvdb-broken|texture-texture3d-broken|texture-texture3d-broken.batch|psd|ptex-broken|raw-broken|rla|targa|tiff-depths|zfile|unit_simd)"
+ )
+
+ cmake_src_test
+}
+
src_install() {
cmake_src_install
# can't use font_src_install
diff --git a/media-libs/openimageio/openimageio-2.3.13.0.ebuild b/media-libs/openimageio/openimageio-2.4.4.1.ebuild
index 4c6138dfb63b..c51efdc3ec4f 100644
--- a/media-libs/openimageio/openimageio-2.3.13.0.ebuild
+++ b/media-libs/openimageio/openimageio-2.4.4.1.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
FONT_PN=OpenImageIO
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
-TEST_OIIO_IMAGE_COMMIT="b85d7a3a10a3256b50325ad310c33e7f7cf2c6cb"
+TEST_OIIO_IMAGE_COMMIT="245e50edede2792205080eadc1dedce33ff5c1e4"
TEST_OEXR_IMAGE_COMMIT="f17e353fbfcde3406fe02675f4d92aeae422a560"
inherit cmake font python-single-r1
@@ -20,9 +20,7 @@ SRC_URI+=" test? (
S="${WORKDIR}/oiio-${PV}"
LICENSE="BSD"
-# TODO: drop .1 on next SONAME change (2.3 -> 2.4?) as we needed to nudge it
-# for changing to openexr 3 which broke ABI.
-SLOT="0/$(ver_cut 1-2).1"
+SLOT="0/$(ver_cut 1-2)"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
X86_CPU_FEATURES=(
@@ -35,7 +33,7 @@ IUSE="dicom doc ffmpeg gif jpeg2k opencv opengl openvdb ptex python qt5 raw test
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
# Not quite working yet
-RESTRICT="!test? ( test ) test"
+RESTRICT="!test? ( test )" # test"
BDEPEND="
doc? (
@@ -53,13 +51,13 @@ RDEPEND="
dev-libs/libfmt:=
dev-libs/pugixml:=
>=media-libs/libheif-1.7.0:=
+ media-libs/libjpeg-turbo:=
media-libs/libpng:0=
>=media-libs/libwebp-0.2.1:=
>=dev-libs/imath-3.1.2-r4:=
>=media-libs/opencolorio-2.1.1-r4:=
>=media-libs/openexr-3:0=
media-libs/tiff:0=
- media-libs/libjpeg-turbo:=
sys-libs/zlib:=
dicom? ( sci-libs/dcmtk )
ffmpeg? ( media-video/ffmpeg:= )
@@ -127,6 +125,7 @@ src_configure() {
-DVERBOSE=ON
-DBUILD_TESTING=$(usex test)
-DOIIO_BUILD_TESTS=$(usex test)
+ -DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF
-DINSTALL_FONTS=OFF
-DBUILD_DOCS=$(usex doc)
-DINSTALL_DOCS=$(usex doc)
@@ -149,6 +148,7 @@ src_configure() {
-DUSE_FREETYPE=$(usex truetype)
-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
)
+
if use python; then
mycmakeargs+=(
-DPYTHON_VERSION=${EPYTHON#python}
@@ -159,6 +159,15 @@ src_configure() {
cmake_src_configure
}
+src_test() {
+ # TODO: investigate failures
+ local myctestargs=(
+ -E "(oiiotool|maketx|oiiotool-maketx|texture-crop|texture-crop.batch|texture-half|texture-half.batch|texture-uint16|texture-uint16.batch|texture-interp-bilinear|texture-interp-bilinear.batch|texture-interp-closest|texture-interp-closest.batch|texture-levels-stochaniso|texture-levels-stochaniso.batch|texture-levels-stochmip|texture-levels-stochmip.batch|texture-mip-onelevel|texture-mip-onelevel.batch|texture-mip-stochastictrilinear|texture-mip-stochastictrilinear.batch|texture-mip-stochasticaniso|texture-mip-stochasticaniso.batch|texture-uint8|texture-uint8.batch|texture-skinny|texture-skinny.batch|texture-icwrite|texture-icwrite.batch|jpeg2000-broken|openexr-damaged|openvdb-broken|texture-texture3d-broken|texture-texture3d-broken.batch|psd|ptex-broken|raw-broken|targa|tiff-depths|zfile|unit_simd)"
+ )
+
+ cmake_src_test
+}
+
src_install() {
cmake_src_install
# can't use font_src_install
diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index a81987c5c540..d5375400dc2c 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -1,7 +1,7 @@
AUX osl-1.11.16.0-no-imath.patch 2248 BLAKE2B b139b26a93c97d4584e80346c281e3f89bf2d86ac03ac1d316505b0d0bf1c539633265b92d5bece5873ff7547b85fe7fcb1f58388b669dd01eecf01a01582421 SHA512 ed8d5897968c00113d8a90ff10539c23c6cdf4debdef52acecf5559a599fcde85bdce87862c9327fa0c5548d1100b95864e681a53737a3d6e77f33d0527e9953
AUX osl-1.11.17.0-llvm14.patch 1187 BLAKE2B 2925b8c83753bfaf3a45cbe3737bdb6490f9ced0131abf8c903075fa5b8949222e10aebf7ef905956efcfd3787c21e6bf5ac43491405b0f56b90dac0ae86a232 SHA512 2862f2b52b68cb5ff057f968cb48b30d54b84f00af251b08eb210a91aa8df940b03657cf61010ea52d99563fa8de8595fd0bde633c7b6d0912fc10276cd2fd16
DIST osl-1.11.17.0.tar.gz 13888749 BLAKE2B 284489a2dc580bade93894c43c22d99d88e249329e10922c9c6dde7fc0eed3f741e279cc5fc043ce513ea59ddcea4a3576e34c6fd2294aadc727bdc8d422ed26 SHA512 14cb25b10f4644551b906344a289e2a4c421f4c85beaa120bb1a1e532c9be3ec235622516c4700fb23d258c5dcd1ece18b84491b0973b3162098843a9059b1d2
-DIST osl-1.12.4.1.tar.gz 17716100 BLAKE2B eddd614ad4631446ff9de5e6c11cb8c19f9226b3306dca39a37827b4a03f7dc034b321ea3cce75e33dbe93dbb2d7dd09a0bf5ba222a693ad7acb6d96c529d2d9 SHA512 eaee1b539fa10ec6703db19acf0cd91cffcd44f4ce9aff3d4e00abd3ba7d8cd3557b37c57c902d435181bc983623828a06a778377b09f40ccac2e430addce4d4
+DIST osl-1.12.6.2.tar.gz 20247666 BLAKE2B 68905b7dc1a055a7ded26f0a6661ba9db8ddc473fef9ec1de4dab37d0473ce22d123feb33416a44d7b57a80281a64c978540e83f200ac2199a9e49142e00749a SHA512 16e35842735b2dfba7d44a310a918ea8a54798f5ff873ec04bb33b9801612aaf0993ca44b9591fb0b797accb0451137edf6424e1b2a511a011b65f385663d828
EBUILD osl-1.11.17.0-r4.ebuild 2916 BLAKE2B aa9d9c6a5990f1b1f98dd3f29c929aa3133298e7ce621eb00742049d5737a1bedf22a83332fddfefcdfa2782c412bcb9b6b4abd375bf3fbbd16fb91aa8238011 SHA512 65e0dd27eff41bf877dd9df9c69b300bbef55abbf1145c5e01a30819bb4ed4af717bb704c13f588773621ae3442d258db45014b2fb0ee4108dd52390af28a9de
-EBUILD osl-1.12.4.1-r2.ebuild 2288 BLAKE2B 4eb4472614a960a29ed871f0e6850590594886134a1b56243daa3752e1c0cebb972a20dff41367af764d22bf820747c9b383acc4c2c6979a19b64426f9b2217f SHA512 473a2b7176bb301738667ab997e1f1410904708dfc116f5ef189315fdca10d40e85ab3715d398fb5c2d0f32637bb560e1b8f60a22990d2cc7520f17aa10fc51c
+EBUILD osl-1.12.6.2.ebuild 2722 BLAKE2B 0f78dae18a41abd3aaeede3a09c9a8e08d31b5c6fd5027a5f34f8705e5413674a7a5da04980652c8659483f0445e841104bf62e33e507424b47b69086a00cac0 SHA512 8856b1154cc650fc023eb9e14867bdf0b3467531225a22b17fb045eaf0379d9861080213098775dca0f53bd9638aa5e36d9cc1d000c00b3696637706656d8aa9
MISC metadata.xml 841 BLAKE2B a2574fca1885067bed78159a9feee75f1118b1d335568a2cbdba347bf62a0b3f75a510bca271c4ee94ca5ce0bb15dcf9bb699cfe7a385f404047da9fef2dcdc3 SHA512 19afc8e4b777384b3421a1a82ff8ae34a05074e5c55010a500b17cfab4b4ae930cfb633c3bdb8013a8dcb9b82bad8fc7d684ef3e4a85352ce0c49bfb26079dce
diff --git a/media-libs/osl/osl-1.12.4.1-r2.ebuild b/media-libs/osl/osl-1.12.6.2.ebuild
index b04804eadb45..965e1f0404e3 100644
--- a/media-libs/osl/osl-1.12.4.1-r2.ebuild
+++ b/media-libs/osl/osl-1.12.6.2.ebuild
@@ -1,19 +1,20 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_COMPAT=( python3_{8..11} )
# Check this on updates
-LLVM_MAX_SLOT=13
+LLVM_MAX_SLOT=15
inherit cmake llvm toolchain-funcs python-single-r1
DESCRIPTION="Advanced shading language for production GI renderers"
HOMEPAGE="http://opensource.imageworks.com/?p=osl"
-SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/v${PV}-dev.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/OpenShadingLanguage-${PV}-dev"
+# If a development release, please don't keyword!
+SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/OpenShadingLanguage-${PV}"
LICENSE="BSD"
SLOT="0"
@@ -26,6 +27,7 @@ X86_CPU_FEATURES=(
CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
IUSE="doc partio qt5 test ${CPU_FEATURES[@]%:*} python"
+RESTRICT="!test? ( test )"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="
@@ -56,20 +58,14 @@ BDEPEND="
virtual/pkgconfig
"
-# Restricting tests as Makefile handles them differently
-RESTRICT="test"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.12.4.1-openexr-3-imath.patch
-)
-
llvm_check_deps() {
has_version -r "sys-devel/clang:${LLVM_SLOT}"
}
pkg_setup() {
- use python && python-single-r1_pkg_setup
llvm_pkg_setup
+
+ use python && python-single-r1_pkg_setup
}
src_configure() {
@@ -83,9 +79,10 @@ src_configure() {
[[ -z ${mysimd} ]] && mysimd=("0")
local gcc="$(tc-getCC)"
- # LLVM needs CPP11. Do not disable.
local mycmakeargs=(
- -DCMAKE_CXX_STANDARD=14
+ # Still needed?
+ # See https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/pull/1454
+ #-DCMAKE_CXX_STANDARD=14
-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
-DINSTALL_DOCS=$(usex doc)
-DUSE_CCACHE=OFF
@@ -95,8 +92,18 @@ src_configure() {
-DUSE_PARTIO=$(usex partio)
-DUSE_QT=$(usex qt5)
-DUSE_PYTHON=$(usex python)
+ -DPYTHON_VERSION="${EPYTHON/python}"
-DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
)
cmake_src_configure
}
+
+src_test() {
+ # TODO: investigate failures
+ local myctestargs=(
+ -E "(osl-imageio|osl-imageio.opt|render-background|render-bumptest|render-mx-furnace-burley-diffuse|render-mx-furnace-sheen|render-mx-burley-diffuse|render-mx-conductor|render-mx-generalized-schlick|render-mx-generalized-schlick-glass|render-microfacet|render-oren-nayar|render-uv|render-veachmis|render-ward)"
+ )
+
+ cmake_src_test
+}