gentoo resync : 11.05.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-05-11 19:55:43 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-05-11 19:55:43 +0100
commit: 185fa19bbf68a4d4dca534d2b46729207a177f16 (patch)
tree: a8a537b82fda83a0799c2ca9887f212558363aa7 /media-video
parent: c8fd0d84af0bfd1949542adc2cbb735b1d28f9ed (diff)
28 files changed, 1124 insertions, 271 deletions
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 49312d7ef30d..300debbe00ac 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index b37d477aeb63..22c518b47d11 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -11,6 +11,6 @@ DIST ffmpeg-4.4.tar.bz2 11489948 BLAKE2B a8dc007e260896228789d27339402e846cd2175
 EBUILD ffmpeg-4.2.4.ebuild 17661 BLAKE2B 4366ffd59e87da3187e619af6ad18b467f2991b53a229d05dd20ca6bfae9093d95ffcfd2eecabc542095cce2b182d03ae6bb2c682d8c9c76a23b9e557174403f SHA512 5b098a52a368f635aebf1d302ef9b84162e251d7aaf9ffe23963eeef731b92be3d397cf5f70f1f68028fc847a3ef4323c916d6c650a753e875725998fb4196ab
 EBUILD ffmpeg-4.3.1.ebuild 17765 BLAKE2B facecec39439dc19a9c2611cc3e902a84401b0ed8b5bcbb827fa38aaba7370f1ca21d4a8f1d4e22a2f9d8297b9024fe5dd654871968b4fb6589a03d69144a75d SHA512 411583535f592af3efcae090f0d820763f27f27b146694f55b1fd5798939463b2fd032801a9b3b14b5e6ce0fe89213bf5523e1c447af65790f5f565931814a5d
 EBUILD ffmpeg-4.3.2.ebuild 17748 BLAKE2B 49fb8aa388f9e2c999deefd0ab458f2c1d985bd0ab339bf60e07f2e96d1f5f0d6508d34980ebddc0347621ff49c0ca357ce535e4e76cffe27e861f2c5d43143a SHA512 858df025f7cfe5be9b318c1c51d23c2ea979cc1e699fd3f15c5a406f8464c06edb165bb586882a49bbb6d6704d4d6f4f0ad44afab67913f3ecd2bea86499d98f
-EBUILD ffmpeg-4.4.ebuild 17653 BLAKE2B 65b40124fd65e43e192aa62ac73b23abd74996c5d7d0f34db86de69aae02fb1ea8ad68bd3007ee18fce3a25381d1c09a4b691412f2fea5143a73fa9296c41fb7 SHA512 83b6a4c0cbed768c6317da77a2fc75dc926a05611beb8103926e4e8589107e9924e0a1f7b461b362a7e9cc8456de28f2aef879376edc4268e6143eed359e43d5
-EBUILD ffmpeg-9999.ebuild 17604 BLAKE2B 7e039e768162dcbaacd17955b63c2700af71990b2735badad34a3ef48bf0bee551e8a4422fa2a6adb28a34c60e6b8430157d2ba23942be6b905e7c5f19b28f78 SHA512 3408683e3bb0f971a48e1367bbb45ea8b385c5893ad219cdaf40c972bff82dacf32b2ec899aea13781bb966f2d5f75905164ca1842eedbf34821027a57f2c581
+EBUILD ffmpeg-4.4.ebuild 17653 BLAKE2B 7eeaaecaa2988ca7f9bb0a419117b7b904713a49e57d1b25a2e153ff2e59f64e4ee3ca0d4fcf3021b1d2c54342ac0550f20a4f30d94462270b5c10460d792d79 SHA512 f9650bb23b9ac78c159dc983faf371ce974b982bb45e3bebdc6ef2094c125a26583e634afa10f6849c83b82310c1bdff87b620025c499cbc55e07ac4e7e4c33d
+EBUILD ffmpeg-9999.ebuild 17604 BLAKE2B 1d4741e290c75ad74b280020b2add43038dfb30627f3919d2458949ad99337d3d83f412695184cbb21cfa1cd3d834a84cd0acd7cc296c2085d6d482c13145edd SHA512 5497138d8204ae86a1dccf38d62cb9fd9ece00ca56056997efc1bd0c0bab3a7a7d8a2a017613b343ec1127c08522a33414e3dc245f8cd7ad0d833c9d2791ba40
 MISC metadata.xml 5955 BLAKE2B 59329980a1e72c3899f09ddc2ac217aed5c540e91c1f1e0636ac2f84986e20ea7cdd0e07c9e350aed664933a4b02cfed2001bcd1e47723fba913b24b0d35b3aa SHA512 9c4d77572b982475313acddc8cd0df16a121d3a5363335d4d2a1e3021b3dd4bcda5efec9f4a913349efc532919441852dfa702df22dceda62d6f8af5fd491666
diff --git a/media-video/ffmpeg/ffmpeg-4.4.ebuild b/media-video/ffmpeg/ffmpeg-4.4.ebuild
index f1e2939f625e..e6217e00523c 100644
--- a/media-video/ffmpeg/ffmpeg-4.4.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.4.ebuild
@@ -509,6 +509,11 @@ multilib_src_compile() {
 	fi
 }
 
