summaryrefslogtreecommitdiff
path: root/media-libs
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-07-03 22:39:47 +0100
committerV3n3RiX <venerix@redcorelinux.org>2021-07-03 22:39:47 +0100
commit7f0ccc917c7abe6223784c703d86cd14755691fb (patch)
tree8c6793f68896b341e22f33d7e6cef88e481f4a8b /media-libs
parent9aa80713372911cec499b3adb2cd746790920916 (diff)
gentoo resync : 03.07.2021
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/Manifest.gzbin64912 -> 65084 bytes
-rw-r--r--media-libs/aalib/Manifest2
-rw-r--r--media-libs/aalib/metadata.xml4
-rw-r--r--media-libs/aubio/Manifest2
-rw-r--r--media-libs/aubio/aubio-0.4.9-r1.ebuild (renamed from media-libs/aubio/aubio-0.4.9.ebuild)4
-rw-r--r--media-libs/compface/Manifest2
-rw-r--r--media-libs/compface/compface-1.5.2.ebuild4
-rw-r--r--media-libs/freeimage/Manifest1
-rw-r--r--media-libs/freeimage/freeimage-3.18.0-r1.ebuild119
-rw-r--r--media-libs/game-music-emu/Manifest2
-rw-r--r--media-libs/game-music-emu/game-music-emu-0.6.3.ebuild9
-rw-r--r--media-libs/glfw/Manifest3
-rw-r--r--media-libs/glfw/glfw-3.3.2.ebuild48
-rw-r--r--media-libs/glfw/glfw-3.3.4-r1.ebuild55
-rw-r--r--media-libs/gmmlib/Manifest6
-rw-r--r--media-libs/gmmlib/gmmlib-21.1.3.ebuild48
-rw-r--r--media-libs/gmmlib/gmmlib-21.2.1.ebuild48
-rw-r--r--media-libs/gmmlib/gmmlib-9999.ebuild2
-rw-r--r--media-libs/gst-plugins-base/Manifest4
-rw-r--r--media-libs/gst-plugins-base/files/gst-plugins-base-1.18.4_meson-0.58.0.patch48
-rw-r--r--media-libs/gst-plugins-base/files/gst-plugins-base-1.18.4_wayland_registry_remove.patch55
-rw-r--r--media-libs/gst-plugins-base/gst-plugins-base-1.18.4.ebuild6
-rw-r--r--media-libs/libavif/Manifest2
-rw-r--r--media-libs/libavif/libavif-0.9.2.ebuild104
-rw-r--r--media-libs/liblrdf/Manifest1
-rw-r--r--media-libs/liblrdf/liblrdf-0.6.1-r1.ebuild46
-rw-r--r--media-libs/libmatemixer/Manifest4
-rw-r--r--media-libs/libmatemixer/libmatemixer-1.24.0-r1.ebuild43
-rw-r--r--media-libs/libmatemixer/libmatemixer-1.24.1.ebuild4
-rw-r--r--media-libs/libsidplayfp/Manifest4
-rw-r--r--media-libs/libsidplayfp/libsidplayfp-2.1.2.ebuild32
-rw-r--r--media-libs/libsidplayfp/libsidplayfp-2.2.0.ebuild2
-rw-r--r--media-libs/libxspf/Manifest7
-rw-r--r--media-libs/libxspf/files/libxspf-1.2.0-autotools.patch191
-rw-r--r--media-libs/libxspf/files/libxspf-1.2.0-gcc44.patch22
-rw-r--r--media-libs/libxspf/files/libxspf-1.2.0-gcc47.patch12
-rw-r--r--media-libs/libxspf/libxspf-1.2.0-r1.ebuild46
-rw-r--r--media-libs/libxspf/libxspf-1.2.1.ebuild2
-rw-r--r--media-libs/mesa/Manifest10
-rw-r--r--media-libs/mesa/mesa-21.1.2.ebuild553
-rw-r--r--media-libs/mesa/mesa-21.1.3.ebuild553
-rw-r--r--media-libs/mesa/mesa-21.1.4.ebuild (renamed from media-libs/mesa/mesa-21.1.1.ebuild)0
-rw-r--r--media-libs/mesa/mesa-9999.ebuild2
-rw-r--r--media-libs/pcaudiolib/Manifest3
-rw-r--r--media-libs/pcaudiolib/metadata.xml17
-rw-r--r--media-libs/pcaudiolib/pcaudiolib-1.1.ebuild44
-rw-r--r--media-libs/qhull/Manifest2
-rw-r--r--media-libs/qhull/qhull-2020.2-r3.ebuild2
-rw-r--r--media-libs/raptor/Manifest1
-rw-r--r--media-libs/raptor/raptor-2.0.15-r4.ebuild76
50 files changed, 595 insertions, 1662 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 743c27e5cd76..e8428e6c966f 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
Binary files differ
diff --git a/media-libs/aalib/Manifest b/media-libs/aalib/Manifest
index 4e12fc3104e8..79f7ff8ae53f 100644
--- a/media-libs/aalib/Manifest
+++ b/media-libs/aalib/Manifest
@@ -7,4 +7,4 @@ AUX aalib-1.4_rc5-more-protos.patch 1499 BLAKE2B abf425195f87f83dc019ded382c365f
AUX aalib-1.4_rc5-tinfo.patch 709 BLAKE2B fb7dd0eb1e39046c66de0466b0411f97fa948d9da03719fcd759a7331c7da0a6cfcba92353ef5363cf651501d73ce4fd29a5baf94897f10f0518284ebb4db10c SHA512 2abab613af549f4c24f7d617cf65de773e7850ec8485dfa23de2405ed59cf14f7cb70c2f1b701e27ae541e5f75302f4d28c3f866303bfc901a96074c9d9d534b
DIST aalib-1.4rc5.tar.gz 391028 BLAKE2B fd527716c0484d45fa3b75712a24301bd485fab8191ac1d5c6d35f8af093a00e11f0f8d2797ddcc32f4d87a39649fd50145dcc557e5ba98e67336cff2bb79002 SHA512 3e4506eccce3b81ccbbb79a4a1b90abd39e2259e6043fde90f70b9ca279bd4c37758a047167267b97c4ec92f64fb17c7c8f548114f0d0c6e78ddb9463b5f1299
EBUILD aalib-1.4_rc5-r9.ebuild 1935 BLAKE2B 3b8634417df2eec3080f90b1312cce41954da998c9e327b13baf67cd8773f60d27827611c73c34f5978f17f6fb3271773a15e714ce47f0f11bcca9357d397e69 SHA512 16b96df102859468e3b6cc3cff9c4f3d4c7b68dc6ba98ecbf00c9d1f1c8e8af4a9325540c95e7f932f5aeb3fbe888e56a70c85df780dd9eed091e27da93e366a
-MISC metadata.xml 415 BLAKE2B 3f7c9a9f7118b0fc7e4134f829c28bc47e637256ad0408e7964cdf617df77e4f5c7742d05850444debc0f6ed7aeac0e756bba5d746092cd9bda69797d5540f66 SHA512 f49d1e3652e86e14a048ad6944c108bec49ba19b961ea89b171d55e789e9c42bd4f981086dc643daf1c805fec79de3831488bdc9c29c2c1a6d6e4b00bb786def
+MISC metadata.xml 409 BLAKE2B d87f142c86047c5f044ba1f96832a4674719843aed45d6a14d82431c14d5c2fd631e1fc1e8ba86594a9d63b7a1e3d9109aed882527a691b50c06541372a19612 SHA512 d071b9cbe0576aca9d886614030a9deb029ef582b893a043c016fcb10e90d808d663c6fd1f6cb19222f5af9b0eb9c652f88fa8d2d127484599cc777a02860b4d
diff --git a/media-libs/aalib/metadata.xml b/media-libs/aalib/metadata.xml
index 15c6c447bea7..8a6d26ef0c49 100644
--- a/media-libs/aalib/metadata.xml
+++ b/media-libs/aalib/metadata.xml
@@ -5,8 +5,8 @@
<email>media-video@gentoo.org</email>
</maintainer>
<maintainer type="person">
- <email>slyfox@gentoo.org</email>
- <name>Sergei Trofimovich</name>
+ <email>marecki@gentoo.org</email>
+ <name>Marek Szuba</name>
</maintainer>
<upstream>
<remote-id type="sourceforge">aa-project</remote-id>
diff --git a/media-libs/aubio/Manifest b/media-libs/aubio/Manifest
index 0d0e6fc9e2a1..458378733d88 100644
--- a/media-libs/aubio/Manifest
+++ b/media-libs/aubio/Manifest
@@ -1,4 +1,4 @@
AUX aubio-0.4.9-docdir.patch 1192 BLAKE2B 617f5a63d51440eba157687b752822b3e14316781d3534c63194c9bef214574f195d3dfb949fc357862c7ddab01e0f9bb58ea54a75dac4c90f27a24f0c1cf477 SHA512 dffe872bd5c63eb874f00b1303e63f241d9b349d5f32fbf34b659b6211cc9cc828784bb3f5ddd2210c9e6b8459a73e842988bad4474b19e319145971de138526
DIST aubio-0.4.9.tar.bz2 397604 BLAKE2B b849d92678ea8fb20e17921b1a61fdc85a84d4a528acfefa3278169ab5f7fe935217ec37dd9f931202f0f0a1fd3a9518372afbce34cc2dd3ca30c6b4e5d9a301 SHA512 0cb81bb4b15051db3f3f4d160d500af56fdfb237e0a74e3f366f53c2870030aa0a7cee8469a611a9694c36b8866d3d42ffb48241c999de08f3fee43e6d903130
-EBUILD aubio-0.4.9.ebuild 2894 BLAKE2B 64ac074903ced4eccb7c12812977fe4cc241b313011a603af532883d48e6f53d2a2ed1b7bf2d5678d76fe0c9894dad849f3665b12e8a5142e56c1a9c737a5b2e SHA512 0c5c1098ee248deba4a291d53abfb33bae7702b0e62de693a5f90f1abc6095ba85f223a08a8b38fd0190e1dc3242ab6d99f63446ed8a1de29a112a615f026bec
+EBUILD aubio-0.4.9-r1.ebuild 2889 BLAKE2B fe56be741202f0b276597d2deac892a43e3851b41fd6aed4501e9fe58000276f6974eada9e66ec4a5ad334e4ff5b8182ddfac6a0f2ebef409b9b9e7285a77f7d SHA512 5f6361a838acf21c30972331d5cc0b919bfa7742314ff23a5ee901f5130105494a87fe50bedde4f34984926116e894a466dfd8ec5c90f3224c6516e06ae5056a
MISC metadata.xml 346 BLAKE2B 00429033f506bf3818f26f13062d21d0d04d8fc84185244615a09d008c5da6e350df5f32bdcba2c07103039ed64f802cc563a0ca8cd79e117741b947e421142d SHA512 ff3830c2d2322fabdb34458fd27c3e05ad825b1d707eee6150417e4c21480bdffbe4e639ff33a9914cc28189b91e970719326f065746f4241e186f7b27b168d1
diff --git a/media-libs/aubio/aubio-0.4.9.ebuild b/media-libs/aubio/aubio-0.4.9-r1.ebuild
index 3e1e243b1c38..33eae76c51c9 100644
--- a/media-libs/aubio/aubio-0.4.9.ebuild
+++ b/media-libs/aubio/aubio-0.4.9-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
DISTUTILS_OPTIONAL=1
-DISTUTILS_USE_SETUPTOOLS=rdepend
+DISTUTILS_USE_SETUPTOOLS=no
PYTHON_COMPAT=( python3_{7..9} )
PYTHON_REQ_USE='threads(+)'
inherit distutils-r1 waf-utils
diff --git a/media-libs/compface/Manifest b/media-libs/compface/Manifest
index dc0aed6acbc2..3c5a44c6d45f 100644
--- a/media-libs/compface/Manifest
+++ b/media-libs/compface/Manifest
@@ -1,4 +1,4 @@
AUX compface-gentoo.patch 1415 BLAKE2B cac49f8b6cb2680df1ef46a811a3dfaf1f7c170b69f3eeb91daa784e885fd75925169a85e6716944056b9f0fa4d29df96c795c3d16f1a1b89d54468faf555c17 SHA512 e966f02c7566a657751ad4ecd30805c5cb77e9fd76a458d639ff3291d0bd3c4e886bfc37106a755b1387c5ceee331eee1921595249e07175918bb218cd449a10
DIST compface-1.5.2.tar.gz 46970 BLAKE2B d26c25a35b3a2e63ddfb50feace61930fa3be9f4150ad8f8c96a3820ccebf1422fda5703628d58ad646f1d1eeaccc5f2f08ed5f2e74b845f5d7328f2829e63d6 SHA512 0da9ee4c5fb2b5c712466d9fa6170e5687b23c038e6304baa42d7ede6d9bd50a1b84da416eb853a420c01a6b9eccd5e7d92a4ebc26295714b85254c05c9e3360
-EBUILD compface-1.5.2.ebuild 606 BLAKE2B 0b77c294392af1123a21da57d85f099ef85464b5f4cc51715eff12c557add525766a88a261d7180989dd90f24f29c27b66766fc03f2459f39d190dc64f4de98b SHA512 82c15d3c13109a840f726c501d28857c6d46eda3ed70acc46fc8eefd97a397ed5cc561730cba2167f3a9e9f4dded6f6d88712ef7851cafeb90bbabfc6e7bc256
+EBUILD compface-1.5.2.ebuild 613 BLAKE2B 12d088bac14260bdbb58f7bd0abccea737f6d034320f2c19368585ad518ed598485ec7557c09ba004f57f5570bd4a3738193ddd31e3f3d060cc82a6ad3ac4e5f SHA512 d5967cce396ed0ceb731a77c802e1f50ce4d8dd58eb611e40375a60500e8c7e5ec9a83d5fb33e0ab4009c7bb445d5c3683f6d836f7fc800a3775e36c09367e3f
MISC metadata.xml 248 BLAKE2B e581d975884f924f92f81a803547379276565617c24d86f893c0186a4793c1167a36cbd8083261a10ce99839b9e5b5dd29f237bebb644eaef29ced562c9c6310 SHA512 62ab121be05f0603fe52b26ac612943b049bc527ff73401e6ed427622fcfd7f07cf3fabae90ac9e30297692ec4188b1a8bdc1f9104e30d6ed4032a96ffd77cf2
diff --git a/media-libs/compface/compface-1.5.2.ebuild b/media-libs/compface/compface-1.5.2.ebuild
index f7360109f376..ab907d8abc4e 100644
--- a/media-libs/compface/compface-1.5.2.ebuild
+++ b/media-libs/compface/compface-1.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -11,7 +11,7 @@ SRC_URI="http://ftp.xemacs.org/pub/xemacs/aux/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
RDEPEND="dev-lang/perl"
diff --git a/media-libs/freeimage/Manifest b/media-libs/freeimage/Manifest
index d4dcc588cd19..82bdc9af3cd7 100644
--- a/media-libs/freeimage/Manifest
+++ b/media-libs/freeimage/Manifest
@@ -8,6 +8,5 @@ AUX freeimage-3.18.0-rename-jpeg_read_icc_profile.patch 1278 BLAKE2B b387457b896
DIST FreeImage3180.pdf 1665541 BLAKE2B 5d40ee6fa0a1e73df0cc961edbd70a2835ef88fb540f123fd81f2bb826d4c949d2a60dfe3fc02406ce632a389935abac0d471c963c9803b8c2aece2b48afb003 SHA512 632f68b14f7a5916a1b95bbf86c268d0afe786a2537472301bb002254aa3195f046efb41f073133633211e985e90edbb99285ab6f42bc55501c756292a3c4c03
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-r1.ebuild 3055 BLAKE2B 4ee4e6887a25899a4e610c15f1995e63672951578aa738b3ba3daeed7d39c5b33e5c5461529cb697798c59685b99853dd968807a80ecbab92ed33f6cf9d697dd SHA512 08a64c0e4ddd54d7f9f44d21ae2d9b47a0df012c8203ad0df1b896bca811200c014ca06b743fb31bda13d86b688b3d0caee9deb28d7b4e4b1eea452384f03f18
EBUILD freeimage-3.18.0-r2.ebuild 3174 BLAKE2B fb299df99374303edc9f38dd38effe2a2aeff342446a4f2b44cb8878b393308cc1611801d32e23a892ffbf879616ee03f5216f75545e712a8c4211f5bce90858 SHA512 252093fc344316203110f98c1eca639e1834a8d5196f7cf86d6e6b0fe3adbbfdbc891b6d3d63ac4f08e2496e37b3fb82959794f3e7a9f83858a1306ebae0d21b
MISC metadata.xml 403 BLAKE2B e4d54e3da3203c09e5b281d7d9a5ee1c42f98d081751195edb3754809e9cfc9037b79f70da579f01485b4cda65fe4ddaa70f5522d6138af5b214cdbcbd412928 SHA512 08dffea02b8771a4728338c3cdfa0fd7f312d4570838bdfea4ec395c007cc36f3ef87432db5da44468c7b3834855e2de8ae13ddf9447cba9c88da4367c6cc10c
diff --git a/media-libs/freeimage/freeimage-3.18.0-r1.ebuild b/media-libs/freeimage/freeimage-3.18.0-r1.ebuild
deleted file mode 100644
index 0193edd91608..000000000000
--- a/media-libs/freeimage/freeimage-3.18.0-r1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 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:= )
- 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
-)
-
-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/game-music-emu/Manifest b/media-libs/game-music-emu/Manifest
index e5c1b95e298b..e56231609618 100644
--- a/media-libs/game-music-emu/Manifest
+++ b/media-libs/game-music-emu/Manifest
@@ -2,5 +2,5 @@ AUX game-music-emu-0.6.2-gcc10.patch 546 BLAKE2B ef04c95fbb0fc51afbfaf27d93cb38c
DIST game-music-emu-0.6.2.tar.xz 163052 BLAKE2B 8bce2a5c09eef947f02cfc3521aa380564ddaad5f8a8f40ac38b645fc146332ba1cb6755592892dab00200c169a4d1f94978d80c52976c04e120d9d01c8db9dc SHA512 1808d28b54cbbd8dc5e3240eb27d2e546398fb62ab6577e59430a7543cfdaa06482f70b4750656b73a05f1c1bc0c0254db97d0940271ea2144724e1c44f5da10
DIST game-music-emu-0.6.3.tar.xz 234412 BLAKE2B 21edd8f5e868231424c56dad6740a5c7cb8e7f503b707dc56ea71d7a75085566b2bd0c2060b0f9e919f858c13821b3810959cff96c41f9248bb3b98f12eb22f7 SHA512 4b20c69ced696bb879c34bcb7ce0f5f276642458d4cebca8ede673eed7d50664e527626e2077f85a3411a26660f1b3f01e43cccd72945e1edb2994421efeb552
EBUILD game-music-emu-0.6.2.ebuild 544 BLAKE2B cfc296de059a13c0d684ee037cebd5088044792b04a2b78b4c3bd316e2ed5d61d1011a67bbfb40262a6bf8778737156aa48eeb651be2824d2c577849b757fb42 SHA512 d0d62797c51dc871ae10fb137cfa700f2ea2c7055d05d15450c0dea2ab89592330e5be913a28a11fba5a6e97b42c78e9459cbdb5d50aa7b8f8ae9dc9bc2f2823
-EBUILD game-music-emu-0.6.3.ebuild 490 BLAKE2B b302d9a3c9faf16e1779e2c55e66dfd09653730b3eccaed2e03f139c0277cf3a1d2f9c4220a1e5286078ec3f75dc3725c05db210241c799c9637789b34c91320 SHA512 ace43fd05f27f9dd1fcc05adb3cc901b6b7df86ebc24f4f6809cca1f3df49ab47a65fe95469d45e2b7f90e9c8cd2386fb4640f615961c52e6b5e46a853db6581
+EBUILD game-music-emu-0.6.3.ebuild 647 BLAKE2B 8d2e2f35b8dee697466764418ddeffc329ad8cdf94601d6788508e94e9c7be968d8df6ecad4e5710b7885aec228ab3f68cb6c85f12ab42fb99e5c7addeb24ca6 SHA512 48ef6baf3ab9b1a24c6a1e425201b72627f2290fb3414b37c0d57a04b64199e6c46ba46f3a3b03b0d37b17b29f29ba927a1c5ef59562dbe5e9aac3c1e60018c0
MISC metadata.xml 400 BLAKE2B 1dd7cab3e13a3364222e52dc2e4c3dcbeb12e4169aaaa4196bc8ab325e42e04aa7b8aaa6fccb64db1de7ed6163d3060fdddb6df21c7243c4c0b3a7b7f28bd3ed SHA512 2abd1362876b6019d1538a6cd6a5740c29c1920037db3f3c622fb7c533a64b6d559ef8cdead9e2fdecc9c64c799fd1d2f8fc5887d493354604e4a99ed77cbf1d
diff --git a/media-libs/game-music-emu/game-music-emu-0.6.3.ebuild b/media-libs/game-music-emu/game-music-emu-0.6.3.ebuild
index 682248956319..931d2f39bfcf 100644
--- a/media-libs/game-music-emu/game-music-emu-0.6.3.ebuild
+++ b/media-libs/game-music-emu/game-music-emu-0.6.3.ebuild
@@ -12,7 +12,14 @@ SRC_URI="https://bitbucket.org/mpyne/game-music-emu/downloads/${P}.tar.xz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 x86"
IUSE=""
DOCS=( changes.txt design.txt gme.txt readme.txt )
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_UBSAN=off # disabled so that if gcc[-sanitize] it does not fail to compile
+ )
+ cmake-multilib_src_configure
+}
diff --git a/media-libs/glfw/Manifest b/media-libs/glfw/Manifest
index c60392567c21..5af993d6a090 100644
--- a/media-libs/glfw/Manifest
+++ b/media-libs/glfw/Manifest
@@ -1,7 +1,6 @@
-DIST glfw-3.3.2.tar.gz 759972 BLAKE2B a246681d580dd569a045b76db71c18f8dbfacb8483c2d825aa68094d655468d093c52ba3770b2b5d566de62149a775001f5acd7c7539a8235c43e3e9ab58df28 SHA512 f5af749d33b5b900ccf07988ad0bf51bd766a18e4cf2bc2a76020c88e98a2528ff1b965224184fe0d290cfe34b1af1e6f633600660d81194fe354078e2f35c56
DIST glfw-3.3.3.tar.gz 763713 BLAKE2B bd6202877a3462d717a6d77b6381de704da854df011f7ab5172e626dc46df90793190284241b470a4b78e020302e5dca4051476e092e73e34731f6245a43ea14 SHA512 6d743d89d159bff6c4f7fa3fc5bc407fd728bdc432d76acc4897fd392580be272f8a9d1d7c375c4323e82bf2fd28310e5daab097fef33e8f43b69ce104f9bd31
DIST glfw-3.3.4.tar.gz 762885 BLAKE2B b88f80ec8cfb1607a8c5ce5e6eabfe5c9813235c6225629ef8001ba5f46cdbed1d726aeed170a8749bbd048f1517cb614f9fc5ad7604ae1698b83b5e995b8cd6 SHA512 2b45ab72da7a2c007c0f42ccd56205f9684cfb980e2b1df127850cd057bb2b02ce02c7c64acd54cd433778e7017148f214afedf09badff9d2edf5f9b8d9d2701
-EBUILD glfw-3.3.2.ebuild 917 BLAKE2B 201613d30143c1145aaf264198be05a0f87e17b5a261174bb397241c8fafdfc38a40dc268cd6f269b10dc41c6b74c65a51ddfdc8121ec5e67b5df3ff0a8e5a5c SHA512 7555c1164fe1fca8fc860e52cafc492fe580a1f1a3456d68209f03adfeeaa377de0217570aa563f95345a9070afadf3358d117efbff2ac70b15879ab54d2d7ca
EBUILD glfw-3.3.3.ebuild 917 BLAKE2B 201613d30143c1145aaf264198be05a0f87e17b5a261174bb397241c8fafdfc38a40dc268cd6f269b10dc41c6b74c65a51ddfdc8121ec5e67b5df3ff0a8e5a5c SHA512 7555c1164fe1fca8fc860e52cafc492fe580a1f1a3456d68209f03adfeeaa377de0217570aa563f95345a9070afadf3358d117efbff2ac70b15879ab54d2d7ca
+EBUILD glfw-3.3.4-r1.ebuild 1210 BLAKE2B a9f95844bb5f1a578511cf62756462259799a58d736dfd85a753ad9be0b25edf22deeef6cd20e7e2bcad44e187ed4801dbe26a1ac724565798cb5ea9a9c041cb SHA512 5163c45026772199ca6b6322cbfa3393d3173516980e136027f1859dbd9573de631012eecabc2006e137e8af7ed1a39a291bd06b843e3c2cb2d2d6e9f89d672c
EBUILD glfw-3.3.4.ebuild 917 BLAKE2B 201613d30143c1145aaf264198be05a0f87e17b5a261174bb397241c8fafdfc38a40dc268cd6f269b10dc41c6b74c65a51ddfdc8121ec5e67b5df3ff0a8e5a5c SHA512 7555c1164fe1fca8fc860e52cafc492fe580a1f1a3456d68209f03adfeeaa377de0217570aa563f95345a9070afadf3358d117efbff2ac70b15879ab54d2d7ca
MISC metadata.xml 388 BLAKE2B 6f83bc48ed7a722cf0b64e450ac3839543db9713d3252c40eab395a54d53b9782e163a3238e6d443c2f8f6c8fd747a273ca018e08918fe084b048821665a8bbe SHA512 47ef3b02e4c8b3a12f328bc227f3ed2196c82e05970a9af12d1988a4466d5b614e0b788914dc03b4325a5cd2d63d93a677b6d093cdd50455c78b3d79c64a5171
diff --git a/media-libs/glfw/glfw-3.3.2.ebuild b/media-libs/glfw/glfw-3.3.2.ebuild
deleted file mode 100644
index 126bde0fc027..000000000000
--- a/media-libs/glfw/glfw-3.3.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="The Portable OpenGL FrameWork"
-HOMEPAGE="https://www.glfw.org/"
-SRC_URI="https://github.com/glfw/glfw/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 x86"
-IUSE="wayland"
-
-RDEPEND="
- x11-libs/libxkbcommon
- !wayland? (
- virtual/opengl
- x11-libs/libX11
- x11-libs/libXcursor
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXxf86vm
- )
- wayland? (
- dev-libs/wayland
- media-libs/mesa[egl,wayland]
- )
-"
-DEPEND="
- ${RDEPEND}
- !wayland? ( x11-libs/libXi )
- wayland? ( dev-libs/wayland-protocols )
-"
-BDEPEND="
- wayland? ( kde-frameworks/extra-cmake-modules )
-"
-
-src_configure() {
- local mycmakeargs=(
- -DGLFW_BUILD_EXAMPLES=no
- -DGLFW_USE_WAYLAND="$(usex wayland)"
- -DBUILD_SHARED_LIBS=1
- )
- cmake_src_configure
-}
diff --git a/media-libs/glfw/glfw-3.3.4-r1.ebuild b/media-libs/glfw/glfw-3.3.4-r1.ebuild
new file mode 100644
index 000000000000..43f33ee0dd73
--- /dev/null
+++ b/media-libs/glfw/glfw-3.3.4-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+DESCRIPTION="The Portable OpenGL FrameWork"
+HOMEPAGE="https://www.glfw.org/"
+SRC_URI="https://github.com/glfw/glfw/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+IUSE="wayland"
+
+RDEPEND="
+ x11-libs/libxkbcommon[${MULTILIB_USEDEP}]
+ !wayland? (
+ virtual/opengl[${MULTILIB_USEDEP}]
+ x11-libs/libX11[${MULTILIB_USEDEP}]
+ x11-libs/libXcursor[${MULTILIB_USEDEP}]
+ x11-libs/libXinerama[${MULTILIB_USEDEP}]
+ x11-libs/libXrandr[${MULTILIB_USEDEP}]
+ x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+ )
+ wayland? (
+ dev-libs/wayland[${MULTILIB_USEDEP}]
+ media-libs/mesa[egl,wayland,${MULTILIB_USEDEP}]
+ )
+"
+DEPEND="
+ ${RDEPEND}
+ !wayland? (
+ x11-base/xorg-proto
+ x11-libs/libXi[${MULTILIB_USEDEP}]
+ )
+ wayland? ( dev-libs/wayland-protocols )
+"
+BDEPEND="
+ wayland? (
+ dev-util/wayland-scanner
+ kde-frameworks/extra-cmake-modules
+ )
+"
+
+src_configure() {
+ local mycmakeargs=(
+ -DGLFW_BUILD_EXAMPLES=no
+ -DGLFW_USE_WAYLAND="$(usex wayland)"
+ -DBUILD_SHARED_LIBS=1
+ )
+ cmake-multilib_src_configure
+}
diff --git a/media-libs/gmmlib/Manifest b/media-libs/gmmlib/Manifest
index 966ce0ba2e6f..79aa6ecf0517 100644
--- a/media-libs/gmmlib/Manifest
+++ b/media-libs/gmmlib/Manifest
@@ -5,10 +5,14 @@ DIST intel-gmmlib-20.2.5.tar.gz 728792 BLAKE2B c78cebcfad9f314e3ee298deaa78586cb
DIST intel-gmmlib-20.3.2.tar.gz 729059 BLAKE2B 3cc07d9dc07fecd483c35bde41802c8a433a751310fe4d0273625f3a6e245a2dd6e5546b4e5bed40b04b22c4e00a648cce66b221c25da8c6f3f3637a890508bd SHA512 1d8ea369b5b22ca747f8bdaee0be24584b79ccdecaad6c85e5f0a41ac171459261c8c5b220797ffc525e7e29cfa1664f9eaca07f5e72d4a260f327d8980fb2dd
DIST intel-gmmlib-20.4.1.tar.gz 732088 BLAKE2B 80873ee7a4b7428197352e77b82315068d6217e025b33e719c6fdc24aa4e5f97fe64b290f2d4461bb701eb8c14e747c8eac0b62f226f044f9a7c71de0455dfbd SHA512 a4f6fb8cd3ae2dc837586d6b51495bcceda5d4a9ecaa59fa730d3240a0da359b4449cd9aec96905f7c572f6425cdc19bb419681d99269ca8541542d7abf03c96
DIST intel-gmmlib-21.1.1.tar.gz 737024 BLAKE2B d8a3b3bf1abe7faf7821ca120ebc40e0407dd8edf074ec8a8c05063c3ea48c0b4b33694210562aa4e6bd32fae30f45fcd23b04bb961535ffb10684ff180a9e2d SHA512 06becc986eb04c5243389686121bcc597ab16620fcb47943de14f901938dd906ad884b132da0e46ff939e7e599899d4262006efe19d14b3ed87b6f799ca40787
+DIST intel-gmmlib-21.1.3.tar.gz 745864 BLAKE2B 57a7d869d98ae28f942e90f54d46047bfda5e33912e6077c4499c4b81865ea3ec473e60fc1da2096c716f0904d0dfc298e8d6f603476ead29366dadab5ab797d SHA512 eccde1dcfd5e2c45ccd65463e092d6d7625c572705db12c4b3b6c6c01b45b81da8751a206a8fcf35acc26000ed1edca72d4bb9ed48e354aad2d79bc68293e555
+DIST intel-gmmlib-21.2.1.tar.gz 746883 BLAKE2B 9ffd3319bca42558e139f81ab60e5db5328d155b591c08b763c2b02f2728c04c6f96b79547ff3a1e6b8b8cb940cdd01b33ee04f946ac6fa9eefda5439cc49414 SHA512 457d2815204c8e12292fbe6e642a7409df4b3de597972e3c956d5dfae23b5032fc07cf60c0a10bd58aa6dc62a89225a5b704c98689112d23b81f91c1129bcb97
EBUILD gmmlib-20.2.2.ebuild 849 BLAKE2B 2cdd2eecc70572bdc19867c91a00c3ee07053877f23b31620fb8e1b8f9036f4b23487e88fa025adf96dd90b121902be81385abb290166df3936ccc21ab8b86e7 SHA512 5b40d4a632ffd9f0e16195e58701b0e5485aeb7e6ae34443295313722522f76f8000b6a0fbc7b6cba4ee8e6c6abb0c6967e9495b0510b7b1a40554eca4d2db02
EBUILD gmmlib-20.2.5.ebuild 850 BLAKE2B 6ed565043380da387123c75f902c44ee33f82b2b3514768da9c0428dc4cfff894c41603e05b0e7a55d3f5afb5321609808251b1959a130c084415933abc3a84d SHA512 949074be31cf55106b9fb02b0b78ca62b31e47f3d0520b6447b16618f6a686510c385899cac61d886047ccdb5741e7d87ff7d935845251d7b8e5054a5eba4409
EBUILD gmmlib-20.3.2.ebuild 850 BLAKE2B 6ed565043380da387123c75f902c44ee33f82b2b3514768da9c0428dc4cfff894c41603e05b0e7a55d3f5afb5321609808251b1959a130c084415933abc3a84d SHA512 949074be31cf55106b9fb02b0b78ca62b31e47f3d0520b6447b16618f6a686510c385899cac61d886047ccdb5741e7d87ff7d935845251d7b8e5054a5eba4409
EBUILD gmmlib-20.4.1.ebuild 986 BLAKE2B 64a5e72660d7d7649fd9246dee574cf86305da9e2ac7ba29d2867588f8edb41fbb95a61379ed9fdd5f66fc55dc9f472215761de7b7100764e0b43fb548839feb SHA512 7bae5f3c22f2e85b4c373e4c08a6a40f1c6dce76e0969d811ff112f72442c6c27c05ef833ac43c56eeea0d59dda5a58e5511e6e2648171a7060822961548a592
EBUILD gmmlib-21.1.1.ebuild 1008 BLAKE2B 752f6cdadb79665d1b8befc29bd1c85a0d2feea544ad91f776fab333afc6075a6487c9626522065c26950762487a65d366565e705ee52b324578c5c3a7f62de2 SHA512 4e8138326980584dba5e56b5182551cce96d1672ac4023bd0e369cd3b401af3ca44db04110d84f5253aea235ef80e16a34f76eb5af0298ad28216374be1b1b99
-EBUILD gmmlib-9999.ebuild 987 BLAKE2B fa9af19564425d1f169068232162c0761bb16b7b5e489af55a0f3282d6e16b78f4022eb76030d62e72197eeeb0e1de9f61fec1bb6d5a8cfc1ebf599b205be893 SHA512 1207e0e79bf790f036d2aea2682f3a01e6d8e8ef629e187e486488835913c5d4995e5baaa4bc9d936fa901605083ff6d1564e681b9f089c3f31cee0ee1218b36
+EBUILD gmmlib-21.1.3.ebuild 1008 BLAKE2B 752f6cdadb79665d1b8befc29bd1c85a0d2feea544ad91f776fab333afc6075a6487c9626522065c26950762487a65d366565e705ee52b324578c5c3a7f62de2 SHA512 4e8138326980584dba5e56b5182551cce96d1672ac4023bd0e369cd3b401af3ca44db04110d84f5253aea235ef80e16a34f76eb5af0298ad28216374be1b1b99
+EBUILD gmmlib-21.2.1.ebuild 1008 BLAKE2B 752f6cdadb79665d1b8befc29bd1c85a0d2feea544ad91f776fab333afc6075a6487c9626522065c26950762487a65d366565e705ee52b324578c5c3a7f62de2 SHA512 4e8138326980584dba5e56b5182551cce96d1672ac4023bd0e369cd3b401af3ca44db04110d84f5253aea235ef80e16a34f76eb5af0298ad28216374be1b1b99
+EBUILD gmmlib-9999.ebuild 1008 BLAKE2B 752f6cdadb79665d1b8befc29bd1c85a0d2feea544ad91f776fab333afc6075a6487c9626522065c26950762487a65d366565e705ee52b324578c5c3a7f62de2 SHA512 4e8138326980584dba5e56b5182551cce96d1672ac4023bd0e369cd3b401af3ca44db04110d84f5253aea235ef80e16a34f76eb5af0298ad28216374be1b1b99
MISC metadata.xml 504 BLAKE2B 504d2971f8948eda1c88d8e6a2b83651552dbf753e7cc1e0230afd075e49350533f5498405b75ed79e54f793a7a6d72571b83a2ff57222ee3960e496fb5923a7 SHA512 60f62309d8e03e23178486bfe6d3e9b23e472de83b2ae5ea1e44da0a26d56b41c12601d3e164e5d3d33c8cc9873314c35f5892abe4059912c39630c4477289ff
diff --git a/media-libs/gmmlib/gmmlib-21.1.3.ebuild b/media-libs/gmmlib/gmmlib-21.1.3.ebuild
new file mode 100644
index 000000000000..4e796e2186d3
--- /dev/null
+++ b/media-libs/gmmlib/gmmlib-21.1.3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+
+inherit cmake-multilib
+
+if [[ ${PV} == *9999 ]] ; then
+ : ${EGIT_REPO_URI:="https://github.com/intel/gmmlib"}
+ if [[ ${PV%9999} != "" ]] ; then
+ : ${EGIT_BRANCH:="release/${PV%.9999}"}
+ fi
+ inherit git-r3
+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
+
+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
+)
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DBUILD_TYPE=Release
+ -DBUILD_TESTING=$(usex test)
+ -DOVERRIDE_COMPILER_FLAGS=$(usex !custom-cflags)
+ )
+ cmake_src_configure
+}
diff --git a/media-libs/gmmlib/gmmlib-21.2.1.ebuild b/media-libs/gmmlib/gmmlib-21.2.1.ebuild
new file mode 100644
index 000000000000..4e796e2186d3
--- /dev/null
+++ b/media-libs/gmmlib/gmmlib-21.2.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+
+inherit cmake-multilib
+
+if [[ ${PV} == *9999 ]] ; then
+ : ${EGIT_REPO_URI:="https://github.com/intel/gmmlib"}
+ if [[ ${PV%9999} != "" ]] ; then
+ : ${EGIT_BRANCH:="release/${PV%.9999}"}
+ fi
+ inherit git-r3
+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
+
+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
+)
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DBUILD_TYPE=Release
+ -DBUILD_TESTING=$(usex test)
+ -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 eec88a3a2181..4e796e2186d3 100644
--- a/media-libs/gmmlib/gmmlib-9999.ebuild
+++ b/media-libs/gmmlib/gmmlib-9999.ebuild
@@ -31,6 +31,8 @@ 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
diff --git a/media-libs/gst-plugins-base/Manifest b/media-libs/gst-plugins-base/Manifest
index 784a28ea7fca..ea97edd479d7 100644
--- a/media-libs/gst-plugins-base/Manifest
+++ b/media-libs/gst-plugins-base/Manifest
@@ -1,5 +1,7 @@
+AUX gst-plugins-base-1.18.4_meson-0.58.0.patch 2198 BLAKE2B 3a6e661f37c94c6c2e013a9addf17c3ce5af25d29d7141ffbdc25df4b75c79952c8c6b60204ca1b9cb652e665a82c66a62b5a16617104b24dd095b776b17b4e9 SHA512 4f3ad40b8d0690cb893207d686d12623d9b7e238f9b7fc7278b567f43e4f36390e4c66bf76fb2dc619c66f2a192e9567d2bfc6688f952355f8a47c3bb9622e86
+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 5954 BLAKE2B 744b3bec6a4d7b6c1ad44276a6641ae960b21d3ee3b5be92a739f0798ff468564a2e776f135e16c67be42d325d6ce2806ffbce6a24b477f27bfbd50b24127006 SHA512 9ec447c3176369f521829a3b2882f73f579f1b608c4bb3c54eb9d290f9200b39f0679ab4ec5ec8d2180821f55efe7c4d89132fe7c968a51b6f1457051a3cd2ca
-EBUILD gst-plugins-base-1.18.4.ebuild 5524 BLAKE2B bb5274444be74b79b3753f562e20c82523cab2a16590b58cd1ee5526709fed07d0ca9bb0dc0719fc7a1a7f85cf74bfcd6967308187ec85722e067a6c9307fb6c SHA512 6209d47015f5be1528804a81657f7a249da00f9a61a4fb041f63165f7df1c9c017418e6a8d824f3b26dc94a25c9e8769b0f5bd14e13c662f07727087c9a6b5f3
+EBUILD gst-plugins-base-1.18.4.ebuild 5718 BLAKE2B a70a9b46e6471263455c049bdf7c8a887c66ed0d50f23fc1e3faa8a4abfc32ab98df4f8484362d696c2041c92c0f95430a05476d526635709914e99dc5072521 SHA512 f42a746757febf46af978caa95ae51eb10ee2b3379f294cc5f48d086ea85408777c56b18cf4768472658fc674f3c17e07e08f368723b8fe6c79e4c823adf9186
MISC metadata.xml 1065 BLAKE2B 9736df3218c6157e5cc0f14e96a15ec6ab6140e8774c7361dd4fe9378efd37d1a3da593527313a81591818ad48a5585bd4395fbeb85d357449b00bf7e51bbb5c SHA512 520802b59fc6575e16edd765dacab4ff0ff6e51dd162f03fe7e4e07eb472aeb78f3974a32ba613939932e123179106a450c503234ed806a08416dc6b8dd534c2
diff --git a/media-libs/gst-plugins-base/files/gst-plugins-base-1.18.4_meson-0.58.0.patch b/media-libs/gst-plugins-base/files/gst-plugins-base-1.18.4_meson-0.58.0.patch
new file mode 100644
index 000000000000..9cb2dafb3d7d
--- /dev/null
+++ b/media-libs/gst-plugins-base/files/gst-plugins-base-1.18.4_meson-0.58.0.patch
@@ -0,0 +1,48 @@
+From 90903917a8185e0f9add7af8153ae2fc9875fdcb Mon Sep 17 00:00:00 2001
+From: Xavier Claessens <xavier.claessens@collabora.com>
+Date: Mon, 26 Apr 2021 14:25:03 -0400
+Subject: [PATCH] gstgl: Fix build when Meson >= 0.58.0rc1
+
+"implicit_include_directories: false" now also means that current build
+directory is not added to include paths by default any more. We have to
+add it manually because we have some custom_target() that generate
+headers in current build directory.
+
+See https://github.com/mesonbuild/meson/issues/8700.
+
+Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1127>
+---
+ gst-libs/gst/gl/meson.build | 15 ++++++++++++---
+ 1 file changed, 12 insertions(+), 3 deletions(-)
+
+diff --git a/gst-libs/gst/gl/meson.build b/gst-libs/gst/gl/meson.build
+index db11c5e89..731ee9f5e 100644
+--- a/gst-libs/gst/gl/meson.build
++++ b/gst-libs/gst/gl/meson.build
+@@ -989,11 +989,20 @@ if build_gstgl
+ command : [mkenums, glib_mkenums, '@OUTPUT@', '@INPUT@'])
+ gen_sources = [gl_enumtypes_h]
+
++ common_args = gst_plugins_base_args + gl_cpp_args + ['-DBUILDING_GST_GL']
++
++ # We have custom_target() that generate headers in the current build dir,
++ # but with implicit_include_directories: false, meson >= 0.58.0 won't include
++ # it by default. We cannot use include_directories('.') here because it would
++ # also include current source dir which is what we want to avoid because
++ # case-insensitive FS would include gst-libs/gl/egl/egl.h as EGL/egl.h.
++ common_args += '-I@0@'.format(meson.current_build_dir())
++
+ gstgl = library('gstgl-' + api_version,
+ gl_sources, gl_egl_sources, gl_x11_sources, gl_wayland_sources, gl_priv_sources, gl_enumtypes_c, gl_enumtypes_h,
+- c_args : gst_plugins_base_args + gl_cpp_args + ['-DBUILDING_GST_GL'],
+- cpp_args : gst_plugins_base_args + gl_cpp_args + ['-DBUILDING_GST_GL'],
+- objc_args : gst_plugins_base_args + gl_cpp_args + gl_objc_args + ['-DBUILDING_GST_GL'],
++ c_args : common_args,
++ cpp_args : common_args,
++ objc_args : common_args + gl_objc_args,
+ include_directories : [configinc, libsinc, gl_includes],
+ version : libversion,
+ soversion : soversion,
+--
+GitLab
+
diff --git a/media-libs/gst-plugins-base/files/gst-plugins-base-1.18.4_wayland_registry_remove.patch b/media-libs/gst-plugins-base/files/gst-plugins-base-1.18.4_wayland_registry_remove.patch
new file mode 100644
index 000000000000..0bf004350f02
--- /dev/null
+++ b/media-libs/gst-plugins-base/files/gst-plugins-base-1.18.4_wayland_registry_remove.patch
@@ -0,0 +1,55 @@
+From dc1fe07687747f11be6bb0eb944d53efa82ef86c Mon Sep 17 00:00:00 2001
+From: Matthew Waters <matthew@centricular.com>
+Date: Mon, 22 Mar 2021 13:59:39 +1100
+Subject: [PATCH] gl/wayland: provide a dummy global_remove function
+
+Even if we don't care about any global objects being removed, wayland
+will still error if globals are removed without a corresponding listener
+set up for them. e.g. wl_output hotplugging
+
+Discovered by: Matthias Clasen
+
+Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1085>
+---
+ .../gst/gl/wayland/gstglwindow_wayland_egl.c | 17 +++++++++++++++--
+ 1 file changed, 15 insertions(+), 2 deletions(-)
+
+diff --git a/gst-libs/gst/gl/wayland/gstglwindow_wayland_egl.c b/gst-libs/gst/gl/wayland/gstglwindow_wayland_egl.c
+index 6b06632a7..bb8be2756 100644
+--- a/gst-libs/gst/gl/wayland/gstglwindow_wayland_egl.c
++++ b/gst-libs/gst/gl/wayland/gstglwindow_wayland_egl.c
+@@ -494,7 +494,8 @@ registry_handle_global (void *data, struct wl_registry *registry,
+ GstGLWindowWaylandEGL *window_wayland = data;
+
+ GST_TRACE_OBJECT (window_wayland, "registry_handle_global with registry %p, "
+- "interface %s, version %u", registry, interface, version);
++ "name %" G_GUINT32_FORMAT ", interface %s, version %u", registry, name,
++ interface, version);
+
+ if (g_strcmp0 (interface, "wl_compositor") == 0) {
+ window_wayland->display.compositor =
+@@ -518,8 +519,20 @@ registry_handle_global (void *data, struct wl_registry *registry,
+ }
+ }
+
++static void
++registry_handle_global_remove (void *data, struct wl_registry *registry,
++ uint32_t name)
++{
++ GstGLWindowWaylandEGL *window_wayland = data;
++
++ /* TODO: deal with any registry objects that may be removed */
++ GST_TRACE_OBJECT (window_wayland, "wl_registry %p global_remove %"
++ G_GUINT32_FORMAT, registry, name);
++}
++
+ static const struct wl_registry_listener registry_listener = {
+- registry_handle_global
++ registry_handle_global,
++ registry_handle_global_remove,
+ };
+
+ static gboolean
+--
+GitLab
+
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.ebuild
index 0f426cd99d04..a158631adf0a 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.ebuild
@@ -92,6 +92,12 @@ DEPEND="${RDEPEND}
DOCS="AUTHORS NEWS README RELEASE"
+# Fixes backported to 1.18.x, to be removed in 1.18.5
+PATCHES=(
+ "${FILESDIR}/gst-plugins-base-1.18.4_meson-0.58.0.patch"
+ "${FILESDIR}/gst-plugins-base-1.18.4_wayland_registry_remove.patch"
+)
+
multilib_src_configure() {
filter-flags -mno-sse -mno-sse2 -mno-sse4.1 #610340
diff --git a/media-libs/libavif/Manifest b/media-libs/libavif/Manifest
index 4356a4fb7dd1..8629b3cd62f0 100644
--- a/media-libs/libavif/Manifest
+++ b/media-libs/libavif/Manifest
@@ -2,8 +2,10 @@ AUX libavif-0.9.0-pkg-config.patch 800 BLAKE2B 401bc92fc4ed0c6f224b1ff23d22b6da9
DIST libavif-0.8.4.tar.gz 2952844 BLAKE2B b5cd46d668212aab23c8146ebfcb793214873d9f82e1b7ca5876cb9859b96ac5b60ad86c2345654f85e97cb6d920f286b683d0bb588ce7db04f50322b158678c SHA512 92c5df26da70ca113ff3b217a4a09e3dea0b7c4737e0924bd2b232502cfda0c79f4f0785bc7992c973491af7660338cda481bae7b999632815142564bf3275ba
DIST libavif-0.9.0.tar.gz 2961252 BLAKE2B 75a3d9c0f9ada1934fdafb8208571c6a863ffe04210d84b26207952028280d4e5c4efe42a6d4bc1fe417e3bbc06e8b93c416472c79ccd08d760ab65a663e16d9 SHA512 220ef27edf716af4ffc5b035c63f84e2848f165a3fe9c1b74dc0ba29f0de65147610fd4266f1b2419f60cfbb72159368da840fcb574c7a07364a60548d3db179
DIST libavif-0.9.1.tar.gz 1985366 BLAKE2B b498f00c56fe3058cf11f10cc629aad618ad297b625155ec8012f88493f8ae076933e4a4ebc7d97249019a64f01b68db34ab7ff5f9c35db0b1b74dd9048bd191 SHA512 15fa857ee40aeae2ee077d244c6e11a34193f2348e922b5dfa8579a91fa6ceff05c7146e85f9222ebaa6ef2d76e876ea050e8056990cad80850fb4d9581de9a5
+DIST libavif-0.9.2.tar.gz 1987058 BLAKE2B a734014945498d29121d64e54f34b367582688bd230f16b58635c363a9722b36ccd58ae0a95918c0322c0cb38b3e29b68bdc344bb99f61adc1397969db39f480 SHA512 04400ae76214d2f0361a14897d6ee97be675375865bb96c8d237e9a4a1152ac1a966db903c11df82da71b0bc68599a5857e038cc90d63c5d3bc77b13169a3e75
EBUILD libavif-0.8.4.ebuild 1696 BLAKE2B 330cf5554d5d3290dc41d90df4b574a4142e4ad941b0b61aedd2241d4e5fd5d8b2b44adfc53a9c0e8e233a2e001f5dca0a22e336a8fb5b7110f5873d0011e4aa SHA512 2725900f3f0974efc152aea05ad53dec427d142be91aab3a1fb6b9f9e1dd92dd98f4c46fef8ca71aa3bba6d900b2cc3e5bb11439879740a474ad0f5a45c390f6
EBUILD libavif-0.9.0-r2.ebuild 2723 BLAKE2B 897b538c7b198edd03168c70877eff541327ab439fac2f844b45dc97070e85caa2cf1cc58217225624ca0c2dd81c649f932b7cd0be05a41e23ca56ef50b0dbb7 SHA512 2e334002bbf2bba95a8182b2091ebab4a1f7ff1695cc0e098a16b56641310cddb1a0d74f28c35e258de52ece7a66fc99676db7562303ce9a21eb4f6a878632ef
EBUILD libavif-0.9.1.ebuild 2676 BLAKE2B f7bc18c5ff496903a50754a83aa5389726a6758879e978f602221770a952b6d0e9dfc8f2642e9782325bbe9041d2c13ed4eb77e712461f2e73d6a95c794dc0e1 SHA512 bf7780568db50757782179613174d49eb89b5a9ad6f02d68ce99adb84e36e83b5543220d49dc491152b13f9457a2de850d045fa6965c803112f854b3e647916a
+EBUILD libavif-0.9.2.ebuild 2678 BLAKE2B c724ac6686d1ee86235450acb49dd6511c7db25bdc55d426f1572435bc56a8de01c7abdc2aa423902b0179d1ef052aaff148fa77b065aacb8eef502d03098172 SHA512 a894a1042468be7fab7a8cde9612bef7613a41f96419a186f5edc1e6c6a717db2ed70b6fddfe957d947c5002836e8e086852a2f265d55d02e35758d50264925d
EBUILD libavif-9999.ebuild 2598 BLAKE2B 30eb997ed8776849fe1a6c075b93169da72ac416ca84e7d0c6a4b8ea6a83eff005a1586eabe28955a8bc453161953dda15f9a90ba94340f239f41b819b0eb9d6 SHA512 f4b650f6ddd67b4a230d4560311f2419c4b8c5c8efc0811350631dfd08f43fced574dc522a36426164fe43a8f77ad6b956c0f25d2c149a067fd7b1d678c25961
MISC metadata.xml 873 BLAKE2B 076f55198ed293b3a61d5fb312e6c0b5769f3e01118ab481b6902cc6b5412298b05e23d20d2063dcdec5514c804b02249f24e433194910741688cba8a51e56c2 SHA512 0ca9b65794748bba0c92034b531b5bb2e3e6f87ba362073954b8c8689cf115f20f0de3b19bdec9189a2b54ac1c5a33c77b426fb1d907b35ff35ff3b71dd86ee7
diff --git a/media-libs/libavif/libavif-0.9.2.ebuild b/media-libs/libavif/libavif-0.9.2.ebuild
new file mode 100644
index 000000000000..1aae436f27eb
--- /dev/null
+++ b/media-libs/libavif/libavif-0.9.2.ebuild
@@ -0,0 +1,104 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib gnome2-utils
+
+DESCRIPTION="Library for encoding and decoding .avif files"
+HOMEPAGE="https://github.com/AOMediaCodec/libavif"
+SRC_URI="https://github.com/AOMediaCodec/libavif/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="+aom dav1d examples extras gdk-pixbuf rav1e svt-av1"
+
+REQUIRED_USE="|| ( aom dav1d )"
+
+DEPEND="media-libs/libpng[${MULTILIB_USEDEP}]
+ sys-libs/zlib[${MULTILIB_USEDEP}]
+ virtual/jpeg[${MULTILIB_USEDEP}]
+ aom? ( >=media-libs/libaom-2.0.0:=[${MULTILIB_USEDEP}] )
+ dav1d? ( media-libs/dav1d[${MULTILIB_USEDEP}] )
+ gdk-pixbuf? ( x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}] )
+ rav1e? ( media-video/rav1e[capi] )
+ svt-av1? ( >=media-libs/svt-av1-0.8.6 )"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DBUILD_SHARED_LIBS=ON
+ -DAVIF_CODEC_AOM=$(usex aom ON OFF)
+ -DAVIF_CODEC_DAV1D=$(usex dav1d ON OFF)
+ -DAVIF_CODEC_LIBGAV1=OFF
+
+ # Use system libraries.
+ -DAVIF_LOCAL_ZLIBPNG=OFF
+ -DAVIF_LOCAL_JPEG=OFF
+
+ -DAVIF_BUILD_GDK_PIXBUF=$(usex gdk-pixbuf ON OFF)
+
+ -DAVIF_ENABLE_WERROR=OFF
+ )
+
+ if multilib_is_native_abi; then
+ mycmakeargs+=(
+ -DAVIF_CODEC_RAV1E=$(usex rav1e ON OFF)
+ -DAVIF_CODEC_SVT=$(usex svt-av1 ON OFF)
+
+ -DAVIF_BUILD_EXAMPLES=$(usex examples ON OFF)
+ -DAVIF_BUILD_APPS=$(usex extras ON OFF)
+ -DAVIF_BUILD_TESTS=$(usex extras ON OFF)
+ )
+ else
+ mycmakeargs+=(
+ -DAVIF_CODEC_RAV1E=OFF
+ -DAVIF_CODEC_SVT=OFF
+
+ -DAVIF_BUILD_EXAMPLES=OFF
+ -DAVIF_BUILD_APPS=OFF
+ -DAVIF_BUILD_TESTS=OFF
+ )
+
+ if ! use aom ; then
+ if use rav1e || use svt-av1 ; then
+ ewarn "libavif on ${MULTILIB_ABI_FLAG} will work in read-only mode."
+ ewarn "Support for rav1e and/or svt-av1 is is not available on ${MULTILIB_ABI_FLAG}"
+ ewarn "Enable aom flag for full support on ${MULTILIB_ABI_FLAG}"
+ fi
+ fi
+ fi
+
+ cmake_src_configure
+}
+
+pkg_preinst() {
+ if use gdk-pixbuf ; then
+ gnome2_gdk_pixbuf_savelist
+ fi
+}
+
+pkg_postinst() {
+ if ! use aom && ! use rav1e && ! use svt-av1 ; then
+ ewarn "No AV1 encoder is set,"
+ ewarn "libavif will work in read-only mode."
+ ewarn "Enable aom, rav1e or svt-av1 flag if you want to save .AVIF files."
+ fi
+
+ if use gdk-pixbuf ; then
+ # causes segfault if set, see bug 375615
+ unset __GL_NO_DSO_FINALIZER
+ multilib_foreach_abi gnome2_gdk_pixbuf_update
+ fi
+}
+
+pkg_postrm() {
+ if use gdk-pixbuf ; then
+ # causes segfault if set, see bug 375615
+ unset __GL_NO_DSO_FINALIZER
+ multilib_foreach_abi gnome2_gdk_pixbuf_update
+ fi
+}
diff --git a/media-libs/liblrdf/Manifest b/media-libs/liblrdf/Manifest
index e8a4238ca88c..e22dabf2fc6c 100644
--- a/media-libs/liblrdf/Manifest
+++ b/media-libs/liblrdf/Manifest
@@ -1,3 +1,4 @@
DIST liblrdf-0.6.1.tar.gz 43878 BLAKE2B 98ae1a900ac4f5517fb027984f4bb40c02cd290ce4ed26a0f8207c353946914d5c984e34df85349def08ef34002028f61649f5370f8b36d663160843db9bd13e SHA512 7732813eec704aef984d056de254e4fa049fdd0a7444b6a88f75f012afe9c587cbd1295f027c77361fa42bc097cdce9d9cabdba6b86e99a3c14805d84258df1c
+EBUILD liblrdf-0.6.1-r1.ebuild 1027 BLAKE2B 08eb38417daad6353e485d65fce29f473a93fdf82af414c8f8294235a7ee8ac785f1beaac2960578f09e37c61862a07cce0d3aeb98a5482e2da108d6d9f13f4d SHA512 b2286010f9e730358faf62df2704d881bda6c7c9ab659006501bc354cbe0861d4a7097aca87e0a40f77c02591ddaff88f0cb5ce919a9111a34568da8d5c73114
EBUILD liblrdf-0.6.1.ebuild 916 BLAKE2B 3358686b389286930893696bba9d7914271c657bd7271a96e51934c282e225e40b2599b3b052cf75616d431e43ed97dfc6f9a97bca0929cc4f62a915feec9b0d SHA512 e192104e4a27408336a4e876387311671e988e580e30a1f46d1c3b8a4fb952f522793440bb354848dad0f56b53783b54544cff52210ac3af6c82361cfd656e50
MISC metadata.xml 326 BLAKE2B 82bf43f86bd7fe43691aa0bf15dafd544e6a6f2dd5977849749e42cf8541fdf57d6c3b7b8d80a822ab9258005cbce10b758e15d09ad4ab6ed4379986fde044eb SHA512 e15fd24533cf1d3288870e08f3d9f213e092d5aa16f5568772d3376f572f7c0a07ab7771ac13e1ebe070c88208258ebd993fa6f4025298c6e912e8a91fc1cafc
diff --git a/media-libs/liblrdf/liblrdf-0.6.1-r1.ebuild b/media-libs/liblrdf/liblrdf-0.6.1-r1.ebuild
new file mode 100644
index 000000000000..2c09c797bfe7
--- /dev/null
+++ b/media-libs/liblrdf/liblrdf-0.6.1-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="Library for manipulation of RDF files in LADSPA plugins"
+HOMEPAGE="https://github.com/swh/LRDF"
+SRC_URI="https://github.com/swh/LRDF/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="static-libs"
+
+RDEPEND="
+ media-libs/ladspa-sdk[${MULTILIB_USEDEP}]
+ media-libs/raptor:2[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog README )
+
+S="${WORKDIR}/LRDF-${PV}"
+
+src_prepare() {
+ default
+ sed -i -e 's:usr/local:usr:' examples/{instances,remove}_test.c || die #392221
+ eautoreconf
+ multilib_copy_sources
+}
+
+multilib_src_configure() {
+ econf $(use_enable static-libs static)
+}
+
+multilib_src_test() {
+ has_version media-plugins/swh-plugins && default #392221
+}
+
+multilib_src_install() {
+ default
+ find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libmatemixer/Manifest b/media-libs/libmatemixer/Manifest
index f6b26658b55d..a433872b0ca4 100644
--- a/media-libs/libmatemixer/Manifest
+++ b/media-libs/libmatemixer/Manifest
@@ -1,5 +1,3 @@
-DIST libmatemixer-1.24.0.tar.xz 484808 BLAKE2B 8527514cec0770381ce5943f8c87e66f101e92f34527af2b3d4c15696f63df8304f00102fbbfe5b98ebb9b8d8b515f64a3d63b53312f7892b1b4868895539a6f SHA512 bf8c807bd45f3626bbf881eefa1e4638165daf61637bc63a704492d2a67eeec622e35e58c041649d33411294f96f79c99b3ea2406ae6fcf83294ec625cca9dbf
DIST libmatemixer-1.24.1.tar.xz 484864 BLAKE2B 21458cdfa14119364c564993f6e67c320332fabc0595d5422b75dd57ea13bfd2754549de29be6cb11708cb016b459494920000df4f86953d55e0102652dc9816 SHA512 c4620d70c66196521296d2d4197a6e025629faf1324e726df7dd7b0e0444ee17b83355c5059ec17ef36f9f15e6ab3bf3bb82a152b087a11e929d7749c1e1d4e6
-EBUILD libmatemixer-1.24.0-r1.ebuild 790 BLAKE2B 6af9babc4b49031bb2c021d65e1fa94f84d651b90b25826a81d20d55cf3a13770e14cac5de8223f9afc5ca715f3f11c92c94797896b7380331098a82ff42b93e SHA512 c3aa9397fccce85f87ab8545ec5c33c24fd4c3193fe483ec8b8692831ff5346a718c9a28b349c2b252c755d651e6781a1823c282b9b5c6a7dcad6f08b3e8b07b
-EBUILD libmatemixer-1.24.1.ebuild 769 BLAKE2B 2bb5dbee84c2b4a650b2f9e5c32f94e212af6525c0559734d361c78d1a51f3b73ec7742ae69f8e5317dc7f1ea2be32c20b0f141445889680e1785da4d2269154 SHA512 85663d92287fe67c4e89cfeacf5596e3a4d324a2a8c0999cf68648d860f44563df0339f38d0b1659ddface5e80e5410934c51b946d1322eac17ff7d3f1bb2748
+EBUILD libmatemixer-1.24.1.ebuild 767 BLAKE2B 207b442c3c948093073671172f536eb03d0da0fad57ebae5278fed961c2a5d45a173b0bc128f7d8f6a2c40361e36cdb619bfb5c5712818f3607adf08e2d5666d SHA512 03cdda5e95bba74868d5c838f469b8762446c0aa1d3ca261319d16b1d210415e15486ab67f32dc3b2a64a5862d99961e33cde7aa3120de0c274802b8a0adb136
MISC metadata.xml 341 BLAKE2B e060b6c02aaaea5885ec10566d2e3b13fb2f480201b3b43144255fa1f27a93a648a9030fa02f0efd20c8f32ee93e03661f379a63576822ed5c27b094ff6d7d81 SHA512 0c6f04ebdfe4cd26e7fdad53fd184045f6d95c4b9c888883f255ddc566fc02e0cf86138d5557fb71c0e8e9ea12e0d19657b218e1d310ce414e2911470eaa9359
diff --git a/media-libs/libmatemixer/libmatemixer-1.24.0-r1.ebuild b/media-libs/libmatemixer/libmatemixer-1.24.0-r1.ebuild
deleted file mode 100644
index b8bfd31da92d..000000000000
--- a/media-libs/libmatemixer/libmatemixer-1.24.0-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
- KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="Mixer library for MATE Desktop"
-LICENSE="LGPL-2+"
-SLOT="0"
-
-IUSE="+alsa oss pulseaudio"
-
-COMMON_DEPEND="
- >=dev-libs/glib-2.50:2
- >=sys-devel/gettext-0.19.8:*
- alsa? ( >=media-libs/alsa-lib-1.0.5 )
- pulseaudio? ( >=media-sound/pulseaudio-5.0.0:0[alsa?,glib] )
-"
-
-RDEPEND="${COMMON_DEPEND}
- virtual/libintl
-"
-
-DEPEND="${COMMON_DEPEND}
- app-text/docbook-xml-dtd:4.1.2
- dev-util/gtk-doc
- dev-util/gtk-doc-am
- virtual/pkgconfig:*
-"
-
-src_configure() {
- mate_src_configure \
- --disable-static \
- --disable-null \
- $(use_enable alsa) \
- $(use_enable oss) \
- $(use_enable pulseaudio)
-}
diff --git a/media-libs/libmatemixer/libmatemixer-1.24.1.ebuild b/media-libs/libmatemixer/libmatemixer-1.24.1.ebuild
index f0193ee65c4d..61b5f29e5087 100644
--- a/media-libs/libmatemixer/libmatemixer-1.24.1.ebuild
+++ b/media-libs/libmatemixer/libmatemixer-1.24.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
inherit mate
if [[ ${PV} != 9999 ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
fi
DESCRIPTION="Mixer library for MATE Desktop"
diff --git a/media-libs/libsidplayfp/Manifest b/media-libs/libsidplayfp/Manifest
index 6252aca644d2..c35e1564c4f6 100644
--- a/media-libs/libsidplayfp/Manifest
+++ b/media-libs/libsidplayfp/Manifest
@@ -1,5 +1,3 @@
-DIST libsidplayfp-2.1.2.tar.gz 788212 BLAKE2B 1959404d8b694e9271276bd3a7d32298747fcfc52fc96da3ebae16e23ed9c1825cda4810bff5ad39a0ca7f173300f6b86791ff589ee78bf05c9e12bc49bccaf5 SHA512 c044cc835666a7616b2c16e8f186877caa42c80c74ae2fd503868f77311ed6bc8df58cbb72e7086477adec1ba314bd4f1410a733642ff18baf1596afa1a9b22b
DIST libsidplayfp-2.2.0.tar.gz 794840 BLAKE2B 1641808e5821f824186b0fd7108dde67ca476724dd4c554dbcca9acd2778c1384e9fbc016658c2c399dbe001100f56658b56234e23032a90aaa75a8faed92792 SHA512 29412410ba1690ad6c9e98f172a0cc49e5d1cb828329da152aa76472ef524932d8b2b35f48f831dbfad08d0c78be22440fd939a1e38b7046cf37fbd34555c683
-EBUILD libsidplayfp-2.1.2.ebuild 745 BLAKE2B b6bbf40f405931533a63166f9fd1c7a14e9c334a3911b380382227fcfd85ed45f471b045bd966651e00e3c78a4a2fbf5f51dd6f69a9a5929dcde51093b7b8a52 SHA512 e0450393b8e2c9c8db50c348a8da8e7301ef3ec475540d86de6967dd8ab828264aadfc8b8870cf727a713c4afde74f1e06ebc8e423aaed92f3a2ee2b68f4cbf8
-EBUILD libsidplayfp-2.2.0.ebuild 667 BLAKE2B 967fc98eaf34234ffa21cc42000363ebd8c897d16aa627b8620f1042759d08edafdd7882d038e42e1d8d64650ab84073d52365ddb9722137b2e07123fb9f0ce9 SHA512 90a1367d0ce9d9022c83636dd8ed761606abb211580c882ad1fc83992d1e3b7161a1b5a2ccdd7c55bf494518fc2d27580d8a249ed7df98374a0f519a5de418eb
+EBUILD libsidplayfp-2.2.0.ebuild 665 BLAKE2B 563e14bd896eb511e1ce667406a261d5c52ab95b0373da739fd03027637bf1f1fc5acc63f5402a40748c3bc6a13920f7e92de8ee837ac3dc325ef04a83746c56 SHA512 65e3fb6b69d93de476b10cbe0c19581e3354d005eb4c3abb89e3f1ec883e8f9b7c75c169dc8cc86157b78817ea2d0a67ab2d1b11fc4a09dd2991a446b317de05
MISC metadata.xml 338 BLAKE2B 8f2f847b878e42e85fed57021162ccfd8cb8b54e6c285cea2691b9dd89ab320a59e4df38ae12414eaa81d7f781f81fd6d102e37f0121f98a2d9355ac8e9c131a SHA512 8f2ffc3fd7b2b6af0143e4125cad702a68da198e0433fd3d22775ca1f64d8689acf3cc0fdbd205d7fc0815b95c1c88fa1cca71c3f5572f3aa3b25bb8b3a9b76e
diff --git a/media-libs/libsidplayfp/libsidplayfp-2.1.2.ebuild b/media-libs/libsidplayfp/libsidplayfp-2.1.2.ebuild
deleted file mode 100644
index 963016b016b8..000000000000
--- a/media-libs/libsidplayfp/libsidplayfp-2.1.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-DESCRIPTION="Library for the sidplay2 fork with resid-fp"
-HOMEPAGE="https://sourceforge.net/projects/sidplay-residfp/"
-SRC_URI="mirror://sourceforge/sidplay-residfp/${PN}/$(ver_cut 1-2)/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/6"
-KEYWORDS="amd64 ~hppa x86"
-IUSE="cpu_flags_x86_mmx static-libs"
-
-src_prepare() {
- default
- # fix automagic. warning: modifying .ac triggers maintainer mode.
- sed -i -e 's:doxygen:dIsAbLe&:' configure || die
-}
-
-src_configure() {
- econf \
- $(use_enable static-libs static) \
- $(use_enable cpu_flags_x86_mmx mmx)
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libsidplayfp/libsidplayfp-2.2.0.ebuild b/media-libs/libsidplayfp/libsidplayfp-2.2.0.ebuild
index 219eebf19780..ecc3f9988790 100644
--- a/media-libs/libsidplayfp/libsidplayfp-2.2.0.ebuild
+++ b/media-libs/libsidplayfp/libsidplayfp-2.2.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/sidplay-residfp/${PN}/$(ver_cut 1-2)/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0/6"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="amd64 ~hppa x86"
IUSE="static-libs"
src_prepare() {
diff --git a/media-libs/libxspf/Manifest b/media-libs/libxspf/Manifest
index 80f95f9c21f0..a0c1664aaed4 100644
--- a/media-libs/libxspf/Manifest
+++ b/media-libs/libxspf/Manifest
@@ -1,8 +1,3 @@
-AUX libxspf-1.2.0-autotools.patch 5008 BLAKE2B 2e0547bb6f7885304e3e4fb03e8562d8df3f0b31690dd57c0838ff889c5fc787c025cb812c5a2477ee9f1b95cee6c3161ba66cf75c6b929cfced1bc2c97e47cc SHA512 dc11038fadbbcfc89bb7c7ce0d63678c3695ca90bf9f83239b84199ad9962bd6c18a30cdf3145c521e66e3f83f99e2ec7ef931206321414b5600b255d3e7b88f
-AUX libxspf-1.2.0-gcc44.patch 520 BLAKE2B 711be1facee0b15d1575daf6f9aadf54a084f733e2f3faeb86918a197464bfcb912efb1f4b93d7c3058d71a8c7f111d6c554ea672644ef5c267a419fa501ac08 SHA512 aa2ee2626504f8b98d1903f1e04e8aab68ea541022f03234b034d477d8d60c8c56af0ca2e1e64aeb28dbde04ca14db2c5ec7b893e6697233752fe629adf169c9
-AUX libxspf-1.2.0-gcc47.patch 267 BLAKE2B bd7c26c5148eed4b936aa811cb98bebcc3ad9b8049827157aea858aa2a48e1283a78d6d8a3fe1726372249a262f029e3a0ccb2269e84ca8bee77b9df037d6d7a SHA512 2e84721ea7e51750ebc3ecad492310ac474563552d46b20aa3184cc26052b91d881ccec7ac283ae76f2b82db7032d371b34a824b4194291427f726c48e8552b6
-DIST libxspf-1.2.0.tar.bz2 372483 BLAKE2B 6a1af724e993bff93979d9e641754e9964dd57363481fda09e91985a773a083f698759e0c4bca6d794ee272bf070304e09282538343fe64bd91a6b876c627868 SHA512 56667b6df89e30517e2e388e2e3b1c083b19d98d69b4ee328d2784bba57a8d50c6b6ae1876cf17e6f9eb1ff872680c8f33b84b826d1290b890ac173c76bea491
DIST libxspf-1.2.1.tar.bz2 479581 BLAKE2B dccae0d88af421e869034ca5fa5c1306bfdfb0d4c6bf6e5d555cfcbb1ac6032e64d6bbd6fe7e4d6a7c0d51fe10a5dbb74fc0f8ba1e7e30ced4a961add3d5a3cc SHA512 e2ac7c56fe71536c198caffac654056c48c619ca0b8bd97905d564ec7aebb60e74b3cdc94b3a2ae3ca6f195fd56034e0483503dc091f1f4d5808d72d086d2613
-EBUILD libxspf-1.2.0-r1.ebuild 870 BLAKE2B 67db633d9b407008a2d7208c435e759a6242613e5aa33e88bbc357bdc74780ce42c6c58175f35ec8e82f10fcb2bbb21364c828a84002a2136f1bafdb9a631295 SHA512 de6f8d1d844c824f161c0ed3c8496b8855a632973f20f04c15078e4ede3fe6a30104a71248d3136b25db09b5f9e63dcf624382790ea5a76f7d2ea2d9f61d5390
-EBUILD libxspf-1.2.1.ebuild 700 BLAKE2B 150676b1f38529e2b09796e8d892a80f8213ba6d4e9f30bd6d09b561ec39ef5cf5ee330edad7329ad00116b1bf3d98ef91e3ffb8e86188c436de76cb1971a427 SHA512 debef3f4008bfa5baee3fe6e600d23d7cfc46483e79ecd1a00db342c8d8c3a9c0fddb7230fe1b7a4bc3a7e6cf4aa224a5f2d9eec4c057e72cd1c17325067e620
+EBUILD libxspf-1.2.1.ebuild 697 BLAKE2B 7ce15375e61a08f27e18b4cd17e87aa895e85b8a02101e2e4f85f2463b8d665e7b0785a328ec6f7189f50a2b41581b8bfe774d35754c681e5dc5eae244bf51cf SHA512 afce063753aa6cd972bb8190cb1c23954455cc7edd76fe938c6a8847d5c81be2c529118ea09874fd8ebfbea44d6d770a71ac7b704fde13eaa72f8440c410aed4
MISC metadata.xml 517 BLAKE2B 12f2175a02bdb84c679ff437352cbac8267dac2bd12a3a04fb2e853c4049acac001160daf124b97b9c6170bd73beddf238ea454b8588a2c635efdefee8773ca7 SHA512 eb605d2fb0dfe1fd3e6fc50f29e6408626e2a4fe255db65a0b20844adf1634b9bd0b0bc69c55a2a6ceedaabb41aca03f330af9258d408896042805f7b78cad33
diff --git a/media-libs/libxspf/files/libxspf-1.2.0-autotools.patch b/media-libs/libxspf/files/libxspf-1.2.0-autotools.patch
deleted file mode 100644
index 93a4c1c7f2e8..000000000000
--- a/media-libs/libxspf/files/libxspf-1.2.0-autotools.patch
+++ /dev/null
@@ -1,191 +0,0 @@
---- a/bindings/c/doc/configure.ac
-+++ b/bindings/c/doc/configure.ac
-@@ -1,8 +1,8 @@
- # Process this file with autoconf to produce a configure script.
- AC_PREREQ(2.61)
--AC_INIT(Doxyfile.in)
-+AC_INIT(libxspf, 1.2.0)
- AC_CONFIG_AUX_DIR([../../../build-aux])
--AM_INIT_AUTOMAKE(xspf_c-doc, 1.2.0)
-+AM_INIT_AUTOMAKE
-
-
- ## Doxygen
---- a/bindings/c/doc/Makefile.am
-+++ b/bindings/c/doc/Makefile.am
-@@ -28,7 +28,7 @@
- ## Install doc files
- install-data-local:
- $(MKDIR_P) "$(DESTDIR)$(docdir)/html" ## Didn't work with installdirs-local
-- $(INSTALL_DATA) html/*.{css,gif,html,png} "$(DESTDIR)$(docdir)/html/"
-+ $(INSTALL_DATA) html/*.{css,html,png} "$(DESTDIR)$(docdir)/html/"
- $(INSTALL_DATA) *.qch "$(DESTDIR)$(docdir)/"
-
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -1,16 +1,15 @@
- # Process this file with autoconf to produce a configure script.
- AC_PREREQ(2.61)
--AC_INIT(src/XspfReader.cpp)
-+AC_INIT(libxspf, 1.2.0)
- AC_CONFIG_AUX_DIR([build-aux])
--AM_INIT_AUTOMAKE(libxspf, 1.2.0)
-+AM_INIT_AUTOMAKE
-
--AC_PROG_LIBTOOL
--AC_PROG_INSTALL
- AC_PROG_CC
- AC_PROG_CXX
- PKG_PROG_PKG_CONFIG
-
- AC_HEADER_STDC
-+LT_INIT
-
-
-
-@@ -29,40 +28,6 @@
-
-
-
--# Expat
--AC_ARG_WITH(expat, [
--===========================================================================
--Extra options:
--AS_HELP_STRING([--with-expat=DIR], [override path of Expat])
--AS_HELP_STRING([], [("/lib" and "/include" is appended)]
--)], [
-- if test "x${withval}" = "x"; then
-- AC_MSG_ERROR([No path given for option --with-expat])
-- fi
-- LDFLAGS="-L${withval}/lib ${LDFLAGS}"
-- CPPFLAGS="-I${withval}/include ${CPPFLAGS}"
--], [])
--
--AC_ARG_WITH(expat-inc, [AS_HELP_STRING(
-- [--with-expat-inc=DIR], [override include path of Expat]
--)], [
-- if test "x${withval}" = "x"; then
-- AC_MSG_ERROR([No path given for option --with-expat-inc])
-- fi
-- CPPFLAGS="-I${withval} ${CPPFLAGS}"
--], [])
--
--AC_ARG_WITH(expat-lib, [AS_HELP_STRING(
-- [--with-expat-lib=DIR], [override library path of Expat]
--)], [
-- if test "x${withval}" = "x"; then
-- AC_MSG_ERROR([No path given for option --with-expat-lib])
-- fi
-- LDFLAGS="-L${withval} ${LDFLAGS}"
--], [])
--
--
--
- # uriparser
- AC_ARG_WITH(uriparser, [AS_HELP_STRING(
- [--with-uriparser=DIR], [override path of uriparser])
-@@ -110,29 +75,8 @@
-
-
-
--# Local headers must come very first. Otherwise we
--# risk including headers of an already installed
--# libxspf version if its path is in CPPFLAGS
--CPPFLAGS="-I${srcdir}/include ${CPPFLAGS}"
--
--
--
--# Append $prefix as a fallback at the very end
--if test "x${prefix}" != "xNONE"; then
-- WORKING_PREFIX=${prefix}
--else
-- WORKING_PREFIX=${ac_default_prefix}
--fi
--LDFLAGS="${LDFLAGS} -L${WORKING_PREFIX}/lib"
--CPPFLAGS="${CPPFLAGS} -I${WORKING_PREFIX}/include"
--
--
--
- # Check presence
--EXPAT_MISSING="Please install expat 1.95.8 or later.
-- On a Debian-based system enter 'sudo apt-get install libexpat-dev'."
--AC_CHECK_LIB(expat, XML_ResumeParser,, AC_MSG_ERROR(${EXPAT_MISSING}))
--AC_CHECK_HEADER(expat.h,, AC_MSG_ERROR(${EXPAT_MISSING}))
-+PKG_CHECK_MODULES([EXPAT], [expat])
-
- PKG_CHECK_MODULES([URIPARSER], [
- liburiparser >= 0.7.5
---- a/doc/configure.ac
-+++ b/doc/configure.ac
-@@ -1,8 +1,8 @@
- ## Process this file with autoconf to produce a configure script.
- AC_PREREQ(2.61)
--AC_INIT(Doxyfile.in)
-+AC_INIT(libxspf, 1.2.0)
- AC_CONFIG_AUX_DIR([../build-aux])
--AM_INIT_AUTOMAKE(libxspf-doc, 1.2.0)
-+AM_INIT_AUTOMAKE
-
-
- ## Doxygen
-@@ -30,7 +30,6 @@
- fi
- AC_SUBST(GENERATE_HTMLHELP)
- AC_SUBST(QHG_LOCATION)
--AC_SUBST(srcdir, [${ac_abs_confdir}])
-
-
- AC_CONFIG_FILES([
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -26,7 +26,7 @@
- ## Install doc files
- install-data-local:
- $(MKDIR_P) "$(DESTDIR)$(docdir)/html" ## Didn't work with installdirs-local
-- $(INSTALL_DATA) html/*.{css,gif,html,png} "$(DESTDIR)$(docdir)/html/"
-+ $(INSTALL_DATA) html/*.{css,html,png} "$(DESTDIR)$(docdir)/html/"
- $(INSTALL_DATA) *.qch "$(DESTDIR)$(docdir)/"
-
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,8 +1,10 @@
- ## Process this file with automake to produce Makefile.in
--AUTOMAKE_OPTIONS = 1.10.1 gnu dist-zip dist-bzip2 dist-lzma subdir-objects
-+AUTOMAKE_OPTIONS = 1.10.1 gnu dist-zip dist-bzip2 subdir-objects
-
- ACLOCAL_AMFLAGS = -I m4
-
-+AM_CPPFLAGS = -I$(top_srcdir)/include
-+
- if GENERATE_DOC
- SUBDIRS = \
- . \
-@@ -39,9 +41,10 @@
- endif
-
-
--libxspf_la_CFLAGS = @URIPARSER_CFLAGS@
-+libxspf_la_CFLAGS = $(URIPARSER_CFLAGS) $(EXPAT_CFLAGS)
-+libxspf_la_LIBADD = $(URIPARSER_LIBS) $(EXPAT_LIBS)
-
--libxspf_la_LDFLAGS = @URIPARSER_LIBS@ -version-info 4:1:0
-+libxspf_la_LDFLAGS = -version-info 4:1:0
-
- libxspf_la_SOURCES = \
- src/XspfChunkCallback.cpp \
-@@ -146,11 +149,9 @@
- if XSPF_TEST_ENABLED
- test_xspf_test_CFLAGS = @CPPTEST_CFLAGS@
-
--test_xspf_test_LDFLAGS = @CPPTEST_LIBS@
--
--test_xspf_test_LDADD = libxspf.la
-+test_xspf_test_LDADD = libxspf.la @CPPTEST_LIBS@
-
--test_xspf_test_CPPFLAGS = -DXSPF_SRCDIR=\"${srcdir}\"
-+test_xspf_test_CPPFLAGS = -DXSPF_SRCDIR=\"${srcdir}\" -I$(top_srcdir)/include
-
- test_xspf_test_SOURCES = \
- test/ProjectOpus/ProjectOpusSuite.cpp \
diff --git a/media-libs/libxspf/files/libxspf-1.2.0-gcc44.patch b/media-libs/libxspf/files/libxspf-1.2.0-gcc44.patch
deleted file mode 100644
index 668e8af1be16..000000000000
--- a/media-libs/libxspf/files/libxspf-1.2.0-gcc44.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-http://bugs.gentoo.org/261604
-
---- a/test/OfficialSuite.cpp
-+++ b/test/OfficialSuite.cpp
-@@ -21,6 +21,7 @@
- * Sebastian Pipping, sping@xiph.org
- */
-
-+#include <cstdio>
- #include "OfficialSuite.h"
- #include <xspf/XspfReaderCallback.h>
- using namespace Xspf;
---- a/test/ProjectOpus/ProjectOpusSuite.cpp
-+++ b/test/ProjectOpus/ProjectOpusSuite.cpp
-@@ -21,6 +21,7 @@
- * Sebastian Pipping, sping@xiph.org
- */
-
-+#include <cstdio>
- #include "ProjectOpusSuite.h"
- #include <xspf/XspfReader.h>
- #include <xspf/XspfTrack.h>
diff --git a/media-libs/libxspf/files/libxspf-1.2.0-gcc47.patch b/media-libs/libxspf/files/libxspf-1.2.0-gcc47.patch
deleted file mode 100644
index 76c0dca755f8..000000000000
--- a/media-libs/libxspf/files/libxspf-1.2.0-gcc47.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-http://bugs.gentoo.org/421745
-
---- a/examples/read/read.cpp
-+++ b/examples/read/read.cpp
-@@ -43,6 +43,7 @@
- #include <cstdio>
- #include <cstdlib> // MAX_PATH
- #include <climits> // PATH_MAX
-+#include <unistd.h> // getcwd
-
-
- #if defined(__WIN32__) || defined(WIN32)
diff --git a/media-libs/libxspf/libxspf-1.2.0-r1.ebuild b/media-libs/libxspf/libxspf-1.2.0-r1.ebuild
deleted file mode 100644
index 2d587d5b770f..000000000000
--- a/media-libs/libxspf/libxspf-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Playlist handling library"
-HOMEPAGE="http://libspiff.sourceforge.net/"
-SRC_URI="mirror://sourceforge/libspiff/${P}.tar.bz2"
-
-LICENSE="BSD LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=dev-libs/expat-2
- >=dev-libs/uriparser-0.7.5"
-DEPEND="${RDEPEND}
- test? ( >=dev-util/cpptest-1.1 )"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${P}-gcc44.patch
- "${FILESDIR}"/${P}-gcc47.patch
- "${FILESDIR}"/${P}-autotools.patch
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- econf \
- --disable-doc \
- --disable-static \
- $(use_enable test)
-}
-
-src_install() {
- default
- find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libxspf/libxspf-1.2.1.ebuild b/media-libs/libxspf/libxspf-1.2.1.ebuild
index d14dc695b584..5d7cbe6142d7 100644
--- a/media-libs/libxspf/libxspf-1.2.1.ebuild
+++ b/media-libs/libxspf/libxspf-1.2.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/libspiff/${P}.tar.bz2"
LICENSE="BSD LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index fb7b705fc457..2f39c8c6f7c9 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,12 +1,8 @@
DIST mesa-20.3.5.tar.xz 14367412 BLAKE2B 7bad876ce702158e727a752eda6722e7165b497fd3a485dae4e989f22b13288a93f51bcd5e6a69b979f0bbe41599fa237c08f3bbb81cb9c6dc4c06827f8ad5f4 SHA512 481e710ed80d8f215a8d541cfe51b960862c2403c2b9e7e6932c8236b8decb5d478871d6c73559d6d795ada143803764f3a93b2329588c80f62e2e5ec98c78a9
DIST mesa-21.0.3.tar.xz 14710004 BLAKE2B f2165da4487824931d8ff90e4f13624546a297b0d3577d69b7cfd6078a965282b4a732cb720cbb08ea83a3a987603cfe67876fb18022fa444b011fcc9b7df352 SHA512 4a8aee48a8ea7f32e8aa3bbbd91db26c6053b9a43e62ff88256929e6bc147884f0fef988726b5a3d59d7008663f017c746a0352fd3fcc1c476b8190af4a2531f
-DIST mesa-21.1.1.tar.xz 15169732 BLAKE2B b2c2f2fa14ebf78baeb64ca976dde2920a594bcea02b3a17820135afc169c8489f37a2869b140d637b11b618c96e37834c255ca7a92d17f70003a11e8fffd401 SHA512 79d0e2b0e1e590e7f36a082df3584010a553af0b3060bd2d3a7ace700ac7a8d1b7734ba67f2e193dd441434eeec74a16e0dbcbf8c15061b5dd5d6a1feca73d62
-DIST mesa-21.1.2.tar.xz 15199892 BLAKE2B 1e1d9e0bee2eec95a38379047c050ba7e4a9ada47bb8d4f1d3faf355ec6f71ad8e792cfaf72234a3c86f254c33618883f772c0f3f7f7f97085a8c7b5a1ad90d0 SHA512 a7907fa29fdb4e137015ee5405b9c8c0769ef9354bbe963c1af80318b398c05c79db6129b583106d620c42a5e9b625611b648fd5207334eb9b588d7963defc70
-DIST mesa-21.1.3.tar.xz 15230376 BLAKE2B 49098dc462a19ded67329556acdf136f249609dae85e8b898f721c34127df17fe816fea90e23a93ca9f86ab1f06f660e787cdb2b01b9caa2cd694c04ee1e2027 SHA512 8ca6d5516035484ea2a63bc6338794003ef167239ab0c220f8d3693f97f9725b46fc9d9a704c4ba11b83197d4b8e5f658d65ef0cce1e0957f5e58bd13726b9e0
+DIST mesa-21.1.4.tar.xz 15254812 BLAKE2B 7ec6177ad4fb6f053553b634c9ff03c5d618d0212fd77c2fda8803197bef529c74ccf3c3ae75a810ba1d57862f08405c6df702e41f6cb0fd202833ce7b9efef0 SHA512 1f4e2d8ba2c3c02bad5468687752d7e87d6e79c4a0e6ec4b2741a57fb270d18ae4712aaa07a9e09a2d3348540f5a26cdbe05464cd52adb8df1e2e28a581b2b53
EBUILD mesa-20.3.5.ebuild 14915 BLAKE2B 73f85b8bbbbbbfba3be499ba55ffa2bcdb5e6f860049819502957e803c2760edf3e45ada1f103f58752e77177065ad12d81ea72c36f96c19c6ebc87d1fe03ab9 SHA512 0b1dd3fad90392be514da0d347efe19b35fe82d13ca02d959f56e625d00a9beb917c83c678e7d6ad419dc81b6fc32e0dd8ca6f95f5fd77484872af464f9ae52b
EBUILD mesa-21.0.3.ebuild 14826 BLAKE2B 1c9793f1dc8b7769406d49d02fcf152c2b21a446972fb754871ec5103ddab1eb93bfc52aed895bbc74b9c7a6743c360d5cbcbc0d1ede2cd28307eb243803a77b SHA512 3b5db1497b6b99412353134139bfd2abac642989d1570d4c8d2172dd82e63aeed6ef1bc1d7ce0c2653288a6c7bd8a6315494ed152deb627fc3eb304a6d5f9be7
-EBUILD mesa-21.1.1.ebuild 14873 BLAKE2B 04fc1df71cb1520fedbfdd73a4042b4871f1bd69b7b89f7152c84de4e3d2a7da6002861ab13d9a6a40130def670d31fdfe1a577175f5916bddd95ea392e3581c SHA512 330970c7a8396a1f938e9ee395cd58425fb62b0a05e4c464e2f0963ee23c218ca7fb012b75d59aac4426c9104682c948f782ad1ba4c1704b0dcc6ff70803127a
-EBUILD mesa-21.1.2.ebuild 14873 BLAKE2B 04fc1df71cb1520fedbfdd73a4042b4871f1bd69b7b89f7152c84de4e3d2a7da6002861ab13d9a6a40130def670d31fdfe1a577175f5916bddd95ea392e3581c SHA512 330970c7a8396a1f938e9ee395cd58425fb62b0a05e4c464e2f0963ee23c218ca7fb012b75d59aac4426c9104682c948f782ad1ba4c1704b0dcc6ff70803127a
-EBUILD mesa-21.1.3.ebuild 14873 BLAKE2B 04fc1df71cb1520fedbfdd73a4042b4871f1bd69b7b89f7152c84de4e3d2a7da6002861ab13d9a6a40130def670d31fdfe1a577175f5916bddd95ea392e3581c SHA512 330970c7a8396a1f938e9ee395cd58425fb62b0a05e4c464e2f0963ee23c218ca7fb012b75d59aac4426c9104682c948f782ad1ba4c1704b0dcc6ff70803127a
-EBUILD mesa-9999.ebuild 14833 BLAKE2B 114e3b670f928a2745a6affa18ec5ad29fc929f5397453f2b276e1a8f7448fc0664aa4057e15cf248a9ad723e48f523619cbe2b1dd39692f273971f1a8e95e1c SHA512 b00131e879ceac909e558ee182fbd50ace215db5a27849707ead338c6199b3878cef066440a51752dc4f481e87a8f87666ddbce46c383c3f46df1032dad2f3bf
+EBUILD mesa-21.1.4.ebuild 14873 BLAKE2B 04fc1df71cb1520fedbfdd73a4042b4871f1bd69b7b89f7152c84de4e3d2a7da6002861ab13d9a6a40130def670d31fdfe1a577175f5916bddd95ea392e3581c SHA512 330970c7a8396a1f938e9ee395cd58425fb62b0a05e4c464e2f0963ee23c218ca7fb012b75d59aac4426c9104682c948f782ad1ba4c1704b0dcc6ff70803127a
+EBUILD mesa-9999.ebuild 14810 BLAKE2B 88b4a3ccc2de4f355f8748208345db24705f58db8a0615f447c1413fa5b86887a9b1d7ecb11cd67f877e918806fcb08d274ffea11d63ef1807b869b3f6c806f7 SHA512 e8f47d0ccf30b686c41fc54bda70395c2b589fbb4ee65d424aa5ab1de5f8fbdb700e47f81861708bbe49b4fddc259de8a0d94760f608104e2f17abbb105a13d6
MISC metadata.xml 1895 BLAKE2B abf62dda9b9eba657e310c68fdd86aaa49c550dc34ef624e8feb038e0412f0da786e1120dc16631399cb2c83961b88e78571347c3e6d464c2cf3a343bc0f1483 SHA512 7758641386100e07c1112afe04a8613de8ae1e35a8e940f0eefcfc7daa829789c42b903320339b04b44c2400f0857c180740407abd171e9773a9f51e3dd9468a
diff --git a/media-libs/mesa/mesa-21.1.2.ebuild b/media-libs/mesa/mesa-21.1.2.ebuild
deleted file mode 100644
index b67e6c7e47f0..000000000000
--- a/media-libs/mesa/mesa-21.1.2.ebuild
+++ /dev/null
@@ -1,553 +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 llvm meson-multilib python-any-r1 linux-info
-
-OPENGL_DIR="xorg-x11"
-
-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} 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 +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"
-
-REQUIRED_USE="
- d3d9? ( dri3 || ( 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? ( dri3
- video_cards_radeonsi? ( llvm ) )
- vulkan-overlay? ( vulkan )
- wayland? ( egl gbm )
- 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.105"
-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="12"
-LLVM_DEPSTR="
- || (
- sys-devel/llvm:12[${MULTILIB_USEDEP}]
- sys-devel/llvm:11[${MULTILIB_USEDEP}]
- sys-devel/llvm:10[${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_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"
- 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_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_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'/,}"
- }
-
- emesonargs+=(
- $(meson_use test build-tests)
- -Dglx=$(usex X dri disabled)
- -Dshared-glapi=enabled
- $(meson_feature dri3)
- $(meson_feature egl)
- $(meson_feature gbm)
- $(meson_feature gles1)
- $(meson_feature gles2)
- $(meson_use osmesa)
- $(meson_use selinux)
- $(meson_feature zstd)
- -Dvalgrind=$(usex valgrind auto false)
- -Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
- -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
- -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
- $(meson_use vulkan vulkan-device-select-layer)
- $(meson_use vulkan-overlay vulkan-overlay-layer)
- --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.1.3.ebuild b/media-libs/mesa/mesa-21.1.3.ebuild
deleted file mode 100644
index b67e6c7e47f0..000000000000
--- a/media-libs/mesa/mesa-21.1.3.ebuild
+++ /dev/null
@@ -1,553 +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 llvm meson-multilib python-any-r1 linux-info
-
-OPENGL_DIR="xorg-x11"
-
-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} 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 +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"
-
-REQUIRED_USE="
- d3d9? ( dri3 || ( 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? ( dri3
- video_cards_radeonsi? ( llvm ) )
- vulkan-overlay? ( vulkan )
- wayland? ( egl gbm )
- 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.105"
-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="12"
-LLVM_DEPSTR="
- || (
- sys-devel/llvm:12[${MULTILIB_USEDEP}]
- sys-devel/llvm:11[${MULTILIB_USEDEP}]
- sys-devel/llvm:10[${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_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"
- 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_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_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'/,}"
- }
-
- emesonargs+=(
- $(meson_use test build-tests)
- -Dglx=$(usex X dri disabled)
- -Dshared-glapi=enabled
- $(meson_feature dri3)
- $(meson_feature egl)
- $(meson_feature gbm)
- $(meson_feature gles1)
- $(meson_feature gles2)
- $(meson_use osmesa)
- $(meson_use selinux)
- $(meson_feature zstd)
- -Dvalgrind=$(usex valgrind auto false)
- -Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
- -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
- -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
- $(meson_use vulkan vulkan-device-select-layer)
- $(meson_use vulkan-overlay vulkan-overlay-layer)
- --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.1.1.ebuild b/media-libs/mesa/mesa-21.1.4.ebuild
index b67e6c7e47f0..b67e6c7e47f0 100644
--- a/media-libs/mesa/mesa-21.1.1.ebuild
+++ b/media-libs/mesa/mesa-21.1.4.ebuild
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index dd671cef87a0..caf150f61b60 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -7,8 +7,6 @@ PYTHON_COMPAT=( python3_{7,8,9} )
inherit llvm meson-multilib python-any-r1 linux-info
-OPENGL_DIR="xorg-x11"
-
MY_P="${P/_/-}"
DESCRIPTION="OpenGL-like graphic library for Linux"
diff --git a/media-libs/pcaudiolib/Manifest b/media-libs/pcaudiolib/Manifest
new file mode 100644
index 000000000000..4a58c51f9b5b
--- /dev/null
+++ b/media-libs/pcaudiolib/Manifest
@@ -0,0 +1,3 @@
+DIST pcaudiolib-1.1.tar.gz 34049 BLAKE2B 7c6ce1532c47db30db2b80be690453257148be9a7115cd24dabda3dfcaca667d5c3a8278276f278556406144461cda48905ce581f0fde2f8429b3f829a948a36 SHA512 d503c11b355601e1e05f0f438a0cd9ce277d19fd53d3f7edf26f6e17f1f8184e8b2112a282e8ed74db8646bb5534d2a9a3c707b1742ce02ef13fd89669785007
+EBUILD pcaudiolib-1.1.ebuild 829 BLAKE2B d9afafebd3eb748583524c0124f2c4d28d70ba0054a9895a12b51dc149360694469b5f9664bcaa452c5f4e5c2504eb5dddd5731a13079a4e2429ed9000016b75 SHA512 7f589e8981d867b3d8fc194c46cd7da8cea1214054440550553a0665333036d6c27aff41bb73407dd6fee214fa69e1e67ee474d26bc477601aa76c91c08b6335
+MISC metadata.xml 587 BLAKE2B 8e440fdab1383e734543c921f69db7cf5fa10714ac903845f453349af14f2008e0976206d85118d8acc10c40bc9cf579d06b01578595c112637605993bfc6555 SHA512 f9737ed539062e93481f4715837f9956667e5e73c8e4cebbdc1a639c1899cb79c13e26f8076929eff92e4b5bf4ccedecd50d31fb75d23fcea46af58c280df382
diff --git a/media-libs/pcaudiolib/metadata.xml b/media-libs/pcaudiolib/metadata.xml
new file mode 100644
index 000000000000..e6100e145988
--- /dev/null
+++ b/media-libs/pcaudiolib/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <upstream>
+ <maintainer>
+ <name>Reece H. Dunn</name>
+ <email>msclrhd@gmail.com</email>
+ </maintainer>
+ <remote-id type="github">espeak-ng/pcaudiolib</remote-id>
+ <bugs-to>https://github.com/espeak-ng/pcaudiolib/issues</bugs-to>
+ <changelog>https://github.com/espeak-ng/pcaudiolib/raw/master/CHANGELOG.md</changelog>
+ </upstream>
+ <maintainer type="person">
+ <email>williamh@gentoo.org</email>
+ <name>William Hubbs</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/media-libs/pcaudiolib/pcaudiolib-1.1.ebuild b/media-libs/pcaudiolib/pcaudiolib-1.1.ebuild
new file mode 100644
index 000000000000..eb7b4b4ff88a
--- /dev/null
+++ b/media-libs/pcaudiolib/pcaudiolib-1.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Portable C Audio Library"
+HOMEPAGE="https://github.com/espeak-ng/pcaudiolib"
+SRC_URI="https://github.com/espeak-ng/pcaudiolib/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+ ZLIB"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+alsa oss pulseaudio"
+
+REQUIRED_USE="|| ( alsa oss pulseaudio )"
+
+RDEPEND="
+ alsa? ( >=media-libs/alsa-lib-1.0.18 )
+ pulseaudio? ( media-sound/pulseaudio )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ local econf_args
+ econf_args=(
+ $(use_with oss)
+ $(use_with alsa)
+ $(use_with pulseaudio)
+ )
+ econf "${econf_args[@]}"
+}
+
+src_install() {
+ default
+ rm "${ED}"/usr/lib*/libpcaudio.{a,la} || die
+}
diff --git a/media-libs/qhull/Manifest b/media-libs/qhull/Manifest
index 38a2ac3823f2..e3b5fb29c452 100644
--- a/media-libs/qhull/Manifest
+++ b/media-libs/qhull/Manifest
@@ -1,4 +1,4 @@
AUX qhull-2020.2-deprecated-pkgconfig.patch 473 BLAKE2B 5fbc2b1b9a4cd5a6c5cff46484b943b36de2f327c051b9badc32c952373b7f250eb751b46c8884e1dcd1c23b4bd2c50e4d5b1af7129ee477e1e75aab55d1f7be SHA512 a688943f6e0210ef170cfe9a8b3f186460bd2654c30cd0b0ca30b71f3245189be76dfa3648fcb9cbfe8daee27e11bec23a7a6016abf0213f0ce418f1fb3c5654
DIST qhull-2020.2.tar.gz 1307213 BLAKE2B db11d4b83124da3ceed95e1eb81c280ac55c871c83acd4c371f9716b57a1777105891a073282789c7a80b5d74e85164996fbe4f2140c8371bca5926eab4adbc2 SHA512 88f50c2a968f56deec61772490617cc877b0ca2d804954ade08297b9bab826076db6b960d6f1feb21c6851e5328cb11c6dd565666517fa78a3d65b901848ff36
-EBUILD qhull-2020.2-r3.ebuild 1496 BLAKE2B 2f20b70a6865a12a7f858a505adef22a8f14674eb78388f0908542fd608f26ce05b38811ee65645b947427926f8b8e24b1eb7e890a1d5dff2cf1568c45bafc02 SHA512 28186546c9f682870ebc4e6858882e07d7fbeb724d8a1fe1aad5e721109ba74ba85a243c1bb3610157aa1b7dbad60d6426833dce6691bdcca10a518275fa34de
+EBUILD qhull-2020.2-r3.ebuild 1503 BLAKE2B 686b26d03141a67125eb163ec66b64d102ff64dc218a577f33a0d24233c464e1b594191830d86d046cee78a9de8c4bb7bf0ce761925b98739c7c5d28bd977de9 SHA512 6977bb7b705e5664e37a9aee412b98623a314aa906d37a0c50abb03c7422140bfde36397f41652a4df7b3981e175fbd99a6f0bc8597df699190aa47f53e74dcc
MISC metadata.xml 1094 BLAKE2B 9667f9f89fc9717129401070888401f0db493c01e4fe73eb8168efae9c1c2d7f1a7aa234fe72f3beea7feb385dc920418a6affe4d99679736cc6a1aef212e4eb SHA512 b1e13904fe69b4535806a871cdda79fadbf294c30654fe119e7e3be0ed481dc926a9dfaffd75c2849e3eb91ebad671a6b7eca293b40a249c8ccbee6264cfdaf9
diff --git a/media-libs/qhull/qhull-2020.2-r3.ebuild b/media-libs/qhull/qhull-2020.2-r3.ebuild
index 66b6330a868d..fe64e83f5a4e 100644
--- a/media-libs/qhull/qhull-2020.2-r3.ebuild
+++ b/media-libs/qhull/qhull-2020.2-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/qhull/qhull/archive/${PV}.tar.gz -> ${P}.tar.gz"
SLOT="0/8"
LICENSE="BSD"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE="doc static-libs"
DOCS=( Announce.txt File_id.diz README.txt REGISTER.txt )
diff --git a/media-libs/raptor/Manifest b/media-libs/raptor/Manifest
index d8283ff2c368..dc05bfbdc169 100644
--- a/media-libs/raptor/Manifest
+++ b/media-libs/raptor/Manifest
@@ -3,4 +3,5 @@ AUX raptor-2.0.15-dont_use_curl-config.patch 1681 BLAKE2B 5c3b241836e04dabbcd6fd
AUX raptor-2.0.15-heap-overflow.patch 1708 BLAKE2B cea8df63861760fe55f1320cbc0833d814c38148b3d5f2b7163348de48bd95a37ee3000d312ce76879c798182f74d60f49fcef89f5f051bd40febc0c1da68099 SHA512 f7df0ec3123ac8ec9f2852dfb54e380d210446a36ab2f74aa9d2dcb8346162046d239b4db9a0747b18e3d19f4dc1ce41d194557c5e53027a3618e81b7b251d3d
DIST raptor2-2.0.15.tar.gz 1886657 BLAKE2B 0a39c7b5705bfbf2daa0ca633f79693953b4dfe24c144008d1646a9840a36d4d7ce153b527450647127ec2522047dbd0a6e71f307ee5656951f7e4b610adfd22 SHA512 563dd01869eb4df8524ec12e2c0a541653874dcd834bd1eb265bc2943bb616968f624121d4688579cdce11b4f00a8ab53b7099f1a0850e256bb0a2c16ba048ee
EBUILD raptor-2.0.15-r3.ebuild 1713 BLAKE2B 9c61a997c410dc4600384ec53b8995ea4782dd2169179c49073b0812953ef399a9ce360b8b6c4d626aae7351e80d50763abe76ea2c85eb9c482bbef04817ec6b SHA512 bb56a414bd06bcf3ee8a656e87e1e7171e2e7fd4bf3c690995d97e3aedd7a99418083f19a0ab2da8772ea6d985a888757e8ba393d02a1c9298c1eaabd7f06ad5
+EBUILD raptor-2.0.15-r4.ebuild 1887 BLAKE2B 56199b0bdce95b0419b691370517fc8c689835f9f04db78e046c9137589d155af1fc8cd4ceac8e32855690a4c527792b87999bf5869f87f3231bbede34513b76 SHA512 2ebdadef2c14f9fe445ba574a870e40f193c49de1eab96a0243b1d468308a1fad5d0cbed6c39e37d5b1932e715d2185f7f2adc1e49693c6e296656eae7015998
MISC metadata.xml 337 BLAKE2B 6244cd4ab5d8d13437590c4bbb672cb9b5ad47f7e70d30adda368737d745daf4df249eb2166d2ab8335fe0a0fec5b8d3afa9ec091cc6ddcaaf0f2d05f9425741 SHA512 3a2c420495274cfca80f0103066b282b9f1301786a8cbde76b894fac721030bee949fc468c92841698038b991b07fa66f15891392784041a87f655d1860fd11c
diff --git a/media-libs/raptor/raptor-2.0.15-r4.ebuild b/media-libs/raptor/raptor-2.0.15-r4.ebuild
new file mode 100644
index 000000000000..f32b2698b01d
--- /dev/null
+++ b/media-libs/raptor/raptor-2.0.15-r4.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools libtool multilib-minimal
+
+MY_PN=${PN}2
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="The RDF Parser Toolkit"
+HOMEPAGE="http://librdf.org/raptor/"
+SRC_URI="http://download.librdf.org/source/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+curl debug json static-libs unicode"
+
+DEPEND="
+ dev-libs/libxml2[${MULTILIB_USEDEP}]
+ dev-libs/libxslt[${MULTILIB_USEDEP}]
+ curl? ( net-misc/curl[${MULTILIB_USEDEP}] )
+ json? ( dev-libs/yajl[${MULTILIB_USEDEP}] )
+ unicode? ( dev-libs/icu:=[${MULTILIB_USEDEP}] )
+"
+RDEPEND="${DEPEND}
+ !media-libs/raptor:0
+"
+BDEPEND="
+ >=sys-devel/bison-3
+ >=sys-devel/flex-2.5.36
+ virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( AUTHORS ChangeLog NEWS NOTICE README )
+HTML_DOCS=( {NEWS,README,RELEASE,UPGRADING}.html )
+
+PATCHES=(
+ "${FILESDIR}/${P}-heap-overflow.patch"
+ "${FILESDIR}/${P}-dont_use_curl-config.patch" #552474
+ "${FILESDIR}/0001-CVE-2020-25713-raptor2-malformed-input-file-can-lead.patch"
+)
+
+src_prepare() {
+ default
+ eautoreconf #552474
+ elibtoolize # Keep this for ~*-fbsd
+ multilib_copy_sources
+}
+
+multilib_src_configure() {
+ # FIXME: It should be possible to use net-nntp/inn for libinn.h and -linn!
+
+ local myeconfargs=(
+ --with-html-dir="${EPREFIX}"/usr/share/gtk-doc/html
+ $(usex curl --with-www=curl --with-www=xml)
+ $(use_enable debug)
+ $(use_with json yajl)
+ $(use_enable static-libs static)
+ $(usex unicode --with-icu-config="${EPREFIX}"/usr/bin/icu-config '')
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+ emake -j1 test
+}
+
+multilib_src_install() {
+ default
+ find "${ED}" -name '*.la' -delete || die
+}