summaryrefslogtreecommitdiff
path: root/media-libs
diff options
context:
space:
mode:
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/Manifest.gzbin64576 -> 64623 bytes
-rw-r--r--media-libs/alsa-lib/Manifest2
-rw-r--r--media-libs/alsa-lib/alsa-lib-1.2.5_p20210604.ebuild103
-rw-r--r--media-libs/alsa-topology-conf/Manifest2
-rw-r--r--media-libs/alsa-topology-conf/alsa-topology-conf-1.2.5.ebuild23
-rw-r--r--media-libs/alsa-ucm-conf/Manifest2
-rw-r--r--media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.5-r1.ebuild25
-rw-r--r--media-libs/cogl/Manifest2
-rw-r--r--media-libs/cogl/cogl-1.22.8-r1.ebuild (renamed from media-libs/cogl/cogl-1.22.8.ebuild)4
-rw-r--r--media-libs/dav1d/Manifest13
-rw-r--r--media-libs/dav1d/dav1d-0.8.2.ebuild12
-rw-r--r--media-libs/dav1d/dav1d-0.9.0.ebuild12
-rw-r--r--media-libs/dav1d/dav1d-0.9.1.ebuild12
-rw-r--r--media-libs/dav1d/dav1d-0.9.2.ebuild12
-rw-r--r--media-libs/dav1d/dav1d-9999.ebuild11
-rw-r--r--media-libs/dav1d/files/build-avoid-meson-s-symbols_have_underscore_prefix.patch35
-rw-r--r--media-libs/dav1d/metadata.xml1
-rw-r--r--media-libs/embree/Manifest2
-rw-r--r--media-libs/embree/embree-3.13.0-r2.ebuild2
-rw-r--r--media-libs/freeglut/Manifest2
-rw-r--r--media-libs/freeglut/freeglut-3.2.1-r2.ebuild (renamed from media-libs/freeglut/freeglut-3.2.1-r1.ebuild)2
-rw-r--r--media-libs/freeimage/Manifest1
-rw-r--r--media-libs/freeimage/freeimage-3.18.0-r3.ebuild121
-rw-r--r--media-libs/gmmlib/Manifest9
-rw-r--r--media-libs/gmmlib/files/gmmlib-20.3.2_cmake_project.patch8
-rw-r--r--media-libs/gmmlib/gmmlib-21.3.1.ebuild2
-rw-r--r--media-libs/gmmlib/gmmlib-21.3.2.ebuild33
-rw-r--r--media-libs/gmmlib/gmmlib-9999.ebuild27
-rw-r--r--media-libs/gmmlib/metadata.xml24
-rw-r--r--media-libs/gst-plugins-base/Manifest4
-rw-r--r--media-libs/gst-plugins-base/gst-plugins-base-1.16.3-r1.ebuild (renamed from media-libs/gst-plugins-base/gst-plugins-base-1.16.3.ebuild)2
-rw-r--r--media-libs/gst-plugins-base/gst-plugins-base-1.18.4-r1.ebuild (renamed from media-libs/gst-plugins-base/gst-plugins-base-1.18.4.ebuild)2
-rw-r--r--media-libs/libepoxy/Manifest6
-rw-r--r--media-libs/libepoxy/libepoxy-1.5.5-r1.ebuild (renamed from media-libs/libepoxy/libepoxy-1.5.5.ebuild)2
-rw-r--r--media-libs/libepoxy/libepoxy-1.5.9-r1.ebuild (renamed from media-libs/libepoxy/libepoxy-1.5.9.ebuild)2
-rw-r--r--media-libs/libepoxy/libepoxy-9999.ebuild2
-rw-r--r--media-libs/libsdl2/Manifest2
-rw-r--r--media-libs/libsdl2/libsdl2-2.0.16-r1.ebuild (renamed from media-libs/libsdl2/libsdl2-2.0.16.ebuild)4
-rw-r--r--media-libs/mesa/Manifest8
-rw-r--r--media-libs/mesa/mesa-21.1.8-r1.ebuild3
-rw-r--r--media-libs/mesa/mesa-21.2.5.ebuild560
-rw-r--r--media-libs/mesa/mesa-21.3.0_rc3.ebuild560
-rw-r--r--media-libs/mesa/mesa-9999.ebuild18
-rw-r--r--media-libs/munt-mt32emu/Manifest2
-rw-r--r--media-libs/munt-mt32emu/munt-mt32emu-2.5.3-r1.ebuild2
-rw-r--r--media-libs/oidn/Manifest2
-rw-r--r--media-libs/oidn/oidn-1.4.1-r1.ebuild2
-rw-r--r--media-libs/opencolorio/Manifest10
-rw-r--r--media-libs/opencolorio/opencolorio-1.1.1-r3.ebuild (renamed from media-libs/opencolorio/opencolorio-1.1.1-r1.ebuild)5
-rw-r--r--media-libs/opencolorio/opencolorio-2.0.0-r2.ebuild (renamed from media-libs/opencolorio/opencolorio-2.0.0.ebuild)5
-rw-r--r--media-libs/opencolorio/opencolorio-2.0.1-r2.ebuild (renamed from media-libs/opencolorio/opencolorio-2.0.1.ebuild)7
-rw-r--r--media-libs/opencolorio/opencolorio-2.0.2-r2.ebuild (renamed from media-libs/opencolorio/opencolorio-2.0.2.ebuild)5
-rw-r--r--media-libs/opencolorio/opencolorio-2.1.0-r1.ebuild102
-rw-r--r--media-libs/openimageio/Manifest8
-rw-r--r--media-libs/openimageio/openimageio-2.2.19.0.ebuild159
-rw-r--r--media-libs/openimageio/openimageio-2.3.8.0-r1.ebuild185
-rw-r--r--media-libs/openimageio/openimageio-2.3.9.1.ebuild183
-rw-r--r--media-libs/osl/Manifest6
-rw-r--r--media-libs/osl/osl-1.11.15.0-r1.ebuild (renamed from media-libs/osl/osl-1.11.15.0.ebuild)3
-rw-r--r--media-libs/osl/osl-1.11.16.0.ebuild105
-rw-r--r--media-libs/osl/osl-1.12.0.2-r3.ebuild (renamed from media-libs/osl/osl-1.12.0.2-r1.ebuild)3
-rw-r--r--media-libs/waffle/Manifest4
-rw-r--r--media-libs/waffle/waffle-1.7.0-r1.ebuild (renamed from media-libs/waffle/waffle-1.7.0.ebuild)2
-rw-r--r--media-libs/waffle/waffle-9999.ebuild2
64 files changed, 2222 insertions, 259 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index bf21a061cc93..d76708b88bba 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
Binary files differ
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index eba77abd579f..608915955849 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -2,8 +2,6 @@ AUX alsa-lib-1.1.6-missing_files.patch 5349 BLAKE2B 9ce6d529b78aa90dd5c507173f6a
AUX alsa-lib-1.2.4-musl.patch 1082 BLAKE2B f905b0b020afcc8124a128c29da015ce0629d46a2671a1af65a3e2bf666c383b0b85387a337c268eb8e1217d17b6dd8e5eabd66e2cb3e8dafcbe0959cfe4574a SHA512 b809b547822acb486baa33038771aef4a66930a3bfe495dde815d1f551e15f1543484efffe30bb6faf2f21e309c8b6956b4479ac1edf19933af32ff5517867e3
DIST alsa-lib-1.2.4.tar.bz2 1044405 BLAKE2B e1d5d9afe21dac693645274ae4ec8a607c9fcc9915ba4ebccfdb539d44b9353ba07529e2c8eaca119884b926d4467285313c945c9015a788101fe532064442db SHA512 12086952dc8f16f1cb6946517858e17b1c3276aeda9ff5703a84bb38aa78eb4c4e9cb4485c5b3f21f174fdbd976b3bcbbc481e85cb2460652858490df51ae844
DIST alsa-lib-1.2.5.1.tar.bz2 1069073 BLAKE2B 5464cc7f263bdf7b10aa7e1f542ad6dbc55bf300156fd1bded00375c41a518d4b14f96e28eb1c60a6ce7cc6e27da4b2e8598cd867f15417f260fc23513f93e11 SHA512 01998ffa449e925ff552c13aea47f9540903afdc533086067c78dcaba4d239c347180d3d28bb0000e6d19b7779c7249fcc77a30057930ca22d18ba55e163fa1c
-DIST alsa-lib-1.2.5_p20210604.tar.gz 814186 BLAKE2B d3bc2f42a0266c1af33953026eecb97d9d4f2cc845924b762b7f6777d15e2a3f60347bd3d6184a8b431ebe703c3b06bcbfbef67345064fbcd14b223e5e4d0e4e SHA512 e04ac38ae6f4b97ac75584c36562ad620820be5156206dc6466b8bfac0d50d1c8e588fac7d5e9d8716c9c89b82ebd9ae9cbc8137080a433a5ddde8177c102a99
EBUILD alsa-lib-1.2.4.ebuild 2183 BLAKE2B 0ae13b0987dc0f55b08b2cc7e6bf565acc782469e7502512b4bafc6cd7ebf80ce54dbbd492cd3d11e8bac04f00d3df50777f92504bf482a8bd03086162d58459 SHA512 68e17a8e334f955cc403386f0e430d07ea9c116c21450fbdf4d071e68e260bfe6189ae612fa4b5efd88d4562885ab84824faa210d5736b7879e36e0dcb9de979
EBUILD alsa-lib-1.2.5.1.ebuild 2511 BLAKE2B 431c692b5ae0ffca98f1100e34abfb64bc93a38a0faba2486c676a21482d156834d766252283f7f689ca8ceda3dc7294f7acc7ef52e4eafe983a7bdbc5cad5d6 SHA512 762f28d5fb7e082f0c3117532aa88f4da0f60a939514ca441cbcb6c48026572a7b85a934eccb27058dbd412356a5a66f615328c4b13fe759c3f9ac46107937d8
-EBUILD alsa-lib-1.2.5_p20210604.ebuild 2977 BLAKE2B e0434a80ecf3694f1d5d483f55e6983db087e804027f2896cd98ca1f11f429f4cf29c6caa80ac1f937f6c26e86e23a13acc2dac48b4103935d077adb19c8288c SHA512 349716f1956ad1a37de3283347d83808232fe7bdd2dcdf13a6105c5d5901a4d54ef298684d4efada4b7c90cb7ca707b8e3c7c6466add7fc59716ae17390752a7
MISC metadata.xml 503 BLAKE2B 89b5c41a55784ff388766f60c106e719edd59a3bd47a1f2c240ad185ce750b1dc1a2efec704361b09c5e6e30d965514955f32fffa304200db7ff031a27d7fd85 SHA512 43f3a7e18f13ac58b4cbf31a92bd809c0618be1dd34a6a47d03e00ededd66343c3082bddac98cc286683ba32436b62aa2d61102de832f5fb21925ecfb2b54755
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.5_p20210604.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.5_p20210604.ebuild
deleted file mode 100644
index 88c9ad860cf8..000000000000
--- a/media-libs/alsa-lib/alsa-lib-1.2.5_p20210604.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit autotools multilib-minimal python-single-r1
-
-# When COMMIT is defined, this ebuild turns from a release into a snapshot ebuild:
-COMMIT="abe805ed6c7f38e48002e575535afd1f673b9bcd"
-# Also set SNAPSHOT_PV to match the correct PV, so that the ebuild can detect a naive rename:
-SNAPSHOT_PV="1.2.5_p20210604"
-
-DESCRIPTION="Advanced Linux Sound Architecture Library"
-HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
-if [[ -n ${COMMIT} ]]; then
- SRC_URI="https://git.alsa-project.org/?p=${PN}.git;a=snapshot;h=${COMMIT};sf=tgz -> ${P}.tar.gz"
- S="${WORKDIR}"/${PN}-${COMMIT:0:7}
-else
- # TODO: Upstream does publish .sig files, so someone could implement verify-sig ;)
- SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="alisp debug doc elibc_uclibc python +thread-safety"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-BDEPEND="doc? ( >=app-doc/doxygen-1.2.6 )"
-RDEPEND="python? ( ${PYTHON_DEPS} )
- media-libs/alsa-topology-conf
- media-libs/alsa-ucm-conf
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.1.6-missing_files.patch" # bug #652422
-)
-
-pkg_pretend() {
- if [[ -n ${COMMIT} && -z ${SNAPSHOT_PV} || -z ${COMMIT} && -n ${SNAPSHOT_PV} ]]; then
- eerror "Please either set both COMMIT and SNAPSHOT_PV or neither!"
- elif [[ -n ${SNAPSHOT_PV} && ${PV} != ${SNAPSHOT_PV} ]]; then
- eerror "Rename of snapshot ebuild detected - please check COMMIT & SNAPSHOT_PV!"
- fi
-}
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die
- # https://bugs.gentoo.org/509886
- if use elibc_uclibc ; then
- sed -i -e 's:oldapi queue_timer:queue_timer:' test/Makefile.am || die
- fi
- # https://bugs.gentoo.org/545950
- sed -i -e '5s:^$:\nAM_CPPFLAGS = -I$(top_srcdir)/include:' test/lsb/Makefile.am || die
- default
- eautoreconf
-}
-
-multilib_src_configure() {
- local myeconfargs=(
- --disable-maintainer-mode
- --disable-resmgr
- --enable-aload
- --enable-rawmidi
- --enable-seq
- --enable-shared
- # enable Python only on final ABI
- $(multilib_native_use_enable python)
- $(use_enable alisp)
- $(use_enable thread-safety)
- $(use_with debug)
- $(usex elibc_uclibc --without-versioned '')
- )
-
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
- emake
-
- if multilib_is_native_abi && use doc; then
- emake doc
- grep -FZrl "${S}" doc/doxygen/html | \
- xargs -0 sed -i -e "s:${S}::" || die
- fi
-}
-
-multilib_src_install() {
- multilib_is_native_abi && use doc && local HTML_DOCS=( doc/doxygen/html/. )
- default
-}
-
-multilib_src_install_all() {
- find "${ED}" -type f \( -name '*.a' -o -name '*.la' \) -delete || die
- dodoc ChangeLog doc/asoundrc.txt NOTES TODO
-}
diff --git a/media-libs/alsa-topology-conf/Manifest b/media-libs/alsa-topology-conf/Manifest
index 946155597f79..38b9cd9b2cb8 100644
--- a/media-libs/alsa-topology-conf/Manifest
+++ b/media-libs/alsa-topology-conf/Manifest
@@ -1,7 +1,5 @@
DIST alsa-topology-conf-1.2.4.tar.bz2 11631 BLAKE2B 57df107b255e598e2fb79b56dc34d84130a023050db42e7925082ce5efb7048658ed6a8cd1854d2d9e23e8a833dbe90d7aa11ca7c1874f39caf392b292147ab7 SHA512 e5b367a23f42ed2c2a83f3dd9df264b4e054f5ba7c4be98520418598f0b06a11627498a8a6ef943522b209951645f83bbbbfb32db7c9c8260aa5db08358970cb
DIST alsa-topology-conf-1.2.5.1.tar.bz2 11697 BLAKE2B 1f8bb172510d86bd0530f2ba437dd1132401c0bd436085c07c61e5ef296a6da6a1c24fb8d585572186fc0073172c82d40948c5c39fd293a01762d49c9c393662 SHA512 b34176b213e1afcb61fee19b569d6422a7692b62cf08b0ef651f2fbb1eefe49f25ca6386d0bfcec7152d4b5ed3daa84edb900181d40169e777751ae033125374
-DIST alsa-topology-conf-1.2.5.tar.bz2 11657 BLAKE2B 0870aa5db05d7b82e5312ac5bd3c2d887f0cafc25a317cbc416ce0ac6982ce296620833c4459ccb357b4b014d300329fc3d0028d3ec2024495cc21f9cc122e1f SHA512 2eb4d8baf2dcbf0b631dd11dbf15bffc51694d9cc6931619e51787f3ba58d1a091d266e6721a3b737c040ec74a28270b93f39fb97f30a3227cf340dd646e5d51
EBUILD alsa-topology-conf-1.2.4.ebuild 510 BLAKE2B 0f2292e5e8932f6ef2fca2ab17a8d6548653d859d45ecf639b9d40ab74ba4c23a1fe86e4877448852378e16ce9b0c161de8b135e980014b53ce75259adabd9a9 SHA512 bbf4c4e5d11101f50bdf331f416657222cc290fe8af4d14a845ad60454f531beab9f1b0357705c9d6443f6d6d23f6e6e0367322019dd2f602ad837fd950baac2
EBUILD alsa-topology-conf-1.2.5.1.ebuild 524 BLAKE2B eceaa5eaf04d1de79032c6da45f6f9ce0d3f8dfcc63819d3a3621c8a08bc69e1f6751a322ef13d848fd851a1a46e4c5a89871b71594da291a0da35d84a58888b SHA512 d7e751ba791f143ea9870f7e77b806e3c8f3be83264eb027520df1d8602272033303c9a71cf50451a28bf68a868cc16ec08c33dc6a39dfb8cd9c052b843a3a37
-EBUILD alsa-topology-conf-1.2.5.ebuild 569 BLAKE2B 031df6bdb91155682e5fcf7b7ccc0dc5280850b5db1d6e37a9abb9dd68c570b176a3479e11a782ced1c0d38758d720c11c18d42545b83b30c50b3318f43653f0 SHA512 e187ed4d6ce42d5be288cfd94d19915245063096ffc1ea36814f2403460292f1ece6ee2bec2e937dfc39a4eff8b30b34f0dad542cd5aa4739cfcf05454a52400
MISC metadata.xml 330 BLAKE2B 483666d5c3505dbe28c41bb0484959a794c67e56b1581cd00ceb96cfc17a77e4f4426a528c225ad65d23b73e0bdd3a6609438d4686da64f0be9ea1fc600cab37 SHA512 198a3560c3e2458d2947ea934457ff7d04df9277146f3c6ccdc06ed0043950dad30200986c7dece3a5620c495365ef835bd38bf3608e0b3c69cb6b127ce5602c
diff --git a/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.5.ebuild b/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.5.ebuild
deleted file mode 100644
index 421ef5520192..000000000000
--- a/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.5.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="ALSA topology configuration files"
-HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
-SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-RDEPEND="!<media-libs/alsa-lib-1.2.1"
-DEPEND="${RDEPEND}"
-MY_P="${PN}-1.2.4.2.g15998"
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
- insinto /usr/share/alsa
- doins -r topology
-}
diff --git a/media-libs/alsa-ucm-conf/Manifest b/media-libs/alsa-ucm-conf/Manifest
index c6c48756bba5..890785f95950 100644
--- a/media-libs/alsa-ucm-conf/Manifest
+++ b/media-libs/alsa-ucm-conf/Manifest
@@ -1,8 +1,6 @@
AUX alsa-ucm-conf-1.2.5-hda-Intel-the-lookups-are-supported-from-syntax-4.patch 646 BLAKE2B 271b720dbcfe5d32794b38125c0d947b62623a8f24b9cbe8a215281cd0586c65de805be2c5192f855f46744fda9b21a5fd463df7d540bf42f9c3035aedcda374 SHA512 aea5277bd5aa68680e31ffb09cd8853e13b9417bf8070480d450873f2864eb4037eabc8c23fafaa7fc482b5b2605ad1b9e45ff13b2b15ad8cb504b2d940d8bfa
DIST alsa-ucm-conf-1.2.4.tar.bz2 20141 BLAKE2B 545f3bfb36c6c41e48a5d6c2a98b936b2e71d8aab99227faecfcb1dd1dec9a03eb25f1664ca9aad3f9371f140b548258bba5a3904f5a3ec83513eb72abe7c7c2 SHA512 9043460e92b2ed44757b08b9faca888e8bfae40d84e4ad7e7df44df2bb3b0617e86ef23783973accd62fb6681788262e67212e2bf67178d75781e57a0fa346d2
DIST alsa-ucm-conf-1.2.5.1.tar.bz2 24124 BLAKE2B 317bcb8e866a68fe467047c67bd15fc88dc1e745e9bbe05f7b091ea1febdac6bd0fd512c2ce410970eb2593c0f8500c28c8405098de2bc56e1438e5b33b00d4a SHA512 774d6da1a0ee6fb1fcd764c1d4b3eb5812a35508cf27db71f6c82784f125eca207992da9081d25783fecb31e548d8b34124d4b3b3d506e33215b76ea48f71012
-DIST alsa-ucm-conf-1.2.5.tar.bz2 23992 BLAKE2B 8ecd5adee6c9f429ab2791dfd57b0f9b1d58272b04d2c6cd3ad9aba36b53b380cfe626cae1e5c40f703eb7f891fb53b0bf70a78f9e5d2d8ae6b2dfb30fd6f659 SHA512 f16e8f04018c65de5e24f2a3eb0b3edff26cbce78cc1820c42c46907c903913c571797b59e803ae36b8ec3136487d0a5aacd034e2a8df3e15ed998b7a70152b7
EBUILD alsa-ucm-conf-1.2.4.ebuild 504 BLAKE2B 84cbca14794d2060a35db13528fd65f694508771bce1c9e75bafe50e437472f2f3bd33365286526b9f3dc2c4ae70fa199fb08f8d37ef0f9fb2bb9d031763fff3 SHA512 1a3f3b2189b0a198720b84fe730386f285abd8b628ff52dc682813d55f375ee4e37cde4e164bc82738c4b15585e113ffcff29307f0dd057fc6bef2d6c4e09d5b
-EBUILD alsa-ucm-conf-1.2.5-r1.ebuild 673 BLAKE2B 1e2b6c7a59bb27e2a0c97a4fea11250a2d51c5c3ad927fb6ac9a1b7229ef892fb8aa1d023cd215387a7446db873ba88d1be37794a40f1692066683298784f164 SHA512 ee6e0d1ee59f3f83bcfe4c7b815c408753bef852a0370d42f01b1c0f5bf44c02cac46a4c53d30256df08e79db14d52e94dd92446ee61196384b8eb4bd7c775dc
EBUILD alsa-ucm-conf-1.2.5.1.ebuild 518 BLAKE2B ec4d80331565113f921b711d4a1d501ff189b614d92989eaa120c480dbbf2e1ad181eeaea6fb696a4d184e20b2602fc7122b1e4e1d4a135f97b4b0b3abb93712 SHA512 76d07e86b7d9af05646ff92ceddce0e10c8cf3bf0c1a0cb6a3645db259c5c2c93c9fe330278a0b6d4dbf8faf40aea31abe7a8c2f50d8dc0723c4f52bc5651944
MISC metadata.xml 325 BLAKE2B 02b18895e880cd1da866d0290d992a060c3a6fb797df776ea270be86b0c32e9c712536efb1ef91c0a69e78238cf5898ef1b737826cf7e9f9ac57cdd8dfba5162 SHA512 f444b018e6d93287bcbc7d886e0962ab3e0fb67b387fe4f0f31f2ba7cc6706d760a2e9db0f29318ca2211cb14cadf2ff4b8e0fa0bb72ff5e238c81996cbd29e2
diff --git a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.5-r1.ebuild b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.5-r1.ebuild
deleted file mode 100644
index 444cc259d28b..000000000000
--- a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.5-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="ALSA ucm configuration files"
-HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
-SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-RDEPEND="!<media-libs/alsa-lib-1.2.1"
-DEPEND="${RDEPEND}"
-MY_P="${PN}-1.2.4.81.g4884e"
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}/${PN}-1.2.5-hda-Intel-the-lookups-are-supported-from-syntax-4.patch" ) # bug #793410
-
-src_install() {
- insinto /usr/share/alsa
- doins -r ucm{,2}
-}
diff --git a/media-libs/cogl/Manifest b/media-libs/cogl/Manifest
index 046eb10d60ba..2a6d88bbc794 100644
--- a/media-libs/cogl/Manifest
+++ b/media-libs/cogl/Manifest
@@ -1,4 +1,4 @@
AUX cogl-1.22.8-slibtool.patch 835 BLAKE2B d0bc0215d785be2b8fbae5afc23b50dc79adc77bb4a1c8e8dcef0104febfad397ddab94f9afe811b9765cd9c829bab4d5282ae95e5f32aaea3ec4e6c2649a651 SHA512 a0478481712f2481f08bcdd2c0feb87c2c1a45fe0e0e37aa00bdeed54ca5376d0dbeafe8b21d9ea28bb326025ccfaefa956683b779cf19f2bfc8524f7b962c97
DIST cogl-1.22.8.tar.xz 1742632 BLAKE2B c6230a2223928c5d4e5d87fa6b039c96000fac546e3e57e04e528b571500d350013a4b6e0a2ab6b2133672fec992fff6f9486ab8c83a01cf9790bc94266c75d4 SHA512 702d5b1b22dc34bffaa82c9c57021caf036ee3a13fa7ca24a90cca1ebc0f8b7a86070cc1fe5125757132b02774fa874bb55675c96d1ccbc233fac0e6132da65f
-EBUILD cogl-1.22.8.ebuild 3459 BLAKE2B 0b43fac0c12be8b0d0b3f9714906406db472458d0d6ab92e927d44720a60f94030642d6f59652c0b788eed64701a741520951ac50d72feb7c57438fa8834e384 SHA512 1c70c654e6b31ed64b460059c258e4ced6f3393c9855df959fb3e310819bd23cd16c309a1e3dfd228b7231bebecbf4900ee3f2cdac36af44e28a5f5bf69b77c0
+EBUILD cogl-1.22.8-r1.ebuild 3468 BLAKE2B 5aeca1d5c5d773f434de3c7d68414c7eaf3299ee68471bbeae75e15f6ee70ef8b4c7269ca66b5ad997f539329758a11bc60ecd4bfa62e6b8904fe33fe28766b2 SHA512 494874708f053e831e3543c6b121a4792845bb0319a4cb3f9d4d2f74991add7aa4bdd2e2250c9020ae0a467fbcac8657712d0af9a10d553d5f6393ad5c25dc2b
MISC metadata.xml 458 BLAKE2B f10413fbb937bfca31271bfb5e1077125fcab9dc3887224f40d65099c715a5d5a5f40d733749cc096df530c431655c4ecaf94584e0529f9379d7e44482876b9a SHA512 8b332175235249193619499150eb4c714e7ebdb9de9685ca60d8dfdcf73940f36067e5864d0cc328b89abf9a138cd52ac0a77d21d9f9d06a524267199669e32e
diff --git a/media-libs/cogl/cogl-1.22.8.ebuild b/media-libs/cogl/cogl-1.22.8-r1.ebuild
index 75c0d96cf936..037d055dd7dd 100644
--- a/media-libs/cogl/cogl-1.22.8.ebuild
+++ b/media-libs/cogl/cogl-1.22.8-r1.ebuild
@@ -40,12 +40,12 @@ COMMON_DEPEND="
media-libs/gst-plugins-base:1.0 )
introspection? ( >=dev-libs/gobject-introspection-1.34.2:= )
kms? (
- media-libs/mesa[egl,gbm]
+ media-libs/mesa[egl(+),gbm(+)]
x11-libs/libdrm:= )
pango? ( >=x11-libs/pango-1.20.0[introspection?] )
wayland? (
>=dev-libs/wayland-1.1.90
- media-libs/mesa[egl,wayland] )
+ media-libs/mesa[egl(+),wayland] )
"
# before clutter-1.7, cogl was part of clutter
RDEPEND="${COMMON_DEPEND}
diff --git a/media-libs/dav1d/Manifest b/media-libs/dav1d/Manifest
index 1230c5e9994d..fb58b780fd5b 100644
--- a/media-libs/dav1d/Manifest
+++ b/media-libs/dav1d/Manifest
@@ -1,12 +1,13 @@
+AUX build-avoid-meson-s-symbols_have_underscore_prefix.patch 1300 BLAKE2B edb4998f3722b0a4da1ea4b7ea77c05f4a7d7be5dcdf6b3898c4930cbdb015dc63217a9ec6af03eece5c4209f62b8f7a855231c7ebc97f94df93193c92fec0d7 SHA512 82c12e98016cb1247ded7a1d5bc913b92632a99dba5b35881c2d35badfdf652fed77a9d70904c224bb909d9209b28e75205718f8495e6f41651ef387a684d047
DIST dav1d-0.8.0.tar.bz2 668627 BLAKE2B 6f45c6b0011acb74bb26fa201e667b16dbf8b691a2bc5d2043517381ca58132fa29ee828841609762737ac8637948b2bd4bac9e2c1d2ca23b1d3ad23f5883875 SHA512 906481ce5b9ce99cef2723c4c2466ba762095b9f88caccd42dcabfd4800964d7cd142736de1bf2ef25b631ee01eb26f7f1ac1754fc161b8fb7192e104df10e28
DIST dav1d-0.8.2.tar.bz2 695931 BLAKE2B cfe7667e583e05f8fd84b226a26ea23a901336fd8cf62900b47cd6b3bf92f8fe58d14224d1e063cc3bf7abdb17da437d291dc3f604cb68e99fc0615619f76880 SHA512 73335594950b08596356a1950213abf57c6d48060da37149e700565f9689ca82b7427e320040bf43b2e97eff7b6da7116a6aca77cb717f7ce140039ebdae5595
DIST dav1d-0.9.0.tar.bz2 771739 BLAKE2B 9cf24b142a1148200766a1a20010ff14d1baec507a7ecb477117826784b668178ba753049abf316aacbe1b957340c157f960f748ab8e6f74caf567edba2be3a9 SHA512 cfbfa4cb4508e1b975d7247bf0fa09d3b7adfd224adcf181153365677237b98a6d53b0b7bb91055a26e5668d58b3dcda5f675f68aceb1b020d14b53c4488575e
DIST dav1d-0.9.1.tar.bz2 810641 BLAKE2B 6ad40f6a339a71bc2bf79c508bc7a8a58cda98c6814981d252a3a40ae8df1cc5ad120c42fc881cb560c84e01186ca3daa09cbb5f6152d7da475d9479aa306f2c SHA512 b688f4743106ceed5f450978a9c265391c0ee906dd5adb8632e563378b316ffb3a7098fb6ea2ef4b160ca880fc03c16e3e3b9d8aa3c90ee7341dd0cbfccecc46
DIST dav1d-0.9.2.tar.bz2 833722 BLAKE2B b05edd1ca627906e57923be08f1ecd73469f9a8e2ed585edf81f1fe1ffc173f1e4ba52eb766b82d9ea1349a6c1cf2a5a48cc9a5bcf2debeb9d640d9842e266f4 SHA512 adfb822734a3fc8b73e9cf5f757bfd78fb144b00d95f1e942254c5caf1d801b05438d39571486ef37a94d2226166937fc56160a862e8d6d45c4f6d790531dc3f
EBUILD dav1d-0.8.0.ebuild 1060 BLAKE2B 9aab861019f4d4b7ab09d3f67a40ecfa3305a3f6057e60ff607b295572fa147e1dbae99f15b748cab8eb5ce668e0b36353e56f2003c816d4c4a4f86db999f6d4 SHA512 1930d6aa4218d5940ed0483d27accae81f94ff9aa18a7f3a5ed4f50fe2e3b6042332faba9dfcbb61883e7489ef44807a9d85b5abd4e9d87bc41d70d6677af936
-EBUILD dav1d-0.8.2.ebuild 1140 BLAKE2B dc06909be0c6b8b10dcf967ab561e0b463433c21e342c629738023ef59f225f7e212c751eebfc0eddf21c25c1af50f87083bbc23c5dafd57468bd36b1b73509b SHA512 314b53ee0a37c017aa0d16507148a8935f2aa2a505cb87c12c8a69d3d849cbe39860cfd36d6863d61d585a0584c47436a2a06edb5fcdcb3fa00dc07b5d7dcb4c
-EBUILD dav1d-0.9.0.ebuild 1153 BLAKE2B 34a0271631ec34a0acbcab9e43443c512485485abfa93d704514508658516ca0171dfcac7047bff3ed35a9f1c5ea51865f5ca790e46d6f0c686f454cf5a00389 SHA512 50368d81e65450bf69b755a3db09d07d593ff4c3aa9c3336266cee324cb8f944bb7fffe57cb0719d8579806d2c6f274f9b0e998498c541d285dc4b51d8da34f7
-EBUILD dav1d-0.9.1.ebuild 1147 BLAKE2B 02f48b772ea1c7f7fa3114041cf52dde3888d65764591cb73562f1084e42d3b025a915d012574343b2dac530156a595d7c5cf674bac59c86addfd04a27268c99 SHA512 2b829ae56fad9cdb6c0e2922a55534fc2749954ef33bcfc2c80603d075862c6c3c7357c3a718be9791de2a35823c8b2e0e3b4802f071d86bd72ab2e268364594
-EBUILD dav1d-0.9.2.ebuild 1153 BLAKE2B bc17badb10454b0eddfe95e890c9e7d4939ca830fc02077a4af9acef5397626efe18c05538af2c7cb3ce41cf1246cae4d110493042578a090e7a51f0eb08d534 SHA512 1e90ec0f7fe82150cdc45849d349bd2c9dd3200983a323ac953511b3911665a3812c76a41dd00e5b9c2545678b2d802fd7517a4827f3c4f64c974348ee2e047b
-EBUILD dav1d-9999.ebuild 1153 BLAKE2B bc17badb10454b0eddfe95e890c9e7d4939ca830fc02077a4af9acef5397626efe18c05538af2c7cb3ce41cf1246cae4d110493042578a090e7a51f0eb08d534 SHA512 1e90ec0f7fe82150cdc45849d349bd2c9dd3200983a323ac953511b3911665a3812c76a41dd00e5b9c2545678b2d802fd7517a4827f3c4f64c974348ee2e047b
-MISC metadata.xml 537 BLAKE2B 374f3ad874f9fd52ba0b9a3d6f65d24d27b6143eb298f736fdb5d80247f7806b0d3634c7e144ed3eac4a2952d52d574fe1088a3a01646cfc1db94534ed5c7c2b SHA512 cf0ddcd969d6b70e7b83744cc5c778935b9dd194aa90f2f8aa0890f8b4c2ecf621f87f52f50bf82cdda5f0728bdcc789b728b9514d2c3b250a01e43ac471ccc4
+EBUILD dav1d-0.8.2.ebuild 1385 BLAKE2B 07afc7effebb6a91327be86b1373ef96a7128c085b60d50a31872b9562393b907a462e4ca224a5bda8a321797f01d6e591aac1b1a441dbf74ad67d3fcc8c1f2e SHA512 fdb3117cdc548992547914ce24fb357eb114f5e4df3615ce481426fc88cfb833426da4308e9b00c83d1272aed071b13e6ccfc698d9325c2eb6e3bc45e98e8b17
+EBUILD dav1d-0.9.0.ebuild 1398 BLAKE2B ba98a74ef08264dd06f10530c26abd743520b80de2249227314b5353afdc2faf67844c4aa8ab4f8e8380f6e2f4a23b5f20f318c1e98bb14d54f91d5d9e38bfa1 SHA512 275f5ab2201789b78c7660779f45e302812fcc65dabd3066aced0dd7aad5aaafc4f95d995674991fbe03f1699f4946498c1460bc218938b81b9de5c7f3a435b7
+EBUILD dav1d-0.9.1.ebuild 1392 BLAKE2B 7b4b06cc144b9854810e59cab5960f21073447ff8ccdc27cd41ea30d59dce505e69639fc5064875352bd2830482a6383758c1ebdedd6cf81cd15691f4ed4690d SHA512 ed2af7eaec02836bc2f63e5ab919162b04b909293e3a335e6f4f084f9fb8a8c657a48e623d127d99874f99615f0e24cbf67723df96a73a591f16f8beef5c683f
+EBUILD dav1d-0.9.2.ebuild 1398 BLAKE2B d54719b00936810c0560ef963804520768a59fad9f3d672bf3956a29f8cad5ffafa7dd632b15c8667717948df0fcad74b81c5563361309e8c13d80520ad117a8 SHA512 3ad58f695222cb49d4787b9b25345bb677a15b431f622fce6264ac9a529cca756b4d837c6a9c8f29946d807f68865790dfc9e569e25133ff33208777f4bb8750
+EBUILD dav1d-9999.ebuild 1315 BLAKE2B d0b8b18c1305696de2db882c054ff3913f4d5733d8d267ce8eb25be5cfd2c2cc5d79c2ceafb5c2209203a72705dbc65488fcf34641f5cc961c8ffe3e25228794 SHA512 9bd5fd0589832f0738c76a55a1815bde76a99b30489d0c4598bf3b7c0f5557d7a05bf1d4596fa976729bd22e7fdef3f9d4012240a94d8178f282884162a89dd5
+MISC metadata.xml 626 BLAKE2B 517fdb1d54d2714913d8d7644c5cc9d72ad04aa51160ba3b31b9915246c1aba3f18c3870428ce66a5b13afb50e6e65e95f12a65af931baf9b73defa8dba16c82 SHA512 7fca750f4f56a87b44ef4a14c466818411ff8a4aa1a376abb11b41648a661ef77c58611d649daebf97fafc1f5bc712d9486327b8f7ea6d94e1981a1d14bf2fd3
diff --git a/media-libs/dav1d/dav1d-0.8.2.ebuild b/media-libs/dav1d/dav1d-0.8.2.ebuild
index 69f483748337..caaf9cb8784f 100644
--- a/media-libs/dav1d/dav1d-0.8.2.ebuild
+++ b/media-libs/dav1d/dav1d-0.8.2.ebuild
@@ -19,15 +19,19 @@ HOMEPAGE="https://code.videolan.org/videolan/dav1d"
LICENSE="BSD-2"
SLOT="0/5"
-IUSE="+8bit +10bit +asm"
+IUSE="+8bit +10bit +asm test xxhash"
+RESTRICT="!test? ( test )"
-ASM_DEPEND=">=dev-lang/nasm-2.14.02"
+ASM_DEPEND=">=dev-lang/nasm-2.15.05"
BDEPEND="asm? (
abi_x86_32? ( ${ASM_DEPEND} )
abi_x86_64? ( ${ASM_DEPEND} )
- )"
+ )
+ xxhash? ( dev-libs/xxhash )
+ "
DOCS=( README.md doc/PATENTS THANKS.md )
+PATCHES=( "${FILESDIR}"/build-avoid-meson-s-symbols_have_underscore_prefix.patch )
multilib_src_configure() {
local -a bits=()
@@ -44,6 +48,8 @@ multilib_src_configure() {
local emesonargs=(
-D bitdepths=$(IFS=,; echo "${bits[*]}")
-D enable_asm=${enable_asm}
+ -D enable_tests=$(usex test true false)
+ -D xxhash_muxer=$(usex xxhash enabled disabled)
)
meson_src_configure
}
diff --git a/media-libs/dav1d/dav1d-0.9.0.ebuild b/media-libs/dav1d/dav1d-0.9.0.ebuild
index ae26cc566f30..f111b62346ef 100644
--- a/media-libs/dav1d/dav1d-0.9.0.ebuild
+++ b/media-libs/dav1d/dav1d-0.9.0.ebuild
@@ -19,15 +19,19 @@ HOMEPAGE="https://code.videolan.org/videolan/dav1d"
LICENSE="BSD-2"
SLOT="0/5"
-IUSE="+8bit +10bit +asm"
+IUSE="+8bit +10bit +asm test xxhash"
+RESTRICT="!test? ( test )"
-ASM_DEPEND=">=dev-lang/nasm-2.14.02"
+ASM_DEPEND=">=dev-lang/nasm-2.15.05"
BDEPEND="asm? (
abi_x86_32? ( ${ASM_DEPEND} )
abi_x86_64? ( ${ASM_DEPEND} )
- )"
+ )
+ xxhash? ( dev-libs/xxhash )
+ "
DOCS=( README.md doc/PATENTS THANKS.md )
+PATCHES=( "${FILESDIR}"/build-avoid-meson-s-symbols_have_underscore_prefix.patch )
multilib_src_configure() {
local -a bits=()
@@ -44,6 +48,8 @@ multilib_src_configure() {
local emesonargs=(
-D bitdepths=$(IFS=,; echo "${bits[*]}")
-D enable_asm=${enable_asm}
+ -D enable_tests=$(usex test true false)
+ -D xxhash_muxer=$(usex xxhash enabled disabled)
)
meson_src_configure
}
diff --git a/media-libs/dav1d/dav1d-0.9.1.ebuild b/media-libs/dav1d/dav1d-0.9.1.ebuild
index 7dedeea1b795..f7ae3e3273bf 100644
--- a/media-libs/dav1d/dav1d-0.9.1.ebuild
+++ b/media-libs/dav1d/dav1d-0.9.1.ebuild
@@ -19,15 +19,19 @@ HOMEPAGE="https://code.videolan.org/videolan/dav1d"
LICENSE="BSD-2"
SLOT="0/5"
-IUSE="+8bit +10bit +asm"
+IUSE="+8bit +10bit +asm test xxhash"
+RESTRICT="!test? ( test )"
-ASM_DEPEND=">=dev-lang/nasm-2.14.02"
+ASM_DEPEND=">=dev-lang/nasm-2.15.05"
BDEPEND="asm? (
abi_x86_32? ( ${ASM_DEPEND} )
abi_x86_64? ( ${ASM_DEPEND} )
- )"
+ )
+ xxhash? ( dev-libs/xxhash )
+ "
DOCS=( README.md doc/PATENTS THANKS.md )
+PATCHES=( "${FILESDIR}"/build-avoid-meson-s-symbols_have_underscore_prefix.patch )
multilib_src_configure() {
local -a bits=()
@@ -44,6 +48,8 @@ multilib_src_configure() {
local emesonargs=(
-D bitdepths=$(IFS=,; echo "${bits[*]}")
-D enable_asm=${enable_asm}
+ -D enable_tests=$(usex test true false)
+ -D xxhash_muxer=$(usex xxhash enabled disabled)
)
meson_src_configure
}
diff --git a/media-libs/dav1d/dav1d-0.9.2.ebuild b/media-libs/dav1d/dav1d-0.9.2.ebuild
index 850f1843db9a..fb91a0e8cc7d 100644
--- a/media-libs/dav1d/dav1d-0.9.2.ebuild
+++ b/media-libs/dav1d/dav1d-0.9.2.ebuild
@@ -19,15 +19,19 @@ HOMEPAGE="https://code.videolan.org/videolan/dav1d"
LICENSE="BSD-2"
SLOT="0/5"
-IUSE="+8bit +10bit +asm"
+IUSE="+8bit +10bit +asm test xxhash"
+RESTRICT="!test? ( test )"
-ASM_DEPEND=">=dev-lang/nasm-2.14.02"
+ASM_DEPEND=">=dev-lang/nasm-2.15.05"
BDEPEND="asm? (
abi_x86_32? ( ${ASM_DEPEND} )
abi_x86_64? ( ${ASM_DEPEND} )
- )"
+ )
+ xxhash? ( dev-libs/xxhash )
+ "
DOCS=( README.md doc/PATENTS THANKS.md )
+PATCHES=( "${FILESDIR}"/build-avoid-meson-s-symbols_have_underscore_prefix.patch )
multilib_src_configure() {
local -a bits=()
@@ -44,6 +48,8 @@ multilib_src_configure() {
local emesonargs=(
-D bitdepths=$(IFS=,; echo "${bits[*]}")
-D enable_asm=${enable_asm}
+ -D enable_tests=$(usex test true false)
+ -D xxhash_muxer=$(usex xxhash enabled disabled)
)
meson_src_configure
}
diff --git a/media-libs/dav1d/dav1d-9999.ebuild b/media-libs/dav1d/dav1d-9999.ebuild
index 850f1843db9a..c0d92e63904d 100644
--- a/media-libs/dav1d/dav1d-9999.ebuild
+++ b/media-libs/dav1d/dav1d-9999.ebuild
@@ -19,13 +19,16 @@ HOMEPAGE="https://code.videolan.org/videolan/dav1d"
LICENSE="BSD-2"
SLOT="0/5"
-IUSE="+8bit +10bit +asm"
+IUSE="+8bit +10bit +asm test xxhash"
+RESTRICT="!test? ( test )"
-ASM_DEPEND=">=dev-lang/nasm-2.14.02"
+ASM_DEPEND=">=dev-lang/nasm-2.15.05"
BDEPEND="asm? (
abi_x86_32? ( ${ASM_DEPEND} )
abi_x86_64? ( ${ASM_DEPEND} )
- )"
+ )
+ xxhash? ( dev-libs/xxhash )
+ "
DOCS=( README.md doc/PATENTS THANKS.md )
@@ -44,6 +47,8 @@ multilib_src_configure() {
local emesonargs=(
-D bitdepths=$(IFS=,; echo "${bits[*]}")
-D enable_asm=${enable_asm}
+ -D enable_tests=$(usex test true false)
+ -D xxhash_muxer=$(usex xxhash enabled disabled)
)
meson_src_configure
}
diff --git a/media-libs/dav1d/files/build-avoid-meson-s-symbols_have_underscore_prefix.patch b/media-libs/dav1d/files/build-avoid-meson-s-symbols_have_underscore_prefix.patch
new file mode 100644
index 000000000000..f9c0dbbfaf2b
--- /dev/null
+++ b/media-libs/dav1d/files/build-avoid-meson-s-symbols_have_underscore_prefix.patch
@@ -0,0 +1,35 @@
+https://code.videolan.org/videolan/dav1d/-/issues/370
+https://code.videolan.org/videolan/dav1d/-/commit/c6a08b3aa1ee99dade53e5e32033bc1d14455a22
+
+From c6a08b3aa1ee99dade53e5e32033bc1d14455a22 Mon Sep 17 00:00:00 2001
+From: Janne Grunau <janne-vlc@jannau.net>
+Date: Tue, 21 Sep 2021 09:30:14 +0200
+Subject: [PATCH 1/5] build: avoid meson's symbols_have_underscore_prefix
+
+Meson's dynamic check is unreliable when additional compiler flags are
+passed via CFLAGS. For example '-fprofile-instr-generate' in oss-fuzz'
+coverage build. Fixes #370.
+---
+ meson.build | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 1bf69ab..1a7c409 100644
+--- a/meson.build
++++ b/meson.build
+@@ -382,7 +382,11 @@ endif
+
+ cdata.set10('ARCH_PPC64LE', host_machine.cpu() == 'ppc64le')
+
+-if cc.symbols_have_underscore_prefix()
++# meson's cc.symbols_have_underscore_prefix() is unfortunately unrelieably
++# when additional flags like '-fprofile-instr-generate' are passed via CFLAGS
++# see following meson issue https://github.com/mesonbuild/meson/issues/5482
++if (host_machine.system() == 'darwin' or
++ (host_machine.system() == 'windows' and host_machine.cpu_family() == 'x86'))
+ cdata.set10('PREFIX', true)
+ cdata_asm.set10('PREFIX', true)
+ endif
+--
+2.32.0
+
diff --git a/media-libs/dav1d/metadata.xml b/media-libs/dav1d/metadata.xml
index edef4df0c989..fbe7f555d99a 100644
--- a/media-libs/dav1d/metadata.xml
+++ b/media-libs/dav1d/metadata.xml
@@ -8,6 +8,7 @@
<flag name="8bit">Add support for decoding 8-bit AV1.</flag>
<flag name="10bit">Add support for building 10-bit and 12-bit AV1.</flag>
<flag name="asm">Enable custom assembly for faster decoding.</flag>
+ <flag name="xxhash">Enable <pkg>dev-libs/xxhash</pkg> support for hashing muxer</flag>
</use>
<upstream>
<bugs-to>https://code.videolan.org/videolan/dav1d/issues</bugs-to>
diff --git a/media-libs/embree/Manifest b/media-libs/embree/Manifest
index e921491f058a..a496b5b4c3b9 100644
--- a/media-libs/embree/Manifest
+++ b/media-libs/embree/Manifest
@@ -1,3 +1,3 @@
DIST embree-3.13.0.tar.gz 13708421 BLAKE2B bace1866d9d6907308d38370347d23b4edb3fe287d093acf35367be1d4548d1df064ed9d46ef928f17af99e335d5fcd7b7285a2bd95707361440547544782080 SHA512 3fc4f00151cb9558810c643bf77f3135465d65c4523e08d5289a0fdcb18d4c63a8e805647e4ce208556c4679d44373d817761c1003b1e9dc65a39d5ebf17926f
-EBUILD embree-3.13.0-r2.ebuild 3672 BLAKE2B 25764980cc59bd155218ba756a13048de54f3bc4632003025972f79aab7e8d417c5406b17078373c8b0772723331df81adf4d88d4162ae51137ac68d60c645c9 SHA512 447720d231a7e1b4dd723a25055d15d72ccef9131be72870c6e47c759f2dcf3e8434a1245c48772f48be91a209678ffc4e30785f05bcb58dc798c008a759e020
+EBUILD embree-3.13.0-r2.ebuild 3671 BLAKE2B f9833656184addff84fcd49024e8ad82bbb871de8ae5b82a19bf1baf9b2cdbb871b13f8919e6046f3aaaa043aabe8867b8ba17ab121c4b3cf1fc9aafe1b28428 SHA512 a5e7a50b44142baafadfd5157fb6af32a6e702688efa9ea72aa1c8c36fdbc8bf752cb9105d9e2e9f696ae6e8aa833f2a78c47e663d60821dd34e2c05acdb6c8a
MISC metadata.xml 1705 BLAKE2B 2785c8b8752e5730e014ce6edfdd1702a20565ab12c9ebee14c3cf603e267a63360eaa0428afb9e178091edad40fe82ea55e2a872339da744113e480b4eda6c2 SHA512 ebfa1a6d3f8a8fe6acc0cc06f54ad62efb86942b55e985542a049fde421663adddcffe2a78c7309774df9bbc714a2bb11dad73c94b89bf2d1cdf56b69d334f59
diff --git a/media-libs/embree/embree-3.13.0-r2.ebuild b/media-libs/embree/embree-3.13.0-r2.ebuild
index fb7a6b0b5750..136ad000762f 100644
--- a/media-libs/embree/embree-3.13.0-r2.ebuild
+++ b/media-libs/embree/embree-3.13.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/embree/embree/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
X86_CPU_FLAGS=( sse2:sse2 sse4_2:sse4_2 avx:avx avx2:avx2 avx512dq:avx512dq )
CPU_FLAGS=( ${X86_CPU_FLAGS[@]/#/cpu_flags_x86_} )
IUSE="+compact-polys ispc +raymask ssp +tbb tutorial static-libs ${CPU_FLAGS[@]%:*}"
diff --git a/media-libs/freeglut/Manifest b/media-libs/freeglut/Manifest
index 5d6fa369fe83..fadba67090b6 100644
--- a/media-libs/freeglut/Manifest
+++ b/media-libs/freeglut/Manifest
@@ -1,4 +1,4 @@
AUX freeglut-3.2.1-gcc10-fno-common.patch 3500 BLAKE2B 7163acef56f8f1bfebeaed554ecbe7a27dc3321bd19f5da5c1f482f52a447acf7bff3b8358d8023d8552fa5fa999475b70e3ec7242e8a127000ee7b49f2f751b SHA512 0845bc4c91c6233cab8c56d15d1efa8fcdac7ae12270a089f8dd20520fc5c94078b7abceadef304f8f42cd575a61ad5b1f444f21e0bbdd3ff310bcc40192336b
DIST freeglut-3.2.1.tar.gz 440228 BLAKE2B ed8a4b2361416cfee5540350ee50c32a56e5ea75d6834c677c5cec676967a04e13b2adf3da1cc9a3a2c73fbc6147b3b0bc91953a6edf1e35ce8c933eeff6f97a SHA512 aced4bbcd36269ce6f4ee1982e0f9e3fffbf18c94f785d3215ac9f4809b992e166c7ada496ed6174e13d77c0f7ef3ca4c57d8a282e96cbbe6ff086339ade3b08
-EBUILD freeglut-3.2.1-r1.ebuild 1496 BLAKE2B 4caaa8ebb3687289b65a1affa82cca7dae944f211765eaf8def4876fd2e798da87a827b5d9ac9ac285c6ab0c68c36b659237632e9e277dd1cb9d596ae23cd353 SHA512 3e8e19d9dbd77c0b7efa554735804a52b70a46e0f6c9a76ca68477b06f83e62fabf492dab89454a82ba3aa9a50880c73aba2f9d82a2e26ab22e608f432f4190e
+EBUILD freeglut-3.2.1-r2.ebuild 1499 BLAKE2B 5fe6ab2def7d44b129fe22ed721303324e5deda66a0d572e990760371cf6c661cd0804a2db8b3c7e876b2834d027bb0bd01727655f86d468f7a638a8ed097bdb SHA512 321c424e287b5e4b0a1e1f7c02f34639b952a85ca4ca81f8f8479b732bd47ad93d8d141dd00ba61cfbed4bdadfeabf70e2608e02acdd6a5195b15d84da088957
MISC metadata.xml 529 BLAKE2B ef8eb49e76fa342486804eb88393b0b80710761c9255e8971f99cd40a41cdfa7ac4734d66a2d2b285d9493ae9b6c56706235749f4958985e15bb22796a81908b SHA512 fe290b4e32aaecbc3f604adf0ef295d8fb1e9a2dee4fd4c3b61a56a82e4d6c4395cb6b6e4e91a6c196d632cf65102539d8f91dd7556ab7d63e539866d83dc8e5
diff --git a/media-libs/freeglut/freeglut-3.2.1-r1.ebuild b/media-libs/freeglut/freeglut-3.2.1-r2.ebuild
index 8cac34cf3c48..f99b7bafeb9e 100644
--- a/media-libs/freeglut/freeglut-3.2.1-r1.ebuild
+++ b/media-libs/freeglut/freeglut-3.2.1-r2.ebuild
@@ -23,7 +23,7 @@ RDEPEND=">=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
>=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]"
-# gles? ( media-libs/mesa[egl,gles1,gles2,${MULTILIB_USEDEP}] )
+# gles? ( media-libs/mesa[egl(+),gles1,gles2,${MULTILIB_USEDEP}] )
DEPEND="${RDEPEND}
x11-base/xorg-proto"
BDEPEND="virtual/pkgconfig"
diff --git a/media-libs/freeimage/Manifest b/media-libs/freeimage/Manifest
index 6a398741fe90..7c1e11bcc936 100644
--- a/media-libs/freeimage/Manifest
+++ b/media-libs/freeimage/Manifest
@@ -9,4 +9,5 @@ DIST FreeImage3180.pdf 1665541 BLAKE2B 5d40ee6fa0a1e73df0cc961edbd70a2835ef88fb5
DIST FreeImage3180.zip 7415716 BLAKE2B b695271f4e80eb304eccde66e38b5095eceae51fbe0dd97df69c55f364f8440d8c97139b8edc2f01c400f5c53a7336fdfab1e28aa3ea04f485901d5def443d25 SHA512 9d9cc7e2d57552c3115e277aeb036e0455204d389026b17a3f513da5be1fd595421655488bb1ec2f76faebed66049119ca55e26e2a6d37024b3fb7ef36ad4818
DIST freeimage-3.18.0-unbundling.patch 20960 BLAKE2B 61ee63e7be0d5db7bf4a3bc053bb67f5a6ce6949ed252b1729e7542addd432d1105b7e70d834f05210be3c5c81a5378a2cb00d5b9d8e21590672a1ac6e1135fa SHA512 c56062099e17e8a16447fccc4bdf3089e7992273f1a09a2ff7f591b3bd68a8d1e80842400aaffdc8394ed64273e26a4f01e12fc8c55bb40d346db96eb5dcbe30
EBUILD freeimage-3.18.0-r2.ebuild 3174 BLAKE2B fb299df99374303edc9f38dd38effe2a2aeff342446a4f2b44cb8878b393308cc1611801d32e23a892ffbf879616ee03f5216f75545e712a8c4211f5bce90858 SHA512 252093fc344316203110f98c1eca639e1834a8d5196f7cf86d6e6b0fe3adbbfdbc891b6d3d63ac4f08e2496e37b3fb82959794f3e7a9f83858a1306ebae0d21b
+EBUILD freeimage-3.18.0-r3.ebuild 3177 BLAKE2B 1eb95c0748aadbfaa5db564df945cd1dfb09d73b069f085b52635a537e583f295a815cf2f5cb83b1739be4881ae7c6eae8cdd097dbce16853d608857e6676860 SHA512 f74db9c5a20a4868a6f7544c917665e7b05bd9944d92822aa1e19a1a89231c2037901c91edcf5a183957ba71388873a923eb7403fc149dd72dc9fb394075f24e
MISC metadata.xml 404 BLAKE2B 09c1635a36f53e8e3a48bd43d03d6cafaf9d511caf5bc3174fea2434970e1372eb1dbb979eb093e88078960c968cd578fcc4b74b67a34f55bf078f074ee97ab3 SHA512 d271f95c2295b4370c5434a172e838467daeab733399c26a1a730771ffae5a46bef879fd7e424b182177a2dd14f9abcc903cfa1c35052f84a2517f8803856836
diff --git a/media-libs/freeimage/freeimage-3.18.0-r3.ebuild b/media-libs/freeimage/freeimage-3.18.0-r3.ebuild
new file mode 100644
index 000000000000..f172fa6a2216
--- /dev/null
+++ b/media-libs/freeimage/freeimage-3.18.0-r3.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edos2unix toolchain-funcs
+
+MY_PN=FreeImage
+MY_PV=${PV//.}
+MY_P=${MY_PN}${MY_PV}
+
+DESCRIPTION="Image library supporting many formats"
+HOMEPAGE="https://freeimage.sourceforge.io/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
+ mirror://sourceforge/${PN}/${MY_P}.pdf
+ https://dev.gentoo.org/~juippis/distfiles/tmp/freeimage-3.18.0-unbundling.patch"
+
+LICENSE="|| ( GPL-2 FIPL-1.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="jpeg jpeg2k mng openexr png raw static-libs tiff webp"
+
+# The tiff/ilmbase isn't a typo. The TIFF plugin cheats and
+# uses code from it to handle 16bit<->float conversions.
+RDEPEND="
+ sys-libs/zlib
+ jpeg? ( virtual/jpeg:0 )
+ jpeg2k? ( media-libs/openjpeg:2= )
+ mng? ( media-libs/libmng:= )
+ openexr? ( media-libs/openexr:0= )
+ png? ( media-libs/libpng:0= )
+ raw? ( media-libs/libraw:= )
+ tiff? (
+ media-libs/ilmbase:=
+ media-libs/tiff:0
+ )
+ webp? ( media-libs/libwebp:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ app-arch/unzip
+ virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_PN}
+
+DOCS=( "${DISTDIR}"/${MY_P}.pdf README.linux Whatsnew.txt )
+PATCHES=(
+ "${DISTDIR}"/${PN}-3.18.0-unbundling.patch
+ "${FILESDIR}"/${PN}-3.18.0-remove-jpeg-transform.patch
+ "${FILESDIR}"/${PN}-3.18.0-rename-jpeg_read_icc_profile.patch
+ "${FILESDIR}"/${PN}-3.18.0-disable-plugin-G3.patch
+ "${FILESDIR}"/${PN}-3.18.0-raw.patch
+ "${FILESDIR}"/${PN}-3.18.0-libjpeg9.patch
+ "${FILESDIR}"/${PN}-3.18.0-CVE-2019-12211-CVE-2019-12213.patch
+ "${FILESDIR}"/${PN}-3.18.0-libraw-0.20.0.patch
+)
+
+src_prepare() {
+ pushd Source >/dev/null || die
+ cp LibJPEG/{transupp.c,transupp.h,jinclude.h} . || die
+ cp LibTIFF4/{tiffiop,tif_dir}.h . || die
+ rm -rf LibPNG LibMNG LibOpenJPEG ZLib OpenEXR LibRawLite LibTIFF4 LibJPEG LibWebP LibJXR || die
+ popd >/dev/null || die
+
+ edos2unix Makefile.{gnu,fip,srcs} fipMakefile.srcs */*.h */*/*.cpp
+ sed -i \
+ -e "s:/./:/:g" \
+ -e "s: ./: :g" \
+ -e 's: Source: \\\n\tSource:g' \
+ -e 's: Wrapper: \\\n\tWrapper:g' \
+ -e 's: Examples: \\\n\tExamples:g' \
+ -e 's: TestAPI: \\\n\tTestAPI:g' \
+ -e 's: -ISource: \\\n\t-ISource:g' \
+ -e 's: -IWrapper: \\\n\t-IWrapper:g' \
+ -e 's:INCLS:\nINCLS:g' \
+ Makefile.srcs fipMakefile.srcs || die
+ sed -i \
+ -e "/LibJPEG/d" \
+ -e "/LibJXR/d" \
+ -e "/LibPNG/d" \
+ -e "/LibTIFF/d" \
+ -e "/Source\/ZLib/d" \
+ -e "/LibOpenJPEG/d" \
+ -e "/OpenEXR/d" \
+ -e "/LibRawLite/d" \
+ -e "/LibMNG/d" \
+ -e "/LibWebP/d" \
+ -e "/LibJXR/d" \
+ Makefile.srcs fipMakefile.srcs || die
+
+ default
+}
+
+foreach_make() {
+ local m
+ for m in Makefile.{gnu,fip} ; do
+ emake -f ${m} \
+ USE_EXR=$(usex openexr) \
+ USE_JPEG=$(usex jpeg) \
+ USE_JPEG2K=$(usex jpeg2k) \
+ USE_MNG=$(usex mng) \
+ USE_PNG=$(usex png) \
+ USE_TIFF=$(usex tiff) \
+ USE_RAW=$(usex raw) \
+ USE_WEBP=$(usex webp) \
+ $(usex static-libs '' STATICLIB=) \
+ "$@"
+ done
+}
+
+src_compile() {
+ tc-export AR PKG_CONFIG
+ foreach_make \
+ CXX="$(tc-getCXX) -fPIC" \
+ CC="$(tc-getCC) -fPIC" \
+ ${MY_PN}
+}
+
+src_install() {
+ foreach_make install DESTDIR="${ED}" INSTALLDIR="${ED}"/usr/$(get_libdir)
+ einstalldocs
+}
diff --git a/media-libs/gmmlib/Manifest b/media-libs/gmmlib/Manifest
index 6313cd3b12a7..e6d564d1c5aa 100644
--- a/media-libs/gmmlib/Manifest
+++ b/media-libs/gmmlib/Manifest
@@ -1,10 +1,13 @@
AUX gmmlib-20.2.2_conditional_testing.patch 1151 BLAKE2B edeb2ff121efeb39e674bc6e4fc37e3603f98875e7d618f4a0bbad49d6d46745c2fdcc2405b3383443af767ab231cddeb1914ccbf0710190fe6c47a94033e638 SHA512 8f6a676104108161e5ca727d231789559bbf1c24b289b25b9809b5b70882e355af976051d31bd4a238df24b13fbe4a3324ce40c3ee3c592e650b34dde8d8a62b
+AUX gmmlib-20.3.2_cmake_project.patch 145 BLAKE2B f42306b41a0c62ea9d3d5bfe3d1e1f85c23028e632c44f1cfe41a5fa47c7e94416ac1e5c58a4018a5da024d65e662c301e8d935994f6b53b52414a5f8081208c SHA512 feafa316267e903a25e7889fcbcfb31bd77402715d84d82464ae25f2cf013866c812b1c37bc1d64a8c5e1a0dd3f00e9333658532ad6d7abebf4f67bd6fc46d64
AUX gmmlib-20.4.1_custom_cflags.patch 2995 BLAKE2B 2e344bd4576c83490dc09e49c6d739e1a06df138fe7f3ff5fd5b4c788f9115f9284a8967b02832ab71ed0f19a4d202e81b865e65ea0c7aa2225a818c366ed465 SHA512 7d4d82aa320ca1aa8f281162e39cc5f9f2e50cb70d2a8df572dd544a8a1b60ed52c903131ee41dd8454f2d1836a8d0a2bf82257f8648d419e0b550c6fe5795bf
DIST intel-gmmlib-21.2.1.tar.gz 746883 BLAKE2B 9ffd3319bca42558e139f81ab60e5db5328d155b591c08b763c2b02f2728c04c6f96b79547ff3a1e6b8b8cb940cdd01b33ee04f946ac6fa9eefda5439cc49414 SHA512 457d2815204c8e12292fbe6e642a7409df4b3de597972e3c956d5dfae23b5032fc07cf60c0a10bd58aa6dc62a89225a5b704c98689112d23b81f91c1129bcb97
DIST intel-gmmlib-21.2.2.tar.gz 746635 BLAKE2B abc73cfa209b8212bfe185e1f27a84cefb7ece9134f287e85e67c09bfd4f48e097e410a95d966d2f85c79bc95f753b6ae462a67db031dcd1fc6f46bec9452e22 SHA512 eaca3595c28afb8873b172fff3e178489b7ff736e6e9d80e75939ffd94af6c9c5f7f7429a74e98c9af478ab218cd25242d7c69037afb7193a983f8f02616e81f
DIST intel-gmmlib-21.3.1.tar.gz 746732 BLAKE2B 537d446839136d6d048d15eb79e18214d797c68dd4288670448e4104e8d6d0701cb93366f77093f264f5392c0c37470b4fbdd0b0da43c9e319c2b334c3315bdf SHA512 54ae92bedadfe8cf7e39786f96bd29b5ace8bbafe8f32620034de8775c5e31fbbd99dd61b10e5fdf12c9f967196c11840e6a202cfb549e5f950f1743cb9b098b
+DIST intel-gmmlib-21.3.2.tar.gz 746990 BLAKE2B b9cc1937d551ff48e317b6a6b70a07f96e6ed1a4a1d27a4cf5be61e97a7ece71cf75a7f2d773f9a42e2c4ad8badf97c06a5cc0dd4a4fa38159a43839f1ac11ac SHA512 155f7077f3135ff812b9fe759e56fecd595f1c5dde9a377df31a9acedcfeea9d93751badba68077c00929a21cb87e1bd69b8fe3961ac61765fabbc5d6d89e6be
EBUILD gmmlib-21.2.1.ebuild 1007 BLAKE2B aa984297a3567665d09052dcb4e32c51fba64bb748e5a71960529911c108dbf2a6a1529137b77a57ec4a8e2a714e7f97716b572f99cd270ef3d6a75dd035a232 SHA512 41c09dc0499292bafe5e2c3ef49bcf6d3c40ae6ffb20cfe540d8c505463c0f4e8ce128afb753d4e18fc415c34b558c92c255c3e0a987bbd3f46229f3c4d232d5
EBUILD gmmlib-21.2.2.ebuild 1008 BLAKE2B 752f6cdadb79665d1b8befc29bd1c85a0d2feea544ad91f776fab333afc6075a6487c9626522065c26950762487a65d366565e705ee52b324578c5c3a7f62de2 SHA512 4e8138326980584dba5e56b5182551cce96d1672ac4023bd0e369cd3b401af3ca44db04110d84f5253aea235ef80e16a34f76eb5af0298ad28216374be1b1b99
-EBUILD gmmlib-21.3.1.ebuild 1008 BLAKE2B 752f6cdadb79665d1b8befc29bd1c85a0d2feea544ad91f776fab333afc6075a6487c9626522065c26950762487a65d366565e705ee52b324578c5c3a7f62de2 SHA512 4e8138326980584dba5e56b5182551cce96d1672ac4023bd0e369cd3b401af3ca44db04110d84f5253aea235ef80e16a34f76eb5af0298ad28216374be1b1b99
-EBUILD gmmlib-9999.ebuild 1008 BLAKE2B 752f6cdadb79665d1b8befc29bd1c85a0d2feea544ad91f776fab333afc6075a6487c9626522065c26950762487a65d366565e705ee52b324578c5c3a7f62de2 SHA512 4e8138326980584dba5e56b5182551cce96d1672ac4023bd0e369cd3b401af3ca44db04110d84f5253aea235ef80e16a34f76eb5af0298ad28216374be1b1b99
-MISC metadata.xml 505 BLAKE2B 83d6dbe0db28839e3f78541cdeb4da1056a7674369b2a6d6956ec02d411eaaee11dc8baa41c5f3a58c863459ec3673539d16691b18875248cc5ccf97912c59e9 SHA512 552cfca4c3a312374f3873be3817deca55c6935903ca3fa6aa04c3d58ecdd07f346818c349192267bcaff4d0173125858fe490ce5ebb28c955832c47c2a46f3d
+EBUILD gmmlib-21.3.1.ebuild 1007 BLAKE2B aa984297a3567665d09052dcb4e32c51fba64bb748e5a71960529911c108dbf2a6a1529137b77a57ec4a8e2a714e7f97716b572f99cd270ef3d6a75dd035a232 SHA512 41c09dc0499292bafe5e2c3ef49bcf6d3c40ae6ffb20cfe540d8c505463c0f4e8ce128afb753d4e18fc415c34b558c92c255c3e0a987bbd3f46229f3c4d232d5
+EBUILD gmmlib-21.3.2.ebuild 763 BLAKE2B 29a714a5243bc8110253bea5950b177ea27eac9b8d044b8928b568fbb5f3aa8c06939457103ad7ac69b984199d907d316ddf34bd2baec8b5b7ed4c031f475d2a SHA512 56a203152fe945bca2fd90914e6941890fff8452c575fdf8306a497130e29afe4fc7018c334aae9ccf09ec4f07ceca9e590d3f51ef3d8e035ef6e61bd5c6f8a4
+EBUILD gmmlib-9999.ebuild 842 BLAKE2B b4791d7666070fc1f47b47888e6571c9844a85ec40a3c32e5b846fd7305af8943c97c6160f2995fe47a771067ab4be8d55b34d0393e3d0c13e44024f2897c609 SHA512 25f35b6bbf0033d0455585bfae6909b2bc204d4e43170c482e31b38b4b5f4302a9b6f0dd5a2f7fa2996693fe7cfa51b01165554784de03c71d4c271149608ed1
+MISC metadata.xml 602 BLAKE2B 3dd974d0293b434877d26265e65ff26cf3b024556b22614012e31169cf7230703f092310cbd4b7bdcf82da4f439e0590f49279e3adbd845de08e7320996032b1 SHA512 48b892b2ad978c1736f8487ea6c3020ba9b94fe0f77306c6c3c48c8d320d04fa513a28bfcb60b991870503fe6dcf7fbf7848e840fd6470c382b4a808bab5b159
diff --git a/media-libs/gmmlib/files/gmmlib-20.3.2_cmake_project.patch b/media-libs/gmmlib/files/gmmlib-20.3.2_cmake_project.patch
new file mode 100644
index 000000000000..628e9f0b295e
--- /dev/null
+++ b/media-libs/gmmlib/files/gmmlib-20.3.2_cmake_project.patch
@@ -0,0 +1,8 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,5 @@
+ cmake_minimum_required (VERSION 3.1 FATAL_ERROR)
++project(gmmlib)
+
+ include(CTest)
+
diff --git a/media-libs/gmmlib/gmmlib-21.3.1.ebuild b/media-libs/gmmlib/gmmlib-21.3.1.ebuild
index 4e796e2186d3..daef825f99e2 100644
--- a/media-libs/gmmlib/gmmlib-21.3.1.ebuild
+++ b/media-libs/gmmlib/gmmlib-21.3.1.ebuild
@@ -22,7 +22,7 @@ if [[ ${PV} == *9999 ]] ; then
else
SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
S="${WORKDIR}/${PN}-intel-${P}"
- KEYWORDS="~amd64"
+ KEYWORDS="amd64"
fi
LICENSE="MIT"
diff --git a/media-libs/gmmlib/gmmlib-21.3.2.ebuild b/media-libs/gmmlib/gmmlib-21.3.2.ebuild
new file mode 100644
index 000000000000..75f21bc6ea03
--- /dev/null
+++ b/media-libs/gmmlib/gmmlib-21.3.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Intel Graphics Memory Management Library"
+HOMEPAGE="https://github.com/intel/gmmlib"
+SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
+S="${WORKDIR}/${PN}-intel-${P}"
+
+KEYWORDS="~amd64"
+LICENSE="MIT"
+SLOT="0"
+IUSE="+custom-cflags test"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch
+ "${FILESDIR}"/${PN}-20.4.1_custom_cflags.patch
+ "${FILESDIR}"/${PN}-20.3.2_cmake_project.patch
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_TESTING="$(usex test)"
+ -DBUILD_TYPE="Release"
+ -DOVERRIDE_COMPILER_FLAGS="$(usex !custom-cflags)"
+ )
+
+ cmake_src_configure
+}
diff --git a/media-libs/gmmlib/gmmlib-9999.ebuild b/media-libs/gmmlib/gmmlib-9999.ebuild
index 4e796e2186d3..1f972c3b1914 100644
--- a/media-libs/gmmlib/gmmlib-9999.ebuild
+++ b/media-libs/gmmlib/gmmlib-9999.ebuild
@@ -1,11 +1,9 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-CMAKE_ECLASS=cmake
-
-inherit cmake-multilib
+inherit cmake
if [[ ${PV} == *9999 ]] ; then
: ${EGIT_REPO_URI:="https://github.com/intel/gmmlib"}
@@ -17,32 +15,25 @@ fi
DESCRIPTION="Intel Graphics Memory Management Library"
HOMEPAGE="https://github.com/intel/gmmlib"
-if [[ ${PV} == *9999 ]] ; then
- SRC_URI=""
-else
- SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
- S="${WORKDIR}/${PN}-intel-${P}"
- KEYWORDS="~amd64"
-fi
+SRC_URI=""
LICENSE="MIT"
SLOT="0"
IUSE="test +custom-cflags"
-
RESTRICT="!test? ( test )"
-RDEPEND="${DEPEND}"
-
PATCHES=(
"${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch
"${FILESDIR}"/${PN}-20.4.1_custom_cflags.patch
+ "${FILESDIR}"/${PN}-20.3.2_cmake_project.patch
)
-multilib_src_configure() {
+src_configure() {
local mycmakeargs=(
- -DBUILD_TYPE=Release
- -DBUILD_TESTING=$(usex test)
- -DOVERRIDE_COMPILER_FLAGS=$(usex !custom-cflags)
+ -DBUILD_TESTING="$(usex test)"
+ -DBUILD_TYPE="Release"
+ -DOVERRIDE_COMPILER_FLAGS="$(usex !custom-cflags)"
)
+
cmake_src_configure
}
diff --git a/media-libs/gmmlib/metadata.xml b/media-libs/gmmlib/metadata.xml
index b2e336175431..79f6bc657e59 100644
--- a/media-libs/gmmlib/metadata.xml
+++ b/media-libs/gmmlib/metadata.xml
@@ -1,14 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>media-video@gentoo.org</email>
- </maintainer>
- <maintainer type="person" proxied="yes">
- <email>k2k@narod.ru</email>
- <name>Evgeny Grin</name>
- </maintainer>
- <use>
- <flag name="custom-cflags">Do not override user CFLAGS like -march, -msse and similar with lib defaults. Not tested by upstream.</flag>
- </use>
+ <maintainer type="project">
+ <email>media-video@gentoo.org</email>
+ </maintainer>
+ <maintainer type="person" proxied="yes">
+ <email>k2k@narod.ru</email>
+ <name>Evgeny Grin</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>conikost@gentoo.org</email>
+ <name>Conrad Kostecki</name>
+ </maintainer>
+ <use>
+ <flag name="custom-cflags">Do not override user CFLAGS like -march, -msse and similar with lib defaults. Not tested by upstream.</flag>
+ </use>
</pkgmetadata>
diff --git a/media-libs/gst-plugins-base/Manifest b/media-libs/gst-plugins-base/Manifest
index 2c0316f61284..c95a64df2d55 100644
--- a/media-libs/gst-plugins-base/Manifest
+++ b/media-libs/gst-plugins-base/Manifest
@@ -2,6 +2,6 @@ AUX gst-plugins-base-1.18.4_meson-0.58.0.patch 2198 BLAKE2B 3a6e661f37c94c6c2e01
AUX gst-plugins-base-1.18.4_wayland_registry_remove.patch 2041 BLAKE2B 88830f067aee3ef0bbe89cce2c88c32a12626ef9c84d64b53fd6a119709aa22f827a3ff30a7ae5064e8e2e2c0f9c3999c740c7712ddc53d058b4a2baec286097 SHA512 0cf14673d77a4071dac220c620db21fd1a82e8d2445ac554ae2d27c9e429729af11eded8b5dacdaac444566676dae68f4bfd2bedd3c186b5eb1e39fc5c694de0
DIST gst-plugins-base-1.16.3.tar.xz 3953616 BLAKE2B c78713d0aa77a7e8c8043377a7b7959e8159baa3c3b81751b6dc825137c26fe8e52d3ff2c9c734bdda1d01a087b67d1bce4da66de390aad8169c74001c8f620c SHA512 d44d4da9cb27a6b8e59cb3f0714cc71809c0f14b42ef8d4a2dddbb940efbcb9634a40596d3cdc7391016f6e758005c14aabe1f8f30bb597a57d85c2d94045e75
DIST gst-plugins-base-1.18.4.tar.xz 3169512 BLAKE2B 8b5a7a08641532631842e2ec02379b116ae0f08cda7654d123dbb2d56f97667b94ffc716b389a14ad034d0edb36587d8edc2c4f53782135c53def248fa60d0a3 SHA512 c750d68404462807ff03f441e232c4d98752a9bceeec3038fb37a105942f25499bde0660ca688b6f3204c58eb6a2e3f33671e979018c8bd829e7591455961a6a
-EBUILD gst-plugins-base-1.16.3.ebuild 5990 BLAKE2B 9be34ae716ebf3708ca3143748a64a87063bfeda41337a7c690947e4bd19f324bafa3db796f98bf9bb1e590c407ccf569835db52ec4b4168b9a7c0fb53e6bdab SHA512 28ac3e0f6c26cc6376906b0843e0245dda908c0ab6454e7936020afd40ec1e3f55021619c43d9dd0d2238dc5887902f479fd439b634f997bef136abeb5c97ace
-EBUILD gst-plugins-base-1.18.4.ebuild 5755 BLAKE2B 602578b463b06fe206893f7936e2598de6c411ede42af7429074ecbab9357f3ff18144ed984fad7e6318a7965039a2f28e5378af6f9acea9e7aa190d8f8d4830 SHA512 fd47fbe8d98e3fdf8593618c86db3d66f05543d165102184b9ef87720291bddc75f054faf620d7678720123e318f8e9c2dd48910167d8c929f641b36820c0e44
+EBUILD gst-plugins-base-1.16.3-r1.ebuild 5996 BLAKE2B 7dd358811a9dd7611fdaa894d98f29cc8bd5220870f4c4f6b150b5c02560b659913932ffe86bf8da8a79be492a08fbc658285e4e6c8ae868e45e521198ea112d SHA512 7e808520e0961f9df523c3b9bab2c66f63c95ab27fff7207514247b93a39cfd5feb5a7544eede97f973df2fbf6123eb971a963ed7db11f811f79575b161eb3f4
+EBUILD gst-plugins-base-1.18.4-r1.ebuild 5761 BLAKE2B 2b93d59d47e5e3ea484be1950a44be3eb03871dcbf67bf027a4dc98a44360431480eb877766cba61512a4b67c82ed777b331a8d52d257b4dc09174fd09bb0b38 SHA512 078ea3980db730d127a86a92b19d7eb80e811034ab55b1a715b135f7abd7b3ecea398d93821c9a21a4ad92431113f6355a0163f38cd2c7252ac0c5f487225d26
MISC metadata.xml 1066 BLAKE2B 1d67f7f75e3f44459adfce03a6ab85a8c7d6a0b24ae83ef48d6b80c1d64845edb1ec5e7cbbb002585eb91663210025707887f5eff66eee41b14e0afcbdc0b4fd SHA512 227960f7c740d5131c1006854273d4b1047a3ceba07d5eda3d60c0f5baba4e8ed9926fab1737e1f97c5745f87f80fcddbdc7e239f5f2942902c92f8053074931
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.16.3.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.16.3-r1.ebuild
index 23555ecd81a1..73da5000cb07 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.16.3.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.16.3-r1.ebuild
@@ -43,7 +43,7 @@ REQUIRED_USE="
# Dependencies needed by opengl library and plugin (enabled via USE gles2 and/or opengl)
# dmabuf automagic from libdrm headers (drm_fourcc.h) and EGL, so ensure it with USE=egl (platform independent header used only, thus no MULTILIB_USEDEP); provides dmabuf based upload/download/eglimage options
GL_DEPS="
- >=media-libs/mesa-9.0[egl?,gbm?,gles2?,wayland?,${MULTILIB_USEDEP}]
+ >=media-libs/mesa-9.0[egl(+)?,gbm(+)?,gles2?,wayland?,${MULTILIB_USEDEP}]
egl? (
x11-libs/libdrm
)
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.18.4.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.18.4-r1.ebuild
index 218d6f4f2560..4e27d0ccf6d5 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.18.4.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.18.4-r1.ebuild
@@ -43,7 +43,7 @@ REQUIRED_USE="
# Dependencies needed by opengl library and plugin (enabled via USE gles2 and/or opengl)
# dmabuf automagic from libdrm headers (drm_fourcc.h) and EGL, so ensure it with USE=egl (platform independent header used only, thus no MULTILIB_USEDEP); provides dmabuf based upload/download/eglimage options
GL_DEPS="
- >=media-libs/mesa-9.0[egl?,gbm?,gles2?,wayland?,${MULTILIB_USEDEP}]
+ >=media-libs/mesa-9.0[egl(+)?,gbm(+)?,gles2?,wayland?,${MULTILIB_USEDEP}]
egl? (
x11-libs/libdrm
)
diff --git a/media-libs/libepoxy/Manifest b/media-libs/libepoxy/Manifest
index 492c9ccf9588..1c77d08121a2 100644
--- a/media-libs/libepoxy/Manifest
+++ b/media-libs/libepoxy/Manifest
@@ -1,6 +1,6 @@
DIST libepoxy-1.5.5.tar.gz 332057 BLAKE2B bf9a1e089c620e710caa7d4b7d5d0ec0cef186c7881b1a61aa22f58d8e023706087c766ad970ea8950752d87d2f32d12e2ded3137502f35991afb5b4fb3648cd SHA512 9056840d887f06c6422f61e65ea02511ed37b866a234d49bf78dc5f2f46e8dd9f029405387da14dced639e6a5740b5c56ab6d88ca23ea3270fc6db6a570b0c45
DIST libepoxy-1.5.9.tar.gz 331982 BLAKE2B 2bac6dae7fa2fcc70c1a5cacb1e6b6d21aaf65a65792d3c60eb0745acc4967092136aad1fbba6009a8c8e9bb1091a5d0a38fca05e63be2b9141d9c7e3042b426 SHA512 2b7c269063dc1c156c1a2a525e27a0a323baaa7fa4ac091536e4cc5fc4c247efe9770d7979dbddb54deb14853008bb6f4d67fddd26d87cbd264eb1e6e65bc5a8
-EBUILD libepoxy-1.5.5.ebuild 1054 BLAKE2B d47f035a9eac0fbb939306ee3b84bd726f7b3e1ed3788abe1b566c93a637369ab5927fd3d2e50ce4ef02537561e7bc25f0ef495be5887568de1e44deba779fbd SHA512 5bcd11e40aae7f70d96e7c1ad040e78b1c08c54f8b99935896e8a118a3d28669d2cb409a534832062371e4c41c0a8fd11611fccf4128e91010a884073ab74129
-EBUILD libepoxy-1.5.9.ebuild 1061 BLAKE2B 30f27e036220fe0935916cf299388d6d43ff5f0f99a79e1b4af2338d87e716e8aa0cbdf9543f49871fd3f9230f231b7d149cf58d2c7569995c74d31cb26dc580 SHA512 6cd5f3ed1776ca7a3886895055b7d9305a876a82a896e848ad2f1de8b1338c05e487d6c8b843e949b82d363bc792da8b2e0ae761a3c6c280d0ed0bd75ceb875c
-EBUILD libepoxy-9999.ebuild 1061 BLAKE2B 30f27e036220fe0935916cf299388d6d43ff5f0f99a79e1b4af2338d87e716e8aa0cbdf9543f49871fd3f9230f231b7d149cf58d2c7569995c74d31cb26dc580 SHA512 6cd5f3ed1776ca7a3886895055b7d9305a876a82a896e848ad2f1de8b1338c05e487d6c8b843e949b82d363bc792da8b2e0ae761a3c6c280d0ed0bd75ceb875c
+EBUILD libepoxy-1.5.5-r1.ebuild 1057 BLAKE2B 02e7fe699e22e02a1d88c16f00c5b7b89496eac315dfba2402750efb06b102ac947089cae764d6193b44a4c8efab8396aeda5008807da06d5c7630a6f30c39fb SHA512 6c00bc24de88f4e799670ba16b8931bc285e037d5b6afec817056d21ea766e65ea0664285455e873e8004d7c6da70502e2354a5abe2eaa3c8286459c16c9b9df
+EBUILD libepoxy-1.5.9-r1.ebuild 1064 BLAKE2B 7dd53d9dcab52dc889fa6d60207bcf4f144fbe2c430a43a14641b69bb4e50436bd7ae87fba382c65f0d61047d89011ae92812eb05548bf996bc230887d52757e SHA512 cb89bd72d25043ab72078c4927b9f64f4e79c6bacd62dd16fca2118286eaac3ad9790e7f062d38ac40e000c4a590a5da1698f7d895bdbe6dcc22f57c6511e2fd
+EBUILD libepoxy-9999.ebuild 1064 BLAKE2B 7dd53d9dcab52dc889fa6d60207bcf4f144fbe2c430a43a14641b69bb4e50436bd7ae87fba382c65f0d61047d89011ae92812eb05548bf996bc230887d52757e SHA512 cb89bd72d25043ab72078c4927b9f64f4e79c6bacd62dd16fca2118286eaac3ad9790e7f062d38ac40e000c4a590a5da1698f7d895bdbe6dcc22f57c6511e2fd
MISC metadata.xml 376 BLAKE2B 980a035e0ac8a5a3126ee27c032e8f14353ca5e7f2920769b74a23aa827a1110ff8f55a49a1f3072889ea1fed9f76f39bb3c2fddc6f6e2e736773c961ea4be3b SHA512 d1b9e9349929118e39201157b34e7955b32301ceaea877025fdf929d1039af536618eec5a9b0c638622c390201cd4d3106d981f884cf0c1c6469534fa65797af
diff --git a/media-libs/libepoxy/libepoxy-1.5.5.ebuild b/media-libs/libepoxy/libepoxy-1.5.5-r1.ebuild
index 62036c1ad5b9..332bb0aabe74 100644
--- a/media-libs/libepoxy/libepoxy-1.5.5.ebuild
+++ b/media-libs/libepoxy/libepoxy-1.5.5-r1.ebuild
@@ -25,7 +25,7 @@ IUSE="+egl test +X"
RESTRICT="!test? ( test )"
RDEPEND="
- egl? ( media-libs/mesa[egl,${MULTILIB_USEDEP}] )"
+ egl? ( media-libs/mesa[egl(+),${MULTILIB_USEDEP}] )"
DEPEND="${RDEPEND}
X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )"
BDEPEND="${PYTHON_DEPS}
diff --git a/media-libs/libepoxy/libepoxy-1.5.9.ebuild b/media-libs/libepoxy/libepoxy-1.5.9-r1.ebuild
index e29ce87c3286..8a0359a68ecb 100644
--- a/media-libs/libepoxy/libepoxy-1.5.9.ebuild
+++ b/media-libs/libepoxy/libepoxy-1.5.9-r1.ebuild
@@ -25,7 +25,7 @@ IUSE="+egl test +X"
RESTRICT="!test? ( test )"
RDEPEND="
- egl? ( media-libs/mesa[egl,${MULTILIB_USEDEP}] )"
+ egl? ( media-libs/mesa[egl(+),${MULTILIB_USEDEP}] )"
DEPEND="${RDEPEND}
X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )"
BDEPEND="${PYTHON_DEPS}
diff --git a/media-libs/libepoxy/libepoxy-9999.ebuild b/media-libs/libepoxy/libepoxy-9999.ebuild
index e29ce87c3286..8a0359a68ecb 100644
--- a/media-libs/libepoxy/libepoxy-9999.ebuild
+++ b/media-libs/libepoxy/libepoxy-9999.ebuild
@@ -25,7 +25,7 @@ IUSE="+egl test +X"
RESTRICT="!test? ( test )"
RDEPEND="
- egl? ( media-libs/mesa[egl,${MULTILIB_USEDEP}] )"
+ egl? ( media-libs/mesa[egl(+),${MULTILIB_USEDEP}] )"
DEPEND="${RDEPEND}
X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )"
BDEPEND="${PYTHON_DEPS}
diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index c957b25ef5c4..3c750ab3f8c4 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -1,4 +1,4 @@
AUX libsdl2-2.0.16-static-libs.patch 2076 BLAKE2B fc2fd18ef413216d2992863adb839ce266dafe8cd79167911bceac5341e58c5ff13ff9604b741ee8726bd4990238345327038cf2cd61df5c28d7a15eeae67b62 SHA512 da34e0da810b119d230e40b17b8f3bb3b3f7c9414960bc41c528a366c9b5f5b2afb321bdfa5871d898ba2bcb98610c2848619ef0f0bc54a0675f75a40a6ce8d4
DIST SDL2-2.0.16.tar.gz 7227262 BLAKE2B b17c531bc51157c7e64c6ea457342f0707f3f069f0cc096bcd658acc9d70c52416427d9e84bb18f36abe2d6e85095f1704ce6e7bba9e45a9766d78cbe93a5d17 SHA512 ec75ef8526792650c2647b78bb0244f973774418aeae33a2182d90ce696b30acb652f8be9c2012a16c1c5d5622f7630ff2e1eadae27ea3dc78ab47730cf5e62f
-EBUILD libsdl2-2.0.16.ebuild 6459 BLAKE2B 250580c6393a8d5d1a421b663c80871f9a8c733483262f5579d04f589267b4a915e8922063115f97191eaed123d3b37a4f039493d00517486aa4444d012a7fc3 SHA512 f330f3f3a2c289f3c110a0c479f19e7d468e83468612a16b2c09d0c1318f937b314bcab4e8a6c0b9286e95cabe5ee7337035e0abddd1231d38b3a1aac6924db4
+EBUILD libsdl2-2.0.16-r1.ebuild 6465 BLAKE2B b1abfb4334df0bb3857d23c4b92f2ca158c75d70bea5aef5dd7643b7f4c5c9b6ba5f280d8a130b6a63fe5331d88012d7924bb5fd9525ad69c07b521b82eaacf4 SHA512 71a675c646db408f01da627c40651bdcbdcc59aff11a8d22ea8bdc13c13de42337082e4b2ee4157aa5081071609c2479be0334f4a119721ebe79bf0d336361c7
MISC metadata.xml 1975 BLAKE2B 7ebb6f5306b8d525ff7564f19e86d11ba36579e376b9b691f421fc47f2ac887cda3baa3ad0cac3ab5d761b7df5ee50ce0c6636ed77287eb86a7fd7e587c70dfb SHA512 e163aaa04637301da96ac9fca8c68582227b24fac1ca929f2ff1f2db8b0e0f7c84914b3a4ccb54367d41082d2e24c761228b2110bf099afed9599a5cb3014db7
diff --git a/media-libs/libsdl2/libsdl2-2.0.16.ebuild b/media-libs/libsdl2/libsdl2-2.0.16-r1.ebuild
index e1bab222dedb..c74bfff69b26 100644
--- a/media-libs/libsdl2/libsdl2-2.0.16.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.16-r1.ebuild
@@ -42,7 +42,7 @@ CDEPEND="
jack? ( virtual/jack[${MULTILIB_USEDEP}] )
kms? (
>=x11-libs/libdrm-2.4.82[${MULTILIB_USEDEP}]
- >=media-libs/mesa-9.0.0[${MULTILIB_USEDEP},gbm]
+ >=media-libs/mesa-9.0.0[${MULTILIB_USEDEP},gbm(+)]
)
libsamplerate? ( media-libs/libsamplerate[${MULTILIB_USEDEP}] )
nas? (
@@ -59,7 +59,7 @@ CDEPEND="
udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
wayland? (
>=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}]
- >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},egl,gles2,wayland]
+ >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},egl(+),gles2,wayland]
>=x11-libs/libxkbcommon-0.2.0[${MULTILIB_USEDEP}]
)
X? (
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 264d82772693..3b3d4f772dc9 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -2,8 +2,12 @@ AUX 21.1.8-util-fossilize_db-Don-t-corrupt-keys-during-entry-re.patch 1732 BLAKE
DIST mesa-21.1.7.tar.xz 15391776 BLAKE2B a9138f189ef953d5efa4e287fbbe795ef2539c113dc7e0f565d3f35dcfaa59ab08674bf37fda196ba34e5963637c3ebb133db40b558bd275e29c8387b1acfdfa SHA512 1fd677437f292c30fbf08bfef8c1088557841f426090ccba20ab2a222b08fb5c3ec48a7a0301466e03a23019d09414c700a4f5e299479cacd6972a9f3ba030c8
DIST mesa-21.1.8.tar.xz 15410504 BLAKE2B 430a1a5f3120bb69b7eaab13438d9a09201f5b11c9d4581d7dd39f48041a1b70d7c125f36553a5c504d1164fe6e0e3d50853c209c4280787f4fa6935ab385b86 SHA512 80fcf2b1d59b49e384e9aa1ae63a3ce709833059af1ffd8eb821054c1976709134098cfc79fac1578a2f08a003223f1c96b38e2e650c5be49821c6f2fe1047af
DIST mesa-21.2.2.tar.xz 15755212 BLAKE2B a9c0f847d8d372fac076bd1a2a2113f34d4f5f57d5d459f88b2d1a14bd8a2a442d70c2959637ac17836d8be13941c2192bf639f42d3a7eaf7d8cdb5175268389 SHA512 0a4877b405384088c8bdac3031444cd22377d19552c41c08fb8928d6edf23d5f5a237ef1d6c5f96e3293c2e90c63f4702813226b85cb304fe5e01dd2710ba697
+DIST mesa-21.2.5.tar.xz 15829684 BLAKE2B a5d00d6c566e699acd1f8cfcf1b52024c92cfa8a4cc9a6fb1d6493526ea0d65790ed97c47c5c174d4369e589caf1a361351df6d43aba89f818970f87f9a81059 SHA512 aaa1ebaa1e18eea76c3784c9a65942c3e417c1079d7bf75dcede574999dc459fb4d68d041cf2f767afb9cbfa834a985e0a4edd5a56b0fc90f8fdc506359aa5da
+DIST mesa-21.3.0-rc3.tar.xz 16349156 BLAKE2B bc25478b7ee2c6186baf8f8540da7d5a6847146badd37653b65e2d3a47f8a7ae866825058ad54b68563ddb4f8409180ebb7415925409b6f0b401be81a45eca9d SHA512 14c3cdf2085077db3ec6d7e7b66304fccdaf441dfd64cc085d6d83960fcbdaa18a48d8f6bcdc096def06b6d389f51c1a5cb0a6793a236d668e22c592bc8b2e4c
EBUILD mesa-21.1.7.ebuild 14933 BLAKE2B 9f7e8cc4f522d6a7b1fbd65e2e12010a7c4132cd403674aaef2170af7247a642b1dc61ca14bf4cb1595c6f14ac94f383a602d7320836b6ee5d0d26ef17886951 SHA512 ef20ed369384d62a639045bd60faffecf7583df00fc67ba5aa88df2263d5bb47ea753b21074194f81b7ab051acb8eedbcad09c5508c662dd50ebcc0fc3a75f24
-EBUILD mesa-21.1.8-r1.ebuild 15033 BLAKE2B cbc17e08f8e8647f83b57d8d0c27389287a17ca499acd449a25819db92aa7a86004acd0b6c05a34e104f518b3f47439082e8c2dcd37e0253521809540baee1e4 SHA512 2525f91bae3559ef3e016aa38e53c8bdff3442ac36325b90615e9ef5971fef418506df0f852fb823d4a7f41462d4c9a7730084e19ad864650b9fe5762387ea86
+EBUILD mesa-21.1.8-r1.ebuild 15091 BLAKE2B e0f111b6f15f58ba68745aab2f4a59377ad897117320033968e032507bb01958981968d3a3cf14eb14a6b062d9cdd6aac4bb9f06d0b13f5fa1079349e7196707 SHA512 6f65a1454996469fddbfa0b0c9b3272555c225044feebc6ac78ff5e5fb054130fd5152f64579bba9f577b7f89ca0dc465902da54666ad46ad4268750eeefb252
EBUILD mesa-21.2.2.ebuild 14852 BLAKE2B 8b7ee50b2e14cbf56c0f0ec5db2fb7ac364373e0d2b43bda68e825bb2a685f79328220defaf51f87d7ec2dfe62ed5fcb717b52dd557e09f16e2ca2c826b18f35 SHA512 07d5a1104caaf68b37fd3e58ef296859640e2ba05645f2f9de41b2982e0b3d2781108f25ae6cb7234c167b59e88653e9ce3d0f34a3d65f708d2d67f709c7668c
-EBUILD mesa-9999.ebuild 14852 BLAKE2B 8b7ee50b2e14cbf56c0f0ec5db2fb7ac364373e0d2b43bda68e825bb2a685f79328220defaf51f87d7ec2dfe62ed5fcb717b52dd557e09f16e2ca2c826b18f35 SHA512 07d5a1104caaf68b37fd3e58ef296859640e2ba05645f2f9de41b2982e0b3d2781108f25ae6cb7234c167b59e88653e9ce3d0f34a3d65f708d2d67f709c7668c
+EBUILD mesa-21.2.5.ebuild 15220 BLAKE2B ec66f903dd1b4c63600992de79860c1280c697b9a517d341a1fc0d8edf361e78cdd672d7c12c460bc4fb6c1ca4691dd5f4409af10048086d2f21327ab23d18da SHA512 8ed4b9a18a779e4570c8c070334596051a7835cf465d3e67c539c99f4843930a4190e5f53498bff1f467c6872761bca8caf77b14b7b536b26b052afb614248e2
+EBUILD mesa-21.3.0_rc3.ebuild 15220 BLAKE2B ec66f903dd1b4c63600992de79860c1280c697b9a517d341a1fc0d8edf361e78cdd672d7c12c460bc4fb6c1ca4691dd5f4409af10048086d2f21327ab23d18da SHA512 8ed4b9a18a779e4570c8c070334596051a7835cf465d3e67c539c99f4843930a4190e5f53498bff1f467c6872761bca8caf77b14b7b536b26b052afb614248e2
+EBUILD mesa-9999.ebuild 15220 BLAKE2B ec66f903dd1b4c63600992de79860c1280c697b9a517d341a1fc0d8edf361e78cdd672d7c12c460bc4fb6c1ca4691dd5f4409af10048086d2f21327ab23d18da SHA512 8ed4b9a18a779e4570c8c070334596051a7835cf465d3e67c539c99f4843930a4190e5f53498bff1f467c6872761bca8caf77b14b7b536b26b052afb614248e2
MISC metadata.xml 1896 BLAKE2B 579a066dd2fa70f2063ff020676fc6a342bc5d04555e4026868f14816a6ff6efb85824a8d689ce4984a1d7fae17548ad8331d209d9bfdb21ef186c895656ff9d SHA512 8c958d7cdd3bfa987683c6b2cb27b6f02d6ef4ddbf7954ec05ed1e5c2a046fbeb49b059e1a6f48d727855c575bd30f04c2898451ae5a02a40370e0bfba93f117
diff --git a/media-libs/mesa/mesa-21.1.8-r1.ebuild b/media-libs/mesa/mesa-21.1.8-r1.ebuild
index 482b96c702ab..636dda43bd7e 100644
--- a/media-libs/mesa/mesa-21.1.8-r1.ebuild
+++ b/media-libs/mesa/mesa-21.1.8-r1.ebuild
@@ -35,7 +35,7 @@ for card in ${VIDEO_CARDS}; do
done
IUSE="${IUSE_VIDEO_CARDS}
- +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +llvm
+ +classic cpu_flags_x86_sse2 d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +llvm
lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
vulkan-overlay wayland +X xa xvmc zink +zstd"
@@ -522,6 +522,7 @@ multilib_src_configure() {
$(meson_use osmesa)
$(meson_use selinux)
$(meson_feature zstd)
+ $(meson_use cpu_flags_x86_sse2 sse2)
-Dvalgrind=$(usex valgrind auto false)
-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
diff --git a/media-libs/mesa/mesa-21.2.5.ebuild b/media-libs/mesa/mesa-21.2.5.ebuild
new file mode 100644
index 000000000000..5829adce48f2
--- /dev/null
+++ b/media-libs/mesa/mesa-21.2.5.ebuild
@@ -0,0 +1,560 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit llvm meson-multilib python-any-r1 linux-info
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+
+if [[ ${PV} == 9999 ]]; then
+ EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+ inherit git-r3
+else
+ SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="
+ !test? ( test )
+"
+
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} crocus freedreno i915 i965 intel iris lima nouveau panfrost v3d vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+ IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+ +classic cpu_flags_x86_sse2 d3d9 debug +egl +gallium +gbm gles1 +gles2 +llvm
+ lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
+ vulkan-overlay wayland +X xa xvmc zink +zstd"
+
+REQUIRED_USE="
+ d3d9? ( || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
+ gles1? ( egl )
+ gles2? ( egl )
+ osmesa? ( gallium )
+ vulkan? ( video_cards_radeonsi? ( llvm ) )
+ vulkan-overlay? ( vulkan )
+ wayland? ( egl gbm )
+ video_cards_crocus? ( gallium )
+ video_cards_freedreno? ( gallium )
+ video_cards_intel? ( classic )
+ video_cards_i915? ( || ( classic gallium ) )
+ video_cards_i965? ( classic )
+ video_cards_iris? ( gallium )
+ video_cards_lima? ( gallium )
+ video_cards_nouveau? ( || ( classic gallium ) )
+ video_cards_panfrost? ( gallium )
+ video_cards_radeon? ( || ( classic gallium )
+ gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
+ video_cards_r100? ( classic )
+ video_cards_r200? ( classic )
+ video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) )
+ video_cards_r600? ( gallium )
+ video_cards_radeonsi? ( gallium llvm )
+ video_cards_v3d? ( gallium )
+ video_cards_vc4? ( gallium )
+ video_cards_virgl? ( gallium )
+ video_cards_vivante? ( gallium gbm )
+ video_cards_vmware? ( gallium )
+ xa? ( X )
+ xvmc? ( X )
+ zink? ( gallium vulkan )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.107"
+RDEPEND="
+ >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+ >=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
+ >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+ gallium? (
+ unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+ llvm? (
+ video_cards_radeonsi? (
+ virtual/libelf:0=[${MULTILIB_USEDEP}]
+ )
+ video_cards_r600? (
+ virtual/libelf:0=[${MULTILIB_USEDEP}]
+ )
+ video_cards_radeon? (
+ virtual/libelf:0=[${MULTILIB_USEDEP}]
+ )
+ )
+ lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
+ opencl? (
+ >=virtual/opencl-3[${MULTILIB_USEDEP}]
+ dev-libs/libclc
+ virtual/libelf:0=[${MULTILIB_USEDEP}]
+ )
+ vaapi? (
+ >=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+ )
+ vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+ xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+ )
+ selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
+ wayland? (
+ >=dev-libs/wayland-1.18.0:=[${MULTILIB_USEDEP}]
+ >=dev-libs/wayland-protocols-1.8
+ )
+ ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+ video_cards_intel? (
+ !video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+ )
+ video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+ vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
+ X? (
+ >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+ >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+ >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+ >=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
+ x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+ )
+ zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
+ zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
+"
+for card in ${RADEON_CARDS}; do
+ RDEPEND="${RDEPEND}
+ video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+ "
+done
+RDEPEND="${RDEPEND}
+ video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 10.
+# 3. Specify LLVM_MAX_SLOT, e.g. 9.
+LLVM_MAX_SLOT="13"
+LLVM_DEPSTR="
+ || (
+ sys-devel/llvm:13[${MULTILIB_USEDEP}]
+ sys-devel/llvm:12[${MULTILIB_USEDEP}]
+ sys-devel/llvm:11[${MULTILIB_USEDEP}]
+ )
+ <sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
+"
+LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
+CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+RDEPEND="${RDEPEND}
+ gallium? (
+ llvm? (
+ opencl? (
+ video_cards_r600? (
+ ${CLANG_DEPSTR_AMDGPU}
+ )
+ !video_cards_r600? (
+ video_cards_radeonsi? (
+ ${CLANG_DEPSTR_AMDGPU}
+ )
+ )
+ !video_cards_r600? (
+ !video_cards_radeonsi? (
+ video_cards_radeon? (
+ ${CLANG_DEPSTR_AMDGPU}
+ )
+ )
+ )
+ !video_cards_r600? (
+ !video_cards_radeon? (
+ !video_cards_radeonsi? (
+ ${CLANG_DEPSTR}
+ )
+ )
+ )
+ )
+ !opencl? (
+ video_cards_r600? (
+ ${LLVM_DEPSTR_AMDGPU}
+ )
+ !video_cards_r600? (
+ video_cards_radeonsi? (
+ ${LLVM_DEPSTR_AMDGPU}
+ )
+ )
+ !video_cards_r600? (
+ !video_cards_radeonsi? (
+ video_cards_radeon? (
+ ${LLVM_DEPSTR_AMDGPU}
+ )
+ )
+ )
+ !video_cards_r600? (
+ !video_cards_radeon? (
+ !video_cards_radeonsi? (
+ ${LLVM_DEPSTR}
+ )
+ )
+ )
+ )
+ )
+ )
+"
+unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
+
+DEPEND="${RDEPEND}
+ valgrind? ( dev-util/valgrind )
+ X? (
+ x11-libs/libXrandr[${MULTILIB_USEDEP}]
+ x11-base/xorg-proto
+ )
+"
+BDEPEND="
+ ${PYTHON_DEPS}
+ opencl? (
+ >=sys-devel/gcc-4.6
+ )
+ sys-devel/bison
+ sys-devel/flex
+ virtual/pkgconfig
+ $(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+ wayland? ( dev-util/wayland-scanner[${MULTILIB_USEDEP}] )
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+ usr/lib*/libglapi.so.0.0.0
+ usr/lib*/libGLESv1_CM.so.1.1.0
+ usr/lib*/libGLESv2.so.2.0.0
+ usr/lib*/libGL.so.1.2.0
+ usr/lib*/libOSMesa.so.8.0.0
+ usr/lib/libGLX_mesa.so.0.0.0
+)"
+
+llvm_check_deps() {
+ local flags=${MULTILIB_USEDEP}
+ if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
+ then
+ flags+=",llvm_targets_AMDGPU(-)"
+ fi
+
+ if use opencl; then
+ has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
+ fi
+ has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
+}
+
+pkg_pretend() {
+ if use vulkan; then
+ if ! use video_cards_freedreno &&
+ ! use video_cards_i965 &&
+ ! use video_cards_iris &&
+ ! use video_cards_radeonsi &&
+ ! use video_cards_v3d; then
+ ewarn "Ignoring USE=vulkan since VIDEO_CARDS does not contain freedreno, i965, iris, radeonsi, or v3d"
+ fi
+ fi
+
+ if use opencl; then
+ if ! use video_cards_r600 &&
+ ! use video_cards_radeonsi; then
+ ewarn "Ignoring USE=opencl since VIDEO_CARDS does not contain r600 or radeonsi"
+ fi
+ fi
+
+ if use vaapi; then
+ if ! use video_cards_r600 &&
+ ! use video_cards_radeonsi &&
+ ! use video_cards_nouveau; then
+ ewarn "Ignoring USE=vaapi since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
+ fi
+ fi
+
+ if use vdpau; then
+ if ! use video_cards_r300 &&
+ ! use video_cards_r600 &&
+ ! use video_cards_radeonsi &&
+ ! use video_cards_nouveau; then
+ ewarn "Ignoring USE=vdpau since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
+ fi
+ fi
+
+ if use xa; then
+ if ! use video_cards_freedreno &&
+ ! use video_cards_nouveau &&
+ ! use video_cards_vmware; then
+ ewarn "Ignoring USE=xa since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
+ fi
+ fi
+
+ if use xvmc; then
+ if ! use video_cards_r600 &&
+ ! use video_cards_nouveau; then
+ ewarn "Ignoring USE=xvmc since VIDEO_CARDS does not contain r600 or nouveau"
+ fi
+ fi
+
+ if ! use gallium; then
+ use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium"
+ use llvm && ewarn "Ignoring USE=llvm since USE does not contain gallium"
+ use opencl && ewarn "Ignoring USE=opencl since USE does not contain gallium"
+ use vaapi && ewarn "Ignoring USE=vaapi since USE does not contain gallium"
+ use vdpau && ewarn "Ignoring USE=vdpau since USE does not contain gallium"
+ use unwind && ewarn "Ignoring USE=unwind since USE does not contain gallium"
+ use xa && ewarn "Ignoring USE=xa since USE does not contain gallium"
+ use xvmc && ewarn "Ignoring USE=xvmc since USE does not contain gallium"
+ fi
+
+ if ! use llvm; then
+ use opencl && ewarn "Ignoring USE=opencl since USE does not contain llvm"
+ fi
+
+ if use osmesa && ! use llvm; then
+ ewarn "OSMesa will be slow without enabling USE=llvm"
+ fi
+}
+
+python_check_deps() {
+ has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ # warning message for bug 459306
+ if use llvm && has_version sys-devel/llvm[!debug=]; then
+ ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+ ewarn "detected! This can cause problems. For details, see bug 459306."
+ fi
+
+ if use video_cards_i965 ||
+ use video_cards_iris ||
+ use video_cards_radeonsi; then
+ if kernel_is -ge 5 11 3; then
+ CONFIG_CHECK="~KCMP"
+ elif kernel_is -ge 5 11; then
+ CONFIG_CHECK="~CHECKPOINT_RESTORE"
+ elif kernel_is -ge 5 10 20; then
+ CONFIG_CHECK="~KCMP"
+ else
+ CONFIG_CHECK="~CHECKPOINT_RESTORE"
+ fi
+ linux-info_pkg_setup
+ fi
+
+ if use gallium && use llvm; then
+ llvm_pkg_setup
+ fi
+ python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+ local emesonargs=()
+
+ if use classic; then
+ # Intel code
+ dri_driver_enable video_cards_i915 i915
+ dri_driver_enable video_cards_i965 i965
+ if ! use video_cards_i915 && \
+ ! use video_cards_i965; then
+ dri_driver_enable video_cards_intel i915 i965
+ fi
+
+ # Nouveau code
+ dri_driver_enable video_cards_nouveau nouveau
+
+ # ATI code
+ dri_driver_enable video_cards_r100 r100
+ dri_driver_enable video_cards_r200 r200
+ if ! use video_cards_r100 && \
+ ! use video_cards_r200; then
+ dri_driver_enable video_cards_radeon r100 r200
+ fi
+ fi
+
+ local platforms
+ use X && platforms+="x11"
+ use wayland && platforms+=",wayland"
+ emesonargs+=(-Dplatforms=${platforms#,})
+
+ if use X || use egl; then
+ emesonargs+=(-Dglvnd=true)
+ else
+ emesonargs+=(-Dglvnd=false)
+ fi
+
+ if use gallium; then
+ emesonargs+=(
+ $(meson_feature llvm)
+ $(meson_feature lm-sensors lmsensors)
+ $(meson_feature unwind libunwind)
+ )
+
+ if use video_cards_iris ||
+ use video_cards_r300 ||
+ use video_cards_r600 ||
+ use video_cards_radeonsi ||
+ use video_cards_nouveau ||
+ use video_cards_vmware; then
+ emesonargs+=($(meson_use d3d9 gallium-nine))
+ else
+ emesonargs+=(-Dgallium-nine=false)
+ fi
+
+ if use video_cards_r600 ||
+ use video_cards_radeonsi ||
+ use video_cards_nouveau; then
+ emesonargs+=($(meson_feature vaapi gallium-va))
+ use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
+ else
+ emesonargs+=(-Dgallium-va=disabled)
+ fi
+
+ if use video_cards_r300 ||
+ use video_cards_r600 ||
+ use video_cards_radeonsi ||
+ use video_cards_nouveau; then
+ emesonargs+=($(meson_feature vdpau gallium-vdpau))
+ else
+ emesonargs+=(-Dgallium-vdpau=disabled)
+ fi
+
+ if use video_cards_freedreno ||
+ use video_cards_nouveau ||
+ use video_cards_vmware; then
+ emesonargs+=($(meson_feature xa gallium-xa))
+ else
+ emesonargs+=(-Dgallium-xa=disabled)
+ fi
+
+ if use video_cards_r600 ||
+ use video_cards_nouveau; then
+ emesonargs+=($(meson_feature xvmc gallium-xvmc))
+ else
+ emesonargs+=(-Dgallium-xvmc=disabled)
+ fi
+
+ if use video_cards_freedreno ||
+ use video_cards_lima ||
+ use video_cards_panfrost ||
+ use video_cards_v3d ||
+ use video_cards_vc4 ||
+ use video_cards_vivante; then
+ gallium_enable -- kmsro
+ fi
+
+ gallium_enable -- swrast
+ gallium_enable video_cards_lima lima
+ gallium_enable video_cards_panfrost panfrost
+ gallium_enable video_cards_v3d v3d
+ gallium_enable video_cards_vc4 vc4
+ gallium_enable video_cards_vivante etnaviv
+ gallium_enable video_cards_vmware svga
+ gallium_enable video_cards_nouveau nouveau
+ gallium_enable zink zink
+
+ # Only one i915 driver (classic vs gallium). Default to classic.
+ if ! use classic; then
+ gallium_enable video_cards_i915 i915
+ if ! use video_cards_i915 && \
+ ! use video_cards_i965; then
+ gallium_enable video_cards_intel i915
+ fi
+ fi
+
+ gallium_enable video_cards_crocus crocus
+ gallium_enable video_cards_iris iris
+
+ gallium_enable video_cards_r300 r300
+ gallium_enable video_cards_r600 r600
+ gallium_enable video_cards_radeonsi radeonsi
+ if ! use video_cards_r300 && \
+ ! use video_cards_r600; then
+ gallium_enable video_cards_radeon r300 r600
+ fi
+
+ gallium_enable video_cards_freedreno freedreno
+ gallium_enable video_cards_virgl virgl
+
+ # opencl stuff
+ emesonargs+=(
+ -Dgallium-opencl="$(usex opencl icd disabled)"
+ )
+ fi
+
+ if use vulkan; then
+ vulkan_enable video_cards_freedreno freedreno
+ vulkan_enable video_cards_i965 intel
+ vulkan_enable video_cards_iris intel
+ vulkan_enable video_cards_radeonsi amd
+ vulkan_enable video_cards_v3d broadcom
+ fi
+
+ driver_list() {
+ local drivers="$(sort -u <<< "${1// /$'\n'}")"
+ echo "${drivers//$'\n'/,}"
+ }
+
+ local vulkan_layers
+ use vulkan && vulkan_layers+="device-select"
+ use vulkan-overlay && vulkan_layers+=",overlay"
+ emesonargs+=(-Dvulkan-layers=${vulkan_layers#,})
+
+ emesonargs+=(
+ $(meson_use test build-tests)
+ -Dglx=$(usex X dri disabled)
+ -Dshared-glapi=enabled
+ -Ddri3=enabled
+ $(meson_feature egl)
+ $(meson_feature gbm)
+ $(meson_feature gles1)
+ $(meson_feature gles2)
+ $(meson_use osmesa)
+ $(meson_use selinux)
+ $(meson_feature zstd)
+ $(meson_use video_cards_crocus prefer-crocus)
+ $(meson_use video_cards_iris prefer-iris)
+ $(meson_use cpu_flags_x86_sse2 sse2)
+ -Dvalgrind=$(usex valgrind auto disabled)
+ -Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
+ -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+ -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+ --buildtype $(usex debug debug plain)
+ -Db_ndebug=$(usex debug false true)
+ )
+ meson_src_configure
+}
+
+multilib_src_test() {
+ meson_src_test -t 100
+}
+
+# $1 - VIDEO_CARDS flag (check skipped for "--")
+# other args - names of DRI drivers to enable
+dri_driver_enable() {
+ if [[ $1 == -- ]] || use $1; then
+ shift
+ DRI_DRIVERS+=("$@")
+ fi
+}
+
+gallium_enable() {
+ if [[ $1 == -- ]] || use $1; then
+ shift
+ GALLIUM_DRIVERS+=("$@")
+ fi
+}
+
+vulkan_enable() {
+ if [[ $1 == -- ]] || use $1; then
+ shift
+ VULKAN_DRIVERS+=("$@")
+ fi
+}
diff --git a/media-libs/mesa/mesa-21.3.0_rc3.ebuild b/media-libs/mesa/mesa-21.3.0_rc3.ebuild
new file mode 100644
index 000000000000..5829adce48f2
--- /dev/null
+++ b/media-libs/mesa/mesa-21.3.0_rc3.ebuild
@@ -0,0 +1,560 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit llvm meson-multilib python-any-r1 linux-info
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+
+if [[ ${PV} == 9999 ]]; then
+ EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+ inherit git-r3
+else
+ SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="
+ !test? ( test )
+"
+
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} crocus freedreno i915 i965 intel iris lima nouveau panfrost v3d vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+ IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+ +classic cpu_flags_x86_sse2 d3d9 debug +egl +gallium +gbm gles1 +gles2 +llvm
+ lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
+ vulkan-overlay wayland +X xa xvmc zink +zstd"
+
+REQUIRED_USE="
+ d3d9? ( || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
+ gles1? ( egl )
+ gles2? ( egl )
+ osmesa? ( gallium )
+ vulkan? ( video_cards_radeonsi? ( llvm ) )
+ vulkan-overlay? ( vulkan )
+ wayland? ( egl gbm )
+ video_cards_crocus? ( gallium )
+ video_cards_freedreno? ( gallium )
+ video_cards_intel? ( classic )
+ video_cards_i915? ( || ( classic gallium ) )
+ video_cards_i965? ( classic )
+ video_cards_iris? ( gallium )
+ video_cards_lima? ( gallium )
+ video_cards_nouveau? ( || ( classic gallium ) )
+ video_cards_panfrost? ( gallium )
+ video_cards_radeon? ( || ( classic gallium )
+ gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
+ video_cards_r100? ( classic )
+ video_cards_r200? ( classic )
+ video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) )
+ video_cards_r600? ( gallium )
+ video_cards_radeonsi? ( gallium llvm )
+ video_cards_v3d? ( gallium )
+ video_cards_vc4? ( gallium )
+ video_cards_virgl? ( gallium )
+ video_cards_vivante? ( gallium gbm )
+ video_cards_vmware? ( gallium )
+ xa? ( X )
+ xvmc? ( X )
+ zink? ( gallium vulkan )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.107"
+RDEPEND="
+ >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+ >=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
+ >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+ gallium? (
+ unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+ llvm? (
+ video_cards_radeonsi? (
+ virtual/libelf:0=[${MULTILIB_USEDEP}]
+ )
+ video_cards_r600? (
+ virtual/libelf:0=[${MULTILIB_USEDEP}]
+ )
+ video_cards_radeon? (
+ virtual/libelf:0=[${MULTILIB_USEDEP}]
+ )
+ )
+ lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
+ opencl? (
+ >=virtual/opencl-3[${MULTILIB_USEDEP}]
+ dev-libs/libclc
+ virtual/libelf:0=[${MULTILIB_USEDEP}]
+ )
+ vaapi? (
+ >=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+ )
+ vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+ xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+ )
+ selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
+ wayland? (
+ >=dev-libs/wayland-1.18.0:=[${MULTILIB_USEDEP}]
+ >=dev-libs/wayland-protocols-1.8
+ )
+ ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+ video_cards_intel? (
+ !video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+ )
+ video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+ vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
+ X? (
+ >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+ >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+ >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+ >=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
+ x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+ )
+ zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
+ zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
+"
+for card in ${RADEON_CARDS}; do
+ RDEPEND="${RDEPEND}
+ video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+ "
+done
+RDEPEND="${RDEPEND}
+ video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 10.
+# 3. Specify LLVM_MAX_SLOT, e.g. 9.
+LLVM_MAX_SLOT="13"
+LLVM_DEPSTR="
+ || (
+ sys-devel/llvm:13[${MULTILIB_USEDEP}]
+ sys-devel/llvm:12[${MULTILIB_USEDEP}]
+ sys-devel/llvm:11[${MULTILIB_USEDEP}]
+ )
+ <sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
+"
+LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
+CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+RDEPEND="${RDEPEND}
+ gallium? (
+ llvm? (
+ opencl? (
+ video_cards_r600? (
+ ${CLANG_DEPSTR_AMDGPU}
+ )
+ !video_cards_r600? (
+ video_cards_radeonsi? (
+ ${CLANG_DEPSTR_AMDGPU}
+ )
+ )
+ !video_cards_r600? (
+ !video_cards_radeonsi? (
+ video_cards_radeon? (
+ ${CLANG_DEPSTR_AMDGPU}
+ )
+ )
+ )
+ !video_cards_r600? (
+ !video_cards_radeon? (
+ !video_cards_radeonsi? (
+ ${CLANG_DEPSTR}
+ )
+ )
+ )
+ )
+ !opencl? (
+ video_cards_r600? (
+ ${LLVM_DEPSTR_AMDGPU}
+ )
+ !video_cards_r600? (
+ video_cards_radeonsi? (
+ ${LLVM_DEPSTR_AMDGPU}
+ )
+ )
+ !video_cards_r600? (
+ !video_cards_radeonsi? (
+ video_cards_radeon? (
+ ${LLVM_DEPSTR_AMDGPU}
+ )
+ )
+ )
+ !video_cards_r600? (
+ !video_cards_radeon? (
+ !video_cards_radeonsi? (
+ ${LLVM_DEPSTR}
+ )
+ )
+ )
+ )
+ )
+ )
+"
+unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
+
+DEPEND="${RDEPEND}
+ valgrind? ( dev-util/valgrind )
+ X? (
+ x11-libs/libXrandr[${MULTILIB_USEDEP}]
+ x11-base/xorg-proto
+ )
+"
+BDEPEND="
+ ${PYTHON_DEPS}
+ opencl? (
+ >=sys-devel/gcc-4.6
+ )
+ sys-devel/bison
+ sys-devel/flex
+ virtual/pkgconfig
+ $(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+ wayland? ( dev-util/wayland-scanner[${MULTILIB_USEDEP}] )
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+ usr/lib*/libglapi.so.0.0.0
+ usr/lib*/libGLESv1_CM.so.1.1.0
+ usr/lib*/libGLESv2.so.2.0.0
+ usr/lib*/libGL.so.1.2.0
+ usr/lib*/libOSMesa.so.8.0.0
+ usr/lib/libGLX_mesa.so.0.0.0
+)"
+
+llvm_check_deps() {
+ local flags=${MULTILIB_USEDEP}
+ if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
+ then
+ flags+=",llvm_targets_AMDGPU(-)"
+ fi
+
+ if use opencl; then
+ has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
+ fi
+ has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
+}
+
+pkg_pretend() {
+ if use vulkan; then
+ if ! use video_cards_freedreno &&
+ ! use video_cards_i965 &&
+ ! use video_cards_iris &&
+ ! use video_cards_radeonsi &&
+ ! use video_cards_v3d; then
+ ewarn "Ignoring USE=vulkan since VIDEO_CARDS does not contain freedreno, i965, iris, radeonsi, or v3d"
+ fi
+ fi
+
+ if use opencl; then
+ if ! use video_cards_r600 &&
+ ! use video_cards_radeonsi; then
+ ewarn "Ignoring USE=opencl since VIDEO_CARDS does not contain r600 or radeonsi"
+ fi
+ fi
+
+ if use vaapi; then
+ if ! use video_cards_r600 &&
+ ! use video_cards_radeonsi &&
+ ! use video_cards_nouveau; then
+ ewarn "Ignoring USE=vaapi since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
+ fi
+ fi
+
+ if use vdpau; then
+ if ! use video_cards_r300 &&
+ ! use video_cards_r600 &&
+ ! use video_cards_radeonsi &&
+ ! use video_cards_nouveau; then
+ ewarn "Ignoring USE=vdpau since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
+ fi
+ fi
+
+ if use xa; then
+ if ! use video_cards_freedreno &&
+ ! use video_cards_nouveau &&
+ ! use video_cards_vmware; then
+ ewarn "Ignoring USE=xa since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
+ fi
+ fi
+
+ if use xvmc; then
+ if ! use video_cards_r600 &&
+ ! use video_cards_nouveau; then
+ ewarn "Ignoring USE=xvmc since VIDEO_CARDS does not contain r600 or nouveau"
+ fi
+ fi
+
+ if ! use gallium; then
+ use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium"
+ use llvm && ewarn "Ignoring USE=llvm since USE does not contain gallium"
+ use opencl && ewarn "Ignoring USE=opencl since USE does not contain gallium"
+ use vaapi && ewarn "Ignoring USE=vaapi since USE does not contain gallium"
+ use vdpau && ewarn "Ignoring USE=vdpau since USE does not contain gallium"
+ use unwind && ewarn "Ignoring USE=unwind since USE does not contain gallium"
+ use xa && ewarn "Ignoring USE=xa since USE does not contain gallium"
+ use xvmc && ewarn "Ignoring USE=xvmc since USE does not contain gallium"
+ fi
+
+ if ! use llvm; then
+ use opencl && ewarn "Ignoring USE=opencl since USE does not contain llvm"
+ fi
+
+ if use osmesa && ! use llvm; then
+ ewarn "OSMesa will be slow without enabling USE=llvm"
+ fi
+}
+
+python_check_deps() {
+ has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ # warning message for bug 459306
+ if use llvm && has_version sys-devel/llvm[!debug=]; then
+ ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+ ewarn "detected! This can cause problems. For details, see bug 459306."
+ fi
+
+ if use video_cards_i965 ||
+ use video_cards_iris ||
+ use video_cards_radeonsi; then
+ if kernel_is -ge 5 11 3; then
+ CONFIG_CHECK="~KCMP"
+ elif kernel_is -ge 5 11; then
+ CONFIG_CHECK="~CHECKPOINT_RESTORE"
+ elif kernel_is -ge 5 10 20; then
+ CONFIG_CHECK="~KCMP"
+ else
+ CONFIG_CHECK="~CHECKPOINT_RESTORE"
+ fi
+ linux-info_pkg_setup
+ fi
+
+ if use gallium && use llvm; then
+ llvm_pkg_setup
+ fi
+ python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+ local emesonargs=()
+
+ if use classic; then
+ # Intel code
+ dri_driver_enable video_cards_i915 i915
+ dri_driver_enable video_cards_i965 i965
+ if ! use video_cards_i915 && \
+ ! use video_cards_i965; then
+ dri_driver_enable video_cards_intel i915 i965
+ fi
+
+ # Nouveau code
+ dri_driver_enable video_cards_nouveau nouveau
+
+ # ATI code
+ dri_driver_enable video_cards_r100 r100
+ dri_driver_enable video_cards_r200 r200
+ if ! use video_cards_r100 && \
+ ! use video_cards_r200; then
+ dri_driver_enable video_cards_radeon r100 r200
+ fi
+ fi
+
+ local platforms
+ use X && platforms+="x11"
+ use wayland && platforms+=",wayland"
+ emesonargs+=(-Dplatforms=${platforms#,})
+
+ if use X || use egl; then
+ emesonargs+=(-Dglvnd=true)
+ else
+ emesonargs+=(-Dglvnd=false)
+ fi
+
+ if use gallium; then
+ emesonargs+=(
+ $(meson_feature llvm)
+ $(meson_feature lm-sensors lmsensors)
+ $(meson_feature unwind libunwind)
+ )
+
+ if use video_cards_iris ||
+ use video_cards_r300 ||
+ use video_cards_r600 ||
+ use video_cards_radeonsi ||
+ use video_cards_nouveau ||
+ use video_cards_vmware; then
+ emesonargs+=($(meson_use d3d9 gallium-nine))
+ else
+ emesonargs+=(-Dgallium-nine=false)
+ fi
+
+ if use video_cards_r600 ||
+ use video_cards_radeonsi ||
+ use video_cards_nouveau; then
+ emesonargs+=($(meson_feature vaapi gallium-va))
+ use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
+ else
+ emesonargs+=(-Dgallium-va=disabled)
+ fi
+
+ if use video_cards_r300 ||
+ use video_cards_r600 ||
+ use video_cards_radeonsi ||
+ use video_cards_nouveau; then
+ emesonargs+=($(meson_feature vdpau gallium-vdpau))
+ else
+ emesonargs+=(-Dgallium-vdpau=disabled)
+ fi
+
+ if use video_cards_freedreno ||
+ use video_cards_nouveau ||
+ use video_cards_vmware; then
+ emesonargs+=($(meson_feature xa gallium-xa))
+ else
+ emesonargs+=(-Dgallium-xa=disabled)
+ fi
+
+ if use video_cards_r600 ||
+ use video_cards_nouveau; then
+ emesonargs+=($(meson_feature xvmc gallium-xvmc))
+ else
+ emesonargs+=(-Dgallium-xvmc=disabled)
+ fi
+
+ if use video_cards_freedreno ||
+ use video_cards_lima ||
+ use video_cards_panfrost ||
+ use video_cards_v3d ||
+ use video_cards_vc4 ||
+ use video_cards_vivante; then
+ gallium_enable -- kmsro
+ fi
+
+ gallium_enable -- swrast
+ gallium_enable video_cards_lima lima
+ gallium_enable video_cards_panfrost panfrost
+ gallium_enable video_cards_v3d v3d
+ gallium_enable video_cards_vc4 vc4
+ gallium_enable video_cards_vivante etnaviv
+ gallium_enable video_cards_vmware svga
+ gallium_enable video_cards_nouveau nouveau
+ gallium_enable zink zink
+
+ # Only one i915 driver (classic vs gallium). Default to classic.
+ if ! use classic; then
+ gallium_enable video_cards_i915 i915
+ if ! use video_cards_i915 && \
+ ! use video_cards_i965; then
+ gallium_enable video_cards_intel i915
+ fi
+ fi
+
+ gallium_enable video_cards_crocus crocus
+ gallium_enable video_cards_iris iris
+
+ gallium_enable video_cards_r300 r300
+ gallium_enable video_cards_r600 r600
+ gallium_enable video_cards_radeonsi radeonsi
+ if ! use video_cards_r300 && \
+ ! use video_cards_r600; then
+ gallium_enable video_cards_radeon r300 r600
+ fi
+
+ gallium_enable video_cards_freedreno freedreno
+ gallium_enable video_cards_virgl virgl
+
+ # opencl stuff
+ emesonargs+=(
+ -Dgallium-opencl="$(usex opencl icd disabled)"
+ )
+ fi
+
+ if use vulkan; then
+ vulkan_enable video_cards_freedreno freedreno
+ vulkan_enable video_cards_i965 intel
+ vulkan_enable video_cards_iris intel
+ vulkan_enable video_cards_radeonsi amd
+ vulkan_enable video_cards_v3d broadcom
+ fi
+
+ driver_list() {
+ local drivers="$(sort -u <<< "${1// /$'\n'}")"
+ echo "${drivers//$'\n'/,}"
+ }
+
+ local vulkan_layers
+ use vulkan && vulkan_layers+="device-select"
+ use vulkan-overlay && vulkan_layers+=",overlay"
+ emesonargs+=(-Dvulkan-layers=${vulkan_layers#,})
+
+ emesonargs+=(
+ $(meson_use test build-tests)
+ -Dglx=$(usex X dri disabled)
+ -Dshared-glapi=enabled
+ -Ddri3=enabled
+ $(meson_feature egl)
+ $(meson_feature gbm)
+ $(meson_feature gles1)
+ $(meson_feature gles2)
+ $(meson_use osmesa)
+ $(meson_use selinux)
+ $(meson_feature zstd)
+ $(meson_use video_cards_crocus prefer-crocus)
+ $(meson_use video_cards_iris prefer-iris)
+ $(meson_use cpu_flags_x86_sse2 sse2)
+ -Dvalgrind=$(usex valgrind auto disabled)
+ -Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
+ -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+ -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+ --buildtype $(usex debug debug plain)
+ -Db_ndebug=$(usex debug false true)
+ )
+ meson_src_configure
+}
+
+multilib_src_test() {
+ meson_src_test -t 100
+}
+
+# $1 - VIDEO_CARDS flag (check skipped for "--")
+# other args - names of DRI drivers to enable
+dri_driver_enable() {
+ if [[ $1 == -- ]] || use $1; then
+ shift
+ DRI_DRIVERS+=("$@")
+ fi
+}
+
+gallium_enable() {
+ if [[ $1 == -- ]] || use $1; then
+ shift
+ GALLIUM_DRIVERS+=("$@")
+ fi
+}
+
+vulkan_enable() {
+ if [[ $1 == -- ]] || use $1; then
+ shift
+ VULKAN_DRIVERS+=("$@")
+ fi
+}
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index e3fd921bbaa0..5829adce48f2 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -27,13 +27,13 @@ RESTRICT="
"
RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost v3d vc4 virgl vivante vmware"
+VIDEO_CARDS="${RADEON_CARDS} crocus freedreno i915 i965 intel iris lima nouveau panfrost v3d vc4 virgl vivante vmware"
for card in ${VIDEO_CARDS}; do
IUSE_VIDEO_CARDS+=" video_cards_${card}"
done
IUSE="${IUSE_VIDEO_CARDS}
- +classic d3d9 debug +egl +gallium +gbm gles1 +gles2 +llvm
+ +classic cpu_flags_x86_sse2 d3d9 debug +egl +gallium +gbm gles1 +gles2 +llvm
lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
vulkan-overlay wayland +X xa xvmc zink +zstd"
@@ -45,6 +45,7 @@ REQUIRED_USE="
vulkan? ( video_cards_radeonsi? ( llvm ) )
vulkan-overlay? ( vulkan )
wayland? ( egl gbm )
+ video_cards_crocus? ( gallium )
video_cards_freedreno? ( gallium )
video_cards_intel? ( classic )
video_cards_i915? ( || ( classic gallium ) )
@@ -139,9 +140,10 @@ RDEPEND="${RDEPEND}
# 1. List all the working slots (with min versions) in ||, newest first.
# 2. Update the := to specify *max* version, e.g. < 10.
# 3. Specify LLVM_MAX_SLOT, e.g. 9.
-LLVM_MAX_SLOT="12"
+LLVM_MAX_SLOT="13"
LLVM_DEPSTR="
|| (
+ sys-devel/llvm:13[${MULTILIB_USEDEP}]
sys-devel/llvm:12[${MULTILIB_USEDEP}]
sys-devel/llvm:11[${MULTILIB_USEDEP}]
)
@@ -253,11 +255,12 @@ llvm_check_deps() {
pkg_pretend() {
if use vulkan; then
- if ! use video_cards_i965 &&
+ if ! use video_cards_freedreno &&
+ ! use video_cards_i965 &&
! use video_cards_iris &&
! use video_cards_radeonsi &&
! use video_cards_v3d; then
- ewarn "Ignoring USE=vulkan since VIDEO_CARDS does not contain i965, iris, radeonsi, or v3d"
+ ewarn "Ignoring USE=vulkan since VIDEO_CARDS does not contain freedreno, i965, iris, radeonsi, or v3d"
fi
fi
@@ -466,6 +469,7 @@ multilib_src_configure() {
fi
fi
+ gallium_enable video_cards_crocus crocus
gallium_enable video_cards_iris iris
gallium_enable video_cards_r300 r300
@@ -486,6 +490,7 @@ multilib_src_configure() {
fi
if use vulkan; then
+ vulkan_enable video_cards_freedreno freedreno
vulkan_enable video_cards_i965 intel
vulkan_enable video_cards_iris intel
vulkan_enable video_cards_radeonsi amd
@@ -514,6 +519,9 @@ multilib_src_configure() {
$(meson_use osmesa)
$(meson_use selinux)
$(meson_feature zstd)
+ $(meson_use video_cards_crocus prefer-crocus)
+ $(meson_use video_cards_iris prefer-iris)
+ $(meson_use cpu_flags_x86_sse2 sse2)
-Dvalgrind=$(usex valgrind auto disabled)
-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
diff --git a/media-libs/munt-mt32emu/Manifest b/media-libs/munt-mt32emu/Manifest
index bc1c9abd57c5..1cf3896de1a5 100644
--- a/media-libs/munt-mt32emu/Manifest
+++ b/media-libs/munt-mt32emu/Manifest
@@ -1,4 +1,4 @@
AUX munt-mt32emu-2.4.2-docs.patch 518 BLAKE2B 15ed5513d3ef11dbfdd9304a1295d82b3e54f223dcf448285392c9cdc24635c5823a8b5ad4b0954908627ba2ebd450e2f849a9cd725fd78b70e578d0a3d68c43 SHA512 2a1ba4731a13c2f54d5eccad6971b0544b75787df922d31ab2ae68471f078e0585d2c386f09461b89db38fa2bf57b2e402ad98c07f6d5773fbd93856d1c27d6d
DIST libmt32emu_2_5_3.tar.gz 527698 BLAKE2B 1ca31f2da92d77f9c3d34bb8c9f19e34e83cc82751ba08dfda1240a28b49e36c2acf3a6d8aab6e62107df4d88645e77d447e332968007fe865882d54e71475de SHA512 c801e22e861898281316109533ca6264f5a9cf778d4f0bb14b49bb6d04d53b7e60cd8320d5b29a63534f6c470b4feb67c881e86c49b7860a98639ce01b99debf
-EBUILD munt-mt32emu-2.5.3-r1.ebuild 679 BLAKE2B 9d76865bc70b3108c8ce5e69c8aaab5017678769007e94d57470d740acfbf0f9351df1a28e8b640a2833932d76945ca3a6b3d8e61b782aeafd60369849001f7f SHA512 775142ffd72e0a7d96e7f5bb2e776858adc80654225fcd4a925b549b0d975c44f46185d46a863290e43c183d13d7b4fded8c28a627208586dd4190a22f508105
+EBUILD munt-mt32emu-2.5.3-r1.ebuild 684 BLAKE2B 8ecf48e04870afd899d5ec983188095e240a031d2dca08df1e9c175d4d4cc59e9978a3f8d2cfeceeadf2e0dd6fda17a6d792adacb5c8272af982e544353ef3f4 SHA512 ba6776449ec18ecca8c6d8f9ee48449dcc0055784f6a79277f62f3a2ac69b6b1bf5fd65db40154f65ae910b19ae9144b6fdb5b0ea6a5830101f3622a5f43b83b
MISC metadata.xml 621 BLAKE2B 52ec37202ec80fc7b37c23087264133c670058b8ae6428377abbccd7b7728314463b13b42f85abbe6b7befdb66a2447d5bb4614767ae94769ae850547c0ec18c SHA512 20c482a847d5b9511d54765ff0d7a8b634a5f5f14e4f0a2abdcc8fea4a424836ff80b7526ebfb39ccf2c848ce02bd52eb7b3088fedfde5b5760f5f9b0bf113c4
diff --git a/media-libs/munt-mt32emu/munt-mt32emu-2.5.3-r1.ebuild b/media-libs/munt-mt32emu/munt-mt32emu-2.5.3-r1.ebuild
index 1faa39379892..ccfcba7eded4 100644
--- a/media-libs/munt-mt32emu/munt-mt32emu-2.5.3-r1.ebuild
+++ b/media-libs/munt-mt32emu/munt-mt32emu-2.5.3-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/munt/munt"
SRC_URI="https://github.com/munt/munt/archive/${MY_P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
S="${WORKDIR}/munt-${MY_P}/mt32emu"
diff --git a/media-libs/oidn/Manifest b/media-libs/oidn/Manifest
index 7c273c915423..5475a8c52f06 100644
--- a/media-libs/oidn/Manifest
+++ b/media-libs/oidn/Manifest
@@ -2,5 +2,5 @@ DIST oidn-1.3.0-glibc.patch.bz2 6359 BLAKE2B 743cd87f92bc89182de716254f89136e690
DIST oidn-1.3.0.tar.gz 36763571 BLAKE2B 395d7aafd87babf7d2414ed940dd85adf4a488df2138e0e63cc82ac06088dd969879de73d79bead4b35bba0045081ee637b72f2a98770dbfc928ffe7c25da78a SHA512 19de3cf11b9d436ee6f33ff020187a4cdc05da5f43c47509f715ca99e4276bfb64425d0a48f3a6f0569c8c6701b46a7e35378f371fdbacc0b6d488e113ffe17c
DIST oidn-1.4.1.tar.gz 50448597 BLAKE2B f5a1dcafa058eb1fa46f1b397599075f45ca0145e51692014a47405e9d1ac2f681a1a23ead50d6bdfcf1750f7504a992218b65d984a6daf2780e829598172f3c SHA512 6551bb038692a1c00a0a408f1682d8609a8c74470a2c4f439af80c1332d4237e723a655a9b7ef95f93c6cbe52fdb3a46a84539f5cdc90073d716afd7b48c3615
EBUILD oidn-1.3.0-r1.ebuild 925 BLAKE2B f38e5ba0887cdb823e36b7cff5a092a93c12c38bcb8aa5acd44686a7c6b102115f0c4794b4826ceff06fbf05bf3ce4d9ae58273b9cd4e896f380a63b33af93d4 SHA512 8eefc86b47ea486447cbcdb7012b51966594e59a0c00690610d3a9c21263f3b41275c0137877b840dac4187b8fe2ccef0c343bef1b9a1559865e78fc1f6d0df7
-EBUILD oidn-1.4.1-r1.ebuild 805 BLAKE2B 091061e9455a5c2c9c9e0aada626cc7b232e3b67b621f3351a48f70019c05b3a432e460463a8c21c5abe40ee2b7a010a246e32915a010155fd8c773550b091d0 SHA512 91c038d42576b709bd80722e1c4b875912da78a3072b3255ef5bca63197b215416c54cefe593d145f17d3cef919d6a3ad4a7dcd5cbce36f2bfd898e2b788a457
+EBUILD oidn-1.4.1-r1.ebuild 804 BLAKE2B 74e3f828c6d08b74b584cf54bddf1687b271d852ab64e746841eb83cd38c20fff165e2c977d024f4a453061c3b3bb8994b86fd1101cbca1faa1b6b2c85000ad1 SHA512 3845870de35356b4b0e6210ed0f114b483f8cf64300927399ab9516f4a636d2513fe8a5f3e9b0040df0a3342e8887733cf554f008dc6ab352b5aa1dfb68e855a
MISC metadata.xml 754 BLAKE2B b1be901e2f498cb917222e495a89f5515c2837a83e086e5a7c8db5f571ce50401d3ca82546e61ab3507de3d3068eee4ee8c85b3430565eb3db7c3cfc3194f827 SHA512 1806e677d62ae2b3cc2857eb05d106abf840a1e1fc21d1a875716441ffe3db1a13c5d96ca9316b2285c43fda4e2d62829ceb4b32ad13ecea2a521a1b1ed84096
diff --git a/media-libs/oidn/oidn-1.4.1-r1.ebuild b/media-libs/oidn/oidn-1.4.1-r1.ebuild
index a82182a13ef2..0583a3ff6201 100644
--- a/media-libs/oidn/oidn-1.4.1-r1.ebuild
+++ b/media-libs/oidn/oidn-1.4.1-r1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} = *9999 ]]; then
EGIT_BRANCH="master"
else
SRC_URI="https://github.com/OpenImageDenoise/${PN}/releases/download/v${PV}/${P}.src.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
fi
LICENSE="Apache-2.0"
diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest
index 8e955cca0e8b..73d3304c8eb2 100644
--- a/media-libs/opencolorio/Manifest
+++ b/media-libs/opencolorio/Manifest
@@ -10,8 +10,10 @@ DIST opencolorio-1.1.1.tar.gz 13828483 BLAKE2B f5642f08db84f2b8da44d0dbf58313c78
DIST opencolorio-2.0.0.tar.gz 9892414 BLAKE2B fdff2e144eadb444624f059f7582ea99d4e2dbd53cad5b89f92d19c7ca9dda2ff9ec4f8c8d00e6ac083da21134f9bc783b297c553a8e7d11936c936e5c41a2f3 SHA512 7110a1a30a5fa64b81d7fc5e33234673aaddbad5e19ce7f21436c590edd7d2ce767650c9a934011a96e53132c030bd0b654fcf93ad79c1bfc8c050762c57f6d0
DIST opencolorio-2.0.1.tar.gz 9945107 BLAKE2B cb4b152205642abd847b7263db838dbb922004017b9f19f7b2bd81d97f64e6f7d008c5a3f734475f510180ae9cc3a84688631e69c0587e0c77599b75b07d9159 SHA512 5787cc4cadb0a1832c925712ca0dfef6e843082b9461460e1798326c6fceaa97bee78e5298651e6a8a3662b348eab5ab9791e94c3efcac337da07229fb559338
DIST opencolorio-2.0.2.tar.gz 10812416 BLAKE2B 36f008035c36bef9473f9f79e9362eec20abb8e217a2131d3a2be5766de60cdab36e137547d414bf18e97ad368e30fb89a0ad4d8095b24bd184704d88ef192ae SHA512 ebc6b4b4251f69cb69f7203bc9ae962010f7f60ed5d53eb3ff14b64d5ef8cac2b98d0482485f1adaaf6b8c065cd4edd01c4e0577324a86ed4ebfe8e33e9fa667
-EBUILD opencolorio-1.1.1-r1.ebuild 2627 BLAKE2B 3a04ff5740dd6e830ba17f2356f2a2b87e1de465e7d103fea654ac95438160abd3dda92a7d6503fd2749542fb8d5717f547adf8a445a98db9c39e690949e6200 SHA512 f58868e63953ee16aa995cb6042458c510bfc3892f11f0e2f37a048b28678189d3fd4a787b5d2d4975e5b2fbdbc119d4cb2131d9fc1227bd3b594f807766aabe
-EBUILD opencolorio-2.0.0.ebuild 2773 BLAKE2B f1469f1917fa14f9cec3a9e5bb799a8c4a38b670a5fae43f9468fe7f97f0e49fdffd49f77958e0dee2d2b8367492fa61642b8177bc06290bd37e256cf72d49e4 SHA512 e527cc50a8d148ddb36ebb9d2e661e2be3c5b0558b7d8b8eaa4b2fc935a835954cffab1fb17f60a985b193818f3951d3e305398885ea329713fa7acfb3048650
-EBUILD opencolorio-2.0.1.ebuild 2709 BLAKE2B aa368b450adc2a11c09179d573bbc9999a220500b377bcaec4630dd4c05f2465987e01450744abea60edffee88119564e210eab96d4024aba59829ef8e863564 SHA512 5528729ab388d3045d5847963daddd038bd06d814a0c1078641c312117febbad76bdc56fcbed70b265f0c5c05955784c57d66df3735f49a1b31dbdd316f6db55
-EBUILD opencolorio-2.0.2.ebuild 2753 BLAKE2B c923b54f54aecf466f0ec37cf684fa9502f8cf41224c3270ecbe89a161a3189615f630c3ac870a5eebaa513312aea410859b23d7794960bf7e3ebbe3a30f0725 SHA512 5cefbce1d9ff3ec23ab4127c174a3ae1906dc0f110783694d5c6cb29ff71f257bf524fc913b4298d93f6726adb55d9f888bd5439d2de7097169650e239d36e4c
+DIST opencolorio-2.1.0.tar.gz 10970849 BLAKE2B 3703ab90c7dfa853583e3018eee9a28c9f471207b3c6743095cf681a4659da708893be508b521195bf84f59ac2c058f844a8f70f83666beaed208812cf845420 SHA512 a0f4fb62c768b392ca1129e2046df96d670d785fc057d4103768440b7adb65d8faf5b7d39729060791794e83e6cd4e67821aed9b30f3f04b410c60809cd72267
+EBUILD opencolorio-1.1.1-r3.ebuild 2750 BLAKE2B 22842c149b2d415b04932511630704b7e25276845d84aa65ebdd547f183f984e72214193fc9f73e0b0caa78ad246562a913b0b372fc843f17e7a7f419759cd92 SHA512 b010bf252e84634be4814e4c12f3503e2c47347a178b86ebf2bd4406c9507f0096a094c614107751bbb06a19d2aa9715f729996d1b5c93aa2ce616a0db813c28
+EBUILD opencolorio-2.0.0-r2.ebuild 2885 BLAKE2B 8bf3fe153366a15eeffc64637c013f6f8ed2e5d5ab831402ec3dff4e2dda285f72ce9838f4304dd0a863c376c6e58e5289079385c9adf8c96ec9c5786f39544f SHA512 86986428cadcd1aecd8583306d87a543f7408a18f1cbe2388b3e17a08f76119ef1215f5b633b7621a973af3c8fdce1a4b6753ebc91ef9fbf04ddc8f68eebb9d1
+EBUILD opencolorio-2.0.1-r2.ebuild 2820 BLAKE2B 7efa8a9aba25285125fce2d7a6ffbe990764cfc5593ef323411547f9c99b351e1511432df6cdad27effa314984f8e81db6606a3f8d958773459074d02fd845ab SHA512 922483a225a736443a67bbcc1e318ca4969be6d161692f0a42bdf88d723f07b6b9b7a398e11af20e68291c956e0ba9825b71554058dbd8adce9dae67b674f7f2
+EBUILD opencolorio-2.0.2-r2.ebuild 2865 BLAKE2B f59dc08bda96088c88cd2108353932f0781610d8c8b2148e4994e4653b8a80fa74585ab516acf04451c6596ef0467e232c487bffa540c2e7ddf18b4e7b835490 SHA512 2ef41f4c4c4d2009dc7624b22091245c1600387f87ae21439ba2e4e3e685e77ecc51a6c323901ecb37fa8e76055c1a591568bd6eb224d85d1e2e1098b5541cda
+EBUILD opencolorio-2.1.0-r1.ebuild 3030 BLAKE2B 1d406a80b0ba910dc73381bb20d41fbf5fa01ab3e8a4342a02f3460e842980a4f09b6f0fde17da9aa30135dfca742b37ff5076ac24d65745d3633fecc6f63010 SHA512 3d2aa32bdf71b9ba2f3f0ecad17e430d7c8e81794168455dbbbb0176dcffb064a384771c5ad738d7b6c4aa209cc9a922325dea0ebf3d37c0bdf85abbb9c8dfbe
MISC metadata.xml 460 BLAKE2B 564c46a6d12ec479bfbe92401cda933760a3fbfd72b83221f8edc927a01eb5f18ecab877184b95aa5bcc8af20a0c36fbff8c6f45bf7ce2996c795b0f8fac1c9c SHA512 d58b105d94f1f11e52f1e88b9cb24885b5369207c3fa2a6ab4c2133c22e2b47a887a8358b79ea53cc9bdd63a44bb18672e5d26d614074e0bc08539cb4e73b49a
diff --git a/media-libs/opencolorio/opencolorio-1.1.1-r1.ebuild b/media-libs/opencolorio/opencolorio-1.1.1-r3.ebuild
index ba79f07d083d..4a6a5c7dd95f 100644
--- a/media-libs/opencolorio/opencolorio-1.1.1-r1.ebuild
+++ b/media-libs/opencolorio/opencolorio-1.1.1-r3.ebuild
@@ -20,12 +20,15 @@ REQUIRED_USE="
doc? ( python )
python? ( ${PYTHON_REQUIRED_USE} )"
+# Not compatible with oiio 2.3
+# https://github.com/AcademySoftwareFoundation/OpenColorIO/issues/1509
+# bug #821073
RDEPEND="
<dev-cpp/yaml-cpp-0.7.0:=
dev-libs/tinyxml
opengl? (
media-libs/lcms:2
- media-libs/openimageio
+ <media-libs/openimageio-2.3:=
media-libs/glew:=
media-libs/freeglut
virtual/opengl
diff --git a/media-libs/opencolorio/opencolorio-2.0.0.ebuild b/media-libs/opencolorio/opencolorio-2.0.0-r2.ebuild
index b5898ec2ed44..d582251eb118 100644
--- a/media-libs/opencolorio/opencolorio-2.0.0.ebuild
+++ b/media-libs/opencolorio/opencolorio-2.0.0-r2.ebuild
@@ -26,6 +26,9 @@ REQUIRED_USE="
doc? ( python )
python? ( ${PYTHON_REQUIRED_USE} )"
+# Not compatible with oiio 2.3
+# https://github.com/AcademySoftwareFoundation/OpenColorIO/issues/1509
+# bug #821073
RDEPEND="
dev-cpp/pystring
dev-python/pybind11
@@ -34,7 +37,7 @@ RDEPEND="
dev-libs/tinyxml
opengl? (
media-libs/lcms:2
- >=media-libs/openimageio-2.2.13.0
+ <media-libs/openimageio-2.3:=
media-libs/glew:=
media-libs/freeglut
virtual/opengl
diff --git a/media-libs/opencolorio/opencolorio-2.0.1.ebuild b/media-libs/opencolorio/opencolorio-2.0.1-r2.ebuild
index a164851fb44a..8b6fd27357c6 100644
--- a/media-libs/opencolorio/opencolorio-2.0.1.ebuild
+++ b/media-libs/opencolorio/opencolorio-2.0.1-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://opencolorio.org https://github.com/AcademySoftwareFoundation/O
SRC_URI="https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/OpenColorIO-${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
LICENSE="BSD"
SLOT="0"
IUSE="cpu_flags_x86_sse2 doc opengl python static-libs test"
@@ -21,6 +21,9 @@ REQUIRED_USE="
python? ( ${PYTHON_REQUIRED_USE} )
"
+# Not compatible with oiio 2.3
+# https://github.com/AcademySoftwareFoundation/OpenColorIO/issues/1509
+# bug #821073
RDEPEND="
dev-cpp/pystring
dev-python/pybind11
@@ -29,7 +32,7 @@ RDEPEND="
dev-libs/tinyxml
opengl? (
media-libs/lcms:2
- >=media-libs/openimageio-2.2.13.0
+ <media-libs/openimageio-2.3:=
media-libs/glew:=
media-libs/freeglut
virtual/opengl
diff --git a/media-libs/opencolorio/opencolorio-2.0.2.ebuild b/media-libs/opencolorio/opencolorio-2.0.2-r2.ebuild
index 1d263c5aee8f..9897f5ded789 100644
--- a/media-libs/opencolorio/opencolorio-2.0.2.ebuild
+++ b/media-libs/opencolorio/opencolorio-2.0.2-r2.ebuild
@@ -21,6 +21,9 @@ REQUIRED_USE="
python? ( ${PYTHON_REQUIRED_USE} )
"
+# Not compatible with oiio 2.3
+# https://github.com/AcademySoftwareFoundation/OpenColorIO/issues/1509
+# bug #821073
RDEPEND="
dev-cpp/pystring
dev-python/pybind11
@@ -29,7 +32,7 @@ RDEPEND="
dev-libs/tinyxml
opengl? (
media-libs/lcms:2
- >=media-libs/openimageio-2.2.13.0
+ <media-libs/openimageio-2.3:=
media-libs/glew:=
media-libs/freeglut
virtual/opengl
diff --git a/media-libs/opencolorio/opencolorio-2.1.0-r1.ebuild b/media-libs/opencolorio/opencolorio-2.1.0-r1.ebuild
new file mode 100644
index 000000000000..9a4f6d7d90ed
--- /dev/null
+++ b/media-libs/opencolorio/opencolorio-2.1.0-r1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake flag-o-matic python-single-r1
+
+DESCRIPTION="A color management framework for visual effects and animation"
+HOMEPAGE="https://opencolorio.org https://github.com/AcademySoftwareFoundation/OpenColorIO"
+SRC_URI="https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/OpenColorIO-${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="cpu_flags_x86_sse2 doc opengl python static-libs test"
+REQUIRED_USE="
+ doc? ( python )
+ python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+# Not compatible with oiio 2.3
+# https://github.com/AcademySoftwareFoundation/OpenColorIO/issues/1509
+# bug #821073
+# 2.1.1 should be?
+#
+# See bug #802363 for yaml-cpp < dep
+RDEPEND="
+ dev-cpp/pystring
+ dev-python/pybind11
+ <dev-cpp/yaml-cpp-0.7.0:=
+ dev-libs/tinyxml
+ media-libs/ilmbase:=
+ opengl? (
+ media-libs/lcms:2
+ <media-libs/openimageio-2.3:=
+ media-libs/glew:=
+ media-libs/freeglut
+ virtual/opengl
+ )
+ python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ >=dev-util/cmake-3.16.2-r1
+ virtual/pkgconfig
+ doc? (
+ $(python_gen_cond_dep '
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ dev-python/testresources[${PYTHON_USEDEP}]
+ ')
+ )
+"
+
+# Restricting tests, bugs #439790 and #447908
+RESTRICT="test"
+
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ cmake_src_prepare
+
+ sed -i -e "s|LIBRARY DESTINATION lib|LIBRARY DESTINATION $(get_libdir)|g" {,src/bindings/python/,src/OpenColorIO/,src/libutils/oiiohelpers/,src/libutils/oglapphelpers/}CMakeLists.txt || die
+ sed -i -e "s|ARCHIVE DESTINATION lib|ARCHIVE DESTINATION $(get_libdir)|g" {,src/bindings/python/,src/OpenColorIO/,src/libutils/oiiohelpers/,src/libutils/oglapphelpers/}CMakeLists.txt || die
+}
+
+src_configure() {
+ # Missing features:
+ # - Truelight and Nuke are not in portage for now, so their support are disabled
+ # - Java bindings was not tested, so disabled
+ # Notes:
+ # - OpenImageIO is required for building ociodisplay and ocioconvert (USE opengl)
+ # - OpenGL, GLUT and GLEW is required for building ociodisplay (USE opengl)
+ local mycmakeargs=(
+ # Don't use imath yet, needs some poking to find the right headers
+ -DOCIO_USE_OPENEXR_HALF=ON
+ -DBUILD_SHARED_LIBS=ON
+ -DOCIO_BUILD_STATIC=$(usex static-libs)
+ -DOCIO_BUILD_DOCS=$(usex doc)
+ -DOCIO_BUILD_APPS=$(usex opengl)
+ -DOCIO_BUILD_PYTHON=$(usex python)
+ -DOCIO_PYTHON_VERSION="${EPYTHON/python/}"
+ -DOCIO_BUILD_JAVA=OFF
+ -DOCIO_USE_SSE=$(usex cpu_flags_x86_sse2)
+ -DOCIO_BUILD_TESTS=$(usex test)
+ -DOCIO_BUILD_GPU_TESTS=$(usex test)
+ -DOCIO_BUILD_FROZEN_DOCS=$(usex doc)
+ -DOCIO_INSTALL_EXT_PACKAGES=NONE
+ )
+
+ # We need this to work around asserts that can trigger even in proper use cases.
+ # See https://github.com/AcademySoftwareFoundation/OpenColorIO/issues/1235
+ append-flags -DNDEBUG
+
+ cmake_src_configure
+}
diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index b0105deb3736..102bd8105212 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -4,10 +4,18 @@ DIST openimageio-2.2.14.0.tar.gz 29226972 BLAKE2B 29daaf4fb987b77dffdd8cb29c5f67
DIST openimageio-2.2.15.0.tar.gz 29238071 BLAKE2B f74f779635b7ff068f87ab6231756cb22acb80185c717c556750d964025aa343f8b3a30b9e73acf6237328b8bdd3fcb6588321d37a3752a6f1d0dd1e3a976363 SHA512 7ade071ae8a78427fb51d75f81e6fcc2d9a3632f0854aea70b985794a53a386072fb171dc8179fa762de19067d402c7ab9f2ea1a44bd3196d3a201ea2cb9ec22
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.2.19.0.tar.gz 29252399 BLAKE2B f90b330944885271e117a01235a48f11e88960f5825d0c84e6e2c994479e76a26bf90e66afec4aae6a5c7164510963027bef79fe0265676ce0993235824d461d SHA512 63951d958daaa4bc62fc210efaeced51affd207be21c938ecd5da70217060bb9c8197bf95813e2fddb728a641e69d2889f9445b7d16653a110e45adf3cb86541
+DIST openimageio-2.3.8.0.tar.gz 29233320 BLAKE2B 3ad92641a336588941ff18637d6c72bc4765068438ea14b12e067ed7c104f26068c037fe2b38c58806143ff703c894bb97cbc78c3138e9798f063a93ec6626b3 SHA512 3ee9755f1dac6fdb63f582abe71e14e1abc50ebd3f8b9ffa66dc356dfb9905575385cb22c47386c0c0ec303db3e8897b4c8cf88a0f7cdc802408916db4b101e0
+DIST openimageio-2.3.9.1.tar.gz 29248072 BLAKE2B 22cd31dc51670a388f232874d2f3831fb87df09de3fe8d2492a34f2c9d96f2e3ae13426e30c1b9627926a3ec3150ca9b37377642ea6621a184e14d7358e9d0e5 SHA512 0522d22eca5c9858ef2b6407053f8a74872b9b05214efe01d88f0abee6b21c48cf23444987a21364261e4addcc5cddef38d7f87deda8bc5167a1cd40770327bb
+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
EBUILD openimageio-2.2.12.0-r1.ebuild 3711 BLAKE2B c25183cfd5c4ede55c0fc76dfc14b0dde0e8983fd44fe5ca24271d6238ab6b89dd93180d7727c557d65f7c2d4e277a9d267a56be4063c4f67de36709ec0fc0f9 SHA512 acf73c45c5504e980633ad6233325b08410a8760bba3b857b3c1b1ac5f75b3e025befc3c59c1b6767adadc96a04f9be65d6ecdc7f8ed0977b24704c4c37deb68
EBUILD openimageio-2.2.13.1-r1.ebuild 3711 BLAKE2B c25183cfd5c4ede55c0fc76dfc14b0dde0e8983fd44fe5ca24271d6238ab6b89dd93180d7727c557d65f7c2d4e277a9d267a56be4063c4f67de36709ec0fc0f9 SHA512 acf73c45c5504e980633ad6233325b08410a8760bba3b857b3c1b1ac5f75b3e025befc3c59c1b6767adadc96a04f9be65d6ecdc7f8ed0977b24704c4c37deb68
EBUILD openimageio-2.2.14.0-r1.ebuild 3797 BLAKE2B 5fde669b95b7a8f8fa093e067696afa986d0d84ddbef9eabca38db24c9b2044956e39c8f1131bae03217fe2245349cded4314b560ea5f608264f27c6c1c4f261 SHA512 f227f29510c50890f0ff2fa398151d17bca8bc83c701d89b53a09e38c0b25cb52e3be59b08f1490cc32d42942dec2a460ff4ce6b8b8eccb06e5208ce9080ac67
EBUILD openimageio-2.2.15.0-r1.ebuild 3797 BLAKE2B 5fde669b95b7a8f8fa093e067696afa986d0d84ddbef9eabca38db24c9b2044956e39c8f1131bae03217fe2245349cded4314b560ea5f608264f27c6c1c4f261 SHA512 f227f29510c50890f0ff2fa398151d17bca8bc83c701d89b53a09e38c0b25cb52e3be59b08f1490cc32d42942dec2a460ff4ce6b8b8eccb06e5208ce9080ac67
EBUILD openimageio-2.2.15.1-r1.ebuild 3795 BLAKE2B 9e5ba0ab65d1bcf48cf46b63685841ea355faa3313d7576e3a5549db892fd13eac327ac4d958384e0ed9f13a8886127a7faed8a6468a19b03e91ea8353bfeeae SHA512 9e603a5a65562d867c2770d5d7fd7b7240a65411170b18f7aca0cd58703274e839e5d3fc31345737a8c096f55994ad908aecbf94dd6ec019936c5e1d17653d1d
EBUILD openimageio-2.2.18.0-r1.ebuild 3798 BLAKE2B a66def4bb9a88887c0d9c4b790ec0d76a459a2fd1b50ec94ca2b255c1cd91f941a6656e1261f3e000f4e69042b2924c4fbf8871de39933b7a0b7b6dd3eda2697 SHA512 fc2d4e270892b6f20936922664213ec59ec285a4ebdd6d1af1ed83b1d1e28c133518e595709addfb2322d2ba8e5e299238a8a1cea623b1724111b658fce1c3cc
+EBUILD openimageio-2.2.19.0.ebuild 3798 BLAKE2B a66def4bb9a88887c0d9c4b790ec0d76a459a2fd1b50ec94ca2b255c1cd91f941a6656e1261f3e000f4e69042b2924c4fbf8871de39933b7a0b7b6dd3eda2697 SHA512 fc2d4e270892b6f20936922664213ec59ec285a4ebdd6d1af1ed83b1d1e28c133518e595709addfb2322d2ba8e5e299238a8a1cea623b1724111b658fce1c3cc
+EBUILD openimageio-2.3.8.0-r1.ebuild 5038 BLAKE2B ef78c98b0d518f3413f991507d132202a34cf5b3e914fdca258371b7b402fbd9a444e7e53071013e560740127b246c93d74115969d8d18c51564d8cd419e37d6 SHA512 09a80048febae0e1c5358577e2bf0eddd810f782e8aad945d8688671456de0febcd07446f1147aac45c8526a23542851b9448b6a330d76326f5ee23189c68b6b
+EBUILD openimageio-2.3.9.1.ebuild 4963 BLAKE2B e6b4094430e888bb0c8327a59fab806467f38a837d98db97891dd21976801a35c5fc53095bf0025ed95ed88d533e8af27238cb7b8e488fe8b09c573e46aa7592 SHA512 8b281a675dcaa05c6a9465edee46568efe8f39cac73c17875b0568aa1f9be928bc32bad8cfc92f4fb2e7f854e9612bd0616816ca7a3c373cbe5dc73dc37cf1b4
MISC metadata.xml 937 BLAKE2B f49461cd8f78f3206eb9016c01850a27017ac6964531769105804140d5d8363b46679d71eadb503221f6e3d03107228a6e66efc16187505cb4560e32bd42e3c1 SHA512 05cc82838184e93ed4064f8fc6519c89a512e6f1fe7abb94dcd624ed52eb004203f201745ec26f2ffd6aac3fb5cd4013917591164a18b0d56a097d6d4d81ae2d
diff --git a/media-libs/openimageio/openimageio-2.2.19.0.ebuild b/media-libs/openimageio/openimageio-2.2.19.0.ebuild
new file mode 100644
index 000000000000..5966a9f7ebd0
--- /dev/null
+++ b/media-libs/openimageio/openimageio-2.2.19.0.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+FONT_PN=OpenImageIO
+PYTHON_COMPAT=( python3_{8..10} )
+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/Release-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/oiio-Release-${PV}"
+
+LICENSE="BSD"
+SLOT="0/2.2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~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 field3d gif jpeg2k opencv opengl openvdb ptex python qt5 raw +truetype ${CPU_FEATURES[@]%:*}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# test data in separate repo
+# second repo has no structure whatsoever
+RESTRICT="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-1.62:=
+ dev-cpp/robin-map
+ dev-libs/libfmt:=
+ dev-libs/pugixml:=
+ >=media-libs/ilmbase-2.2.0-r1:=
+ >=media-libs/libheif-1.7.0:=
+ media-libs/libpng:0=
+ >=media-libs/libwebp-0.2.1:=
+ media-libs/opencolorio:=
+ >=media-libs/openexr-2.2.0-r2:0=
+ media-libs/tiff:0=
+ sys-libs/zlib:=
+ virtual/jpeg:0
+ dicom? ( sci-libs/dcmtk )
+ ffmpeg? ( media-video/ffmpeg:= )
+ field3d? ( media-libs/Field3D:= )
+ 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
+}
+
+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
+ -DOIIO_BUILD_TESTS=OFF
+ -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_FIELD3D=$(usex field3d)
+ -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_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.8.0-r1.ebuild b/media-libs/openimageio/openimageio-2.3.8.0-r1.ebuild
new file mode 100644
index 000000000000..77b43ff2ec14
--- /dev/null
+++ b/media-libs/openimageio/openimageio-2.3.8.0-r1.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2021 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"
+SLOT="0/2.3"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~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 field3d 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
+ )
+"
+# 2.3.8.0 should support OpenEXR 3 but it seems to prefer OpenEXR 2
+# when installed, so let's stick with that for now.
+RDEPEND="
+ >=dev-libs/boost-1.62:=
+ 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:=
+ media-libs/ilmbase:=
+ media-libs/opencolorio:=
+ media-libs/openexr:0=
+ media-libs/tiff:0=
+ sys-libs/zlib:=
+ virtual/jpeg:0
+ dicom? ( sci-libs/dcmtk )
+ ffmpeg? ( media-video/ffmpeg:= )
+ field3d? ( media-libs/Field3D:= )
+ 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() {
+ # Note: on bumps, please try again with OpenEXR 3 + ilmmath!
+ # Sabotage finding OpenEXR 3 for now to force usage of OpenEXR 2
+ # (because it mix and matches which version it uses; sed this to
+ # make sure it'll use OpenEXR 3 if it can, but it won't.)
+ # bug #821193
+ 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() {
+ # 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
+ -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_FIELD3D=$(usex field3d)
+ -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.9.1.ebuild b/media-libs/openimageio/openimageio-2.3.9.1.ebuild
new file mode 100644
index 000000000000..88f1d6b8b497
--- /dev/null
+++ b/media-libs/openimageio/openimageio-2.3.9.1.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2021 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"
+SLOT="0/2.3"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~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
+ )
+"
+# 2.3.8.0 should support OpenEXR 3 but it seems to prefer OpenEXR 2
+# when installed, so let's stick with that for now.
+RDEPEND="
+ >=dev-libs/boost-1.62:=
+ 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:=
+ media-libs/ilmbase:=
+ media-libs/opencolorio:=
+ media-libs/openexr: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() {
+ # Note: on bumps, please try again with OpenEXR 3 + ilmmath!
+ # Sabotage finding OpenEXR 3 for now to force usage of OpenEXR 2
+ # (because it mix and matches which version it uses; sed this to
+ # make sure it'll use OpenEXR 3 if it can, but it won't.)
+ # bug #821193
+ 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() {
+ # 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
+ -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/osl/Manifest b/media-libs/osl/Manifest
index 8114871dad11..f1174fc48933 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -4,12 +4,14 @@ AUX osl-1.12.0.2-llvm-11.patch 1405 BLAKE2B 9e6e162591d4450609c6759d3e9aa45acee0
AUX osl-1.12.0.2-llvm-12.patch 10828 BLAKE2B b172c99210b6874033a157ea4d98d902f9bf4a1d348619ba3180f08cd1a97dd945bd17b5af2f5a87ff8a0240ec82aeac498aeb448861f8f1de5623e80ac39570 SHA512 547254e9eb2bffacd43dbdebf4aa1929475132f42433b4df9b5535e720578af44ae2b08a01a51d80e539fcc22f424291dece51ee6ea55821a821fd0efd76d619
DIST osl-1.10.13.tar.gz 13551733 BLAKE2B 63b687ec46bd5334a7d0c00cfa5bf5243003e16adf2637fba648a75f98c10103c7c4b5fa1d091ab43b0929f85523b0fa79589eca56686490ee61c48069593767 SHA512 bc39fcf80878160807e35c52654a2993a7d33b3ab2fbf567ec50d0b23636a19064830afab5734f1e39276c77e843bbfe1d6b10a64fd4ebe69b17c8faa5378201
DIST osl-1.11.15.0.tar.gz 14143372 BLAKE2B 7385d86417fd2666d7558eb459402a9720fc4b59287c2feb45c451bd1e413d102f3f286e6bc07bbeb320b9f5a96b4981851dddcf3a6eaa69d5869238811978a8 SHA512 d1df69349cb43690d0578b32caf92fe33ff570713fd87899e2ab312962c6474bd9c19df5b3b018a7498390e5933fcfbfdd3ecd450a4d91d64dd680ee74f492c5
+DIST osl-1.11.16.0.tar.gz 14143407 BLAKE2B 0e6a20ee63a836bc268f03eb943731e8bf18909bf86041532de50e51ff9fb78f9be316be9b3677cb2b0e5fddd90defab95281e6597a52e61d982ffc9fcc52f79 SHA512 717a588bb371ff64d41dc34caad6a4e8483cba32d3b8fe7db9f98e422be050b1b89e4cf7f018e1106dfc9120d2485c3d8430a63cd80344050b00082fdd45fa1b
DIST osl-1.11.9.0.tar.gz 14137334 BLAKE2B db68cb77d6af56e711b897371a4fe9386bf1a62625f9fa04012e9ec22346933fe3b0112301a8ad17ac6dd9c01c2a8e00c6d6e557d947870fd39bb3dec1443fd8 SHA512 f93bce0b29ff2da022372d81f2709c7db68e011c07c346b679c4b5ce05425f7eda8904779d7ea460817639e6be78a8c77272d71a3ffa8b068cfaab7572eb2e65
DIST osl-1.12.0.2.tar.gz 16205315 BLAKE2B 543d120e981f093c121b4abb4c36d7d8c127555c8986df931a3040136e3ae3d84d602d73395604cd492f8d192e408f585cd6579fe6283c974778f0b99092985d SHA512 cdcd1fb348f6f2f1f889ed1895bac545e10b73e700959bc09b1df2a40cd86e69ba43a1dfaf26dedaec9c23aa17b74428d4bccc9cf7f4d27ae2fc5152adb6c010
EBUILD osl-1.10.13.ebuild 1981 BLAKE2B 97232a51c24c3487f63d87d7767861278123b2f835a91324ac48ab086d14444769d5d9a7234659175be9540bd3239b0ef68a0b377afa2bccbd8a403d9180d053 SHA512 4588924ce659113de46252fea4206cab7b3ec1567ba62b8b56a471c39f949570040751b3bc7949cc9e1e699967bafe70d7a2ed48a80a6c9305529dd39ef4cd2b
-EBUILD osl-1.11.15.0.ebuild 2517 BLAKE2B 2d01ddfeb0a3ca760fa656fd0a71ec34edb2da5d8d6073097e1b1c15f99a74b1d927c25c0439f976e6a9b0e0f4a53d5ce9c183b3c3a99573d6162afc8858e074 SHA512 27345ac7369de8d65ba0cef986586a2ad41cdfe0f8333cd687e74a1a4defe9f4a0223696345db02e1f8f70c3b2987d3f4583679e28e90ee097d1e1c75ce75116
+EBUILD osl-1.11.15.0-r1.ebuild 2562 BLAKE2B 40df90315638c1651e2c5ab0e141de50eb59146baf900808a2db9757706f79e585f2904697fe479144d960f2c800c0d615203c1ba72904fc71589f39266e24a1 SHA512 108fc337ed3b098c32c8fa1a4c2f6d695b605aea00f4b65786413f722cbb04e77b4e9df64d76d181d4d123eed896d7603873fa0dff30e72ed429917638568004
+EBUILD osl-1.11.16.0.ebuild 2513 BLAKE2B f0e471a66d3ef4950d76c14cdb043f46b7caecaf908cb4e2567fec08f9e336b8369fe30a5f3faeb91088ac83d1a249249702b75884574a3f506d7c7c215abd9b SHA512 bbf760617e9e81505a0fe031b57e645956696f1cba89d4cb52ebc4230aa63f3e58a5c8f038120748fdd3ac61d4aef5752794b1ed57d1c9e06413e900fb0a6543
EBUILD osl-1.11.9.0-r1.ebuild 2480 BLAKE2B 8dfa487a16d3d5b7fcf9878d1f74b859421f26a82afa491e4cd099628e349a9f62adaca9878369a4ed57ccf24b75fd24e2190b79f04a6f80956590f901910ecc SHA512 e4c87b26f0bb80e865de96cfbd20e1e8f921829682eac8121ff3a0e9eec2457f5846b6e430762dffad687cf765a4e7e4c179878c1655ef99929c1b503c6bde21
EBUILD osl-1.11.9.0.ebuild 2144 BLAKE2B 957d748e1b107867eeb7e598995aa4b37efdb9222fe3b29f5c1a00b7da8c9aa93a08ec46f724d6f49a6cfb7e5209cbd0d59e5f7b028a94abd309a46f3966f00c SHA512 f68be55f42c0ac9375370fd22c94f7e7d643f76ad7caf41d1dbada0806168ab1429ddf8d817d7a311acc5a326cb01b8c5686656752659ec0bed3987d968e0f81
-EBUILD osl-1.12.0.2-r1.ebuild 2298 BLAKE2B fe159648e3585c696b205f39b3d152af6bee62d70994846703940a8c6ba7b9f1e59e019fd7eee52164eefdd00d48a545fd9032d1851b0a954e91c530f252845f SHA512 30acf08d9203585aad4c8b266ea0214d4148b29ff5a26d365d76473be326781e22691ceb7b3a3f87648e7455fda9a7428d8fa538ccda9737f5811012fcd807d0
+EBUILD osl-1.12.0.2-r3.ebuild 2343 BLAKE2B b8bed7e7922021e888578a3471858097f8a4a30813922ed4c9e5ce8dec9def9c97f90fac719290f3be6d86b7d1ac8458838b78e9aa499a8f838c15c013572abb SHA512 1c8b2863239a25734e3638b052ffb3a0fcf3f3229652dc7e8b2c22b173c9b51342c335c315b9e4063b9aaa296a78cabb4e139fa5b66110d0b2e717a209182d67
EBUILD osl-1.12.0.2.ebuild 1970 BLAKE2B b872758587a5b15768212a2952b72da718550c0728b04b38ed769691794baf635d61032650244bfc918e54327d49c615cd47afd6743a5307c3115d03ca70ac1b SHA512 e6d6579f9ad2ae29a4df92004facf8301c018fc879b743124051647f85c1a32e760ccfbdf9a4cfacab410a72bad22cb24cc8809c0ed7613c44579e84893098ea
MISC metadata.xml 841 BLAKE2B a2574fca1885067bed78159a9feee75f1118b1d335568a2cbdba347bf62a0b3f75a510bca271c4ee94ca5ce0bb15dcf9bb699cfe7a385f404047da9fef2dcdc3 SHA512 19afc8e4b777384b3421a1a82ff8ae34a05074e5c55010a500b17cfab4b4ae930cfb633c3bdb8013a8dcb9b82bad8fc7d684ef3e4a85352ce0c49bfb26079dce
diff --git a/media-libs/osl/osl-1.11.15.0.ebuild b/media-libs/osl/osl-1.11.15.0-r1.ebuild
index 2874e67dd898..5f806806db4c 100644
--- a/media-libs/osl/osl-1.11.15.0.ebuild
+++ b/media-libs/osl/osl-1.11.15.0-r1.ebuild
@@ -29,11 +29,12 @@ CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
IUSE="doc partio qt5 test ${CPU_FEATURES[@]%:*} python"
+# See bug #821202 for openimageio < dep
RDEPEND="
dev-libs/boost:=
dev-libs/pugixml
media-libs/openexr:=
- media-libs/openimageio:=
+ <media-libs/openimageio-2.3:=
<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
sys-libs/zlib
partio? ( media-libs/partio )
diff --git a/media-libs/osl/osl-1.11.16.0.ebuild b/media-libs/osl/osl-1.11.16.0.ebuild
new file mode 100644
index 000000000000..d4591a784b78
--- /dev/null
+++ b/media-libs/osl/osl-1.11.16.0.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+# check this on updates
+LLVM_MAX_SLOT=13
+
+CMAKE_REMOVE_MODULES_LIST=()
+
+inherit cmake llvm toolchain-funcs python-single-r1
+
+DESCRIPTION="Advanced shading language for production GI renderers"
+HOMEPAGE="http://opensource.imageworks.com/?p=osl https://github.com/imageworks/OpenShadingLanguage"
+SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/11"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+X86_CPU_FEATURES=(
+ 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="doc partio qt5 test ${CPU_FEATURES[@]%:*} python"
+
+# See bug #821202 for openimageio < dep
+RDEPEND="
+ dev-libs/boost:=
+ dev-libs/pugixml
+ media-libs/openexr:=
+ <media-libs/openimageio-2.3:=
+ <sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
+ sys-libs/zlib
+ partio? ( media-libs/partio )
+ python? (
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ dev-python/pybind11[${PYTHON_USEDEP}]
+ ')
+ )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ sys-devel/bison
+ sys-devel/flex
+ virtual/pkgconfig
+"
+
+# Restricting tests as Makefile handles them differently
+RESTRICT="test"
+
+S="${WORKDIR}/OpenShadingLanguage-Release-${PV}"
+
+llvm_check_deps() {
+ has_version -r "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+ llvm_pkg_setup
+}
+
+src_configure() {
+ 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 gcc=$(tc-getCC)
+
+ local mycmakeargs=(
+ # LLVM 10+ needs C++14
+ -DCMAKE_CXX_STANDARD=14
+ -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+ -DINSTALL_DOCS=$(usex doc)
+ -DUSE_CCACHE=OFF
+ -DLLVM_STATIC=OFF
+ -DLLVM_ROOT="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
+ -DOSL_BUILD_TESTS=$(usex test)
+ -DOSL_SHADER_INSTALL_DIR="${EPREFIX}/usr/include/${PN^^}/shaders"
+ -DOSL_PTX_INSTALL_DIR="${EPREFIX}/usr/include/${PN^^}/ptx"
+ -DSTOP_ON_WARNING=OFF
+ -DUSE_PARTIO=$(usex partio)
+ -DUSE_QT=$(usex qt5)
+ -DUSE_PYTHON=$(usex python)
+ -DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
+ )
+
+ cmake_src_configure
+}
diff --git a/media-libs/osl/osl-1.12.0.2-r1.ebuild b/media-libs/osl/osl-1.12.0.2-r3.ebuild
index 11944da63f69..1006a0b16368 100644
--- a/media-libs/osl/osl-1.12.0.2-r1.ebuild
+++ b/media-libs/osl/osl-1.12.0.2-r3.ebuild
@@ -27,11 +27,12 @@ CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
IUSE="doc partio qt5 test ${CPU_FEATURES[@]%:*} python"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+# See bug #821202 for openimageio < dep
RDEPEND="
dev-libs/boost:=
dev-libs/pugixml
media-libs/openexr:=
- media-libs/openimageio:=
+ <media-libs/openimageio-2.3:=
<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
sys-libs/zlib:=
python? (
diff --git a/media-libs/waffle/Manifest b/media-libs/waffle/Manifest
index cfd3be925f04..64de289e7199 100644
--- a/media-libs/waffle/Manifest
+++ b/media-libs/waffle/Manifest
@@ -1,4 +1,4 @@
DIST waffle-v1.7.0.tar.bz2 302120 BLAKE2B 8ebfc78182ff86447d88d92edd6452dae28c1515de5f9639c402203bfb5a135bc493040941420161690a4812a202552266bceb89eee948d0c7aeae55d5b8d3d5 SHA512 ee7b8419e309387fa6d610174ba5dddda97525cef41c9600772b902eddfc4570e940437596d7fb50ee9dc2f5945e723236b61463975d2b9cc0faa150696d24c2
-EBUILD waffle-1.7.0.ebuild 1611 BLAKE2B fceed4dd10256c71ecdbc9df09fccf012aaa561425f151bf9a4d03f6bc4f88c5421adb9b6406e2e453a94a64a48a8e6642305712b0ced440ee6d0bdba74b7eb3 SHA512 1d421acf1d1b71643ddc2feb9801a1841408ae3daf853eae1e3cfcd2461742b73f90dc5013e053ef64b5efa0ee1601dbca138a337427d6d6aa26360fd8a4a143
-EBUILD waffle-9999.ebuild 1611 BLAKE2B fceed4dd10256c71ecdbc9df09fccf012aaa561425f151bf9a4d03f6bc4f88c5421adb9b6406e2e453a94a64a48a8e6642305712b0ced440ee6d0bdba74b7eb3 SHA512 1d421acf1d1b71643ddc2feb9801a1841408ae3daf853eae1e3cfcd2461742b73f90dc5013e053ef64b5efa0ee1601dbca138a337427d6d6aa26360fd8a4a143
+EBUILD waffle-1.7.0-r1.ebuild 1617 BLAKE2B 76bfbd6a39f365c3e29631a7101322261e56cc3b284ba21b862dc1262009de1588a22be27941e69c74bb5a63a2ba9bb45f0bbc08c9988b7a6bc4f5b0446bfb68 SHA512 4f2c0f90cc06214379ef5a3d95fd352bbebae532c0fd005a3c06a05ded84b3f2905d53d9c2242b57b2fd8b1d05145b9520a738945348ee95c8f94504eca37d97
+EBUILD waffle-9999.ebuild 1617 BLAKE2B 76bfbd6a39f365c3e29631a7101322261e56cc3b284ba21b862dc1262009de1588a22be27941e69c74bb5a63a2ba9bb45f0bbc08c9988b7a6bc4f5b0446bfb68 SHA512 4f2c0f90cc06214379ef5a3d95fd352bbebae532c0fd005a3c06a05ded84b3f2905d53d9c2242b57b2fd8b1d05145b9520a738945348ee95c8f94504eca37d97
MISC metadata.xml 417 BLAKE2B 93ea54a57c011a3488ec75dbb8b93bce0bd568dfc4438cf7c80b3c622513a9be4b3e809e9794646571f9f21afd1572d0b16915dbda35d7345d4ef6afcec4dca8 SHA512 1652ef53bd20fd9c526b77db60affc226920b007c1b1b2bbeb90c0606ae2d4e199cb352a3322e2953ae0b1472e671da516ea3c0fdfcc9aa26cc5a1c348590da6
diff --git a/media-libs/waffle/waffle-1.7.0.ebuild b/media-libs/waffle/waffle-1.7.0-r1.ebuild
index b58cfad30b98..7b4d01d42f65 100644
--- a/media-libs/waffle/waffle-1.7.0.ebuild
+++ b/media-libs/waffle/waffle-1.7.0-r1.ebuild
@@ -22,7 +22,7 @@ IUSE="doc +egl +gbm wayland X"
RESTRICT="test" # gl_basic tests don't work when run from portage
RDEPEND="
- >=media-libs/mesa-9.1.6[egl?,gbm?,${MULTILIB_USEDEP}]
+ >=media-libs/mesa-9.1.6[egl(+)?,gbm(+)?,${MULTILIB_USEDEP}]
X? (
>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
diff --git a/media-libs/waffle/waffle-9999.ebuild b/media-libs/waffle/waffle-9999.ebuild
index b58cfad30b98..7b4d01d42f65 100644
--- a/media-libs/waffle/waffle-9999.ebuild
+++ b/media-libs/waffle/waffle-9999.ebuild
@@ -22,7 +22,7 @@ IUSE="doc +egl +gbm wayland X"
RESTRICT="test" # gl_basic tests don't work when run from portage
RDEPEND="
- >=media-libs/mesa-9.1.6[egl?,gbm?,${MULTILIB_USEDEP}]
+ >=media-libs/mesa-9.1.6[egl(+)?,gbm(+)?,${MULTILIB_USEDEP}]
X? (
>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]