+multilib_src_test() {
+	LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
+		emake V=1 fate
+}
+
 multilib_src_install() {
 	emake V=1 DESTDIR="${D}" install install-doc
 
@@ -540,8 +545,3 @@ multilib_src_install_all() {
 	dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
 	[ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
 }
-
-multilib_src_test() {
-	LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
-		emake V=1 fate
-}
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 65f9e0ca8aef..ff89e66f841f 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -508,6 +508,11 @@ multilib_src_compile() {
 	fi
 }
 
+multilib_src_test() {
+	LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil" \
+		emake V=1 fate
+}
+
 multilib_src_install() {
 	emake V=1 DESTDIR="${D}" install install-doc
 
@@ -539,8 +544,3 @@ multilib_src_install_all() {
 	dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
 	[ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
 }
-
-multilib_src_test() {
-	LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil" \
-		emake V=1 fate
-}
diff --git a/media-video/kaffeine/Manifest b/media-video/kaffeine/Manifest
index ee6e2d0a4776..626f8219757c 100644
--- a/media-video/kaffeine/Manifest
+++ b/media-video/kaffeine/Manifest
@@ -1,3 +1,5 @@
+AUX kaffeine-2.0.18-kwindowsystem-5.82.patch 885 BLAKE2B 4ea110e8ddf8fc1555953a9de61002ef3a0c2395eb0f5d1ce5516cf256ae0d4a1a92571c797ff1c48801c555073e3fda424aa180e73f4f1d4888023b6b491376 SHA512 0270e812a61669c6fe78061d2045319668d6d05f0181fb028318ad397dd230d4e21756fd304bcb0b46be4c342a1abed4c8cf046ab0b06bd4babb67c282d1ed89
 DIST kaffeine-2.0.18.tar.xz 6033112 BLAKE2B c9a0fbd58f7ee4ed8ad44cbed59d95cde7df8ba9c2f5f341df74e6a771293756434e38adb7706baf224a684b56453601099fcac9bf27fd7ec935073a0c30ec19 SHA512 60854251f25e7de94928686f647e6e0f07ca40188e8dfd8140985f1dfbb53bb4d92ff42c29e216431500839d7eb83b81f386bac3a8a86dd8c986a611ec0db3a4
+EBUILD kaffeine-2.0.18-r1.ebuild 1525 BLAKE2B 4b41f4b6114dab705871477d840fcf581f55a55af78e01ca0073ebacebe07f7db465d32d09d7c0ff24b1973d24dc5df44aa979b802f4acc1b1b3803e9545adc5 SHA512 c8a888e964a4e1e9e63b03bec4ed74bd146a040e707f3b1dc8b25190b166e4a697f4a95877478c844e1490c70fd56ce469104032b348da7d9132a1066137d834
 EBUILD kaffeine-2.0.18.ebuild 1444 BLAKE2B ea8a713fc0aaa108c6e28db08a760a0271222318f615a67d006b7295f9f20ac04a14606540cd959773213ed3be28a27f69c9e01224b88542af0fa87a3e097d16 SHA512 34dfcd7123d8d19d3d8079242b89e88f416e7e374ba97751099adca93346ce8c0bbe02b739c3d2ffb6437dbbdf496d555114f50b8b2fced45d6af7122a171832
 MISC metadata.xml 369 BLAKE2B 2ba0f7bed05089f04c57eaeae806308ef4fe560461e5f44b32e05ffcb2cd2ee064d81a07589e1d9ad067acb56f9dd43d0acda9a87cdaf42187aae8cb67306a54 SHA512 f58a7acad05449a5cfc6ee4bc9d52677b06b9d994bb109a279d04e71ff7368cd697b286767b463e4f5d42a1194b268789fb373b17a19e581927c25d64d46a083
diff --git a/media-video/kaffeine/files/kaffeine-2.0.18-kwindowsystem-5.82.patch b/media-video/kaffeine/files/kaffeine-2.0.18-kwindowsystem-5.82.patch
new file mode 100644
index 000000000000..97d8ecdec057
--- /dev/null
+++ b/media-video/kaffeine/files/kaffeine-2.0.18-kwindowsystem-5.82.patch
@@ -0,0 +1,28 @@
+From 4280d21a96c4ffd162eca52815aa84ddb679f60b Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 8 May 2021 23:45:53 +0200
+Subject: [PATCH] Port away from API deprecated in >KF-5.62
+
+BUG: 436798
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ src/main.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/main.cpp b/src/main.cpp
+index 01e3b80..cee5102 100644
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -180,7 +180,7 @@ void KaffeineApplication::activateRequested(const QStringList &arguments,
+ 		return;
+ 
+ 	parser.parse(arguments);
+-	KStartupInfo::setNewStartupId(mainWindow, KStartupInfo::startupId());
++	KStartupInfo::setNewStartupId(mainWindow->window()->windowHandle(), KStartupInfo::startupId());
+ 	KWindowSystem::forceActiveWindow(mainWindow->winId());
+ 	mainWindow->parseArgs(workingDirectory);
+ }
+-- 
+2.31.1
+
diff --git a/media-video/kaffeine/kaffeine-2.0.18-r1.ebuild b/media-video/kaffeine/kaffeine-2.0.18-r1.ebuild
new file mode 100644
index 000000000000..48b9edc935b3
--- /dev/null
+++ b/media-video/kaffeine/kaffeine-2.0.18-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+KFMIN=5.82.0
+QTMIN=5.15.2
+inherit ecm kde.org
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Media player with digital TV support by KDE"
+HOMEPAGE="https://userbase.kde.org/Kaffeine"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.3 )"
+SLOT="5"
+IUSE="dvb"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5[sqlite]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	media-video/vlc[X]
+	x11-libs/libXScrnSaver
+	dvb? ( media-libs/libv4l[dvb] )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+DOCS=( Changelog NOTES README.md )
+
+PATCHES=( "${FILESDIR}/${P}-kwindowsystem-5.82.patch" ) # KDE-bug 436798
+
+src_configure() {
+	# tools working on $HOME directory for a local git checkout
+	local mycmakeargs=(
+		-DBUILD_TOOLS=OFF
+		$(cmake_use_find_package dvb Libdvbv5)
+	)
+
+	ecm_src_configure
+}
diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest
index e769cbf7bc85..5740ed754124 100644
--- a/media-video/obs-studio/Manifest
+++ b/media-video/obs-studio/Manifest
@@ -1,8 +1,7 @@
 AUX obs-studio-25.0.8-gcc-10-build.patch 1050 BLAKE2B ccf18ba3f51de72f967fbab5b1526d1fc9a9bb628a25d1caed44ca308f4a988a15fe0ab235b218b2edc4e4eef40c86545cda989f0d748af942352ad8eb091f51 SHA512 1ff0e088eed61554268009f3d8c5a23c0888bfbe860d6cb288ddf348108446c152fd87e2cb8f54613a88378d8474550632c90f924005d5e0343bf1a801339ccc
 AUX obs-studio-26.1.2-fix-alsa-crash.patch 1047 BLAKE2B 5c7417042565beb47bd57ad770358e6d751f3ed08b849f279439f07ac48a1f4dace780ed23b60a3c26988e06ae9899e1ad088c04ffccd42d953e6d05f5287719 SHA512 e5261c1e6fdc5bdbdd3663225c71ee9aa40ec3f724ab69426a96f7180f2a3f6193d1a1b171aac2ba78d6a4c2a9362d060d6b7e99841754829001f087bcde7062
-DIST obs-studio-25.0.8.tar.gz 9531713 BLAKE2B 4775ca8305e1beee4d926eff728351b699ca4d52f66e53409dbcfe1f73699df0286fadc0c138cb76b8eb73e70a143719e46f030b6d15d43629bdcbf23bdb88af SHA512 a97c03dc218a4e03e48f6a7dc82b4a59ebeee2039f17be66bb847681ce9ff3d25e6e015be4af78fe44739f6fad5089b6e683d7657c2e4fde8e547df9a2594a08
+AUX obs-studio-26.1.2-python-3.8.patch 850 BLAKE2B dbaab7b41598bbbd08d77d386de58638f2dfb6d3f7254314068bed2d3ec9171903484d711d27e53b86f6585ddca7b989580f5c6968c1c04ac003157c2d9dbe73 SHA512 eba28d2027143c9ea30248b50eefc27b1cb761a24ca4561d6aca2d4813c1f57f47c6a0421d244479a9afa8d5dbc6e54066f3d70622edbf78039f3738eb2c37a3
 DIST obs-studio-26.1.2.tar.gz 16624899 BLAKE2B 655a6c71d3a0ae6ae1fc2d166a148002bb17d6eaec06d5633a10fdbfe7f42e073526ede83cd36ad21c440debe870b41b43724caa00633733f1e196d918304adc SHA512 cd95fbf587f7edfe415cae75299d65c1d771bb118649fb839ae43d77145d87725c23df3360aa7b8c35ab8b62e5ec7983a8b02f8b102caa78f768eb58b4263417
-EBUILD obs-studio-25.0.8-r100.ebuild 3656 BLAKE2B ded7642022885ad3163b2583af7472666a85e265ea0d0ca3e0879cddb93c00b0e1078539f6506e83f88258583cace0a4e903f41f3d1bc1e7d92cd844421ad152 SHA512 80e697adcf0221111cb298b36158885841a430248541f484afa075bd47d862e70a327b455aab59a856e13e719deaf455e653da5f31fa805ea5fd449be6bb759e
-EBUILD obs-studio-26.1.2.ebuild 3658 BLAKE2B 65e50aec6d6fa5aef00b9a884e6654582a07d66899ccb88c0188e56b314426066bb2ef00d3b5b233cb7b5154f41c7f46a57d21399853244e6b46056a66aa71aa SHA512 ee933e3a31e7faf560e2b7ca14d03d26bfb4d5041ae5457a9c3b1e253f428f0b3d0e4c30dd2fc17fd27a70bb4d7b96eea82fb193245ca66b79c520dd28096d6a
-EBUILD obs-studio-9999.ebuild 3597 BLAKE2B 46214450fd63782a469d29dee88fab6c0fecfbc6ddb2e1fbfe5c44ae5aa9d600544745bf611d84bdf1442e2c4168d0949aa12fd86bef0d9481df422db3c75d3c SHA512 76b013916aea107ed6e5a06ee932d3ff4ad74f5e1af9f81010d6692193295783f376b4a42b5c7b8a6890ab4e0c9fdd0209da327e6c57c2b43fc784ff44e39061
-MISC metadata.xml 1262 BLAKE2B 0ff74ff065f5efdfbd8a2e0a0311bf94cbd645a7a199e97bae0a696e15840de7713413e56a52d90c6db2da5fa5da454692c1d8766e2480f33fde1d29d95df37a SHA512 e094b748cbbccbf64cbf4895b7dd8911773a2fbb5a5f166bf8895ab27ce1dd7a360c3de0246e22d78abb6a18519a117277931e30584bc8d49c7b87da6e2040a2
+EBUILD obs-studio-26.1.2-r1.ebuild 4006 BLAKE2B f7bbf701f886efa63171ea25bcc8303c54fa60bea7ad72b7160d625193aa929ccfd4a4a5adb91628025b6a5240441ee52c79a01757b22a41cf933994978789f8 SHA512 0ce7a598bf46398e054981a71a7a6e904a0f45078d2014c8c43b85b164d9c812f4a60b75f57343ea89709c73cf60cdc83f751aedd34dbc71b9bff035197c0c1b
+EBUILD obs-studio-9999.ebuild 4208 BLAKE2B 5ea108c780d22293779d1228b93e0e6e34ff5e86b49bdce31790a5c7c633bd1dcec019cc27ba94deaf6e3c2521f61b938435d44eac619d2b207bbecc725d2a47 SHA512 fea4eb48342a6fa9fa697095fd6b93c629994f6632e27b4ffeb26680512ca0a67f4a6ac9af8c5ffc30f2b336088888e9995d74fedab6b86affee9ee8396490d0
+MISC metadata.xml 1289 BLAKE2B 4004638114baeb19100daf3903ae17005853b9fa95ca4a27380c1351d2fb9245baa3b127fd6eb4c641698787a248ccc4878a884ed1d61c58f88b64df221a8ac4 SHA512 276a74edcc1109218f4a3761759e43866f59bc547999cdf186fb6296d94e122e30c09520492742f53ae5785c72ac1abfa75a024dabb8b8d07862b3011cbdaa0b
diff --git a/media-video/obs-studio/files/obs-studio-26.1.2-python-3.8.patch b/media-video/obs-studio/files/obs-studio-26.1.2-python-3.8.patch
new file mode 100644
index 000000000000..c4709c654688
--- /dev/null
+++ b/media-video/obs-studio/files/obs-studio-26.1.2-python-3.8.patch
@@ -0,0 +1,24 @@
+From 413fbe27ee68881f60265f0f2dd670ce42ca220e Mon Sep 17 00:00:00 2001
+From: Matt Gajownik <matt@obsproject.com>
+Date: Tue, 25 Aug 2020 19:28:26 +1000
+Subject: [PATCH] libobs/util: Fix loading Python binary modules on *nix
+
+Fixes #2222
+---
+ libobs/util/platform-nix.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/libobs/util/platform-nix.c b/libobs/util/platform-nix.c
+index 26800d52f7c..997b62db1a3 100644
+--- a/libobs/util/platform-nix.c
++++ b/libobs/util/platform-nix.c
+@@ -71,7 +71,8 @@ void *os_dlopen(const char *path)
+ #ifdef __APPLE__
+ 	void *res = dlopen(dylib_name.array, RTLD_LAZY | RTLD_FIRST);
+ #else
+-	void *res = dlopen(dylib_name.array, RTLD_LAZY);
++	void *res = dlopen(dylib_name.array,
++			   RTLD_LAZY | RTLD_DEEPBIND | RTLD_GLOBAL);
+ #endif
+ 	if (!res)
+ 		blog(LOG_ERROR, "os_dlopen(%s->%s): %s\n", path,
diff --git a/media-video/obs-studio/metadata.xml b/media-video/obs-studio/metadata.xml
index 603cd8cc27ce..07659c3e82fa 100644
--- a/media-video/obs-studio/metadata.xml
+++ b/media-video/obs-studio/metadata.xml
@@ -12,15 +12,15 @@
     internally.
   </longdescription>
   <use>
-    <flag name="fdk">Enable libfdk support for AAC encoding.</flag>
+    <flag name="decklink">Build the Decklink plugin.</flag>
+    <flag name="fdk">Build with LibFDK AAC support.</flag>
     <flag name="imagemagick">Use ImageMagick for image loading instead of FFmpeg.</flag>
-    <flag name="nvenc">Enable NVENC encoding for nVidia video cards.</flag>
-    <flag name="python">Build support for scripting via Python 3.</flag>
-    <flag name="speex">Enable noise suppression filter support via
-      <pkg>media-libs/speexdsp</pkg>.</flag>
-    <flag name="ssl">Build support for TLS/SSL connections (RTMPS) via
-      <pkg>net-libs/mbedtls</pkg>.</flag>
-    <flag name="vlc">Build support for using <pkg>media-video/vlc</pkg> as a media source.</flag>
+    <flag name="nvenc">Build with NVENC encoding support for nVidia video cards.</flag>
+    <flag name="pipewire">Build with PipeWire support.</flag>
+    <flag name="python">Build with scripting support for Python 3.</flag>
+    <flag name="speex">Build with Speex noise suppression filter support.</flag>
+    <flag name="ssl">Build with TLS/SSL support for RTMPS connections.</flag>
+    <flag name="vlc">Build with VLC media source support.</flag>
   </use>
   <upstream>
     <remote-id type="github">obsproject/obs-studio</remote-id>
diff --git a/media-video/obs-studio/obs-studio-25.0.8-r100.ebuild b/media-video/obs-studio/obs-studio-25.0.8-r100.ebuild
deleted file mode 100644
index f0f5aacc1e9e..000000000000
--- a/media-video/obs-studio/obs-studio-25.0.8-r100.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
-LUA_COMPAT=( luajit )
-# Does not work with 3.8+ https://bugs.gentoo.org/754006
-PYTHON_COMPAT=( python3_7 )
-
-inherit cmake lua-single python-single-r1 xdg-utils
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/obsproject/obs-studio.git"
-	EGIT_SUBMODULES=()
-else
-	SRC_URI="https://github.com/obsproject/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Software for Recording and Streaming Live Video Content"
-HOMEPAGE="https://obsproject.com"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+alsa fdk imagemagick jack lua nvenc pulseaudio python speex +ssl truetype v4l vlc"
-REQUIRED_USE="
-	lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-BDEPEND="
-	lua? ( dev-lang/swig )
-	python? ( dev-lang/swig )
-"
-DEPEND="
-	>=dev-libs/jansson-2.5
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtsql:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	media-libs/x264:=
-	media-video/ffmpeg:=[x264]
-	net-misc/curl
-	sys-apps/dbus
-	sys-libs/zlib
-	virtual/udev
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXfixes
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libxcb
-	alsa? ( media-libs/alsa-lib )
-	fdk? ( media-libs/fdk-aac:= )
-	imagemagick? ( media-gfx/imagemagick:= )
-	jack? ( virtual/jack )
-	lua? ( ${LUA_DEPS} )
-	nvenc? ( >=media-video/ffmpeg-4[video_cards_nvidia] )
-	pulseaudio? ( media-sound/pulseaudio )
-	python? ( ${PYTHON_DEPS} )
-	speex? ( media-libs/speexdsp )
-	ssl? ( net-libs/mbedtls:= )
-	truetype? (
-		media-libs/fontconfig
-		media-libs/freetype
-	)
-	v4l? ( media-libs/libv4l )
-	vlc? ( media-video/vlc:= )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-25.0.8-gcc-10-build.patch" )
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DDISABLE_ALSA=$(usex !alsa)
-		-DDISABLE_FREETYPE=$(usex !truetype)
-		-DDISABLE_JACK=$(usex !jack)
-		-DDISABLE_LIBFDK=$(usex !fdk)
-		-DDISABLE_PULSEAUDIO=$(usex !pulseaudio)
-		-DDISABLE_SPEEXDSP=$(usex !speex)
-		-DDISABLE_V4L2=$(usex !v4l)
-		-DDISABLE_VLC=$(usex !vlc)
-		-DLIBOBS_PREFER_IMAGEMAGICK=$(usex imagemagick)
-		-DOBS_MULTIARCH_SUFFIX=${libdir#lib}
-		-DUNIX_STRUCTURE=1
-		-DWITH_RTMPS=$(usex ssl)
-	)
-
-	if [[ ${PV} != *9999 ]]; then
-		mycmakeargs+=(
-			-DOBS_VERSION_OVERRIDE=${PV}
-		)
-	fi
-
-	if use lua || use python; then
-		mycmakeargs+=(
-			-DDISABLE_LUA=$(usex !lua)
-			-DDISABLE_PYTHON=$(usex !python)
-			-DENABLE_SCRIPTING=yes
-		)
-	else
-		mycmakeargs+=( -DENABLE_SCRIPTING=no )
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	#external plugins may need some things not installed by default, install them here
-	insinto /usr/include/obs/UI/obs-frontend-api
-	doins UI/obs-frontend-api/obs-frontend-api.h
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-
-	if ! use alsa && ! use pulseaudio; then
-		elog
-		elog "For the audio capture features to be available,"
-		elog "either the 'alsa' or the 'pulseaudio' USE-flag needs to"
-		elog "be enabled."
-		elog
-	fi
-
-	if ! has_version "sys-apps/dbus"; then
-		elog
-		elog "The 'sys-apps/dbus' package is not installed, but"
-		elog "could be used for disabling hibernating, screensaving,"
-		elog "and sleeping.  Where it is not installed,"
-		elog "'xdg-screensaver reset' is used instead"
-		elog "(if 'x11-misc/xdg-utils' is installed)."
-		elog
-	fi
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/media-video/obs-studio/obs-studio-26.1.2.ebuild b/media-video/obs-studio/obs-studio-26.1.2-r1.ebuild
index 9833f5fb6b6c..3e12ab881f7e 100644
--- a/media-video/obs-studio/obs-studio-26.1.2.ebuild
+++ b/media-video/obs-studio/obs-studio-26.1.2-r1.ebuild
@@ -5,8 +5,7 @@ EAPI=7
 
 CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
 LUA_COMPAT=( luajit )
-# Does not work with 3.8+ https://bugs.gentoo.org/754006
-PYTHON_COMPAT=( python3_7 )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit cmake lua-single python-single-r1 xdg-utils
 
@@ -78,7 +77,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-26.1.2-fix-alsa-crash.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-26.1.2-fix-alsa-crash.patch"
+	"${FILESDIR}/${PN}-26.1.2-python-3.8.patch" # https://github.com/obsproject/obs-studio/pull/3335
+)
 
 pkg_setup() {
 	use lua && lua-single_pkg_setup
@@ -150,6 +152,16 @@ pkg_postinst() {
 	fi
 }
 
+pkg_postinst() {
+	if use python; then
+		ewarn "This ebuild applies a patch that is not yet accepted upstream,"
+		ewarn "and while it fixes Python support at least to some extent, it"
+		ewarn "may cause other issues."
+		ewarn ""
+		ewarn "Please report any such issues to the Gentoo maintainer."
+	fi
+}
+
 pkg_postrm() {
 	xdg_icon_cache_update
 }
diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild
index e9173352238b..f1b911e33918 100644
--- a/media-video/obs-studio/obs-studio-9999.ebuild
+++ b/media-video/obs-studio/obs-studio-9999.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
 LUA_COMPAT=( luajit )
-# Does not work with 3.8+ https://bugs.gentoo.org/754006
-PYTHON_COMPAT=( python3_7 )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit cmake lua-single python-single-r1 xdg-utils
 
@@ -24,7 +23,7 @@ HOMEPAGE="https://obsproject.com"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+alsa fdk imagemagick jack lua nvenc pulseaudio python speex +ssl truetype v4l vlc"
+IUSE="+alsa decklink fdk imagemagick jack lua nvenc pipewire pulseaudio python speex +ssl truetype v4l vlc wayland"
 REQUIRED_USE="
 	lua? ( ${LUA_REQUIRED_USE} )
 	python? ( ${PYTHON_REQUIRED_USE} )
@@ -38,7 +37,7 @@ DEPEND="
 	>=dev-libs/jansson-2.5
 	dev-qt/qtcore:5
 	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
+	dev-qt/qtgui:5[wayland?]
 	dev-qt/qtmultimedia:5
 	dev-qt/qtnetwork:5
 	dev-qt/qtquickcontrols:5
@@ -65,6 +64,7 @@ DEPEND="
 	jack? ( virtual/jack )
 	lua? ( ${LUA_DEPS} )
 	nvenc? ( >=media-video/ffmpeg-4[video_cards_nvidia] )
+	pipewire? ( media-video/pipewire )
 	pulseaudio? ( media-sound/pulseaudio )
 	python? ( ${PYTHON_DEPS} )
 	speex? ( media-libs/speexdsp )
@@ -75,9 +75,12 @@ DEPEND="
 	)
 	v4l? ( media-libs/libv4l )
 	vlc? ( media-video/vlc:= )
+	wayland? ( dev-libs/wayland )
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${PN}-26.1.2-python-3.8.patch" ) # https://github.com/obsproject/obs-studio/pull/3335
+
 pkg_setup() {
 	use lua && lua-single_pkg_setup
 	use python && python-single-r1_pkg_setup
@@ -86,10 +89,15 @@ pkg_setup() {
 src_configure() {
 	local libdir=$(get_libdir)
 	local mycmakeargs=(
+		-DBUILD_BROWSER=no
+		-DBUILD_VST=no
+		-DENABLE_WAYLAND=$(usex wayland)
 		-DDISABLE_ALSA=$(usex !alsa)
+		-DDISABLE_DECKLINK=$(usex !decklink)
 		-DDISABLE_FREETYPE=$(usex !truetype)
 		-DDISABLE_JACK=$(usex !jack)
 		-DDISABLE_LIBFDK=$(usex !fdk)
+		-DENABLE_PIPEWIRE=$(usex pipewire)
 		-DDISABLE_PULSEAUDIO=$(usex !pulseaudio)
 		-DDISABLE_SPEEXDSP=$(usex !speex)
 		-DDISABLE_V4L2=$(usex !v4l)
@@ -148,6 +156,16 @@ pkg_postinst() {
 	fi
 }
 
+pkg_postinst() {
+	if use python; then
+		ewarn "This ebuild applies a patch that is not yet accepted upstream,"
+		ewarn "and while it fixes Python support at least to some extent, it"
+		ewarn "may cause other issues."
+		ewarn ""
+		ewarn "Please report any such issues to the Gentoo maintainer."
+	fi
+}
+
 pkg_postrm() {
 	xdg_icon_cache_update
 }
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index beeac7f6bfd3..65c3aee8902d 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -6,8 +6,10 @@ AUX pipewire.desktop 322 BLAKE2B 0299b9054cf881a5cbbdb128a5e8a51308cf0b5a98260dc
 DIST pipewire-0.3.22.tar.gz 1263844 BLAKE2B 3fb90c0b1c17ed108e8c390873f5c4527e1ff9241d1c5964ad5b7c01fbfefda901ef1228f178cf3c9899e6e8e75969a470f8fba63473ff203cba612c6c0553ca SHA512 a6587e0afd5c90be1733ecf62c6fc68e735ab3b84f2cbbf844bbe1be93e7a23dee07b041ed6b273cab6ab207d2388ae6f2027d0380928555a0155a7cc9ca4a7e
 DIST pipewire-0.3.25.tar.gz 1351257 BLAKE2B 3c4d6d98e3255df8baf50eb548bcf77b5c027a50f6acedd83cd63481ed5b642c174589f34314f150b07116cea8a3458c3f8b770df4081585d7f75cc8dde4decd SHA512 0f84be21bfcd70f25900c53a8ce399c29ce2d4d10f8b56e5103603cf0c80673aab0b16492e55b42985283adf46343cdca01626225db85a2263f06c309f68f2d7
 DIST pipewire-0.3.26.tar.gz 1447673 BLAKE2B 67feb1288fcdc9ac5578b97ab2567b46a7431921291584bc9db2c2e60db074c3a61c3af9859d3b2f9044cfba6c15e9bfde9edc001b753f8fc47965eb55d751c8 SHA512 d771956a42801a6e07fac48a175363eb4107a9fba13d649ff5c2cdc40044c84a61bf56050783507f6dd8efae8c59a2be07ec67433827335ae60f8116c4a4e178
+DIST pipewire-0.3.27.tar.gz 1459913 BLAKE2B b6db73de85c41932b630e62b3dcc589529ae5457cae6731a8ec5db50f20b541e7e9596976a368c4bb654b1443071c53f8fe4a9ddfc1ee8a0ecc04d69b683456a SHA512 a2df1df8e43846b91fbeedeb1cda9c73b970ac9de58d8b4e97ada54ee74a8f26a168504289c7392c94cc7ea54aa01ada4791c66a5d3159a2bc980df633f6bcfe
 EBUILD pipewire-0.3.22.ebuild 3177 BLAKE2B 712e773c42b0a89d482a1c38f1d5b2ad73bd9790173093813f257378e5bcda3aaaeedb2d215812637d14dccc4c57cb25ba3d4574d579821f7c09f8a110cac8ac SHA512 89583f0495c8a12598c829de80d2b515a1a37aecf51b4cb54c4988f0fc3aff2f5d9b7f4d23621678d5f1b2e67f145d941eacc0d9eca0281d9cf202ff109a7195
 EBUILD pipewire-0.3.25.ebuild 8576 BLAKE2B 8e84ae5b121a7755c247f6a140a9c72fbf69912edf84e2891f8c78944dccc6204f6f9c1a7ad211c51d87a09719750d9bd2de2ee1e993def4e66d04672a2eec86 SHA512 1de53f6529cdaed7194f6a05c0adf84e40dd8484f251b245fd3e036196d663a71450d7b53ffa64d06a9b805c23f08eebe8c06cc6490c84a5f5d5ecd37a6f1e47
 EBUILD pipewire-0.3.26.ebuild 8727 BLAKE2B f8562cef3ecb56394c026923f55c814c1ea66c7eafd40288e64737e7e9991be6c24eddbd3dbdb26053ad57454e178351e78dac810cf09b5c2c99bd7e6f24a002 SHA512 f75916fd73b14fa5f62c3ac6fb71dc31ad8cff4370cf23edd8ef3ca230f9000d07c21797d25cb39f21e012d62882e8b4d4c10c577e9847f83a455c28f4fd9db1
-EBUILD pipewire-9999.ebuild 8727 BLAKE2B f8562cef3ecb56394c026923f55c814c1ea66c7eafd40288e64737e7e9991be6c24eddbd3dbdb26053ad57454e178351e78dac810cf09b5c2c99bd7e6f24a002 SHA512 f75916fd73b14fa5f62c3ac6fb71dc31ad8cff4370cf23edd8ef3ca230f9000d07c21797d25cb39f21e012d62882e8b4d4c10c577e9847f83a455c28f4fd9db1
-MISC metadata.xml 1536 BLAKE2B b0c4a4c8723d29f1dfa1ad8c74730c5aeeff2b0af77631e6ea6f09fb75b3b0cf2e6e755129fd1e5fa8782230bb9658bffa86c752a66cea6bd73079029b4b606e SHA512 a788e4c079a1dd11b84ea6a095fb378e9453c516010654b487cc22a2eeedffc0fb969394ec88f21bdc9b3227b08a1e99e912d5cee8e7e2a405314adf121ce55f
+EBUILD pipewire-0.3.27-r1.ebuild 9497 BLAKE2B 6400fcf66c4e1efc34838b2dbcffe80d9279a9281c91a155830bb0455ebd99d4e7df4bb006b0db63f8f2558aa33f1cc215b5e5c1cd23f41eb966b21199e183cd SHA512 69f4713c3b4f62cea0f30d95eabf554d8d13a28822f06d8f3d5828611be8150c4e3f21352fb1c40103459b73301a2e5185553f6bbdc45be8820599efcb2ce42f
+EBUILD pipewire-9999.ebuild 9497 BLAKE2B 6400fcf66c4e1efc34838b2dbcffe80d9279a9281c91a155830bb0455ebd99d4e7df4bb006b0db63f8f2558aa33f1cc215b5e5c1cd23f41eb966b21199e183cd SHA512 69f4713c3b4f62cea0f30d95eabf554d8d13a28822f06d8f3d5828611be8150c4e3f21352fb1c40103459b73301a2e5185553f6bbdc45be8820599efcb2ce42f
+MISC metadata.xml 1600 BLAKE2B 1138c789841fae8ea509ba2becdfef8376b87525b5b1822854ca083ab49e63124cbde6d8064849e0114a0e39269f63cf76d63f49396d709f6b3da865cf539487 SHA512 5ca5105edecf2515049b61e71327236c3e0fd949a25e91a9ed9dc0a9ad5d9d66f0b99329276c824e8840352b699bb9995b9ae073b43f30f87f4a8cc4bc4237a5
diff --git a/media-video/pipewire/metadata.xml b/media-video/pipewire/metadata.xml
index 954805d1590e..d199e8a9255e 100644
--- a/media-video/pipewire/metadata.xml
+++ b/media-video/pipewire/metadata.xml
@@ -25,6 +25,7 @@
 		<flag name="ffmpeg">Builds an unsupported SPA (file a Gentoo bug if you need this)</flag>
 		<flag name="jack">Enable SPA JACK plugin and emulation to be able to run JACK applications on top of PipeWire</flag>
 		<flag name="jack-client">Install a plugin for running PipeWire as a JACK client</flag>
+		<flag name="jack-sdk">Use PipeWire as JACK replacement</flag>
 		<flag name="ldac">LDAC over Bluetooth (primarily Sony headphones)</flag>
 		<flag name="pipewire-alsa">Replace PulseAudio's ALSA plugin with PipeWire's plugin</flag>
 		<flag name="vulkan">Uses Vulkan compute shaders to provide a CGI video source</flag>
diff --git a/media-video/pipewire/pipewire-0.3.27-r1.ebuild b/media-video/pipewire/pipewire-0.3.27-r1.ebuild
new file mode 100644
index 000000000000..c833b6f88796
--- /dev/null
+++ b/media-video/pipewire/pipewire-0.3.27-r1.ebuild
@@ -0,0 +1,285 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit meson optfeature udev multilib-minimal
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Multimedia processing graphs"
+HOMEPAGE="https://pipewire.org/"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/0.3"
+IUSE="aac aptx bluetooth doc extra gstreamer jack-client jack-sdk ldac pipewire-alsa systemd test v4l"
+
+# Once replacing system JACK libraries is possible, it's likely that
+# jack-client IUSE will need blocking to avoid users accidentally
+# configuring their systems to send PW sink output to the emulated
+# JACK's sink - doing so is likely to yield no audio, cause a CPU
+# cycles consuming loop (and may even cause GUI crashes)!
+
+REQUIRED_USE="
+	aac? ( bluetooth )
+	aptx? ( bluetooth )
+	jack-sdk? ( !jack-client )
+	ldac? ( bluetooth )
+"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	app-doc/xmltoman
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+"
+RDEPEND="
+	acct-group/audio
+	media-libs/alsa-lib
+	sys-apps/dbus[${MULTILIB_USEDEP}]
+	sys-libs/ncurses[unicode]
+	virtual/libintl[${MULTILIB_USEDEP}]
+	virtual/libudev[${MULTILIB_USEDEP}]
+	bluetooth? (
+		aac? ( media-libs/fdk-aac )
+		aptx? ( media-libs/libopenaptx )
+		ldac? ( media-libs/libldac )
+		media-libs/sbc
+		>=net-wireless/bluez-4.101:=
+	)
+	extra? (
+		>=media-libs/libsndfile-1.0.20
+	)
+	gstreamer? (
+		>=dev-libs/glib-2.32.0:2
+		>=media-libs/gstreamer-1.10.0:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] )
+	jack-sdk? (
+		!media-sound/jack-audio-connection-kit
+		!media-sound/jack2
+	)
+	pipewire-alsa? (
+		>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
+		|| (
+			media-plugins/alsa-plugins[-pulseaudio]
+			!media-plugins/alsa-plugins
+		)
+	)
+	!pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] )
+	systemd? ( sys-apps/systemd )
+	v4l? ( media-libs/libv4l )
+"
+
+DEPEND="${RDEPEND}"
+
+# Present RDEPEND that are currently always disabled due to the PW
+# code using them being required to be disabled by Gentoo guidelines
+# (i.e. developer binaries not meant for users) and unready code
+#	media-video/ffmpeg:=
+#	media-libs/libsdl2
+#	>=media-libs/vulkan-loader-1.1.69
+#
+# Ditto for DEPEND
+#	>=dev-util/vulkan-headers-1.1.69
+
+DOCS=( {README,INSTALL}.md NEWS )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
+)
+
+# limitsdfile related code taken from =sys-auth/realtime-base-0.1
+# with changes as necessary.
+limitsdfile=40-${PN}.conf
+
+meson_native_enabled() {
+	if multilib_is_native_abi; then
+		echo "-D${1}=enabled"
+	else
+		echo "-D${1}=disabled"
+	fi
+}
+
+meson_native_feature() {
+	multilib_native_usex "${1}" "-D${2-${1}}=enabled" "-D${2-${1}}=disabled"
+}
+
+src_prepare() {
+	default
+
+	if ! use systemd; then
+		# This can be applied non-conditionally but would make for a
+		# significantly worse user experience on systemd then.
+		eapply "${FILESDIR}"/${PN}-0.3.25-non-systemd-integration.patch
+	fi
+
+	einfo "Generating ${limitsdfile}"
+	cat > ${limitsdfile} <<- EOF || die
+		# Start of ${limitsdfile} from ${P}
+
+		@audio	-	memlock 256
+
+		# End of ${limitsdfile} from ${P}
+	EOF
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(meson_native_feature doc docs)
+		$(meson_native_enabled examples) # Disabling this implicitly disables -Dmedia-session
+		$(meson_native_enabled media-session)
+		$(meson_native_enabled man)
+		$(meson_feature test tests)
+		-Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests
+		$(meson_native_feature gstreamer)
+		$(meson_native_feature gstreamer gstreamer-device-provider)
+		$(meson_native_feature systemd)
+		-Dsystemd-system-service=disabled # Matches upstream
+		$(meson_native_feature systemd systemd-user-service)
+		$(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
+		-Dspa-plugins=enabled
+		-Dalsa=enabled # Allows using kernel ALSA for sound I/O (-Dmedia-session depends on this)
+		-Daudiomixer=enabled # Matches upstream
+		-Daudioconvert=enabled # Matches upstream
+		$(meson_native_feature bluetooth bluez5)
+		$(meson_native_feature bluetooth bluez5-backend-hsp-native)
+		$(meson_native_feature bluetooth bluez5-backend-hfp-native)
+		$(meson_native_feature bluetooth bluez5-backend-ofono)
+		$(meson_native_feature bluetooth bluez5-backend-hsphfpd)
+		$(meson_native_feature aac bluez5-codec-aac)
+		$(meson_native_feature aptx bluez5-codec-aptx)
+		$(meson_native_feature ldac bluez5-codec-ldac)
+		-Dcontrol=enabled # Matches upstream
+		-Daudiotestsrc=enabled # Matches upstream
+		-Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
+		-Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph
+		$(meson_native_feature jack-client jack) # Allows PW to act as a JACK client
+		$(meson_feature jack-sdk jack-devel)
+		$(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '')
+		-Dsupport=enabled # Miscellaneous/common plugins, such as null sink
+		-Devl=disabled # Matches upstream
+		-Dtest=disabled # fakesink and fakesource plugins
+		$(meson_native_feature v4l v4l2)
+		-Dlibcamera=disabled # libcamera is not in Portage tree
+		-Dvideoconvert=enabled # Matches upstream
+		-Dvideotestsrc=enabled # Matches upstream
+		-Dvolume=enabled # Matches upstream
+		-Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
+		$(meson_native_feature extra pw-cat)
+		-Dudev=enabled
+		-Dudevrulesdir="$(get_udevdir)/rules.d"
+		-Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
+		$(meson_native_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
+	)
+
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_install() {
+	# Our customs DOCS do not exist in multilib source directory
+	DOCS= meson_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	insinto /etc/security/limits.d
+	doins ${limitsdfile}
+
+	if use pipewire-alsa; then
+		dodir /etc/alsa/conf.d
+		# These will break if someone has /etc that is a symbol link to a subfolder! See #724222
+		# And the current dosym8 -r implementation is likely affected by the same issue, too.
+		dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
+		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf
+	fi
+
+	if ! use systemd; then
+		insinto /etc/xdg/autostart
+		newins "${FILESDIR}"/pipewire.desktop pipewire.desktop
+
+		exeinto /usr/libexec
+		newexe "${FILESDIR}"/pipewire-launcher.sh pipewire-launcher
+	fi
+}
+
+pkg_postinst() {
+	elog "It is recommended to raise RLIMIT_MEMLOCK to 256 for users"
+	elog "using PipeWire. Do it either manually or add yourself"
+	elog "to the 'audio' group:"
+	elog
+	elog "  usermod -aG audio <youruser>"
+	elog
+
+	if ! use jack-sdk; then
+		elog "JACK emulation is incomplete and not all programs will work. PipeWire's"
+		elog "alternative libraries have been installed to a non-default location."
+		elog "To use them, put pw-jack <application> before every JACK application."
+		elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack"
+		elog "provider is still needed to compile the JACK applications themselves."
+		elog
+	fi
+
+	if use systemd; then
+		elog "To use PipeWire for audio, the user units must be manually enabled:"
+		elog
+		elog "  systemctl --user enable pipewire.socket pipewire-pulse.socket"
+		elog
+		elog "When switching from PulseAudio, do not forget to disable PulseAudio:"
+		elog
+		elog "  systemctl --user disable pulseaudio.service pulseaudio.socket"
+		elog
+		elog "A reboot is recommended to avoid interferences from still running"
+		elog "PulseAudio daemon."
+		elog
+		elog "Both, new users and those upgrading, need to enable pipewire-media-session:"
+		elog
+		elog "  systemctl --user enable pipewire-media-session.service"
+		elog
+		elog "NOTE: This is not required when using PipeWire only for screencasting."
+		elog
+	else
+		elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
+		elog "are recommended to edit: ${EROOT}/etc/pulse/client.conf and disable "
+		elog "autospawn'ing of the original daemon by setting:"
+		elog
+		elog "  autospawn = no"
+		elog
+		elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
+		elog
+		elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
+		elog "${EROOT}/etc/pipewire/pipewire.conf by commenting out the relevant"
+		elog "command near the end of the file:"
+		elog
+		elog "#\"/usr/bin/pipewire\" = { args = \"-c pipewire-pulse.conf\" }"
+		elog
+	fi
+
+	elog "For latest tips and tricks, troubleshooting information and documentation"
+	elog "in general, please refer to https://wiki.gentoo.org/wiki/PipeWire"
+	elog
+
+	optfeature_header "The following can be installed for optional runtime features:"
+	optfeature "restricted realtime capabilities vai D-Bus" sys-auth/rtkit
+	# Once hsphfpd lands in tree, both it and ofono will need to be checked for presence here!
+	if use bluetooth; then
+		optfeature "better BT headset support (daemon startup required)" net-misc/ofono
+		#optfeature "an oFono alternative (not packaged)" foo-bar/hsphfpd
+	fi
+}
diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild
index a90b445a81d0..c833b6f88796 100644
--- a/media-video/pipewire/pipewire-9999.ebuild
+++ b/media-video/pipewire/pipewire-9999.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI="7"
 
-inherit meson optfeature udev
+inherit meson optfeature udev multilib-minimal
 
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
-#	EGIT_BRANCH="master"
 	inherit git-r3
 else
 	SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
@@ -19,7 +18,7 @@ HOMEPAGE="https://pipewire.org/"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/0.3"
-IUSE="aac aptx bluetooth doc extra gstreamer jack-client ldac pipewire-alsa systemd test v4l"
+IUSE="aac aptx bluetooth doc extra gstreamer jack-client jack-sdk ldac pipewire-alsa systemd test v4l"
 
 # Once replacing system JACK libraries is possible, it's likely that
 # jack-client IUSE will need blocking to avoid users accidentally
@@ -30,9 +29,12 @@ IUSE="aac aptx bluetooth doc extra gstreamer jack-client ldac pipewire-alsa syst
 REQUIRED_USE="
 	aac? ( bluetooth )
 	aptx? ( bluetooth )
+	jack-sdk? ( !jack-client )
 	ldac? ( bluetooth )
 "
 
+RESTRICT="!test? ( test )"
+
 BDEPEND="
 	app-doc/xmltoman
 	doc? (
@@ -41,10 +43,12 @@ BDEPEND="
 	)
 "
 RDEPEND="
+	acct-group/audio
 	media-libs/alsa-lib
-	sys-apps/dbus
+	sys-apps/dbus[${MULTILIB_USEDEP}]
 	sys-libs/ncurses[unicode]
-	virtual/libudev
+	virtual/libintl[${MULTILIB_USEDEP}]
+	virtual/libudev[${MULTILIB_USEDEP}]
 	bluetooth? (
 		aac? ( media-libs/fdk-aac )
 		aptx? ( media-libs/libopenaptx )
@@ -61,14 +65,18 @@ RDEPEND="
 		media-libs/gst-plugins-base:1.0
 	)
 	jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] )
+	jack-sdk? (
+		!media-sound/jack-audio-connection-kit
+		!media-sound/jack2
+	)
 	pipewire-alsa? (
-		>=media-libs/alsa-lib-1.1.7
+		>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
 		|| (
 			media-plugins/alsa-plugins[-pulseaudio]
 			!media-plugins/alsa-plugins
 		)
 	)
-	!pipewire-alsa? ( media-plugins/alsa-plugins[pulseaudio] )
+	!pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] )
 	systemd? ( sys-apps/systemd )
 	v4l? ( media-libs/libv4l )
 "
@@ -87,8 +95,6 @@ DEPEND="${RDEPEND}"
 
 DOCS=( {README,INSTALL}.md NEWS )
 
-RESTRICT="!test? ( test )"
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
 )
@@ -97,6 +103,18 @@ PATCHES=(
 # with changes as necessary.
 limitsdfile=40-${PN}.conf
 
+meson_native_enabled() {
+	if multilib_is_native_abi; then
+		echo "-D${1}=enabled"
+	else
+		echo "-D${1}=disabled"
+	fi
+}
+
+meson_native_feature() {
+	multilib_native_usex "${1}" "-D${2-${1}}=enabled" "-D${2-${1}}=disabled"
+}
+
 src_prepare() {
 	default
 
@@ -105,74 +123,81 @@ src_prepare() {
 		# significantly worse user experience on systemd then.
 		eapply "${FILESDIR}"/${PN}-0.3.25-non-systemd-integration.patch
 	fi
+
+	einfo "Generating ${limitsdfile}"
+	cat > ${limitsdfile} <<- EOF || die
+		# Start of ${limitsdfile} from ${P}
+
+		@audio	-	memlock 256
+
+		# End of ${limitsdfile} from ${P}
+	EOF
 }
 
-src_configure() {
+multilib_src_configure() {
 	local emesonargs=(
 		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(meson_feature doc docs)
-		-Dexamples=enabled # Disabling this implicitly disables -Dmedia-session (not good)
-		-Dmedia-session=enabled
-		-Dman=enabled
+		$(meson_native_feature doc docs)
+		$(meson_native_enabled examples) # Disabling this implicitly disables -Dmedia-session
+		$(meson_native_enabled media-session)
+		$(meson_native_enabled man)
 		$(meson_feature test tests)
 		-Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests
-		$(meson_feature gstreamer)
-		$(meson_feature gstreamer gstreamer-device-provider)
-		$(meson_feature systemd) # Also covers logind integration
+		$(meson_native_feature gstreamer)
+		$(meson_native_feature gstreamer gstreamer-device-provider)
+		$(meson_native_feature systemd)
 		-Dsystemd-system-service=disabled # Matches upstream
-		$(meson_feature systemd systemd-user-service)
+		$(meson_native_feature systemd systemd-user-service)
 		$(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
-		-Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph
-		#-Dlibjack-path="" # Where to install libjack.so et al (if an absolute path is used, remember to prefix it with ${EROOT} or similar!); setting this will also break pw-jack's multilib support (but presumably that's okay as the intended use would be to replace system's libraries making the loader irrelevant)
 		-Dspa-plugins=enabled
 		-Dalsa=enabled # Allows using kernel ALSA for sound I/O (-Dmedia-session depends on this)
 		-Daudiomixer=enabled # Matches upstream
 		-Daudioconvert=enabled # Matches upstream
-		$(meson_feature bluetooth bluez5)
-		$(meson_feature bluetooth bluez5-backend-hsp-native)
-		$(meson_feature bluetooth bluez5-backend-hfp-native)
-		$(meson_feature bluetooth bluez5-backend-ofono)
-		$(meson_feature bluetooth bluez5-backend-hsphfpd)
-		$(meson_feature aac bluez5-codec-aac)
-		$(meson_feature aptx bluez5-codec-aptx)
-		$(meson_feature ldac bluez5-codec-ldac)
+		$(meson_native_feature bluetooth bluez5)
+		$(meson_native_feature bluetooth bluez5-backend-hsp-native)
+		$(meson_native_feature bluetooth bluez5-backend-hfp-native)
+		$(meson_native_feature bluetooth bluez5-backend-ofono)
+		$(meson_native_feature bluetooth bluez5-backend-hsphfpd)
+		$(meson_native_feature aac bluez5-codec-aac)
+		$(meson_native_feature aptx bluez5-codec-aptx)
+		$(meson_native_feature ldac bluez5-codec-ldac)
 		-Dcontrol=enabled # Matches upstream
 		-Daudiotestsrc=enabled # Matches upstream
 		-Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
-		$(meson_feature jack-client jack) # Allows PW to act as a JACK client
+		-Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph
+		$(meson_native_feature jack-client jack) # Allows PW to act as a JACK client
+		$(meson_feature jack-sdk jack-devel)
+		$(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '')
 		-Dsupport=enabled # Miscellaneous/common plugins, such as null sink
 		-Devl=disabled # Matches upstream
 		-Dtest=disabled # fakesink and fakesource plugins
-		$(meson_feature v4l v4l2)
+		$(meson_native_feature v4l v4l2)
 		-Dlibcamera=disabled # libcamera is not in Portage tree
 		-Dvideoconvert=enabled # Matches upstream
 		-Dvideotestsrc=enabled # Matches upstream
 		-Dvolume=enabled # Matches upstream
 		-Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
-		$(meson_feature extra pw-cat)
+		$(meson_native_feature extra pw-cat)
 		-Dudev=enabled
 		-Dudevrulesdir="$(get_udevdir)/rules.d"
 		-Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
-		$(meson_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
+		$(meson_native_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
 	)
+
 	meson_src_configure
 }
 
-src_compile() {
+multilib_src_compile() {
 	meson_src_compile
+}
 
-	einfo "Generating ${limitsdfile}"
-	cat > ${limitsdfile} <<- EOF || die
-		# Start of ${limitsdfile} from ${P}
-
-		1000:60000	-	memlock 256
-
-		# End of ${limitsdfile} from ${P}
-	EOF
+multilib_src_install() {
+	# Our customs DOCS do not exist in multilib source directory
+	DOCS= meson_src_install
 }
 
-src_install() {
-	meson_src_install
+multilib_src_install_all() {
+	einstalldocs
 
 	insinto /etc/security/limits.d
 	doins ${limitsdfile}
@@ -195,44 +220,61 @@ src_install() {
 }
 
 pkg_postinst() {
-	if ! use pipewire-alsa; then
-		elog "Contrary to what some online resources may suggest, avoid setting"
-		elog "PULSE_LATENCY_MSEC environment variable since it may break ALSA clients."
+	elog "It is recommended to raise RLIMIT_MEMLOCK to 256 for users"
+	elog "using PipeWire. Do it either manually or add yourself"
+	elog "to the 'audio' group:"
+	elog
+	elog "  usermod -aG audio <youruser>"
+	elog
+
+	if ! use jack-sdk; then
+		elog "JACK emulation is incomplete and not all programs will work. PipeWire's"
+		elog "alternative libraries have been installed to a non-default location."
+		elog "To use them, put pw-jack <application> before every JACK application."
+		elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack"
+		elog "provider is still needed to compile the JACK applications themselves."
 		elog
 	fi
 
-	elog "JACK emulation is incomplete and not all programs will work. PipeWire's"
-	elog "alternative libraries have been installed to a non-default location."
-	elog "To use them, put pw-jack <application> before every JACK application."
-	elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack"
-	elog "provider is still needed to compile the JACK applications themselves."
-	elog
-
 	if use systemd; then
-		elog "Per Gentoo policy installed systemd units must be manually enabled:"
-		elog "systemctl --user disable pulseaudio.service pulseaudio.socket"
-		elog "systemctl --user enable pipewire.socket pipewire-pulse.socket"
-		elog "Rebooting is strongly recommended to avoid surprises from"
-		elog "remnant PulseAudio daemon auto-spawning and surviving logouts."
+		elog "To use PipeWire for audio, the user units must be manually enabled:"
+		elog
+		elog "  systemctl --user enable pipewire.socket pipewire-pulse.socket"
+		elog
+		elog "When switching from PulseAudio, do not forget to disable PulseAudio:"
+		elog
+		elog "  systemctl --user disable pulseaudio.service pulseaudio.socket"
+		elog
+		elog "A reboot is recommended to avoid interferences from still running"
+		elog "PulseAudio daemon."
+		elog
+		elog "Both, new users and those upgrading, need to enable pipewire-media-session:"
+		elog
+		elog "  systemctl --user enable pipewire-media-session.service"
+		elog
+		elog "NOTE: This is not required when using PipeWire only for screencasting."
 		elog
-		ewarn "Both new users and those upgrading need to enable pipewire-media-session:"
-		ewarn "systemctl --user enable pipewire-media-session.service"
 	else
-		elog "This ebuild auto-enables PulseAudio replacement. Because of that users"
+		elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
 		elog "are recommended to edit: ${EROOT}/etc/pulse/client.conf and disable "
 		elog "autospawn'ing of the original daemon by setting:"
-		elog "autospawn = no"
+		elog
+		elog "  autospawn = no"
+		elog
 		elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
 		elog
 		elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
-		elog "${EROOT}/etc/pipewire/pipewire.conf"
-		elog "by commenting out the relevant command near the end of the file:"
+		elog "${EROOT}/etc/pipewire/pipewire.conf by commenting out the relevant"
+		elog "command near the end of the file:"
+		elog
 		elog "#\"/usr/bin/pipewire\" = { args = \"-c pipewire-pulse.conf\" }"
 		elog
-		elog "It is still necessary to manually enable PipeWire startup. Setup specific"
-		elog "instructions can be found at: https://wiki.gentoo.org/wiki/PipeWire"
 	fi
 
+	elog "For latest tips and tricks, troubleshooting information and documentation"
+	elog "in general, please refer to https://wiki.gentoo.org/wiki/PipeWire"
+	elog
+
 	optfeature_header "The following can be installed for optional runtime features:"
 	optfeature "restricted realtime capabilities vai D-Bus" sys-auth/rtkit
 	# Once hsphfpd lands in tree, both it and ofono will need to be checked for presence here!
diff --git a/media-video/rav1e/Manifest b/media-video/rav1e/Manifest
index 71c4df9dcda2..2c8661a42e44 100644
--- a/media-video/rav1e/Manifest
+++ b/media-video/rav1e/Manifest
@@ -359,6 +359,6 @@ DIST y4m-0.5.3.crate 11447 BLAKE2B d3a7081899f12a50907ecbce6f63f1b1119618aefdc97
 DIST y4m-0.7.0.crate 12045 BLAKE2B 4f48eb7ad5be2486e0f723b9beb9109cd1b38a0d0c5ac4a64411fce0bd9371d45496e5e0e839d15e7d1616b3888cfc1a0fc1ca364e65ac508306cad9a4ed44a7 SHA512 b85b0dd6df46c9bf125eee3e51ea39545ea1c794a2a097bba0aa31c682532ed3a9ba141745c61915fff13535fc5fff5a490d7c9e731c75bb5ce38a702075467e
 EBUILD rav1e-0.3.5.ebuild 4218 BLAKE2B b4a4e63de87d673c12f814a174598ec8dea06bf208d6e4f0f7e6c6bb4e2f6b53051c1cf220be8335f1757cb85aa495104f91de621a079a1c9a7fb7b8d3e503f5 SHA512 69bd68f8a5b077f63eb43765c7d07a9681cf8ff2f9d89bf7c331fb35789a2f8ee779f45fc592618eced604b1b6e632ab4bbf5dc7e8ad93823b4c32133dbaf71f
 EBUILD rav1e-0.4.0.ebuild 4468 BLAKE2B 8760cdb7b50991dd861b6010eff114e71af8ddc1979eff893f8e5b85729971ffc5d8fa46714ee80a488f2ba7b05a78e71bc1d377c5a477653239e1cf53d7d290 SHA512 2435c1737201fee6eeb7008f7f292abc29ea899d5f64c0e3a6475d78ae711d64306bd640232c3bc71d8d82dbf70f0a565fcd87b17e6661934109f4ab597f2a6e
-EBUILD rav1e-0.4.1.ebuild 5861 BLAKE2B d27bdc711f4b6d9b78ce67e8fd62f4f2d105f832d0e3eea7f739acd29680cc8fd0f71a6f757d298be57d666b456db9623eac4f355369f9e1c751500cbf58bb70 SHA512 ff6b51f0c1c4ce85bf1b24420eeef65d72a6b70bf065569da88147a5b75bd9a6dcb219b45f5ee52b5a07d915a48265c340e71eab98d139a05593048e644f718f
+EBUILD rav1e-0.4.1.ebuild 5856 BLAKE2B 35cac0d61da537b74144317a6d56919d62b92edb10f85d3f4bd2ba1cf382fcb362d5086dc2fd3654b2da91ae402caa24efbb100f003ffcdbbb77bbbd8df258c7 SHA512 4283515165bc0eee459335c3f47cbee98756c4693fcaff0f9293dca9df9d226630ffc80100a3fc7093558ff610be9c854b4240ef1d3fa9f8dbde9edc7a54c13e
 EBUILD rav1e-9999.ebuild 1361 BLAKE2B 8eaf63b69c5eef56c0e7fb725aea974e688da362dec3cfe1bac18562f281102e0f4430c1dd612c66425e60d7146b2b8e5504717229cd19e260834c2d2bd6e74b SHA512 e0f16779f8646fe7f283a5f0a07b3374aa5db1f31155637780a0dc3d25148664373e92907e27d4a1259e063d7a392c8a9e320a21bf05c4bbc4fe756fa5b8d1c9
 MISC metadata.xml 396 BLAKE2B 3f15123aeeca6df02c1b6a886418af6cfd4e4e977a5a93b2cc13301ae8e5a17a918a9e8116e19ae120cc27e42bcdaeb5e6c546f99b0333144bbc4aa9960b862e SHA512 4d650221196a5f48b12f2dcd6ccd3ea56abc7ec205e78d470aae267c7706cf81f03a691ca916d5c2a8c9e09a62c07b0802b5c688bc60bbc09d74ea7a135278ed
diff --git a/media-video/rav1e/rav1e-0.4.1.ebuild b/media-video/rav1e/rav1e-0.4.1.ebuild
index 8b07f2528793..3e7a00ad98aa 100644
--- a/media-video/rav1e/rav1e-0.4.1.ebuild
+++ b/media-video/rav1e/rav1e-0.4.1.ebuild
@@ -272,7 +272,7 @@ else
 		https://github.com/xiph/rav1e/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		$(cargo_crate_uris ${CRATES})
 		"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 arm arm64 ppc64 x86"
 fi
 
 DESCRIPTION="The fastest and safest AV1 encoder"
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index 97c1e1a6f560..a2a7f1961795 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -32,6 +32,6 @@ DIST vdr-menuorg-2.3.x.diff 8852 BLAKE2B 19b98d51a69f52ecda5500f51ef1741a8397953
 EBUILD vdr-2.2.0-r6.ebuild 8159 BLAKE2B 383a0d759dea10033288f365a2d4c5ea90598a7254c7cd2179aa8ad98d111a84c2b324e2f63f2a8fac120a99038ab872ccf2f301f13a6a1e0e09da0877bade3b SHA512 195696b43bd21ea93bcf2a1056beb1557251f451ae52f5f4234afdbb78f82c99e3a628a19c3a6575cfb82b3530b4be0ecdd87eca349afc8afd5af1f4a535866c
 EBUILD vdr-2.2.0-r7.ebuild 8201 BLAKE2B 570575adafaa3d80d46d59f40f179ab1ac702b9bfd0df6697f27af944cbd63e3d4541efa26fe981c184e02180aed21de85dfc94a3c7445cc6d56eb032a3b4917 SHA512 5a1c355cfe87b2be49ac3d746d929585c188c43a8465da21f2eee323736b923117cff96faad915703e2fc242d22dd18564e2ce585c677d30653f3f67a38fda7c
 EBUILD vdr-2.4.1-r3.ebuild 6081 BLAKE2B 4bf9470dff3b8997e3e5c87755a8a1aed655c8bbe66c67a01cac6e13daad63da17347dd3b870db7e3326a2f5e6d4eea779103b3c79aac42c4b34341e82ff873e SHA512 eef8e4e4e9059126cbd4745b1d5ece8b79204d81d0f3bc0ffebad64cd52508446aea6c2af227befb971a913fcf6195abfa4c008069e83532cf914c95933599f2
-EBUILD vdr-2.4.6-r1.ebuild 5990 BLAKE2B c7f384d5f5f4d3db13efe9cf6996070b41ffea836b2460e755b037af90b7ba87aa22140fa2dabd820a7882075b0aaaf590863394526c025face8c0fa9bcf3f57 SHA512 b047a77e991e794001a6b7629408b798ca3cc60ca36e26b5ed1e18e8c99d63f2eacaeaa8a2cc14fce4ad8620e77639e944a5d392efaf3ba30da68d01030b7c31
+EBUILD vdr-2.4.6-r1.ebuild 5988 BLAKE2B 9e1f65d254097dacf0e416bb1d40678b6bad06f63e64fa57e294af16c34d146f7b44d48fe065e0ae8fcc1eec5a7eeac578a10462fd9f6e9fdb091958e0612d14 SHA512 0be0b0f2cdc169c76ccba7dd271c21f8c147eeb49f5687b3c6de23b4cb4718e00ab8fe97450ade8177c2e4d435cb1cac17709ce8dc61468277c8999aad45d71d
 EBUILD vdr-2.4.7-r1.ebuild 6162 BLAKE2B 49015e4234c9509c09622e05e816c94d5959ff18b02cf578b9b82c9ef2387637d3c0b0392906b23c49ae90c3faf7b980300c9c60a118148101c684fb5bc4ed18 SHA512 918fa2b26963d7b16e2799bb1bd22eb8b657523be4ad070337cc2e8e1679f3d94c155f4b10399ea39033fae97b0090088e1b5479f7fdbd1bf0aabe1b1bd66100
 MISC metadata.xml 1892 BLAKE2B 2a233ceb745f8df9350e37d99d8dce2cc56d3c21e0d187de483a2d2d18c0129a047d48cf7cddff7ea2500ae044d1eb196efb508cce0424368e03bbddb75c6d82 SHA512 dba266e22f0d99b98284db088beaf4fbd288cb8eee046a5f96610ed6cd748a116a3ced7ce74c69660d9943a7f7ccc016ba8a242174780275334b95a1ad4489c7
diff --git a/media-video/vdr/vdr-2.4.6-r1.ebuild b/media-video/vdr/vdr-2.4.6-r1.ebuild
index aac5f13f30e4..0a8de8f2ee00 100644
--- a/media-video/vdr/vdr-2.4.6-r1.ebuild
+++ b/media-video/vdr/vdr-2.4.6-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.tvdr.de/vdr/${P}.tar.bz2
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 IUSE="bidi debug demoplugins html keyboard mainmenuhooks menuorg naludump permashift pinplugin systemd ttxtsubs verbose"
 
 COMMON_DEPEND="
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 235ead8b9775..04f78911285a 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -10,8 +10,10 @@ AUX vlc-3.0.6-fdk-aac-2.0.0.patch 3436 BLAKE2B 022201ed10fef189feeb36f44ab4194ab
 AUX vlc-9999-libupnp-slot-1.8.patch 763 BLAKE2B 6bc8cf46f029db27d6d30d96e871d3bcfddee004e4e8469e1526a6a38fb5cc11a24a19888443e5f9062d7145665d594e142c12f3a9693967f195bab3b33ada38 SHA512 dd3375997a1935d3a227231785f35e300e3f992034da6a9c3019e28c68c1f005cbdd67190672264b342abc719e69005f965599f7af975e2bbd4cfccd89e3770d
 DIST vlc-3.0-3.0.12.1.tar.gz 34233801 BLAKE2B 0bc571d8f3f8aa40eee93fe8ab13bd1f37e288372d46b13998986899d03bf327b300a98ec5736bb9fe7bb58aae65c1d469786a4dfdb80f4cf8b5bbbb250ee45d SHA512 05b079dcfd4a21cdae7bb19e9d71f2fad33ca846852683c5d2ca6d45f779749ead420d5211b4acce76971d7ec2265d0d07f970f35f647dd446e337dc31aa0ec1
 DIST vlc-3.0-3.0.13.tar.gz 34356102 BLAKE2B 93490278f47ab389c927a44bc84727b8067a9792e5621b3a9caa90c23a25ecb11244ebd62aa2dfb6d03df692c1ce3ae2aaec20aff001bb805f3965357298b4c9 SHA512 58439ef605ddc43aaf3fbd41715d3e341565590db3d73256ea3a977544f287d8f5001eb334a70674b707ccdc584125a24a3f320b3b4d166c01450d53741a4f85
+DIST vlc-3.0-3.0.14.tar.gz 34355555 BLAKE2B e8182229da1fe4f73b640fad8005ec3fc49da70f289bd32c33fcec51bf81d393b067a795626bad57c87499e8de181ac3ce159e572431e794586753c4a7c32597 SHA512 6d366c0f17a8bda7f588ab1818d985bccd076dd821bc83dd7d06827d463931e56cb06ca934622ee2cda4a76b0fbe265a66e4566e9307abc768b76174020f0150
 EBUILD vlc-3.0.12.1-r100.ebuild 13748 BLAKE2B 107691a0a6f7a25082845706fe39be5d51c48b23bca434075f2d86b53205cc528d1bfe09374c945e80510f59739cf610dd76d6fda4735406ae10d60fb525ee5a SHA512 747e7cf72eb2e01b324ad6b8526f11b5d55400f9a86a02674e72ee1666ac4ff5c486bc5fa03319e369c84b34f5e350862c5cee5ae5cee327e5006147273bc3e7
 EBUILD vlc-3.0.13.ebuild 13746 BLAKE2B b4a84533271235cde54783bc92f6cc7bcddd4f87c05fc67ca51b0d2dc9bd5b4d02e7f5e7da4329544169781f67dbc7e38a8fcb33139318f7ce12f0a29872d483 SHA512 ccd6e2232808764ef877df955ab5921a1761a511cf04c57413cc2a5bd54552166d3ded64164c958360d89de244bccb793c1a0b2a934823af4dd4187ecbf943fb
-EBUILD vlc-3.0.9999.ebuild 13495 BLAKE2B 337ce593dab5e0924e34ac8ef948da81e22dfba8290e6ee27775a67aeea32585e1862987ff4d17fe574c635d8a7dc054bebaa7945e66af4b2b963a2af9e19636 SHA512 19a40732cb57fd8639275e8ceeb342a7a0ca0a254678ad8d0813cdaae63885b968dd9b30dae0aa812ccd8e7ad47ab7e43a581a86b6d703927f673b67ef217e34
-EBUILD vlc-9999.ebuild 13516 BLAKE2B 747bba8e6e930bd42b050e8605af7a500711ae379683ec20e475fb241caf3f7836f74c5de1843c5a6706ea00c9de5ec54a6994313bd6156fe7a498e68d9ee6c4 SHA512 2d3a0ed2938d06c655313391898429182a9baebb442eae926b53e1eb9f47c754bfb876ed418d9d16a096a58163855936b668e8d2c1dc25abb4821854017deaec
+EBUILD vlc-3.0.14.ebuild 13722 BLAKE2B dd733bf6882bdb463ba16677bb04bd1bb1b527e2ffd89c2e54acb37d31255808a7687b4e9ae6122139293344592fd5a969ef4cc8d0e4585f0f5d9077cc1b0d08 SHA512 e3a923177302ec208dd916384a19aa21853f2b9a34085b5aa0d59bb09e99e21fc8e80b26d3c4ee7ff478b31d1bc16103a31db1726a8cbc5667e3451c24c2dfee
+EBUILD vlc-3.0.9999.ebuild 13471 BLAKE2B b670f3966ef3b437efbc49c237723ee1b58eadd1072f9b019ccb42644e0699f1673acb53839c044e6dd3b5e0137e3c6562d5cc008e05793d9bdd1ac5329c74c6 SHA512 7175f7a47a3466e3e08e72064d4cf280dc528a9e98ef538a0f45d05ca63ab4a23c212393d66a5192ea892cdc62f5fed742efb0068977f76da0debd1e16e764d1
+EBUILD vlc-9999.ebuild 13492 BLAKE2B 4ce1ec116bd322cb97a258e5bc61e2ea068d19f5eea7c024df8c3e3662342b0395b01407a1dad74dc69200501e5d85d17102fb2d0adf0f5a27ff5a5ea6262b47 SHA512 aa17c24cfa15b04be911405523eaac1d5bc6003f32c21d32f9161e2d98820646344a5d7dde75ccd7784a36d18b2bf61c1d94bebd3ed2e10181fdb6153967b25a
 MISC metadata.xml 4911 BLAKE2B 689cbaf21ee9adbae82ea670b575286cecfe49865aaff92a92d1cb78305c26306a72d9b010e052955c79e0c39723f03301f7a858de198948759ec228e90e7baf SHA512 62442acac34bf27c40e5cf41313c2f9ed3efd54cfb9c0dc42ca0ba3b37cb8e23690e88f04a3629bbe62b774c2bc6740a33f7336d371589982c8b2578050f13d1
diff --git a/media-video/vlc/vlc-3.0.14.ebuild b/media-video/vlc/vlc-3.0.14.ebuild
new file mode 100644
index 000000000000..935a496030c1
--- /dev/null
+++ b/media-video/vlc/vlc-3.0.14.ebuild
@@ -0,0 +1,513 @@
+# Copyright 2000-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..2} )
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-beta/-test}"
+MY_P="${PN}-${MY_PV}"
+if [[ ${PV} = *9999 ]] ; then
+	if [[ ${PV%.9999} != ${PV} ]] ; then
+		EGIT_REPO_URI="https://git.videolan.org/git/vlc/vlc-${PV%.9999}.git"
+	else
+		EGIT_REPO_URI="https://git.videolan.org/git/vlc.git"
+	fi
+	inherit git-r3
+else
+	SRC_URI="https://code.videolan.org/videolan/vlc-$(ver_cut 1-2)/-/archive/${PV}/vlc-$(ver_cut 1-2)-${PV}.tar.gz"
+	S="${WORKDIR}/${PN}-$(ver_cut 1-2)-${PV}"
+	#if [[ ${MY_P} = ${P} ]] ; then
+	#	SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
+	#else
+	#	SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
+	#fi
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86"
+fi
+
+inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg
+
+DESCRIPTION="Media player and framework with support for most multimedia files and streaming"
+HOMEPAGE="https://www.videolan.org/vlc/"
+
+LICENSE="LGPL-2.1 GPL-2"
+SLOT="0/5-9" # vlc - vlccore
+
+IUSE="a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast
+	dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac
+	fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate
+	libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc
+	live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses
+	nfs ogg omxil optimisememory opus png projectm pulseaudio +qt5 rdp
+	run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib
+	theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vpx wayland +X
+	x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx
+	cpu_flags_x86_sse
+"
+REQUIRED_USE="
+	chromecast? ( encode )
+	directx? ( ffmpeg )
+	fontconfig? ( truetype )
+	libcaca? ( X )
+	libtar? ( skins )
+	libtiger? ( kate )
+	lua? ( ${LUA_REQUIRED_USE} )
+	skins? ( qt5 truetype X xml )
+	ssl? ( gcrypt )
+	vaapi? ( ffmpeg X )
+	vdpau? ( ffmpeg X )
+"
+BDEPEND="
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	lua? ( ${LUA_DEPS} )
+	amd64? ( dev-lang/yasm )
+	x86? ( dev-lang/yasm )
+"
+RDEPEND="
+	media-libs/libvorbis
+	net-dns/libidn:=
+	sys-libs/zlib[minizip]
+	virtual/libintl
+	virtual/opengl
+	a52? ( media-libs/a52dec )
+	alsa? ( media-libs/alsa-lib )
+	aom? ( media-libs/libaom:= )
+	archive? ( app-arch/libarchive:= )
+	aribsub? ( media-libs/aribb24 )
+	bidi? (
+		dev-libs/fribidi
+		media-libs/freetype:2[harfbuzz]
+		media-libs/harfbuzz
+		virtual/ttf-fonts
+	)
+	bluray? ( >=media-libs/libbluray-1.3.0:= )
+	cddb? ( media-libs/libcddb )
+	chromaprint? ( media-libs/chromaprint:= )
+	chromecast? (
+		>=dev-libs/protobuf-2.5.0:=
+		>=net-libs/libmicrodns-0.1.2:=
+	)
+	dav1d? ( media-libs/dav1d:= )
+	dbus? ( sys-apps/dbus )
+	dc1394? (
+		media-libs/libdc1394:2
+		sys-libs/libraw1394
+	)
+	dts? ( media-libs/libdca )
+	dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= )
+	dvd? (
+		>=media-libs/libdvdnav-6.1.1:0=
+		>=media-libs/libdvdread-6.1.2:0=
+	)
+	faad? ( media-libs/faad2 )
+	fdk? ( media-libs/fdk-aac:= )
+	ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] )
+	flac? (
+		media-libs/flac
+		media-libs/libogg
+	)
+	fluidsynth? ( media-sound/fluidsynth:= )
+	fontconfig? ( media-libs/fontconfig:1.0 )
+	gcrypt? (
+		dev-libs/libgcrypt:0=
+		dev-libs/libgpg-error
+	)
+	gme? ( media-libs/game-music-emu )
+	gnome-keyring? ( app-crypt/libsecret )
+	gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 )
+	ieee1394? (
+		sys-libs/libavc1394
+		sys-libs/libraw1394
+	)
+	jack? ( virtual/jack )
+	jpeg? ( virtual/jpeg:0 )
+	kate? ( media-libs/libkate )
+	libass? (
+		media-libs/fontconfig:1.0
+		media-libs/libass:=
+	)
+	libcaca? ( media-libs/libcaca )
+	libnotify? (
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:3
+		x11-libs/libnotify
+	)
+	libsamplerate? ( media-libs/libsamplerate )
+	libtar? ( dev-libs/libtar )
+	libtiger? ( media-libs/libtiger )
+	linsys? ( media-libs/zvbi )
+	lirc? ( app-misc/lirc )
+	live? ( media-plugins/live:= )
+	lua? ( ${LUA_DEPS} )
+	mad? ( media-libs/libmad )
+	matroska? (
+		>=dev-libs/libebml-1.4.2:=
+		media-libs/libmatroska:=
+	)
+	modplug? ( >=media-libs/libmodplug-0.8.9.0 )
+	mp3? ( media-sound/mpg123 )
+	mpeg? ( media-libs/libmpeg2 )
+	mtp? ( media-libs/libmtp:= )
+	musepack? ( media-sound/musepack-tools )
+	ncurses? ( sys-libs/ncurses:0=[unicode] )
+	nfs? ( >=net-fs/libnfs-0.10.0:= )
+	ogg? ( media-libs/libogg )
+	opus? ( >=media-libs/opus-1.0.3 )
+	png? ( media-libs/libpng:0= )
+	projectm? (
+		media-fonts/dejavu
+		media-libs/libprojectm:0=
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		X? (
+			dev-qt/qtx11extras:5
+			x11-libs/libX11
+		)
+	)
+	rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] )
+	samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
+	sdl-image? ( media-libs/sdl-image )
+	sftp? ( net-libs/libssh2 )
+	shout? ( media-libs/libshout )
+	sid? ( media-libs/libsidplay:2 )
+	skins? (
+		x11-libs/libXext
+		x11-libs/libXinerama
+		x11-libs/libXpm
+	)
+	soxr? ( >=media-libs/soxr-0.1.2 )
+	speex? (
+		>=media-libs/speex-1.2.0
+		media-libs/speexdsp
+	)
+	srt? ( >=net-libs/srt-1.4.2 )
+	ssl? ( net-libs/gnutls:= )
+	svg? (
+		gnome-base/librsvg:2
+		x11-libs/cairo
+	)
+	taglib? ( >=media-libs/taglib-1.9 )
+	theora? ( media-libs/libtheora )
+	tremor? ( media-libs/tremor )
+	truetype? (
+		media-libs/freetype:2
+		virtual/ttf-fonts
+		!fontconfig? ( media-fonts/dejavu )
+	)
+	twolame? ( media-sound/twolame )
+	udev? ( virtual/udev )
+	upnp? ( net-libs/libupnp:=[ipv6] )
+	v4l? ( media-libs/libv4l:= )
+	vaapi? ( x11-libs/libva:=[drm,wayland?,X?] )
+	vdpau? ( x11-libs/libvdpau )
+	vnc? ( net-libs/libvncserver )
+	vpx? ( media-libs/libvpx:= )
+	wayland? (
+		>=dev-libs/wayland-1.15
+		dev-libs/wayland-protocols
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libxcb
+		x11-libs/xcb-util
+		x11-libs/xcb-util-keysyms
+	)
+	x264? ( >=media-libs/x264-0.0.20190214:= )
+	x265? ( media-libs/x265:= )
+	xml? ( dev-libs/libxml2:2 )
+	zeroconf? ( net-dns/avahi[dbus] )
+	zvbi? ( media-libs/zvbi )
+"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
+	"${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
+	"${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290
+	"${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch
+	"${FILESDIR}"/${PN}-3.0.11.1-srt-1.4.2.patch # bug 758062
+	"${FILESDIR}"/${PN}-3.0.13-srt-1.3.0.patch
+)
+
+DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
+
+pkg_setup() {
+	if use lua; then
+		lua-single_pkg_setup
+	fi
+}
+
+src_prepare() {
+	xdg_src_prepare # bug 608256
+
+	has_version 'net-libs/libupnp:1.8' && \
+		eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
+
+	# Bootstrap when we are on a git checkout.
+	if [[ ${PV} = *9999 ]] ; then
+		./bootstrap
+	fi
+
+	# Make it build with libtool 1.5
+	#rm m4/lt* m4/libtool.m4 || die
+
+	# We are not in a real git checkout due to the absence of a .git directory.
+	touch src/revision.txt || die
+
+	# Don't use --started-from-file when not using dbus.
+	if ! use dbus ; then
+		sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
+	fi
+
+	# Disable running of vlc-cache-gen, we do that in pkg_postinst
+	sed -e "/test.*build.*host/s/\$(host)/nothanks/" \
+		-i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen"
+
+	# Fix gettext version mismatch errors.
+	sed -i -e s/GETTEXT_VERSION/GETTEXT_REQUIRE_VERSION/ configure.ac || die
+
+	eautoreconf
+
+	# Disable automatic running of tests.
+	find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die
+}
+
+src_configure() {
+	local -x BUILDCC=$(tc-getBUILD_CC)
+
+	local myeconfargs=(
+		--disable-aa
+		--disable-optimizations
+		--disable-rpath
+		--disable-update-check
+		--enable-fast-install
+		--enable-screen
+		--enable-vcd
+		--enable-vlc
+		--enable-vorbis
+		$(use_enable a52)
+		$(use_enable alsa)
+		$(use_enable aom)
+		$(use_enable archive)
+		$(use_enable aribsub)
+		$(use_enable bidi fribidi)
+		$(use_enable bidi harfbuzz)
+		$(use_enable bluray)
+		$(use_enable cddb libcddb)
+		$(use_enable chromaprint)
+		$(use_enable chromecast)
+		$(use_enable chromecast microdns)
+		$(use_enable cpu_flags_arm_neon neon)
+		$(use_enable cpu_flags_ppc_altivec altivec)
+		$(use_enable cpu_flags_x86_mmx mmx)
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable dav1d)
+		$(use_enable dbus)
+		$(use_enable dbus kwallet)
+		$(use_enable dc1394)
+		$(use_enable debug)
+		$(use_enable directx)
+		$(use_enable directx d3d11va)
+		$(use_enable directx dxva2)
+		$(use_enable dts dca)
+		$(use_enable dvbpsi)
+		$(use_enable dvd dvdnav)
+		$(use_enable dvd dvdread)
+		$(use_enable encode sout)
+		$(use_enable encode vlm)
+		$(use_enable faad)
+		$(use_enable fdk fdkaac)
+		$(use_enable ffmpeg avcodec)
+		$(use_enable ffmpeg avformat)
+		$(use_enable ffmpeg postproc)
+		$(use_enable ffmpeg swscale)
+		$(use_enable flac)
+		$(use_enable fluidsynth)
+		$(use_enable fontconfig)
+		$(use_enable gcrypt libgcrypt)
+		$(use_enable gme)
+		$(use_enable gnome-keyring secret)
+		$(use_enable gstreamer gst-decode)
+		$(use_enable ieee1394 dv1394)
+		$(use_enable jack)
+		$(use_enable jpeg)
+		$(use_enable kate)
+		$(use_enable libass)
+		$(use_enable libcaca caca)
+		$(use_enable libnotify notify)
+		$(use_enable libsamplerate samplerate)
+		$(use_enable libtar)
+		$(use_enable libtiger tiger)
+		$(use_enable linsys)
+		$(use_enable lirc)
+		$(use_enable live live555)
+		$(use_enable lua)
+		$(use_enable macosx-notifications osx-notifications)
+		$(use_enable mad)
+		$(use_enable matroska)
+		$(use_enable modplug mod)
+		$(use_enable mp3 mpg123)
+		$(use_enable mpeg libmpeg2)
+		$(use_enable mtp)
+		$(use_enable musepack mpc)
+		$(use_enable ncurses)
+		$(use_enable nfs)
+		$(use_enable ogg)
+		$(use_enable omxil)
+		$(use_enable omxil omxil-vout)
+		$(use_enable optimisememory optimize-memory)
+		$(use_enable opus)
+		$(use_enable png)
+		$(use_enable projectm)
+		$(use_enable pulseaudio pulse)
+		$(use_enable qt5 qt)
+		$(use_enable rdp freerdp)
+		$(use_enable run-as-root)
+		$(use_enable samba smbclient)
+		$(use_enable sdl-image)
+		$(use_enable sftp)
+		$(use_enable shout)
+		$(use_enable sid)
+		$(use_enable skins skins2)
+		$(use_enable soxr)
+		$(use_enable speex)
+		$(use_enable srt)
+		$(use_enable ssl gnutls)
+		$(use_enable svg)
+		$(use_enable svg svgdec)
+		$(use_enable taglib)
+		$(use_enable theora)
+		$(use_enable tremor)
+		$(use_enable twolame)
+		$(use_enable udev)
+		$(use_enable upnp)
+		$(use_enable v4l v4l2)
+		$(use_enable vaapi libva)
+		$(use_enable vdpau)
+		$(use_enable vnc)
+		$(use_enable vpx)
+		$(use_enable wayland)
+		$(use_with X x)
+		$(use_enable X xcb)
+		$(use_enable X xvideo)
+		$(use_enable x264)
+		$(use_enable x264 x26410b)
+		$(use_enable x265)
+		$(use_enable xml libxml2)
+		$(use_enable zeroconf avahi)
+		$(use_enable zvbi)
+		$(use_enable !zvbi telx)
+		--with-kde-solid="${EPREFIX}"/usr/share/solid/actions
+		--disable-asdcp
+		--disable-coverage
+		--disable-cprof
+		--disable-crystalhd
+		--disable-decklink
+		--disable-gles2
+		--disable-goom
+		--disable-kai
+		--disable-kva
+		--disable-libplacebo
+		--disable-maintainer-mode
+		--disable-merge-ffmpeg
+		--disable-mfx
+		--disable-mmal
+		--disable-opencv
+		--disable-opensles
+		--disable-oss
+		--disable-rpi-omxil
+		--disable-schroedinger
+		--disable-shine
+		--disable-sndio
+		--disable-spatialaudio
+		--disable-vsxu
+		--disable-wasapi
+		--disable-wma-fixed
+	)
+	# ^ We don't have these disabled libraries in the Portage tree yet.
+
+	# Compatibility fix for Samba 4.
+	use samba && append-cppflags "-I/usr/include/samba-4.0"
+
+	if use x86; then
+		# We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996
+		append-cflags $(test-flags-CC -fno-stack-check)
+		# Bug 569774
+		replace-flags -Os -O2
+	fi
+
+	# VLC now requires C++11 after commit 4b1c9dcdda0bbff801e47505ff9dfd3f274eb0d8
+	append-cxxflags -std=c++11
+
+	if use omxil; then
+		# bug #723006
+		# https://trac.videolan.org/vlc/ticket/24617
+		append-cflags -fcommon
+	fi
+
+	# FIXME: Needs libresid-builder from libsidplay:2 which is in another directory...
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
+
+	if use truetype || use bidi; then
+		myeconfargs+=( --enable-freetype )
+	else
+		myeconfargs+=( --disable-freetype )
+	fi
+
+	if use truetype || use projectm; then
+		local dejavu="${EPREFIX}/usr/share/fonts/dejavu/"
+		myeconfargs+=(
+			--with-default-font=${dejavu}/DejaVuSans.ttf
+			--with-default-font-family=Sans
+			--with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
+			--with-default-monospace-font-family=Monospace
+		)
+	fi
+
+	econf "${myeconfargs[@]}"
+
+	# _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
+	# Other values may break the build (bug 523144), so definition should not be removed.
+	# To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the start of config.h
+	sed -i '1i#undef _FORTIFY_SOURCE' config.h || die
+}
+
+src_test() {
+	virtx emake check-TESTS
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	if [[ -z "${ROOT}" ]] && [[ -x "${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then
+		einfo "Running ${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen on ${EROOT}/usr/$(get_libdir)/vlc/plugins/"
+		"${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen" "${EROOT}/usr/$(get_libdir)/vlc/plugins/"
+	else
+		ewarn "We cannot run vlc-cache-gen (most likely ROOT != /)"
+		ewarn "Please run ${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen manually"
+		ewarn "If you do not do it, vlc will take a long time to load."
+	fi
+
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	if [[ -e "${EROOT}"/usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then
+		rm "${EROOT}"/usr/$(get_libdir)/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
+	fi
+
+	xdg_pkg_postrm
+}
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index 2017c3d83411..ae09b448136d 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -38,7 +38,7 @@ IUSE="a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d
 	macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses nfs ogg
 	omxil optimisememory opus png projectm pulseaudio rdp run-as-root samba sdl-image
 	sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame
-	udev upnp vaapi v4l vdpau vnc vorbis vpx wayland +X x264 x265 xml zeroconf zvbi
+	udev upnp vaapi v4l vdpau vnc vpx wayland +X x264 x265 xml zeroconf zvbi
 	cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse
 "
 REQUIRED_USE="
@@ -62,6 +62,7 @@ BDEPEND="
 	x86? ( dev-lang/yasm )
 "
 RDEPEND="
+	media-libs/libvorbis
 	net-dns/libidn:=
 	sys-libs/zlib[minizip]
 	virtual/libintl
@@ -204,7 +205,6 @@ RDEPEND="
 	vaapi? ( x11-libs/libva:=[drm,wayland?,X?] )
 	vdpau? ( x11-libs/libvdpau )
 	vnc? ( net-libs/libvncserver )
-	vorbis? ( media-libs/libvorbis )
 	vpx? ( media-libs/libvpx:= )
 	wayland? (
 		>=dev-libs/wayland-1.15
@@ -290,6 +290,7 @@ src_configure() {
 		--enable-screen
 		--enable-vcd
 		--enable-vlc
+		--enable-vorbis
 		$(use_enable a52)
 		$(use_enable alsa)
 		$(use_enable aom)
@@ -390,7 +391,6 @@ src_configure() {
 		$(use_enable vaapi libva)
 		$(use_enable vdpau)
 		$(use_enable vnc)
-		$(use_enable vorbis)
 		$(use_enable vpx)
 		$(use_enable wayland)
 		$(use_with X x)
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 875389cc8ba9..d8edc34b878c 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -38,7 +38,7 @@ IUSE="a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d
 	loudness lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses
 	nfs ogg omxil optimisememory opus png projectm pulseaudio rdp run-as-root samba
 	sdl-image sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype
-	twolame udev upnp vaapi v4l vdpau vnc vorbis vpx wayland +X x264 x265 xml zeroconf
+	twolame udev upnp vaapi v4l vdpau vnc vpx wayland +X x264 x265 xml zeroconf
 	zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse
 "
 REQUIRED_USE="
@@ -62,6 +62,7 @@ BDEPEND="
 	x86? ( dev-lang/yasm )
 "
 RDEPEND="
+	media-libs/libvorbis
 	net-dns/libidn:=
 	sys-libs/zlib[minizip]
 	virtual/libintl
@@ -206,7 +207,6 @@ RDEPEND="
 	vaapi? ( x11-libs/libva:=[drm,wayland?,X?] )
 	vdpau? ( x11-libs/libvdpau )
 	vnc? ( net-libs/libvncserver )
-	vorbis? ( media-libs/libvorbis )
 	vpx? ( media-libs/libvpx:= )
 	wayland? (
 		>=dev-libs/wayland-1.15
@@ -292,6 +292,7 @@ src_configure() {
 		--enable-screen
 		--enable-vcd
 		--enable-vlc
+		--enable-vorbis
 		$(use_enable a52)
 		$(use_enable alsa)
 		$(use_enable aom)
@@ -394,7 +395,6 @@ src_configure() {
 		$(use_enable vaapi libva)
 		$(use_enable vdpau)
 		$(use_enable vnc)
-		$(use_enable vorbis)
 		$(use_enable vpx)
 		$(use_enable wayland)
 		$(use_with X x)
diff --git a/media-video/webcamoid/Manifest b/media-video/webcamoid/Manifest
index a9aea95c0a26..111c9ecfe69f 100644
--- a/media-video/webcamoid/Manifest
+++ b/media-video/webcamoid/Manifest
@@ -1,3 +1,4 @@
+AUX webcamoid-8.7.1-gcc11.patch 469 BLAKE2B e6994f1f0bd90a83ee1a3510990ff3e31867f89da9a66ff755a60f364f4bdbbbd5e8130816329beec533a48d1517261f60f2650fa9ff45a7e1536066d8fc7d3e SHA512 ac225037ef06604d413452447d863875a10f896a396ffc0def178e3bab447f3f2357558724f00ab9128f94a8f916a4d454e9fef2915e17465d4166508f9c2012
 DIST webcamoid-8.7.1.tar.gz 8900338 BLAKE2B f379811cf9e44e67caa80c301c2774f13c686fa4721b5adc85dcd803ea97edb07073e53575c7dae8dab4ebfa0a9ee4f3691511cc7ddd6b55f84ae2cc77cd3c52 SHA512 b9a4b1dd4c863ab126e304eabce47c025ec0e3eb85a5b42035d26caa004399bde733913c0a5598ada3deb01673bd42ea54c9d2b06d300608582e63dda75d9bf6
-EBUILD webcamoid-8.7.1.ebuild 1586 BLAKE2B 1e4d64b0bcf3ccab556890d5e1b4d05e57f7e7a52af1d2752a850f274a7b5686db1adf530705b05ff45f408724c3a62841aab96522b51351166dd45dbc7f1f96 SHA512 3527d48529234811384c36323290788cadd0a610ff53fea24d8defb36c8f031880f8fdc9fd6a12ff3406905386899aa07eb352de4c9f3f543ab9cbdec0b67fb4
+EBUILD webcamoid-8.7.1.ebuild 1638 BLAKE2B a4f0f45dd25e991d9847b0d09ff415972fc3d0441f4207b5c647228f24315d0a4bec34612cf71e91368a744b1336102fdae8f9d671c259f16054e8e43381f8ec SHA512 8d2b1324509dd1e10f90529572404bd190ee62ea814157e55e822df316e583564c5c9bfccceaf07283b12468e02e0c76d00aa072505c8bea4fc0e196bd28355a
 MISC metadata.xml 585 BLAKE2B b14cedca2e5ef031571c1e3345b42b43ffaaf0ec4a5433235eac523d885fe9a3199a02d37890955d06e00f5e9f2fd007a325c47425e83404aa4fdd97af3ce683 SHA512 6af635fb163a73a42538bb2c9c893f04f98c0ef3bd746b54d3efac4640bd14ed999c11bab2734d0cb86c96de3b66046952dc6594cedad70352b6f35b95ea1242
diff --git a/media-video/webcamoid/files/webcamoid-8.7.1-gcc11.patch b/media-video/webcamoid/files/webcamoid-8.7.1-gcc11.patch
new file mode 100644
index 000000000000..d228210a19ee
--- /dev/null
+++ b/media-video/webcamoid/files/webcamoid-8.7.1-gcc11.patch
@@ -0,0 +1,12 @@
+diff --git a/libAvKys/Plugins/VirtualCamera/src/VCamUtils/src/image/videoformat.cpp b/libAvKys/Plugins/VirtualCamera/src/VCamUtils/src/image/videoformat.cpp
+index 2a32732..5175d1d 100644
+--- a/libAvKys/Plugins/VirtualCamera/src/VCamUtils/src/image/videoformat.cpp
++++ b/libAvKys/Plugins/VirtualCamera/src/VCamUtils/src/image/videoformat.cpp
+@@ -19,6 +19,7 @@
+ 
+ #include <map>
+ #include <algorithm>
++#include <limits>
+ 
+ #include "videoformat.h"
+ #include "../utils.h"
diff --git a/media-video/webcamoid/webcamoid-8.7.1.ebuild b/media-video/webcamoid/webcamoid-8.7.1.ebuild
index e2492b146025..eb5217846b13 100644
--- a/media-video/webcamoid/webcamoid-8.7.1.ebuild
+++ b/media-video/webcamoid/webcamoid-8.7.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=7
@@ -44,6 +44,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.7.1-gcc11.patch
+)
+
 src_configure() {
 	local myqmakeargs=(
 		"CONFIG+=debug"
author	V3n3RiX <venerix@redcorelinux.org>	2021-05-11 19:55:43 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-05-11 19:55:43 +0100
commit	185fa19bbf68a4d4dca534d2b46729207a177f16 (patch)
tree	a8a537b82fda83a0799c2ca9887f212558363aa7 /media-video
parent	c8fd0d84af0bfd1949542adc2cbb735b1d28f9ed (diff)