gentoo christmass resync : 25.12.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-12-25 23:06:25 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-12-25 23:06:25 +0000
commit: 441d1370330332b7d78f238d2f5e13f7aed5e4e0 (patch)
tree: 6a5171dd615dfeee62a45044144c66e864738fb0 /media-video
parent: ab3da91fb6c91a9df52fff8f991570f456fd3c7a (diff)
43 files changed, 1405 insertions, 831 deletions
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 6fc9a226e2de..e3116ebc3fd1 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 336ef7cb59a7..bc1b1db19d8a 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,11 +1,12 @@
 AUX chromium-r1.patch 1582 BLAKE2B 48547a7d53fd1f0f44b682c7e2306e79f007f8e96b36253f76775c4a3ced54ffaaf403dfaae94e81aa26c60887677b2dabdd2c5cef9fc4553e203f8259453910 SHA512 808daad5afed13a6d3926c9f9ab5cb58f80e16969533022c7ee959147908bb2c12d066d2125a6b6975ef9304d9b8d49c39aeb0a047009adabb4529e3cf54498f
 AUX ffmpeg-4.3-altivec-novsx-yuv2rgb.patch 1110 BLAKE2B ceccefcb4dd106067c0200801408c759c9b4746177a224f4448ad557a3e8335d8d48710af4b476bb18180dcfd308ff958f5addb0a06e50ab1802e853c5d2f633 SHA512 402651608332e8a4056e64c1f7c1350527c543d51632f213a74b4ee455789f3f4eac1ce7afba63392a86fd7aed2fd7b96a66342c6639067ada66508fe2f8770c
 AUX ffmpeg-4.3-fix-build-without-SSSE3.patch 622 BLAKE2B 258b8bbe70d4d17c18d281a64341618d6089653e5a91a162309363bc1ed33c4eb4e5ae684de0ce4c5e199c6664a90761b9e3488982bff2a0e2e3cb56aa08f62b SHA512 509fb710586d934c782111e0b4e4ffd888f34311b5054a0521a7b6781615c562451f3c53bf7bd3cc5d42ddabe31fb4b63b653e7c32a38acc3574a813b0cae264
+AUX ffmpeg-4.3.1-srt-1.4.2-build.patch 3240 BLAKE2B bbae19d16050233a09d888978b0bce6fada6ca707227157f7c2f68e2db2ed61a7ef4afa26fb7708b3f2a273e1436e97bc8f770d8f67df4b82a94a4a6ce9edd20 SHA512 e2e96472a204724358eb093eebea4d5f3339ac9a4d218ef115ee6d1e0404b0af73a3abe448d5fc0af31174bfc1dec7ce990dd64b05efe16251cf09dd1f476166
 DIST ffmpeg-4.2.2-ppc64-altivec.patch.gz 7171 BLAKE2B 6676dadb22d2ab4b0f5c19b418448c5b9b54fd8c803c3f0ab517c6fa7990be08098dd6f6a2b1b3e77a1bed31a069c702366aba79ef9141ff9e23cd8c1b6e2885 SHA512 6653975017de3f7bde420860419fbdddb50ae41dbb811b819f4b5b13807bf885a4c01736f05a684515f97b0d63bd8896d5951a3276af90cc74abfe32dc2e2407
 DIST ffmpeg-4.2.2-ppc64-gcc.patch.gz 750 BLAKE2B 3a9cc7f0135e077c77179a7ca3da917bca3995d99d53b58221b23181a075f330132f83ea90a6110e89f90c7c3b5b2a7837559c5df414d9bd52dbb3ec166b1545 SHA512 701b0635e0819484a31de2062ba52d95ee03883ab56547cd75c3646a9b32bf3ecc7f719690b93f29202cfed0fdeecd26b51b9f3c66e72a999a3e8d9e97389275
 DIST ffmpeg-4.2.4.tar.bz2 10959430 BLAKE2B 932bc0046edab5587063bbc04d6ef0149876bd1001ad185384fcabb3d0ae196c9ba591e680823b3c7b6e0ef9a0a9e9575a8b08439fdd89ef0e4dabb9d4a7f4e6 SHA512 5c74e3fe77ddf8ffede0e4692d574858dd0626e542380a819ab79c0f669c6c1329ffbccb872502f60306e561f10aa8bc1e61d09b2bea829870fe4a48b76460c6
 DIST ffmpeg-4.3.1.tar.bz2 11301038 BLAKE2B 3b0eb332459921435b60e72f5c572034abf65d4ab79ef4cfae94fe594048eaa37eec47724d119863102a7211c2178f5a2382a6d4016b792818079b8241bde084 SHA512 831a187d8b8f2715a9f11c93c8d3ec126ff579d470797da452d3395178877de113af7ae90ed27fca0b223791ad257972570481e6dbb8361d2b7f3b010924bee8
 EBUILD ffmpeg-4.2.4.ebuild 18169 BLAKE2B b771bf50bfce5c754963f431f085c29b962bed73e55e805e112986281abf025cf7723e8cdc5f15829d06424aadbc6899c644f5e4ca56a2a113920a13c5c8b13b SHA512 b26527dc7e5c46dbe8b958efd4d5ebd51d91e258c2a6b23d1d9c9fcc4ddbbe72f1ad9751b8dd9273ebd0840003db83db16babc15ca844e33df2a06ac16add793
-EBUILD ffmpeg-4.3.1.ebuild 18225 BLAKE2B 243639ef4e19df4a57cdf3084687dd4bd6e37a3d59b17b8bdc5ee4b5b03113cce262929f0ecb546912145a47d3554fc3fdd34cb51774648f55e509ea5f359431 SHA512 9b08a306c5b2dda66b4721eb714ff1c61a32ebc221ace8b7e9b38223c7ce0f7b40fb64d42c10453b9e4dae2f7a19afa1516d9332df1aea91a27f13d46d91fd7f
+EBUILD ffmpeg-4.3.1.ebuild 18273 BLAKE2B eb5dc1bd75ed130f327d5e8c87b7124f43fcc6d1a6120ac3a19e8921d4364553afcd60d615f5cca1ad12321288306107486edcc57f300941af3a66e156a09969 SHA512 bab445d72698e907dd3d11b48bd1d86875d7f1f2db576a03f14623def6435569ac1e28052af4d7d464747a0067d26d6ae116766de707bb8d4f6a630b0b8377d4
 EBUILD ffmpeg-9999.ebuild 18049 BLAKE2B 3d1ebb9b9ce4abc8e5db6da31e600a9db93580a4fa876dde23e0ae4623a3aceba9351b40637d8a6ecc60f0f15c62c438fd8445633e325eaff25c69b64438927a SHA512 dce9ed532ac8a084c03e4d27898de3d5b9fc9afa577d1312e1c157657a3f372faaa594aa83006ec6397ef9cc35b684ce37865a2a0c59624ee88481026be00d1f
 MISC metadata.xml 5868 BLAKE2B afe06c266a6dce5dc2b13a1dcaae85c4288a4f45ef493d9b865bf476a624fb188ebab686708049149f1eac94e434b926b185d1bf0467f26f62f641a0f832dd22 SHA512 8b85ed0ba2d98135b3b2f7f4e13b7fcff52cd4238fa429e355c4e2033e51d945d8363ecf2bf73c0569e5a071a793bb01cd716113e4672603867a01d258d4aa77
diff --git a/media-video/ffmpeg/ffmpeg-4.3.1.ebuild b/media-video/ffmpeg/ffmpeg-4.3.1.ebuild
index 2fd3ea1ba4c1..cd228d62314f 100644
--- a/media-video/ffmpeg/ffmpeg-4.3.1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.3.1.ebuild
@@ -59,7 +59,7 @@ LICENSE="
 	samba? ( GPL-3 )
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 # Options to use as use_enable in the foo[:bar] form.
@@ -328,6 +328,7 @@ PATCHES=(
 	"${FILESDIR}"/chromium-r1.patch
 	"${FILESDIR}"/${PN}-4.3-fix-build-without-SSSE3.patch
 	"${FILESDIR}"/${PN}-4.3-altivec-novsx-yuv2rgb.patch
+	"${FILESDIR}"/${PN}-4.3.1-srt-1.4.2-build.patch
 )
 
 MULTILIB_WRAPPED_HEADERS=(
diff --git a/media-video/ffmpeg/files/ffmpeg-4.3.1-srt-1.4.2-build.patch b/media-video/ffmpeg/files/ffmpeg-4.3.1-srt-1.4.2-build.patch
new file mode 100644
index 000000000000..691314cbacb8
--- /dev/null
+++ b/media-video/ffmpeg/files/ffmpeg-4.3.1-srt-1.4.2-build.patch
@@ -0,0 +1,52 @@
+http://git.videolan.org/?p=ffmpeg.git;a=patch;h=7c59e1b0f285cd7c7b35fcd71f49c5fd52cf9315
+https://bugs.gentoo.org/756859
+From 7c59e1b0f285cd7c7b35fcd71f49c5fd52cf9315 Mon Sep 17 00:00:00 2001
+From: Jun Zhao <barryjzhao@tencent.com>
+Date: Sun, 12 Jul 2020 13:48:48 +0800
+Subject: [PATCH] lavf/srt: fix build fail when used the libsrt 1.4.1
+
+libsrt changed the:
+SRTO_SMOOTHER   -> SRTO_CONGESTION
+SRTO_STRICTENC  -> SRTO_ENFORCEDENCRYPTION
+and removed the front of deprecated options (SRTO_SMOOTHER/SRTO_STRICTENC)
+in the header, it's lead to build fail
+
+fix #8760
+
+Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
+---
+ libavformat/libsrt.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/libavformat/libsrt.c b/libavformat/libsrt.c
+index 4de575b37c..4719ce0d4b 100644
+--- a/libavformat/libsrt.c
++++ b/libavformat/libsrt.c
+@@ -313,8 +313,12 @@ static int libsrt_set_options_pre(URLContext *h, int fd)
+         (s->pbkeylen >= 0 && libsrt_setsockopt(h, fd, SRTO_PBKEYLEN, "SRTO_PBKEYLEN", &s->pbkeylen, sizeof(s->pbkeylen)) < 0) ||
+         (s->passphrase && libsrt_setsockopt(h, fd, SRTO_PASSPHRASE, "SRTO_PASSPHRASE", s->passphrase, strlen(s->passphrase)) < 0) ||
+ #if SRT_VERSION_VALUE >= 0x010302
++#if SRT_VERSION_VALUE >= 0x010401
++        (s->enforced_encryption >= 0 && libsrt_setsockopt(h, fd, SRTO_ENFORCEDENCRYPTION, "SRTO_ENFORCEDENCRYPTION", &s->enforced_encryption, sizeof(s->enforced_encryption)) < 0) ||
++#else
+         /* SRTO_STRICTENC == SRTO_ENFORCEDENCRYPTION (53), but for compatibility, we used SRTO_STRICTENC */
+         (s->enforced_encryption >= 0 && libsrt_setsockopt(h, fd, SRTO_STRICTENC, "SRTO_STRICTENC", &s->enforced_encryption, sizeof(s->enforced_encryption)) < 0) ||
++#endif
+         (s->kmrefreshrate >= 0 && libsrt_setsockopt(h, fd, SRTO_KMREFRESHRATE, "SRTO_KMREFRESHRATE", &s->kmrefreshrate, sizeof(s->kmrefreshrate)) < 0) ||
+         (s->kmpreannounce >= 0 && libsrt_setsockopt(h, fd, SRTO_KMPREANNOUNCE, "SRTO_KMPREANNOUNCE", &s->kmpreannounce, sizeof(s->kmpreannounce)) < 0) ||
+ #endif
+@@ -333,7 +337,11 @@ static int libsrt_set_options_pre(URLContext *h, int fd)
+         (s->lossmaxttl >= 0 && libsrt_setsockopt(h, fd, SRTO_LOSSMAXTTL, "SRTO_LOSSMAXTTL", &s->lossmaxttl, sizeof(s->lossmaxttl)) < 0) ||
+         (s->minversion >= 0 && libsrt_setsockopt(h, fd, SRTO_MINVERSION, "SRTO_MINVERSION", &s->minversion, sizeof(s->minversion)) < 0) ||
+         (s->streamid && libsrt_setsockopt(h, fd, SRTO_STREAMID, "SRTO_STREAMID", s->streamid, strlen(s->streamid)) < 0) ||
++#if SRT_VERSION_VALUE >= 0x010401
++        (s->smoother && libsrt_setsockopt(h, fd, SRTO_CONGESTION, "SRTO_CONGESTION", s->smoother, strlen(s->smoother)) < 0) ||
++#else
+         (s->smoother && libsrt_setsockopt(h, fd, SRTO_SMOOTHER, "SRTO_SMOOTHER", s->smoother, strlen(s->smoother)) < 0) ||
++#endif
+         (s->messageapi >= 0 && libsrt_setsockopt(h, fd, SRTO_MESSAGEAPI, "SRTO_MESSAGEAPI", &s->messageapi, sizeof(s->messageapi)) < 0) ||
+         (s->payload_size >= 0 && libsrt_setsockopt(h, fd, SRTO_PAYLOADSIZE, "SRTO_PAYLOADSIZE", &s->payload_size, sizeof(s->payload_size)) < 0) ||
+         ((h->flags & AVIO_FLAG_WRITE) && libsrt_setsockopt(h, fd, SRTO_SENDER, "SRTO_SENDER", &yes, sizeof(yes)) < 0)) {
+-- 
+2.20.1
+
diff --git a/media-video/kmplayer/Manifest b/media-video/kmplayer/Manifest
deleted file mode 100644
index ff46c98ead14..000000000000
--- a/media-video/kmplayer/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX kmplayer-0.12.0b-cmake.patch 1494 BLAKE2B 51ce1dd8118e36f864588a02107868493cefab78e0a1cb17751eb6bc5bd4d9b04795c849973be465429b6574050d94facad3aa569bae2b4ddc731a51718931ef SHA512 ea899817fc49fea549b4b2e2a180d2db2cb3310d88d9ff5464dbe19334428fb2afbec0228ccaf320229f8102f66f29dd64533f529021bba4a93933bc1f6e09d4
-AUX kmplayer-0.12.0b-desktop.patch 1629 BLAKE2B 09640d28334f91753a01b9f799ad3929f578f0127cf2012b0fea96f342d389661ac06719ef78d8ca12386658e051433ba6a8a1b0b2ea20c82901e454cb240a6d SHA512 bf85ab238afae771ba99299d719bf398444efacdf3092ff93c0472b831a4996b11762573d9cd9ecba88e882cb7bb801780afe87652a1657afe7903d639d1678e
-AUX kmplayer-0.12.0b-devpixelratio.patch 1290 BLAKE2B 1b076e616f6a8bc645b4505101f95b0c30422f83ffd01c01277196eef9f69f2be5f73880dddf55700f3b94aec7fadc45582b42b93dd68b419c883274980a3220 SHA512 4090efd279df4f106e197886eaacce73a24b60edf6eebdd1811f84ff3eb4798505278d397327b1b07c3423774a45fe6de02455a8f0ba20548c074840c89ac0fa
-AUX kmplayer-0.12.0b-qfile.patch 1387 BLAKE2B 6c04f0dc3eeed0635397a22fe5dc5b6fe5215c16a03f6c1f05a77353daac5c6b1f77d277e746b5283feaf5ba50eab68947c16cee9b6ac6f0642ba3051323c85f SHA512 3cee584d1560e4b9cf7ba621c907e3e521f0e778f728728f476cee98babb49122428605468d65d366fd382ee79746dffb5002cd6a9205f1eff3c827b77152753
-AUX kmplayer-0.12.0b-qt-5.11b3.patch 943 BLAKE2B db0b5bbf4e36859693645cde5aa67b90e2b5ab5a2658a2ef5b944ffa2973be9ab2674506260cca9d6b63bc3b7dd6c4c48469539cea0530d922cf3b7bd5514b07 SHA512 74f7e835e918d5e44147bb23ce7ac2f03385825ef049557ef983c028602a04cabb59988f2a594ccc88147d24db2c9fb3cf85b31f4fd25a67801daccddb97844c
-AUX kmplayer-0.12.0b-qt-5.9.patch 1097 BLAKE2B 093961b12c4482303c43b603ad30c5fb49a97550da77641c4cb306eded8849df76eac0dcc441c2febf5523eb07abd1a494eee2335e02bd9d1bceacc87ccdf826 SHA512 137733705a879e87c59d26b1cb609aa9246d4543f758a0987fb1dee013d47ea469cdf7a19fa8aebe01a4643c5d7ed8b5e5f9057e9f80eaa3d3f5504fccaa48e9
-AUX kmplayer-0.12.0b-schedulerepaint.patch 2085 BLAKE2B a8c51d503de212b375cf77c41cf1c581c80decfdfe30cdd98ac0ff3f4b8a7bc335e921762808994c298db47e6327bb768838c00b41e8d20e6bb211a2c62ef6ff SHA512 e3c874ca5886d3a16eab0f10169009317214c8c196d9ce70b797f97f1ed2ed9143fb31e7f99d711a2c9ede26cb957f767fabbeb3c6670d430b1d4061a02982f1
-DIST kmplayer-0.12.0b.tar.bz2 599496 BLAKE2B c27b54cf05c52ffbb78c8f623b7cab066901f647c14364da1de2fcedd96329439521ad329fc15be58491b570de17fd151c95f266738e049501a5a22ba8dd9c93 SHA512 d34c496d0c24c6d5c1bb675b83fac60da5c9672e4076aed72bac2e9b333e88d031076e7e386ec7b61ae8ece88870f6187c61f483f425aa78edd1e443c7f2e882
-EBUILD kmplayer-0.12.0b-r4.ebuild 2052 BLAKE2B 6bf6975098f2f6190da3c88824b53f7bce877aa5cf23b763d9d98c5a72eeefe9bb7d11da9e868fb2566ce6ede4bb4200fb5f5e99e586f829b852f048ebb1af60 SHA512 5e36be168e75a2d2098d4c15fbbc96291a2e1e312eeaefc89d85731f99a42c304bfb9a9d176bba60168c7f7e2513a31acfb48f0f055ec280ef1a5464a35a594f
-MISC metadata.xml 369 BLAKE2B 2aa133972dd0e135637cde16aa084542c31a85793cc055af814e27eafb8902dbb239dbf2df2bbe41cbfedd61db66be66f3fea1450d169c1aee18a5312664dd30 SHA512 3464b912770a6e66976021b81ea22d04be45800542c6fee0c5d74c3e16d8572d0bed5a94665933d4ffd405da6b744a200d991d0ecd0bd652a984277d05a459cd
diff --git a/media-video/kmplayer/files/kmplayer-0.12.0b-cmake.patch b/media-video/kmplayer/files/kmplayer-0.12.0b-cmake.patch
deleted file mode 100644
index a99b1149f8c3..000000000000
--- a/media-video/kmplayer/files/kmplayer-0.12.0b-cmake.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 2a5df7b875a8c5acb99be05baf84e5c9800d52a3 Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino@kde.org>
-Date: Sat, 13 May 2017 18:57:15 +0200
-Subject: cmake: fix endif syntax
-
-it does not match the if condition, so just remove it (also to ease
-reading it)
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 057fcc4..14a55d2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -81,7 +81,7 @@ add_subdirectory(src)
- add_subdirectory(icons)
- if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/doc" AND KF5DocTools_VERSION)
-   add_subdirectory(doc)
--endif(KF5DocTools_VERSION)
-+endif()
- add_subdirectory(data)
- 
- if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
-
-From 41a284a0f5f728556280b9f942961631566ad7ff Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino@kde.org>
-Date: Sat, 13 May 2017 19:04:47 +0200
-Subject: cmake: use NO_POLICY_SCOPE for KDECompilerSettings
-
-just like done for all the other projects
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 14a55d2..5a58a35 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -15,7 +15,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_D
- 
- include(KDEInstallDirs)
- include(KDECMakeSettings)
--include(KDECompilerSettings)
-+include(KDECompilerSettings NO_POLICY_SCOPE)
- include(ECMInstallIcons)
- #include(ECMSetupVersion)
- include(FeatureSummary)
--- 
-cgit v0.11.2
diff --git a/media-video/kmplayer/files/kmplayer-0.12.0b-desktop.patch b/media-video/kmplayer/files/kmplayer-0.12.0b-desktop.patch
deleted file mode 100644
index c84944effc29..000000000000
--- a/media-video/kmplayer/files/kmplayer-0.12.0b-desktop.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 2126d76b8f16381e576de779b94b5b4555e562c2 Mon Sep 17 00:00:00 2001
-From: Luigi Toscano <luigi.toscano@tiscali.it>
-Date: Sat, 13 May 2017 21:13:43 +0200
-Subject: Fix .desktop: Qt5 apps accept qwindowtitle, not caption
-
----
- src/org.kde.kmplayer.desktop | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/org.kde.kmplayer.desktop b/src/org.kde.kmplayer.desktop
-index fcc5255..2b5435c 100644
---- a/src/org.kde.kmplayer.desktop
-+++ b/src/org.kde.kmplayer.desktop
-@@ -1,6 +1,6 @@
- [Desktop Entry]
- Type=Application
--Exec=kmplayer -caption %c %i %U
-+Exec=kmplayer -qwindowtitle %c %i %U
- Icon=kmplayer
- X-DocPath=kmplayer/index.html
- Comment=KDE interface for MPlayer
-
-From 6b7757397c6181664d58d0a9e09cc329f279cc72 Mon Sep 17 00:00:00 2001
-From: Luigi Toscano <luigi.toscano@tiscali.it>
-Date: Sat, 13 May 2017 21:13:36 +0200
-Subject: Add org namespace to the desktop file
-
-Required by the Desktop Entry Specification for desktop file
-with Type=Application.
----
- src/CMakeLists.txt           |   2 +-
- src/kmplayer_part.desktop    |   2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 7a05382..f675d9a 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -122,7 +122,7 @@ install(TARGETS kdeinit_kmplayer  ${INSTALL_TARGETS_DEFAULT_ARGS} )
- 
- install(TARGETS kmplayer ${INSTALL_TARGETS_DEFAULT_ARGS})
- 
--install(FILES kmplayer.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
-+install(FILES org.kde.kmplayer.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
- 
- #qt5_add_dbus_interface(kmplayer_SRCS org.kde.Konqueror.Main.xml kmplayer_interface)
- 
diff --git a/media-video/kmplayer/files/kmplayer-0.12.0b-devpixelratio.patch b/media-video/kmplayer/files/kmplayer-0.12.0b-devpixelratio.patch
deleted file mode 100644
index 0dea98084e3e..000000000000
--- a/media-video/kmplayer/files/kmplayer-0.12.0b-devpixelratio.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 93fa2c2587fa8b2f1b0da4ab7f7f2978f105fac2 Mon Sep 17 00:00:00 2001
-From: Koos Vriezen <koos.vriezen@gmail.com>
-Date: Sun, 30 Oct 2016 12:58:05 +0100
-Subject: Update pixel_device_ratio before painting instead on app startup
-
-Only used for adding a few pixels to text bounds. So if dragging the app
-from a low res to a hires display, that could cause text being tuncated.
----
- src/viewarea.cpp | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/src/viewarea.cpp b/src/viewarea.cpp
-index e407c95..77a260f 100644
---- a/src/viewarea.cpp
-+++ b/src/viewarea.cpp
-@@ -1892,9 +1892,6 @@ KDE_NO_CDTOR_EXPORT ViewArea::ViewArea (QWidget *, View * view, bool paint_bg)
-    m_minimal (false),
-    m_updaters_enabled (true),
-    m_paint_background (paint_bg) {
--#if QT_VERSION >= 0x050600
--    pixel_device_ratio = devicePixelRatioF();
--#endif
-     if (!paint_bg)
-         setAttribute (Qt::WA_NoSystemBackground, true);
-     QPalette palette;
-@@ -2030,6 +2027,7 @@ KDE_NO_EXPORT void ViewArea::mouseMoveEvent (QMouseEvent * e) {
- 
- KDE_NO_EXPORT void ViewArea::syncVisual () {
- #if QT_VERSION >= 0x050600
-+    pixel_device_ratio = devicePixelRatioF();
-     int w = (int)(width() * devicePixelRatioF());
-     int h = (int)(height() * devicePixelRatioF());
- #else
--- 
-cgit v0.11.2
-
diff --git a/media-video/kmplayer/files/kmplayer-0.12.0b-qfile.patch b/media-video/kmplayer/files/kmplayer-0.12.0b-qfile.patch
deleted file mode 100644
index 32b645cd0a00..000000000000
--- a/media-video/kmplayer/files/kmplayer-0.12.0b-qfile.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 7dce8e00c8e48cc08d3cc39909681643aa36ed62 Mon Sep 17 00:00:00 2001
-From: Luigi Toscano <luigi.toscano@tiscali.it>
-Date: Mon, 8 May 2017 18:07:40 +0200
-Subject: Use QFile to copy a file instead of /bin/cp
-
-The code has been there probably way before QFile gained the copy
-functionality.
----
- src/kmplayerpartbase.cpp | 8 ++------
- 1 file changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/src/kmplayerpartbase.cpp b/src/kmplayerpartbase.cpp
-index fd7b363..f718496 100644
---- a/src/kmplayerpartbase.cpp
-+++ b/src/kmplayerpartbase.cpp
-@@ -124,12 +124,8 @@ PartBase::PartBase (QWidget * wparent, QObject * parent, KSharedConfigPtr config
-     QString bmfile = KStandardDirs::locate ("data", "kmplayer/bookmarks.xml");
-     QString localbmfile = KStandardDirs::locateLocal ("data", "kmplayer/bookmarks.xml");
-     if (localbmfile != bmfile) {
--        QProcess p;
--        QStringList args;
--        args << QFile::encodeName (bmfile) << QFile::encodeName (localbmfile);
--        p.start ("/bin/cp", args);
--        kDebug () << "cp " << args.join (" ");
--        p.waitForFinished ();
-+        bool bmfileCopied = QFile(bmfile).copy(localbmfile);
-+        kDebug() << "bookmarks.xml copied successfully?" << bmfileCopied;
-     }
-     m_bookmark_manager = KBookmarkManager::managerForFile (localbmfile, "kmplayer");
-     m_bookmark_owner = new BookmarkOwner (this);
--- 
-cgit v0.11.2
-
diff --git a/media-video/kmplayer/files/kmplayer-0.12.0b-qt-5.11b3.patch b/media-video/kmplayer/files/kmplayer-0.12.0b-qt-5.11b3.patch
deleted file mode 100644
index 8c91fa6c2ff3..000000000000
--- a/media-video/kmplayer/files/kmplayer-0.12.0b-qt-5.11b3.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 66b262c344deb6ac4924966a584e8aeb3d899180 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Tue, 17 Apr 2018 12:07:04 +0200
-Subject: [PATCH] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)
-
----
- src/CMakeLists.txt | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index f675d9a..57af1ed 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -161,9 +161,9 @@ qt5_add_dbus_adaptor(kphononplayer_SRCS org.kde.kmplayer.streamslave.xml
- 
- add_executable(kphononplayer ${kphononplayer_SRCS})
- 
--qt5_use_modules(kphononplayer Core DBus Widgets X11Extras)
--
--target_link_libraries(kphononplayer Phonon::phonon4qt5 ${XCB_LIBRARIES})
-+target_link_libraries(kphononplayer Phonon::phonon4qt5 ${XCB_LIBRARIES}
-+    Qt5::Core Qt5::DBus Qt5::Widgets Qt5::X11Extras
-+)
- 
- install(TARGETS kphononplayer ${INSTALL_TARGETS_DEFAULT_ARGS})
- 
--- 
-2.17.0
-
diff --git a/media-video/kmplayer/files/kmplayer-0.12.0b-qt-5.9.patch b/media-video/kmplayer/files/kmplayer-0.12.0b-qt-5.9.patch
deleted file mode 100644
index 80f3bee6ee88..000000000000
--- a/media-video/kmplayer/files/kmplayer-0.12.0b-qt-5.9.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 3def65075c09af4961cd399e8e78ed78cca72e65 Mon Sep 17 00:00:00 2001
-From: Wolfgang Bauer <wbauer@tmo.at>
-Date: Wed, 11 Oct 2017 22:16:02 +0200
-Subject: Fix build with Qt 5.9
-
-Summary:
-moc 5.9 errors out when building:
-Error: Plugin Metadata file "" could not be opened: file to open is a directory
-
-Same issue and fix as https://phabricator.kde.org/D5392 for khtml.
-
-CCBUG: 377490
-
-Test Plan: builds fine now with Qt 5.9.0rc and also earlier versions.
-
-Reviewers: vriezen, pino
-
-Reviewed By: pino
-
-Subscribers: pino
-
-Differential Revision: https://phabricator.kde.org/D5985
----
- src/kmplayer_part.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/kmplayer_part.h b/src/kmplayer_part.h
-index f90f85d..0fddbaa 100644
---- a/src/kmplayer_part.h
-+++ b/src/kmplayer_part.h
-@@ -36,7 +36,7 @@ namespace KMPlayer {
- 
- class KMPlayerFactory : public KPluginFactory {
-     Q_OBJECT
--    Q_PLUGIN_METADATA(IID "org.kde.KPluginFactory" FILE "")
-+    Q_PLUGIN_METADATA(IID "org.kde.KPluginFactory")
-     Q_INTERFACES(KPluginFactory)
- public:
-     KMPlayerFactory();
--- 
-cgit v0.11.2
-
diff --git a/media-video/kmplayer/files/kmplayer-0.12.0b-schedulerepaint.patch b/media-video/kmplayer/files/kmplayer-0.12.0b-schedulerepaint.patch
deleted file mode 100644
index 02bf9f38b561..000000000000
--- a/media-video/kmplayer/files/kmplayer-0.12.0b-schedulerepaint.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 5517262a2a328518dd42a8aa0e37a34152a06282 Mon Sep 17 00:00:00 2001
-From: Koos Vriezen <koos.vriezen@gmail.com>
-Date: Sun, 30 Oct 2016 12:50:03 +0100
-Subject: scheduleRepaint should be called with pixel coordinates
-
----
- src/viewarea.cpp | 31 ++++++++++++++++++++++++++-----
- 1 file changed, 26 insertions(+), 5 deletions(-)
-
-diff --git a/src/viewarea.cpp b/src/viewarea.cpp
-index 24f68cf..e4df941 100644
---- a/src/viewarea.cpp
-+++ b/src/viewarea.cpp
-@@ -2117,9 +2117,20 @@ KDE_NO_EXPORT void ViewArea::syncVisual () {
- 
- KDE_NO_EXPORT void ViewArea::paintEvent (QPaintEvent * pe) {
- #ifdef KMPLAYER_WITH_CAIRO
--    if (surface->node)
--        scheduleRepaint (IRect (pe->rect ().x (), pe->rect ().y (), pe->rect ().width (), pe->rect ().height ()));
--    else
-+    if (surface->node) {
-+#if QT_VERSION >= 0x050600
-+        int x = (int)(pe->rect().x() * devicePixelRatioF());
-+        int y = (int)(pe->rect().y() * devicePixelRatioF());
-+        int w = (int)(pe->rect().width() * devicePixelRatioF());
-+        int h = (int)(pe->rect().height() * devicePixelRatioF());
-+#else
-+        int x = pe->rect().x();
-+        int y = pe->rect().y();
-+        int w = pe->rect().width();
-+        int h = pe->rect().height();
-+#endif
-+        scheduleRepaint(IRect(x, y, w, h));
-+    } else
- #endif
-         if (m_fullscreen || m_paint_background)
-     {
-@@ -2647,8 +2658,18 @@ void VideoOutput::setGeometry (const IRect &rect) {
- void VideoOutput::setAspect (float a) {
-     m_aspect = a;
-     QRect r = geometry ();
--    m_view->viewArea ()->scheduleRepaint (
--            IRect (r.x (), r.y (), r.width (), r.height ()));
-+#if QT_VERSION >= 0x050600
-+    int x = (int)(r.x() * devicePixelRatioF());
-+    int y = (int)(r.y() * devicePixelRatioF());
-+    int w = (int)(r.width() * devicePixelRatioF());
-+    int h = (int)(r.height() * devicePixelRatioF());
-+#else
-+    int x = r.x();
-+    int y = r.y();
-+    int w = r.width();
-+    int h = r.height();
-+#endif
-+    m_view->viewArea()->scheduleRepaint(IRect(x, y, w, h));
- }
- 
- KDE_NO_EXPORT void VideoOutput::map () {
--- 
-cgit v0.11.2
-
diff --git a/media-video/kmplayer/kmplayer-0.12.0b-r4.ebuild b/media-video/kmplayer/kmplayer-0.12.0b-r4.ebuild
deleted file mode 100644
index 6feb296bfb3c..000000000000
--- a/media-video/kmplayer/kmplayer-0.12.0b-r4.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="true"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Video player plugin for Konqueror and basic MPlayer frontend"
-HOMEPAGE="https://kmplayer.kde.org https://apps.kde.org/en/kmplayer"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/$(ver_cut 1-2)/${P}.tar.bz2"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2 FDL-1.2 LGPL-2.1"
-SLOT="5"
-IUSE="cairo"
-
-BDEPEND="sys-devel/gettext"
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdelibs4support-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kmediaplayer-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=media-libs/phonon-4.11.0
-	x11-libs/libX11
-	x11-libs/libxcb
-	cairo? ( x11-libs/cairo[X,xcb(+)] )
-"
-RDEPEND="${DEPEND}
-	media-video/mplayer
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-schedulerepaint.patch
-	"${FILESDIR}"/${P}-devpixelratio.patch
-	"${FILESDIR}"/${P}-qfile.patch
-	"${FILESDIR}"/${P}-cmake.patch
-	"${FILESDIR}"/${P}-desktop.patch
-	"${FILESDIR}"/${P}-qt-5.9.patch
-	"${FILESDIR}"/${P}-qt-5.11b3.patch
-)
-
-src_prepare() {
-	# Prerequisite for ${P}-desktop.patch:
-	mv src/kmplayer.desktop src/org.kde.kmplayer.desktop || die
-	ecm_src_prepare
-}
-
-src_configure() {
-	# 0.12: expat build broken, check in later releases
-	local mycmakeargs=(
-		-DKMPLAYER_BUILT_WITH_EXPAT=OFF
-		-DKMPLAYER_BUILT_WITH_NPP=OFF
-		-DKMPLAYER_BUILT_WITH_CAIRO=$(usex cairo)
-	)
-	ecm_src_configure
-}
diff --git a/media-video/kmplayer/metadata.xml b/media-video/kmplayer/metadata.xml
deleted file mode 100644
index e68bcea066c3..000000000000
--- a/media-video/kmplayer/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>media-video@gentoo.org</email>
-		<name>Gentoo Video project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/media-video/mjpg-streamer/Manifest b/media-video/mjpg-streamer/Manifest
index 83d248f54a29..c91b9b492eef 100644
--- a/media-video/mjpg-streamer/Manifest
+++ b/media-video/mjpg-streamer/Manifest
@@ -1,6 +1,6 @@
 AUX make-var-instead-of-cmd.patch 3716 BLAKE2B 322c6ada49e976840e949ca781eca29e1008c781c6aa578586bb7ef522b6fe2227a9c6b6f60ac7d4d1c982ddf926e522798aa7ebde74d2a272e57b4d8c2c1cef SHA512 e585b6f2988020087ffd2dd33878e6392baeb94f6020471ade157d1f27df073f363f5fc05107ef1b21fad69aaacf0a53096e48ce5c8eeaf77a6a328780d64e9d
 AUX mjpg-streamer.confd 347 BLAKE2B f544307fca9e420d5a8edd3b8ea1834dc5d9125d2aba627361ef381329036831ee2d19925dff5f5cc7fb5b1d6623dcb33e74c68966d88749cd9b84325aa78f5c SHA512 15841b10f0caa136b58372e180bfc3a0198d323ef2df22ddd2b334c09d0d376cac78d799c327306105bc97648ee40a3d0c78ef013a421f9468be7f89278baa33
-AUX mjpg-streamer.initd 1268 BLAKE2B cf516a21368667b3f88db2d5541f61dc30b0d524dd6c0601bf8f0fafb746452204c210798b87426e7d38b9d4d9fef6239730f4afcd959a8f261613fbc780696f SHA512 4a9d1fafd4fe31f8cece9295f67a6e53cb1d4a61a2c12283da61ca65aae1a9932f70ab4dd1a9f0d3bfe1c05bc00dc235481c2b751e6d0cd39535690e24fe473f
+AUX mjpg-streamer.initd 1265 BLAKE2B e42564a98636a1a5dc059bd418e281ab6da494f88cb64cd56c58401d55c4e02208c5f45289d0ee04ce16fe4118a7cbcd2f5f2d4a289f171be790bbb5e8d81a3e SHA512 4cc90922e9fbd966f9a41719e18672e46a94a7206f18e12e8ac19bd40de3944597f0323c42862731079201367381af9de8cfd4ee8d89f7fc3173640fda9ef5d9
 AUX to-work-with-kernel-3.18.patch 2832 BLAKE2B 157c3c5c30973cdc64d9bd0a5cadba238dd6e33d72b96b0776065f57bb34e14f47336e509e8dbf1fe6fbb8f715fd99837b42e9ecec6fcc4c5da1101300c1e900 SHA512 c619c788fd09118f309b081eabb7f80835690923e098368f16f26a7b4e6b63e494dd5f91a9fe73d83b3151b77dd6393263ab3756f7d8b3a6286ac3d52f1e89c8
 DIST mjpg-streamer-0_pre20120621.tar.bz2 471546 BLAKE2B 3ede2a60062bba7c91ddfa0d7151e32cd8dac11a083cc6a88dc350a523174685b2ff066fa99db13b82a6a4960d370b97b27aa3663ac323fa54908bb0108857d0 SHA512 dfc6077ec03fe4f239d8e25b65b7808bd489a954d8cf3aeed444e68fd9536720c2c888a5fa9f4b8d0152dab5ca0bd166a46f2cb22a357ba816eb5bc79ff11332
 EBUILD mjpg-streamer-0_pre20120621-r2.ebuild 1895 BLAKE2B f78c80d7b4b94b4d91082f7a332d11dde3f6b994f30d0c1f1d704a80d725f3231a4fe492f5e69a40baa71ee1b1de638d65d4fb73dd9d77b2ccfcd98db5d220ea SHA512 6ada19dc511b45b5a565cdbcc9651269e559b70007663062531e6892e8b3b08bd306b13e4b3b72506a609a985dfe10814d01f52a887feae833ebd996e55033cf
diff --git a/media-video/mjpg-streamer/files/mjpg-streamer.initd b/media-video/mjpg-streamer/files/mjpg-streamer.initd
index 9672a429887e..e7116dba01d2 100644
--- a/media-video/mjpg-streamer/files/mjpg-streamer.initd
+++ b/media-video/mjpg-streamer/files/mjpg-streamer.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 MJPG_STREAMER_PIDFILE="${MJPG_STREAMER_PIDFILE:-/var/run/${SVCNAME}.pid}"
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index e7fdcebd386b..4095ab0bae58 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -2,6 +2,7 @@ DIST mpv-0.32.0.tar.gz 3148730 BLAKE2B 085c38f0074dd005462aef52ef01ad7cfd70ebf92
 DIST mpv-0.33.0.tar.gz 3259387 BLAKE2B c9ffaccb2258493517814490ab589ef298d6a0ba66398683f5fd1bcb01e2c073c99b8276a60951bea766ee85c726456d8a4ae329cf8748de4f15bb346161a269 SHA512 5a4af74ba2c9656c6b61adcf944c734923c7b4527a49cd79ec63a0617911629438a138d887dfbd4b6c0c9c53e2c68c18839d98d9765179e52cc5675d0682e077
 DIST waf-2.0.9 103104 BLAKE2B c7e996aa49662da3ff941d076fc7e2dd23e867ade92a3b2ae07560b76d63a69e495184a1f9c76be5c51977ddb1713f9247f62e672033ecb988ac559e3a47e546 SHA512 0755170ded115b03e78a2096f197cd9fff62b5036db764153d26ce426f182ea7d7b8231cfa1a10b4a564a8480428502f3691851df66e7b83c7bca8e5fe26de7d
 EBUILD mpv-0.32.0-r2.ebuild 9728 BLAKE2B 6d82550003be24ecf3fdd2f4d6e36c9c78cf86476a68e54e8114245e940059d91ecd7b346959a92cf3a3e034463117138063de49488c16eef4703e3b693cbff0 SHA512 6f04a328b862cf18ec29accbf60aed2166b9b7beb1eb110999ef35eb0fc21d216c9453ca1f280bbe73466e3217b3064e4e565bcce5e2a5ae2de269d874a3ae5b
+EBUILD mpv-0.33.0-r100.ebuild 9708 BLAKE2B 8229dec44c9d971b164218af11cc04ba1ca091ad5830ffa2cae6fd09548945c3343d1b6ad81c84ab4012880459cca08d3ba65f9e5850197f6c434075bde197db SHA512 30fdc15f3d988967c899a56fac8fcf3f321d79474ac1b89649be34f21e9586aed1dcea45c571b68c2aec2e5c05bcde8b5c27550ae3b124515b2f8d6cc82c642e
 EBUILD mpv-0.33.0.ebuild 9402 BLAKE2B 27d1b87eb595164284c98259b9659964c54ff9afeb3bebea7966de2e912fbab21e4ee4be4129653942a6cad75f7dd98452f439c7e5b27892b078f977a8dd1c31 SHA512 3c80283e1cd1baf3dd63b9e81e5c340eb2eabb5df3f1c196706489928e63a7883eff32aed948b1319e5028096cefd14f070647780fc50b1c48fc72302d50c8ad
 EBUILD mpv-9999.ebuild 9402 BLAKE2B 27d1b87eb595164284c98259b9659964c54ff9afeb3bebea7966de2e912fbab21e4ee4be4129653942a6cad75f7dd98452f439c7e5b27892b078f977a8dd1c31 SHA512 3c80283e1cd1baf3dd63b9e81e5c340eb2eabb5df3f1c196706489928e63a7883eff32aed948b1319e5028096cefd14f070647780fc50b1c48fc72302d50c8ad
 MISC metadata.xml 2325 BLAKE2B ea9ce00b54f9aabf4f37dcbf20c94f6583e219638f6831e0f8f3292df0768d7e6c597a9072903604f8dbb7f88ef15cad87b2cbe57a41d22554e554cc6e9663b1 SHA512 84802287f2655571923a44c7383bac2f70838890b18222d0b060a371a79dbe5022bb7c186bb1ac6496b930c62dacafbc132178b60b0746bd2cce4eb08a5c6be7
diff --git a/media-video/mpv/mpv-0.33.0-r100.ebuild b/media-video/mpv/mpv-0.33.0-r100.ebuild
new file mode 100644
index 000000000000..cf434331d32e
--- /dev/null
+++ b/media-video/mpv/mpv-0.33.0-r100.ebuild
@@ -0,0 +1,358 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..2} luajit )
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE='threads(+)'
+
+WAF_PV=2.0.9
+
+inherit bash-completion-r1 flag-o-matic lua-single pax-utils python-r1 toolchain-funcs waf-utils xdg-utils
+
+DESCRIPTION="Media player based on MPlayer and mplayer2"
+HOMEPAGE="https://mpv.io/ https://github.com/mpv-player/mpv"
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+	DOCS=( RELEASE_NOTES )
+else
+	EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
+	inherit git-r3
+	DOCS=(); SRC_URI=""
+fi
+SRC_URI+=" https://waf.io/waf-${WAF_PV}"
+DOCS+=( README.md DOCS/{client-api,interface}-changes.rst )
+
+# See Copyright in sources and Gentoo bug 506946. Waf is BSD, libmpv is ISC.
+LICENSE="LGPL-2.1+ GPL-2+ BSD ISC"
+SLOT="0"
+IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda debug doc drm dvb
+	dvd +egl gamepad gbm +iconv jack javascript jpeg lcms libcaca libmpv +lua
+	openal +opengl pulseaudio raspberry-pi rubberband sdl
+	selinux test tools +uchardet vaapi vdpau vulkan wayland +X +xv zlib zimg"
+
+REQUIRED_USE="
+	|| ( cli libmpv )
+	aqua? ( opengl )
+	cuda? ( opengl )
+	egl? ( || ( gbm X wayland ) )
+	gamepad? ( sdl )
+	gbm? ( drm egl opengl )
+	lcms? ( opengl )
+	lua? ( ${LUA_REQUIRED_USE} )
+	opengl? ( || ( aqua egl X raspberry-pi !cli ) )
+	raspberry-pi? ( opengl )
+	test? ( opengl )
+	tools? ( cli )
+	uchardet? ( iconv )
+	vaapi? ( || ( gbm X wayland ) )
+	vdpau? ( X )
+	vulkan? ( || ( X wayland ) )
+	wayland? ( egl )
+	X? ( egl? ( opengl ) )
+	xv? ( X )
+	${PYTHON_REQUIRED_USE}
+"
+
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	>=media-video/ffmpeg-4.0:0=[encode,threads,vaapi?,vdpau?]
+	alsa? ( >=media-libs/alsa-lib-1.0.18 )
+	archive? ( >=app-arch/libarchive-3.4.0:= )
+	bluray? ( >=media-libs/libbluray-0.3.0:= )
+	cdda? ( dev-libs/libcdio-paranoia
+			dev-libs/libcdio:= )
+	drm? ( x11-libs/libdrm )
+	dvd? (
+		>=media-libs/libdvdnav-4.2.0:=
+		>=media-libs/libdvdread-4.1.0:=
+	)
+	egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] )
+	gamepad? ( media-libs/libsdl2 )
+	iconv? (
+		virtual/libiconv
+		uchardet? ( app-i18n/uchardet )
+	)
+	jack? ( virtual/jack )
+	javascript? ( >=dev-lang/mujs-1.0.0 )
+	jpeg? ( virtual/jpeg:0 )
+	lcms? ( >=media-libs/lcms-2.6:2 )
+	>=media-libs/libass-0.12.1:=[fontconfig,harfbuzz(+)]
+	virtual/ttf-fonts
+	libcaca? ( >=media-libs/libcaca-0.99_beta18 )
+	lua? ( ${LUA_DEPS} )
+	openal? ( >=media-libs/openal-1.13 )
+	pulseaudio? ( media-sound/pulseaudio )
+	raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 )
+	rubberband? ( >=media-libs/rubberband-1.8.0 )
+	sdl? ( media-libs/libsdl2[sound,threads,video] )
+	vaapi? ( x11-libs/libva:=[drm?,X?,wayland?] )
+	vdpau? ( x11-libs/libvdpau )
+	vulkan? (
+		media-libs/libplacebo:=[vulkan]
+		media-libs/shaderc
+	)
+	wayland? (
+		>=dev-libs/wayland-1.6.0
+		>=dev-libs/wayland-protocols-1.14
+		>=x11-libs/libxkbcommon-0.3.0
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libXScrnSaver
+		x11-libs/libXext
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		opengl? (
+			x11-libs/libXdamage
+			virtual/opengl
+		)
+		xv? ( x11-libs/libXv )
+	)
+	zlib? ( sys-libs/zlib )
+	zimg? ( >=media-libs/zimg-2.9.2 )
+"
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	cuda? ( >=media-libs/nv-codec-headers-8.2.15.7 )
+	dvb? ( virtual/linuxtv-dvb-headers )
+"
+RDEPEND="${COMMON_DEPEND}
+	cuda? ( x11-drivers/nvidia-drivers[X] )
+	selinux? ( sec-policy/selinux-mplayer )
+	tools? ( ${PYTHON_DEPS} )
+"
+BDEPEND="dev-python/docutils
+	virtual/pkgconfig
+	test? ( >=dev-util/cmocka-1.0.0 )
+"
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die
+	chmod +x "${S}"/waf || die
+	default
+}
+
+src_configure() {
+	python_setup
+	tc-export CC PKG_CONFIG AR
+
+	if use raspberry-pi; then
+		append-cflags -I"${SYSROOT%/}${EPREFIX}/opt/vc/include"
+		append-ldflags -L"${SYSROOT%/}${EPREFIX}/opt/vc/lib"
+	fi
+
+	local mywafargs=(
+		--confdir="${EPREFIX}/etc/${PN}"
+
+		$(usex cli '' '--disable-cplayer')
+		$(use_enable libmpv libmpv-shared)
+
+		--disable-libmpv-static
+		--disable-static-build
+		# See deep down below for build-date.
+		--disable-optimize # Don't add '-O2' to CFLAGS.
+		$(usex debug '' '--disable-debug-build')
+
+		$(use_enable doc html-build)
+		--disable-pdf-build
+		--enable-manpage-build
+		$(use_enable cplugins)
+		$(use_enable test)
+
+		$(use_enable iconv)
+		$(use_enable lua)
+		$(use_enable javascript)
+		$(use_enable zlib)
+		$(use_enable bluray libbluray)
+		$(use_enable dvd dvdnav)
+		$(use_enable cdda)
+		$(use_enable uchardet)
+		$(use_enable rubberband)
+		$(use_enable lcms lcms2)
+		--disable-vapoursynth # Only available in overlays.
+		$(use_enable archive libarchive)
+
+		--enable-libavdevice
+
+		# Audio outputs:
+		$(use_enable sdl sdl2) # Listed under audio, but also includes video.
+		$(use_enable pulseaudio pulse)
+		$(use_enable jack)
+		$(use_enable openal)
+		--disable-opensles
+		$(use_enable alsa)
+		$(use_enable coreaudio)
+
+		# Video outputs:
+		$(use_enable aqua cocoa)
+		$(use_enable drm)
+		$(use_enable gbm)
+		$(use_enable wayland wayland-scanner)
+		$(use_enable wayland wayland-protocols)
+		$(use_enable wayland)
+		$(use_enable X x11)
+		$(use_enable xv)
+		$(usex opengl "$(use_enable aqua gl-cocoa)" '--disable-gl-cocoa')
+		$(usex opengl "$(use_enable X gl-x11)" '--disable-gl-x11')
+		$(usex egl "$(use_enable X egl-x11)" '--disable-egl-x11')
+		$(usex egl "$(use_enable gbm egl-drm)" '--disable-egl-drm')
+		$(usex opengl "$(use_enable wayland gl-wayland)" '--disable-gl-wayland')
+		$(use_enable vdpau)
+		$(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11')
+		$(use_enable vaapi) # See below for vaapi-glx, vaapi-x-egl.
+		$(usex vaapi "$(use_enable X vaapi-x11)" '--disable-vaapi-x11')
+		$(usex vaapi "$(use_enable wayland vaapi-wayland)" '--disable-vaapi-wayland')
+		$(usex vaapi "$(use_enable gbm vaapi-drm)" '--disable-vaapi-drm')
+		$(use_enable libcaca caca)
+		$(use_enable jpeg)
+		$(use_enable vulkan shaderc)
+		$(use_enable vulkan libplacebo)
+		$(use_enable raspberry-pi rpi)
+		$(usex libmpv "$(use_enable opengl plain-gl)" '--disable-plain-gl')
+		$(usex opengl '' '--disable-gl')
+		$(use_enable vulkan)
+		$(use_enable gamepad sdl2-gamepad)
+
+		# HWaccels:
+		# Automagic Video Toolbox HW acceleration. See Gentoo bug 577332.
+		$(use_enable cuda cuda-hwaccel)
+		$(use_enable cuda cuda-interop)
+
+		# TV features:
+		$(use_enable dvb dvbin)
+
+		# Miscellaneous features:
+		$(use_enable zimg)
+	)
+	if use lua; then
+		if use lua_single_target_luajit; then
+			mywafargs+=( --lua="luajit" )
+		else
+			# Because it would be too simple to just let the user directly
+			# specify the package name to check, wouldn't it.
+			mywafargs+=( --lua="$(ver_rs 1 '' $(ver_cut 1-2 $(lua_get_version)))" )
+		fi
+	fi
+
+	if use vaapi && use X; then
+		mywafargs+=(
+			$(use_enable egl vaapi-x-egl)
+		)
+	fi
+
+	# Not for us
+	mywafargs+=(
+		--disable-android
+		--disable-egl-android
+		--disable-uwp
+		--disable-audiounit
+		--disable-macos-media-player
+		--disable-wasapi
+		--disable-ios-gl
+		--disable-macos-touchbar
+		--disable-macos-cocoa-cb
+		--disable-tvos
+		--disable-egl-angle-win32
+	)
+
+	mywafargs+=(
+		--bashdir="$(get_bashcompdir)"
+		--zshdir="${EPREFIX}"/usr/share/zsh/site-functions
+)
+
+	# Create reproducible non-live builds.
+	[[ ${PV} != *9999* ]] && mywafargs+=(--disable-build-date)
+
+	waf-utils_src_configure "${mywafargs[@]}"
+}
+
+src_install() {
+	waf-utils_src_install
+
+	if use lua; then
+		insinto /usr/share/${PN}
+		doins -r TOOLS/lua
+	fi
+
+	if use cli && use lua_single_target_luajit; then
+		pax-mark -m "${ED}"/usr/bin/${PN}
+	fi
+
+	if use tools; then
+		dobin TOOLS/{mpv_identify.sh,umpv}
+		newbin TOOLS/idet.sh mpv_idet.sh
+		python_replicate_script "${ED}"/usr/bin/umpv
+	fi
+}
+
+pkg_postinst() {
+	local rv softvol_0_18_1=0 osc_0_21_0=0 txtsubs_0_24_0=0 opengl_0_25_0=0
+
+	for rv in ${REPLACING_VERSIONS}; do
+		ver_test ${rv} -lt 0.18.1 && softvol_0_18_1=1
+		ver_test ${rv} -lt 0.21.0 && osc_0_21_0=1
+		ver_test ${rv} -lt 0.24.0 && txtsubs_0_24_0=1
+		ver_test ${rv} -lt 0.25.0 && ! use opengl && opengl_0_25_0=1
+	done
+
+	if [[ ${softvol_0_18_1} -eq 1 ]]; then
+		elog "Since version 0.18.1 the software volume control is always enabled."
+		elog "This means that volume controls don't change the system volume,"
+		elog "e.g. per-application volume with PulseAudio."
+		elog "If you want to restore the previous behaviour, please refer to"
+		elog
+		elog "https://wiki.gentoo.org/wiki/Mpv#Volume_in_0.18.1"
+		elog
+	fi
+
+	if [[ ${osc_0_21_0} -eq 1 ]]; then
+		elog "In version 0.21.0 the default OSC layout was changed."
+		elog "If you want to restore the previous layout, please refer to"
+		elog
+		elog "https://wiki.gentoo.org/wiki/Mpv#OSC_in_0.21.0"
+		elog
+	fi
+
+	if [[ ${txtsubs_0_24_0} -eq 1 ]]; then
+		elog "Since version 0.24.0 subtitles with .txt extension aren't autoloaded."
+		elog "If you want to restore the previous behaviour, please refer to"
+		elog
+		elog "https://wiki.gentoo.org/wiki/Mpv#Subtitles_with_.txt_extension_in_0.24.0"
+		elog
+	fi
+
+	if [[ ${opengl_0_25_0} -eq 1 ]]; then
+		elog "Since version 0.25.0 the 'opengl' USE flag is mapped to"
+		elog "the 'opengl' video output and no longer explicitly requires"
+		elog "X11 or Mac OS Aqua. Consider enabling the 'opengl' USE flag."
+	fi
+
+	elog "If you want URL support, please install net-misc/youtube-dl."
+
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+src_test() {
+	cd "${S}"/build/test || die
+	local test
+	for test in *; do
+		if [[ -x ${test} ]]; then
+			./"${test}" || die "Test suite failed"
+		fi
+	done
+}
diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest
index 4c0587d199b0..7daa17085561 100644
--- a/media-video/obs-studio/Manifest
+++ b/media-video/obs-studio/Manifest
@@ -1,5 +1,6 @@
 AUX obs-studio-25.0.8-gcc-10-build.patch 1050 BLAKE2B ccf18ba3f51de72f967fbab5b1526d1fc9a9bb628a25d1caed44ca308f4a988a15fe0ab235b218b2edc4e4eef40c86545cda989f0d748af942352ad8eb091f51 SHA512 1ff0e088eed61554268009f3d8c5a23c0888bfbe860d6cb288ddf348108446c152fd87e2cb8f54613a88378d8474550632c90f924005d5e0343bf1a801339ccc
 DIST obs-studio-25.0.8.tar.gz 9531713 BLAKE2B 4775ca8305e1beee4d926eff728351b699ca4d52f66e53409dbcfe1f73699df0286fadc0c138cb76b8eb73e70a143719e46f030b6d15d43629bdcbf23bdb88af SHA512 a97c03dc218a4e03e48f6a7dc82b4a59ebeee2039f17be66bb847681ce9ff3d25e6e015be4af78fe44739f6fad5089b6e683d7657c2e4fde8e547df9a2594a08
-EBUILD obs-studio-25.0.8-r1.ebuild 3544 BLAKE2B 2b2f4df593f1616d7ba315d7410c6ffe7a6b1858688c149bf263cb64be6864b9492bd6f5d35a0d8160de81d41c62b0616ee6f28af2613b283c602109603576b3 SHA512 b883f912e288bd1819e0baf26de55912a42ba14b8da6cfd87f2d4d174e8e2d5162429fb18a6e33b072413536c63fde55333aac9859c08accbb95e678698dc2a3
-EBUILD obs-studio-9999.ebuild 3485 BLAKE2B 59491eed9c4e0ef4e7cfe5cc9241570ee319090eda8c9575db84d8da9eee8d8867f7796e5ace284d64ba72494b74430be3c23458261fd47f9ee8e7ffb44ae283 SHA512 fc9d7d1b7de0df70a2b3bc90ec7955051ea9d0eb54fd6dccc745a3d6521eb3083eb1c7e296bd5963bfb5b7879384c87b0ff573059cbc618e1e6effec02861138
+EBUILD obs-studio-25.0.8-r1.ebuild 3601 BLAKE2B 1e95f46ef29bfa1c27b941eb3ce652192c66b00f0b8c242bef92215101b944c490aac0d90fb06e5ca210f1c0c39e2daf0ceb81cb2867b87ec159ebde00bb32d2 SHA512 7fc4415408c26a96196e2e3882c4ccaff4b62ab024ffa2ea120102ea03b1a250eff54cf992c9a1c20498fea24066da6fedfb46114ea50806d544ab147c9e2bf5
+EBUILD obs-studio-25.0.8-r100.ebuild 3660 BLAKE2B 8cd29fc9130dc3e43353d103d6cf113e8c2416e6555bc6edb91a132f0db53938d78039728e38288c706e683f922d2597d1256d9706bcc916e766507ab7b6b6e2 SHA512 83895b1caa8d8dcfb4623676d50f58a828eb0e28660c447eadc0760903145488eb9cc8812f0cec8588d618c284b2ccd2eb242769a80c6b2105569088a7f1d161
+EBUILD obs-studio-9999.ebuild 3601 BLAKE2B 9c53d2e61df60268a1ed95bacc8ed0e1466f89b814a3a1def95d3a6d900fa3aa817247dfafed0d9725d444c5aef210bf4b25c076ab14b086ba76ece5d9e1d6bf SHA512 edceb8e6b1fbef66f6556d441143303841458da7c2143c833569b69ffa95631049616ee009084cd94cea8ad7ef92d70d779714e1e5bf7edc63f3f9451858776d
 MISC metadata.xml 1333 BLAKE2B 64d005a96fe4861ab30cc51ff8f9b37dfc6e24eda2149b487ca2f5af9db663f2a2ce564ff4953c6cf5b35d425d1fb1c3774c86e610db0eb336119baddcbc52b5 SHA512 06ab2cd75b521a2753fdc7e379ed67bd2179a74f0868324af4365a2bffa6c132528fd72b98d319bc0a924cad9bb006e382093f368602fb5dd7dc94db94ae703b
diff --git a/media-video/obs-studio/obs-studio-25.0.8-r1.ebuild b/media-video/obs-studio/obs-studio-25.0.8-r1.ebuild
index 8bdbdd3a6e49..19d4a9a037eb 100644
--- a/media-video/obs-studio/obs-studio-25.0.8-r1.ebuild
+++ b/media-video/obs-studio/obs-studio-25.0.8-r1.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
+# Does not work with 3.8+ https://bugs.gentoo.org/754006
 PYTHON_COMPAT=( python3_{6,7} )
 
 inherit cmake-utils python-single-r1 xdg-utils
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
new file mode 100644
index 000000000000..0032ba06fca0
--- /dev/null
+++ b/media-video/obs-studio/obs-studio-25.0.8-r100.ebuild
@@ -0,0 +1,155 @@
+# 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_{6,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-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild
index c8ccd0308e53..481cfe79ce98 100644
--- a/media-video/obs-studio/obs-studio-9999.ebuild
+++ b/media-video/obs-studio/obs-studio-9999.ebuild
@@ -4,9 +4,11 @@
 EAPI=7
 
 CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
+LUA_COMPAT=( luajit )
+# Does not work with 3.8+ https://bugs.gentoo.org/754006
 PYTHON_COMPAT=( python3_{6,7} )
 
-inherit cmake-utils python-single-r1 xdg-utils
+inherit cmake lua-single python-single-r1 xdg-utils
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
@@ -22,11 +24,14 @@ HOMEPAGE="https://obsproject.com"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+alsa fdk imagemagick jack luajit nvenc pulseaudio python speex +ssl truetype v4l vlc"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+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="
-	luajit? ( dev-lang/swig )
+	lua? ( dev-lang/swig )
 	python? ( dev-lang/swig )
 "
 DEPEND="
@@ -58,7 +63,7 @@ DEPEND="
 	fdk? ( media-libs/fdk-aac:= )
 	imagemagick? ( media-gfx/imagemagick:= )
 	jack? ( virtual/jack )
-	luajit? ( dev-lang/luajit:2 )
+	lua? ( ${LUA_DEPS} )
 	nvenc? ( >=media-video/ffmpeg-4[video_cards_nvidia] )
 	pulseaudio? ( media-sound/pulseaudio )
 	python? ( ${PYTHON_DEPS} )
@@ -74,6 +79,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 pkg_setup() {
+	use lua && lua-single_pkg_setup
 	use python && python-single-r1_pkg_setup
 }
 
@@ -94,15 +100,15 @@ src_configure() {
 		-DWITH_RTMPS=$(usex ssl)
 	)
 
-	if [ "${PV}" != "9999" ]; then
+	if [[ ${PV} != *9999 ]]; then
 		mycmakeargs+=(
 			-DOBS_VERSION_OVERRIDE=${PV}
 		)
 	fi
 
-	if use luajit || use python; then
+	if use lua || use python; then
 		mycmakeargs+=(
-			-DDISABLE_LUA=$(usex !luajit)
+			-DDISABLE_LUA=$(usex !lua)
 			-DDISABLE_PYTHON=$(usex !python)
 			-DENABLE_SCRIPTING=yes
 		)
@@ -110,11 +116,11 @@ src_configure() {
 		mycmakeargs+=( -DENABLE_SCRIPTING=no )
 	fi
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_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
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index de85e324b521..fb86aea3eb9c 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -1,12 +1,8 @@
 AUX pipewire-0.2.7-fno-common.patch 1235 BLAKE2B 59e5c9376a3097d3427c0f0623827e3163298bb23d1888d3791504928c50850cf59d41392e78d90b07d4f5a481af60d37661a96ca47c61f939a938c54a523839 SHA512 87a67a14289b5dde0ff174e90cb94c3884ea7b3189d00b7c8fc195445a5555fbba0ee8a641edd8e1b5322508082f8c2e52c14a18a392038a9ba9c27ff470bd2b
 DIST pipewire-0.2.7.tar.gz 421644 BLAKE2B d2ccb56a9ea5ea7782678deb6eae0b0a70da1fa69e807398062d388733901839f15a2f0f7db982fbebd2b2759f443709e6c1950b6367f3ed4801d6c2d6109e73 SHA512 10d3e20cc3d233fbcd1fc39702ae3043a656ebcd9cd3c39c77f0cc2bf42ff4956fc03e7933c7b397bca446c63f45ddacea948d5ec7e4a3300499fa2794f14334
 DIST pipewire-0.3.10.tar.gz 1148297 BLAKE2B d890b8e6697b17be9f8706a7228b9c79631120550ac51d7fbea8b5d05ca161ce6142a5666a6a61db618d4da0519676160ba1180cf9274865d879f4bb0da2a8e7 SHA512 f2f3dd7ce9b9f3a5ab55b6da97cd64419dad5115714848ce8893795c0ed2fd2fe0059240ec9fe1c92fb1442caf8d7071e415afe6712500be1c29fd001293cf0d
-DIST pipewire-0.3.13.tar.gz 1176949 BLAKE2B 5a4c7f211c1ac3c823cc34cede2f42204a2a7c6d583237465e702936926fad924c37f0638c8bbdedc55ad70d59cc2796e64b2b3dea2c64f199383d4ed9c1c84a SHA512 38ce7d8808e69935db0148c077340cfbc1b85f5a016a0a57eff2c076560c42f0695cfe681c9f16ebf15796d773dd113c9a84631eb50ac44dfb09f91ed3fc61f0
-DIST pipewire-0.3.15.tar.gz 1227022 BLAKE2B 590c5275d98a38c238f8c63d5bcdc9dbab07e870aff0e7414e0894aeb93507c106b7b45cd70b0f44a077b2fc5bd916c764dc4e03a54926f90a3296d870b7bcaa SHA512 949f2e64a3e9ec06b3414cacfbd7cf4ef6b7bad484a5dea1b79b5d4310413ec5a7538b702431f2cf6fb580ffd430081bd568399faa9b819689a79bebc955ca33
-DIST pipewire-0.3.17.tar.gz 1254486 BLAKE2B e6a8e31dc968b95012f01dce53faa30dde40b3a382fe85eb25a50b96f3d011711be1f9fc5ce42e355c19f92e59bdaa4e5b6ecf41347f400c35adb3eeb2a53c5c SHA512 0de4f2431cf19708c3457877b8172a39676ef8f748071921a21da391d95b83a870190dc1343ffe9000e2599431464b6bfe90219f6237493903ccba5eb9b3473d
+DIST pipewire-0.3.18.tar.gz 1277055 BLAKE2B 4a18bd668afaf144d6e83590293a744b6d2c2a7d8e9fc6ab581f22d294fac5a4841098875f8569f36b794c083e4ec9f0b7d4e29a10dc79286a4843996f7fb64e SHA512 933b15908e30c389555dd9f82f87c2e571b4cb078bfbe5ed1858440166093cdee2b1c15da50bc5ab36087b62e216786b95c2aad9403e5047ae33e4fe8a6f4cc5
 EBUILD pipewire-0.2.7.ebuild 1650 BLAKE2B 3e94b6c00adb56c37e01df3f0adafc7d0d2115b2a27a1da3622245731ee341550f8bc8421e7d85693ca41a0a2ba17c192c06017f59e62bcd758babaf4bedfa20 SHA512 f924725947d243452b8bec1f03f7d113de2d4668ef3db18b2922a4b1695c87d4ac9def44e2d79d38fac3013a09dadb84af11fe8dc9aec4fe0ba475340f17b295
 EBUILD pipewire-0.3.10.ebuild 3386 BLAKE2B 4567234b2ff098c6fdb853fa7df9922d1712de2b50845f84d411ca73b46b38e601dc29589edcd7b181e175964101a8b182ab42e9333ba9de5dcc3ad0abaa7a5f SHA512 75714d9c10a79464cd017531900fb4100b83dae4a2858669444c25badeef4bcdbbe685ef7f73c817f102d3b776b55fdbcb64e3a7578a82d073d5f3cabfa2ece6
-EBUILD pipewire-0.3.13.ebuild 3389 BLAKE2B 61426a7a2d1cce9442eae8a937cc3a1046c1b09c0ab02eac2dc53b4a66ac313186cdd41ce751e07c9c7614deca0cf0bf4bae25aa31190624ae762f8e123a590c SHA512 fbfb5fd2a1583ce61e76360272ad865c7a683ef225883ac0f94b1d99fa8a291f920498c463749e3f4e4b71be569194ce36ec0c9113ae9ab1de9b8f284b4f0f3e
-EBUILD pipewire-0.3.15.ebuild 3427 BLAKE2B c2ac1b35d25ecd0e79e04fe22b8d6947a1fba024bc788bbb2833bafa694f8ec0ffccaf8c36f507fefcecd266e42eb344560f817d21aada97a34bdf481223dc61 SHA512 3f2ab1b3cda626d7107f9b9d00bab2a4f7b27c5baa4a794fe9662d90fc1ddd7eb51b54b5214b85ca4e8e5007c332029bfd8d3b8b87aae4d71178b7e0ddfb27e4
-EBUILD pipewire-0.3.17.ebuild 3427 BLAKE2B c2ac1b35d25ecd0e79e04fe22b8d6947a1fba024bc788bbb2833bafa694f8ec0ffccaf8c36f507fefcecd266e42eb344560f817d21aada97a34bdf481223dc61 SHA512 3f2ab1b3cda626d7107f9b9d00bab2a4f7b27c5baa4a794fe9662d90fc1ddd7eb51b54b5214b85ca4e8e5007c332029bfd8d3b8b87aae4d71178b7e0ddfb27e4
+EBUILD pipewire-0.3.18.ebuild 3427 BLAKE2B c2ac1b35d25ecd0e79e04fe22b8d6947a1fba024bc788bbb2833bafa694f8ec0ffccaf8c36f507fefcecd266e42eb344560f817d21aada97a34bdf481223dc61 SHA512 3f2ab1b3cda626d7107f9b9d00bab2a4f7b27c5baa4a794fe9662d90fc1ddd7eb51b54b5214b85ca4e8e5007c332029bfd8d3b8b87aae4d71178b7e0ddfb27e4
 MISC metadata.xml 760 BLAKE2B 7ce012dfa532fe563c70ec4782b43db76a9d2f6bdf439d0a524f59f9e8df8ea5aff513abb71d55aba5fe74277f71d7f0b20bb40182903a5d50b72bdffa3cfc9f SHA512 d3f9b3c4f80d282337c5c538680190f8b060ac28813ac6510c81c23e003c384ee3f6995e2eb5bb646e7af9d52a73a2e2c7578b313bcb11a5f86de94400c71246
diff --git a/media-video/pipewire/pipewire-0.3.13.ebuild b/media-video/pipewire/pipewire-0.3.13.ebuild
deleted file mode 100644
index 7396ae3ab65d..000000000000
--- a/media-video/pipewire/pipewire-0.3.13.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/PipeWire/pipewire.git"
-	EGIT_BRANCH="work"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/PipeWire/${PN}/archive/${PV}.tar.gz -> ${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="bluetooth debug doc ffmpeg gstreamer jack pulseaudio systemd test vulkan X"
-
-BDEPEND="
-	app-doc/xmltoman
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-"
-RDEPEND="
-	>=media-libs/alsa-lib-1.1.7
-	media-libs/libsdl2
-	>=media-libs/libsndfile-1.0.20
-	sys-apps/dbus
-	virtual/libudev
-	bluetooth? (
-		media-libs/sbc
-		net-wireless/bluez:=
-	)
-	ffmpeg? ( media-video/ffmpeg:= )
-	gstreamer? (
-		>=dev-libs/glib-2.32.0:2
-		>=media-libs/gstreamer-1.10.0:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	jack? ( >=media-sound/jack2-1.9.10:2 )
-	pulseaudio? (
-		dev-libs/glib:2
-		>=media-sound/pulseaudio-11.1
-	)
-	systemd? ( sys-apps/systemd )
-	vulkan? ( media-libs/vulkan-loader )
-	X? ( x11-libs/libX11 )
-"
-DEPEND="${RDEPEND}
-	vulkan? ( dev-util/vulkan-headers )
-"
-
-DOCS=( {README,INSTALL}.md NEWS )
-
-RESTRICT="!test? ( test )"
-
-src_prepare() {
-	spa_use() {
-		if ! in_iuse ${1} || ! use ${1}; then
-			sed -e "/^add-spa-lib.*${1}/s/^/#${2-$1}-disabled-by-USE-no-${1}\:/" \
-				-e "/^load-module.*${1}/s/^/#${2-$1}-disabled-by-USE-no-${1}\:/" \
-				-i src/daemon/pipewire.conf.in || die
-		fi
-	}
-
-	default
-	spa_use libcamera
-	spa_use rtkit
-	spa_use bluetooth bluez5
-	spa_use jack
-	spa_use vulkan
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dexamples=true # contains required pipewire-media-session
-		-Dman=true
-		-Dspa=true
-		-Dspa-plugins=true
-		--buildtype=$(usex debug debugoptimized plain)
-		# alsa plugin and jack/pulseaudio emulation
-		-Dpipewire-alsa=true
-		$(meson_use jack pipewire-jack)
-		$(meson_use pulseaudio pipewire-pulseaudio)
-		# spa-plugins
-		# we install alsa support unconditionally
-		$(meson_use bluetooth bluez5)
-		$(meson_use ffmpeg)
-		$(meson_use jack)
-		$(meson_use vulkan)
-		# libcamera is not packaged
-		# misc
-		$(meson_use doc docs)
-		$(meson_use gstreamer)
-		$(meson_use systemd)
-		$(meson_use test test)
-		$(meson_use test tests)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
-
-# 	# TODO: this breaks alsa users
-# 	if use alsa; then
-# 		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf
-# 	fi
-}
-
-pkg_postinst() {
-	elog "Package has optional sys-auth/rtkit RUNTIME support that may be disabled"
-	elog "by setting DISABLE_RTKIT env var."
-	elog "To enable rtkit, uncomment the load-module line in /etc/pipewire/pipewire.conf"
-	elog
-	if use jack; then
-		elog "Please note that even though the libraries for JACK emulation have"
-		elog "been installed, this ebuild is not yet wired up to replace a JACK server."
-		elog
-	fi
-	if use pulseaudio; then
-		elog "Please note that even though the libraries for PulseAudio emulation have"
-		elog "been installed, this ebuild is not yet wired up to replace PulseAudio."
-		elog
-	fi
-	elog "Read INSTALL.md for information about ALSA plugin or JACK/PulseAudio emulation."
-}
diff --git a/media-video/pipewire/pipewire-0.3.17.ebuild b/media-video/pipewire/pipewire-0.3.17.ebuild
deleted file mode 100644
index ddd42bd689c4..000000000000
--- a/media-video/pipewire/pipewire-0.3.17.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/PipeWire/pipewire.git"
-	EGIT_BRANCH="work"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/PipeWire/${PN}/archive/${PV}.tar.gz -> ${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="bluetooth debug doc ffmpeg gstreamer jack pulseaudio systemd test vulkan X"
-
-BDEPEND="
-	app-doc/xmltoman
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-"
-RDEPEND="
-	>=media-libs/alsa-lib-1.1.7
-	media-libs/libsdl2
-	>=media-libs/libsndfile-1.0.20
-	sys-apps/dbus
-	virtual/libudev
-	bluetooth? (
-		media-libs/sbc
-		net-wireless/bluez:=
-	)
-	ffmpeg? ( media-video/ffmpeg:= )
-	gstreamer? (
-		>=dev-libs/glib-2.32.0:2
-		>=media-libs/gstreamer-1.10.0:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	jack? ( >=media-sound/jack2-1.9.10:2 )
-	pulseaudio? (
-		dev-libs/glib:2
-		>=media-sound/pulseaudio-11.1
-	)
-	systemd? ( sys-apps/systemd )
-	vulkan? ( media-libs/vulkan-loader )
-	X? ( x11-libs/libX11 )
-"
-DEPEND="${RDEPEND}
-	vulkan? ( dev-util/vulkan-headers )
-"
-
-DOCS=( {README,INSTALL}.md NEWS )
-
-RESTRICT="!test? ( test )"
-
-src_prepare() {
-	spa_use() {
-		if ! in_iuse ${1} || ! use ${1}; then
-			sed -e "/^add-spa-lib.*${1}/s/^/#${2-$1}-disabled-by-USE-no-${1}\:/" \
-				-e "/^load-module.*${1}/s/^/#${2-$1}-disabled-by-USE-no-${1}\:/" \
-				-i src/daemon/pipewire.conf.in || die
-		fi
-	}
-
-	default
-	spa_use libcamera
-	spa_use rtkit
-	spa_use bluetooth bluez5
-	spa_use jack
-	spa_use vulkan
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dexamples=true # contains required pipewire-media-session
-		-Dman=true
-		-Dspa-plugins=true
-		--buildtype=$(usex debug debugoptimized plain)
-		# alsa plugin and jack/pulseaudio emulation
-		-Dpipewire-alsa=true
-		$(meson_use jack pipewire-jack)
-		$(meson_use pulseaudio pipewire-pulseaudio)
-		# spa-plugins
-		# we install alsa support unconditionally
-		$(meson_use bluetooth bluez5)
-		$(meson_use ffmpeg)
-		$(meson_use jack)
-		$(meson_use vulkan)
-		# libcamera is not packaged
-		# misc
-		$(meson_use doc docs)
-		$(meson_use gstreamer)
-		$(meson_use gstreamer gstreamer-device-provider)
-		$(meson_use systemd)
-		$(meson_use test test)
-		$(meson_use test tests)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
-
-# 	# TODO: this breaks alsa users
-# 	if use alsa; then
-# 		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf
-# 	fi
-}
-
-pkg_postinst() {
-	elog "Package has optional sys-auth/rtkit RUNTIME support that may be disabled"
-	elog "by setting DISABLE_RTKIT env var."
-	elog "To enable rtkit, uncomment the load-module line in /etc/pipewire/pipewire.conf"
-	elog
-	if use jack; then
-		elog "Please note that even though the libraries for JACK emulation have"
-		elog "been installed, this ebuild is not yet wired up to replace a JACK server."
-		elog
-	fi
-	if use pulseaudio; then
-		elog "Please note that even though the libraries for PulseAudio emulation have"
-		elog "been installed, this ebuild is not yet wired up to replace PulseAudio."
-		elog
-	fi
-	elog "Read INSTALL.md for information about ALSA plugin or JACK/PulseAudio emulation."
-}
diff --git a/media-video/pipewire/pipewire-0.3.15.ebuild b/media-video/pipewire/pipewire-0.3.18.ebuild
index ddd42bd689c4..ddd42bd689c4 100644
--- a/media-video/pipewire/pipewire-0.3.15.ebuild
+++ b/media-video/pipewire/pipewire-0.3.18.ebuild
diff --git a/media-video/rav1e/Manifest b/media-video/rav1e/Manifest
index 1c9f0e9c7086..eaebce8ff0b3 100644
--- a/media-video/rav1e/Manifest
+++ b/media-video/rav1e/Manifest
@@ -234,6 +234,6 @@ DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST y4m-0.5.3.crate 11447 BLAKE2B d3a7081899f12a50907ecbce6f63f1b1119618aefdc97bf967d5fe5b908b234552aac0fe96cc359f12aad7018af8b47b34b6219e0d87d036c8b4df1c1bcf1a27 SHA512 2d414d178c4bc16db7f5804987494629d12b85b409327012db2e9e868a7bb952cb630a86190fb455228ae40776b2c30c042eca65a1d3730e8425daf53f034991
 EBUILD rav1e-0.3.3.ebuild 4153 BLAKE2B 96f69c97721839eb9eaf7249780a50c95f3eaf7acc59d405cc618a8502bcfc480f93faa7518fb38a4e75fbeb1a1b09f910917dd1123de0b1cd8b7f2ec972f194 SHA512 dfdeccc66fba51e839cacc73c6c6502b86c30d6e7e771e186f7803cc5e82633858b2dba88b7baf73fa144ede00e1dc96a7f02314d286b05be11c9a92bf0efbf7
-EBUILD rav1e-0.3.4.ebuild 4206 BLAKE2B 780afff57f232730b4a2350bea35bde861106b5f009185996d0519a4b3cc2e9882509c55d253a9fd12c8dc78ec61193f79210a356dddb88c94808ffbdbab7713 SHA512 1d3905625b10cb8f8003eb4094f3d5a0a5871fa3cbea8472d357006d91a2c2efae68b7dfc1cb4c8527399cbb25de58caab31b81afd2dfe4660cd7f0abc0d5042
+EBUILD rav1e-0.3.4.ebuild 4204 BLAKE2B 7ac7a8f83ba51e84e3af9efb10e7d933af07f98089ac5083fb6583c8d8500d8923a6616e9ae4be8b4250eae7ce5c9fdf63617ca4dae29cac6849510fb0864d1f SHA512 103e3bd77c98ce7ded5d4c2aaa242b0e2acf239c248a0f6e3e7fd27f76faabce48992a70726ed332b108a8e28472b7bde41e1d73713ab49ad692610e3c1ede8b
 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.3.4.ebuild b/media-video/rav1e/rav1e-0.3.4.ebuild
index 74e42d2b18e4..3cf9015a2eaf 100644
--- a/media-video/rav1e/rav1e-0.3.4.ebuild
+++ b/media-video/rav1e/rav1e-0.3.4.ebuild
@@ -180,7 +180,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/subtitlecomposer/Manifest b/media-video/subtitlecomposer/Manifest
index a41e5af83190..6624ded45369 100644
--- a/media-video/subtitlecomposer/Manifest
+++ b/media-video/subtitlecomposer/Manifest
@@ -1,5 +1,6 @@
+AUX subtitlecomposer-0.7.0-mpv-0.33.patch 8812 BLAKE2B 00f0f9eb715c080b7a3f117f88a2aa69c08e553d3370637a09e27d04efdd01615b1f381a31efc415d0a114a0bfbf1ccf2d4d271377094f9bc20b29992ce953e2 SHA512 fe965b896358b969c6eef9e1a0262a59f6776e6f302da5356f447939992a9755285d95a495bd7acfb75fb28e78053557b0414b80c8315588e2f943545f16517f
 AUX subtitlecomposer-0.7.0-tests-optional.patch 242 BLAKE2B 6a3d88a537ad39a151b8a6ac071376eda0d1e5d504e92052b9f55e4693633b47fc2b6986d560bd086adf76630ad24bc3671b88f3bc97f9cb429a9e14ad9376bc SHA512 65f5c8db0c5e99b51600db772c918acb7154c7999bbbbbed18ed859f4defcb70d4f907c02a08d9a7529f3aaf4867d6154b9987fb3528cb100f4daa4466e33e74
 AUX subtitlecomposer-0.7.0-valid-desktop-file.patch 1090 BLAKE2B 4491d0bf738fe19374d40b2d278322694a456ac2d11394853653f44351ddf06714143164773eb6597ba4b6f55cf510803231c1241cca20cdc9822d3892f8e646 SHA512 4f2802be511da0b9f132d4368e23c06510fd0c115c8a19f5c05d0e737c355b3c061d290e38370a5992b85a48d77b23949ce3ebf675b9086d585df5be056e358b
 DIST subtitlecomposer-0.7.0.tar.gz 1649840 BLAKE2B a60d3917cc9bd8025d75782e850ba2507ab140ffaeff84e995d58994e848ebe4e103a87824a20dd689132235f67102e7fec39bf0f99d827c78883165e01e9fb7 SHA512 b1c71496a2609686946af2377862b86d70e357565646a3de2f158481bc9e397f649d0907499ecd21a193ec07eaf2135b7f5831697e6b20ba6721a743227fbe04
-EBUILD subtitlecomposer-0.7.0.ebuild 1957 BLAKE2B c198a52aab4776e0b17e109366db581339744e5727078cfffac79023032eb36ffe9a05fe0c93ed906d211281f86fea3112a28ce06abb7f0ee7f588b3fa9d10b7 SHA512 7eab20abe42eadd951982890349d1964609cd4092b2b00dad2a07e332e39508877067eaf839d65249647d294e487837d5377fe4ff25532af3132b3636e9467dc
+EBUILD subtitlecomposer-0.7.0.ebuild 2005 BLAKE2B 7ef30553b68f40208e46ca6f3338458d7c3269cf8227b8e965dcfd88ef590e6929e40a334135f83e5f2a69161668cfd2e4eede8a8100aa1915526f0b3e29808e SHA512 147ac6581658b440958fa2df73ac346c5656762a2889bd596c8c5bca99faa101b775771bd62b4567187e1e2edf2b780f567c0932f72b5d5b27a1edd2f07ae714
 MISC metadata.xml 524 BLAKE2B 662474bada941eadcab48ae4432e72af4f786ff61d2bc1db20115e2f70ca4953e01c38fd550cce72908fe5c36077d9e1b240f53e24142c7556802f3a7783d1bd SHA512 c2ef5d88d2b12534ba76ba4949c4ceee405f88b546f3b749704d8f7529d1b19b3ce8b20b18b496203259dcbde74ba7bf948ae9e4fa4601984554f8f0664a6efe
diff --git a/media-video/subtitlecomposer/files/subtitlecomposer-0.7.0-mpv-0.33.patch b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.0-mpv-0.33.patch
new file mode 100644
index 000000000000..a97ab22543bc
--- /dev/null
+++ b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.0-mpv-0.33.patch
@@ -0,0 +1,260 @@
+From d09a3cbc60da86f57d06477dea1a57962a11ffb2 Mon Sep 17 00:00:00 2001
+From: Mladen Milinkovic <maxrd2@smoothware.net>
+Date: Mon, 8 Jul 2019 20:19:03 +0200
+Subject: [PATCH] MPV player config options aren't hardcoded anymore.
+
+---
+ src/videoplayerplugins/mpv/mpvbackend.cpp     |  37 ++++++-
+ src/videoplayerplugins/mpv/mpvbackend.h       |   8 +-
+ .../mpv/mpvconfigwidget.cpp                   | 102 ++++++++++++++++--
+ src/videoplayerplugins/mpv/mpvconfigwidget.h  |   8 ++
+ 4 files changed, 139 insertions(+), 16 deletions(-)
+
+diff --git a/src/videoplayerplugins/mpv/mpvbackend.cpp b/src/videoplayerplugins/mpv/mpvbackend.cpp
+index d85a56c..9fdcd95 100644
+--- a/src/videoplayerplugins/mpv/mpvbackend.cpp
++++ b/src/videoplayerplugins/mpv/mpvbackend.cpp
+@@ -33,8 +33,6 @@
+ #include <KMessageBox>
+ 
+ using namespace SubtitleComposer;
+-using namespace mpv;
+-using namespace mpv::qt;
+ 
+ MPVBackend::MPVBackend()
+ 	: PlayerBackend(),
+@@ -218,6 +216,37 @@ MPVBackend::mpvEventHandle(mpv_event *event)
+ 	}
+ }
+ 
++static QVariant
++node_to_variant(const mpv_node *node)
++{
++	switch(node->format) {
++	case MPV_FORMAT_STRING:
++		return QVariant(QString::fromUtf8(node->u.string));
++	case MPV_FORMAT_FLAG:
++		return QVariant(static_cast<bool>(node->u.flag));
++	case MPV_FORMAT_INT64:
++		return QVariant(static_cast<qlonglong>(node->u.int64));
++	case MPV_FORMAT_DOUBLE:
++		return QVariant(node->u.double_);
++	case MPV_FORMAT_NODE_ARRAY: {
++		mpv_node_list *list = node->u.list;
++		QVariantList qlist;
++		for(int n = 0; n < list->num; n++)
++			qlist.append(node_to_variant(&list->values[n]));
++		return QVariant(qlist);
++	}
++	case MPV_FORMAT_NODE_MAP: {
++		mpv_node_list *list = node->u.list;
++		QVariantMap qmap;
++		for(int n = 0; n < list->num; n++)
++			qmap.insert(QString::fromUtf8(list->keys[n]), node_to_variant(&list->values[n]));
++		return QVariant(qmap);
++	}
++	default: // MPV_FORMAT_NONE, unknown values (e.g. future extensions)
++		return QVariant();
++	}
++}
++
+ void
+ MPVBackend::updateTextData(const mpv_event_property *prop)
+ {
+@@ -230,7 +259,7 @@ MPVBackend::updateTextData(const mpv_event_property *prop)
+ 				if(val.format != MPV_FORMAT_NODE_MAP)
+ 					continue;
+ 
+-				const QMap<QString, QVariant> &map = mpv::qt::node_to_variant(&val).toMap();
++				const QMap<QString, QVariant> &map = node_to_variant(&val).toMap();
+ 
+ 				if(map[QStringLiteral("type")].toString() != QStringLiteral("sub")
+ 				|| map[QStringLiteral("external")].toBool() == true)
+@@ -269,7 +298,7 @@ MPVBackend::updateAudioData(const mpv_event_property *prop)
+ 				if(val.format != MPV_FORMAT_NODE_MAP)
+ 					continue;
+ 
+-				const QMap<QString, QVariant> &map = mpv::qt::node_to_variant(&val).toMap();
++				const QMap<QString, QVariant> &map = node_to_variant(&val).toMap();
+ 
+ 				if(map[QStringLiteral("type")].toString() != QStringLiteral("audio"))
+ 					continue;
+diff --git a/src/videoplayerplugins/mpv/mpvbackend.h b/src/videoplayerplugins/mpv/mpvbackend.h
+index d0edf2e..5e19fa1 100644
+--- a/src/videoplayerplugins/mpv/mpvbackend.h
++++ b/src/videoplayerplugins/mpv/mpvbackend.h
+@@ -23,7 +23,7 @@
+ 
+ #include "videoplayer/playerbackend.h"
+ 
+-#include <mpv/qthelper.hpp>
++#include <mpv/client.h>
+ 
+ #include <QWidget>
+ #include <QString>
+@@ -76,14 +76,10 @@ signals:
+ protected slots:
+ 	void onMPVEvents();
+ 
+-protected:
+-	void setupProcessArgs(const QString &filePath);
+-
++private:
+ 	void mpvEventHandle(mpv_event *event);
+-
+ 	static void wakeup(void *ctx);
+ 
+-private:
+ 	void updateTextData(const mpv_event_property *prop);
+ 	void updateAudioData(const mpv_event_property *prop);
+ 	void updateVideoData();
+diff --git a/src/videoplayerplugins/mpv/mpvconfigwidget.cpp b/src/videoplayerplugins/mpv/mpvconfigwidget.cpp
+index 78458f8..6958141 100644
+--- a/src/videoplayerplugins/mpv/mpvconfigwidget.cpp
++++ b/src/videoplayerplugins/mpv/mpvconfigwidget.cpp
+@@ -20,6 +20,11 @@
+ 
+ #include "mpvconfigwidget.h"
+ 
++#include <locale>
++#include <mpv/client.h>
++
++#include "scconfig.h"
++
+ using namespace SubtitleComposer;
+ 
+ MPVConfigWidget::MPVConfigWidget(QWidget *parent)
+@@ -27,14 +32,99 @@ MPVConfigWidget::MPVConfigWidget(QWidget *parent)
+ {
+ 	setupUi(this);
+ 
+-	kcfg_mpvVideoOutput->addItems(QString("vdpau vaapi opengl opengl-hq sdl xv wayland x11 null").split(' '));
+-	kcfg_mpvVideoOutput->setProperty("kcfg_property", QByteArray("currentText"));
++	// FIXME: libmpv requires LC_NUMERIC category to be set to "C".. is there some nicer way to do this?
++	std::setlocale(LC_NUMERIC, "C");
++	m_mpv = mpv_create();
++	mpv_request_log_messages(m_mpv, "info");
++	if(mpv_initialize(m_mpv) >= 0) {
++		getHelpResponse(); // make sure there are no log messages
++		static QStringList bad = {
++			QStringLiteral("libmpv"),
++			QStringLiteral("null"),
++			QStringLiteral("image"),
++			QStringLiteral("tct"),
++			QStringLiteral("caca"),
++			QStringLiteral("pcm"),
++		};
++
++		mpv_set_property_string(m_mpv, "vo", "help");
++		for(QString row : getHelpResponse()) {
++			int pos = row.indexOf(QChar(' '));
++			if(pos == -1)
++				continue;
++			const QString name = row.left(pos);
++			if(bad.contains(name))
++				continue;
++			row.insert(pos, "\t-");
++			if(SCConfig::mpvVideoOutput() == name)
++				kcfg_mpvVideoOutput->setCurrentIndex(kcfg_mpvHwDecode->count());
++			kcfg_mpvVideoOutput->addItem(row, name);
++		}
++		kcfg_mpvVideoOutput->setProperty("kcfg_property", QByteArray("currentData"));
++
++		mpv_set_property_string(m_mpv, "hwdec", "help");
++		kcfg_mpvHwDecode->addItem(QStringLiteral("auto\t- Choose best HW decoder"), QStringLiteral("auto"));
++		for(QString row : getHelpResponse()) {
++			int pos = row.indexOf(QChar(' '));
++			if(pos == -1)
++				continue;
++			const QString name = row.left(pos);
++			const QString lastName = kcfg_mpvHwDecode->itemData(kcfg_mpvHwDecode->count() - 1).toString();
++			if(lastName == name || bad.contains(name))
++				continue;
++			if(SCConfig::mpvHwDecode() == name)
++				kcfg_mpvHwDecode->setCurrentIndex(kcfg_mpvHwDecode->count());
++			kcfg_mpvHwDecode->addItem(name, name);
++		}
++		kcfg_mpvHwDecode->setProperty("kcfg_property", QByteArray("currentData"));
++
++		mpv_set_property_string(m_mpv, "ao", "help");
++		for(QString row : getHelpResponse()) {
++			int pos = row.indexOf(QChar(' '));
++			if(pos == -1)
++				continue;
++			const QString name = row.left(pos);
++			if(bad.contains(name))
++				continue;
++			row.insert(pos, "\t-");
++			if(SCConfig::mpvAudioOutput() == name)
++				kcfg_mpvAudioOutput->setCurrentIndex(kcfg_mpvHwDecode->count());
++			kcfg_mpvAudioOutput->addItem(row, name);
++		}
++		kcfg_mpvAudioOutput->setProperty("kcfg_property", QByteArray("currentData"));
+ 
+-	kcfg_mpvHwDecode->addItems(QString("auto vdpau vaapi vaapi-copy").split(' '));
+-	kcfg_mpvHwDecode->setProperty("kcfg_property", QByteArray("currentText"));
++		mpv_detach_destroy(m_mpv);
++	} else {
++		kcfg_mpvVideoOutput->addItems(QString("vdpau vaapi opengl opengl-hq sdl xv wayland x11 null").split(' '));
++		kcfg_mpvVideoOutput->setProperty("kcfg_property", QByteArray("currentText"));
+ 
+-	kcfg_mpvAudioOutput->addItems(QString("pulse alsa oss portaudio jack null").split(' '));
+-	kcfg_mpvAudioOutput->setProperty("kcfg_property", QByteArray("currentText"));
++		kcfg_mpvHwDecode->addItems(QString("auto vdpau vaapi vaapi-copy").split(' '));
++		kcfg_mpvHwDecode->setProperty("kcfg_property", QByteArray("currentText"));
++
++		kcfg_mpvAudioOutput->addItems(QString("pulse alsa oss portaudio jack null").split(' '));
++		kcfg_mpvAudioOutput->setProperty("kcfg_property", QByteArray("currentText"));
++	}
++}
++
++const QStringList
++MPVConfigWidget::getHelpResponse()
++{
++	QStringList res;
++	while(m_mpv) {
++		mpv_event *event = mpv_wait_event(m_mpv, .1);
++		if(event->event_id == MPV_EVENT_LOG_MESSAGE) {
++			mpv_event_log_message *msg = reinterpret_cast<mpv_event_log_message *>(event->data);
++			if(msg->log_level == MPV_LOG_LEVEL_INFO && strcmp(msg->prefix, "cplayer") == 0) {
++				QString row = QString::fromUtf8(msg->text).simplified();
++				if(row.endsWith(QChar(':')))
++					continue;
++				res << row;
++			}
++		} else if(event->event_id == MPV_EVENT_NONE) {
++			break;
++		}
++	}
++	return res;
+ }
+ 
+ MPVConfigWidget::~MPVConfigWidget()
+diff --git a/src/videoplayerplugins/mpv/mpvconfigwidget.h b/src/videoplayerplugins/mpv/mpvconfigwidget.h
+index f4105d7..775b507 100644
+--- a/src/videoplayerplugins/mpv/mpvconfigwidget.h
++++ b/src/videoplayerplugins/mpv/mpvconfigwidget.h
+@@ -23,6 +23,8 @@
+ 
+ #include "ui_mpvconfigwidget.h"
+ 
++#include <mpv/client.h>
++
+ namespace SubtitleComposer {
+ class MPVConfigWidget : public QWidget, private Ui::MPVConfigWidget
+ {
+@@ -31,6 +33,12 @@ class MPVConfigWidget : public QWidget, private Ui::MPVConfigWidget
+ public:
+ 	explicit MPVConfigWidget(QWidget *parent = 0);
+ 	virtual ~MPVConfigWidget();
++
++private:
++	const QStringList getHelpResponse();
++
++private:
++	mpv_handle *m_mpv;
+ };
+ }
+ 
+-- 
+2.29.2
diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild b/media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild
index d5fe989dd52a..6dbfebafa05d 100644
--- a/media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild
@@ -57,6 +57,7 @@ RDEPEND="${DEPEND}"
 PATCHES=(
 	"${FILESDIR}/${P}-tests-optional.patch"
 	"${FILESDIR}/${P}-valid-desktop-file.patch" # bug 745429
+	"${FILESDIR}/${P}-mpv-0.33.patch" # bug 760006
 )
 
 S="${WORKDIR}/SubtitleComposer-${PV}"
diff --git a/media-video/tsmuxer/Manifest b/media-video/tsmuxer/Manifest
index 2f496763738c..25f5d4623906 100644
--- a/media-video/tsmuxer/Manifest
+++ b/media-video/tsmuxer/Manifest
@@ -1,3 +1,3 @@
 DIST tsmuxer-2.6.11.tar.gz 538798 BLAKE2B 18f5f9002e356664ae84343afbadcddd447743404bcdcca709ba039ebb2ab05e5fba7eda0f30c86c29e18040d646004d1aec7dec34ed008ddbdb15228c63f09d SHA512 25b552153b76231ac1b88858d2178564d22edd18c6b08dc872765ac214ca6fd1ff6df5c5fff0f24647ea35f3f990e364bfb8adff5dd79c69cc12875fafb4f137
-EBUILD tsmuxer-2.6.11-r1.ebuild 790 BLAKE2B e12590324f4798c862045b53e0a9eb4f043d31ab719b77a4d43fc42d3f45445b6a9506ffa028b47e5c0ec86b3c6e5671294497838d70b94de75ce69173384847 SHA512 bb8e02444ceec2b8411633e22df14fd729a3ce4f30d8714fc7623d25c14f652bb2f864bdc2cc977417d0c64f71fc217ca6a0b0e7aa8391959e83f380f99c0016
+EBUILD tsmuxer-2.6.11-r1.ebuild 787 BLAKE2B a47275e8bdb863a8323c82a777d738547ae7d94a4182e37e0aadfcd1a21c7947553f7531ca8b1d09cc7185f087dcedf81d744e87d665716462e13f1822b44cd2 SHA512 e0bc8f16c0a7ba1c9546c14e1eeb1325d9958720a1e6c57dca2b7f1f0e06930481ea8f2f628dd915740f91ec2dce6d34d2ece90169e5022d306c2cd15e27b59c
 MISC metadata.xml 572 BLAKE2B 244e20f96b8fc9ae813458ea873fb6dc9fb2f35208bda79a560bf9d014de331643f38c7734b507a7b41b6e59c5f73a0919f6467f03545e25f151de06435fbdce SHA512 8527c0daedfcbf7798518d8731fb6c2995b551b83f17d476a949d3b34e8df8a96cf5f85d78d01c6f5b621d8e5f243ceadde6af763b50f84aa24ec406b41a2714
diff --git a/media-video/tsmuxer/tsmuxer-2.6.11-r1.ebuild b/media-video/tsmuxer/tsmuxer-2.6.11-r1.ebuild
index f9c3f8f54b78..4ddb8bb9da41 100644
--- a/media-video/tsmuxer/tsmuxer-2.6.11-r1.ebuild
+++ b/media-video/tsmuxer/tsmuxer-2.6.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 949494af80c6..dabb62aca387 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -2,12 +2,14 @@ AUX vlc-2.1.0-fix-libtremor-libs.patch 453 BLAKE2B 526934642617384224faee8d26c0a
 AUX vlc-2.2.8-freerdp-2.patch 4478 BLAKE2B 24b34ae2015de5197a275e393a761535d3386138ca1cdd67f0254a8bb916c9b0b40e553846299036882da5e5389fd8b8722f6f0cdf3e114a05fe1d445b48801c SHA512 e71bf81d87e7d0daf6d5820ba8e6a365cb8041eca82674ef69cc0d1eabbb29349a9ac193b0c2ad212e6d231dda7cf07a71e76317b8e8fc44b5ef0467d8f86b2f
 AUX vlc-2.2.8-libupnp-slot-1.8.patch 725 BLAKE2B eb217ef57f0709fa1d0bdf1644610588f373e17d18c2642ee6489ca00311772307d8fc67a07ecc8d29810b80aa8f14c40298285c3319d8ddede2552d28d2837e SHA512 890b91405cbf6105c932566fd7799fdccd1b27f1e0df0c6dae1511aeead2c28eb5fea7642b01af1abbcf546aae0559408c0ddf2ec82c92809f3b02d1d477bb51
 AUX vlc-3.0.11.1-configure_lua_version.patch 1598 BLAKE2B 589c90d0c805ff516b7957e9b9fc6931674bc23a8aac15eb27351e9bae00aa55bffb3e62a87813714d8f0d64effa16c06680f10d00ecbe4207d5b26d37c4e5ac SHA512 0f24f54add360164417e01b2899ead07cc9f37cdc872387c7a9c350890f55c6fbec35f99e1e85a96309d7154359ffb99bc2ab7c8151adb080bb1531f88d987e6
+AUX vlc-3.0.11.1-srt-1.4.2.patch 976 BLAKE2B 1d5c6a2df44e2cc26c0b835b71f028b04457e1cfc37954d30d9f2b29d711ea80ae2ec5431ed87be626caa16effa1565a34520dd7a54e89ee470e6aace6d3c594 SHA512 333480c279ad743b30ae61ab2e4e1c7bdca8e406009075f669c84fbaffe7fd68a9e9c58615d44cdba1056b973726c486cacd8d2dbcfea6f282173a929f5f8d68
 AUX vlc-3.0.6-fdk-aac-2.0.0.patch 3436 BLAKE2B 022201ed10fef189feeb36f44ab4194ab7994e4fdd8bad922070b54688d34d051fac28177a0e648d55670e0b9f0c6b45f9a05650476b0ae12ebfe759dd561e28 SHA512 68964adda04cd88e80b586984f1af0cfdccff5dbf8529070d5ab985b23402dfb7380b5d39eacfea433c1ba03434139e4f394c1c25d6b426489883d3a42cb7b5b
 AUX vlc-3.0.8-qt-5.15.patch 1003 BLAKE2B 44a64b0448a235ce1dcf7100d084c85f9ffe6cdebf6cf0b5561e915a2ab6fbf348c152ff6e3c9beb1f073157a8ce8b15f3317a29c5410d3131462aac8d7c1ea4 SHA512 ff61fdc64e2bf4bc19536e76d7b824b0f77d8aa7a1fe61578f57b400ccda1bb51a5f5d97486c42ca6760b137ada68faedc73697dc39005babc839428fafee731
 AUX vlc-9999-libupnp-slot-1.8.patch 763 BLAKE2B 6bc8cf46f029db27d6d30d96e871d3bcfddee004e4e8469e1526a6a38fb5cc11a24a19888443e5f9062d7145665d594e142c12f3a9693967f195bab3b33ada38 SHA512 dd3375997a1935d3a227231785f35e300e3f992034da6a9c3019e28c68c1f005cbdd67190672264b342abc719e69005f965599f7af975e2bbd4cfccd89e3770d
 DIST vlc-3.0.11.1.tar.xz 25886644 BLAKE2B b3cf3f8776086fcd45ca20918be8951960bf3d18c219d0d512f64bfe89d3e947300875b4b8e1a27742132400fd9a3b32f5e84afd08f52254899a23922a682361 SHA512 8ce1e2f11aabf847dc5c55cf21ce6d7c0419a1051b5f4795e36cd060eab82d5056e44b4c070b80af56744e6aa841ef538386d08bc3b397a444e7258b2ba3f76b
-EBUILD vlc-3.0.11.1-r100.ebuild 13176 BLAKE2B b6d354b79b6816cf1a3dca77cca1c68e240536645fbb14a37559f4c336846db5913b0fdf2f6031e5dd3e3943b33b83e691de0653478e6e1718f9130b8299ff0c SHA512 fd1b0fb98876300a4b72df411a87e576992e3666464a1aa904fdca691e91391a450f9a09b0fce8cd8101a6ab809faf4cb312f67195ebb416105bb423f9c498fd
+EBUILD vlc-3.0.11.1-r1.ebuild 13104 BLAKE2B 288aa1c7697a865fdd86a4b3e0e77fdf1e4636ecb3b97f2eead2f9fd25035322af2c9fc505a0fcb7334786208706f31dd5c7d45e0ccd9297bfa6d590b4ddabfd SHA512 5d1020021e4325e041ce60adc1e4c0588340f6238e50a16694f5b5995b35e7e41af945c3b7b4f302191aefa93f0122040b8d2a2a9200bedf0124fe45ec807025
+EBUILD vlc-3.0.11.1-r101.ebuild 13305 BLAKE2B 1cbd290b6225643ed7debcdf2ef440a47f4da77d3fd1cdb94b0af2aea8094a58e0329d4d0600c71445706a03cfc9be8884c09cbbc1efd316b7bb01d7f23ff6bd SHA512 d4eb61235adf0ac66d9c2c8eca0d95c00ae8f6929a8b065bcce5026a659045cb1bae4d24dccc5bff2b5083a4be58d16f9c9edf015b01495a7056a699840d9e26
 EBUILD vlc-3.0.11.1.ebuild 13032 BLAKE2B fa553af69eefea08a196bf942278bfca08e21a6547eaa3ab1b49f1f676081e85f31ace2c64b9a509cc6f7e8bd6de6665f8fe1bde56a58819afc0d348540535c7 SHA512 5f4f5eb7547cc178379ce620f526ff054c92090cb4106e24e20b4e8a856991b9c01374954f047a48896e768f156a51eb015d106af76d89fa9dd79213ab33720d
-EBUILD vlc-3.0.9999.ebuild 13111 BLAKE2B 356da7a2561af3112065b632b8191767c26cf9a8bfa4097c5a5e83e05dc15d59450667a9bf5ef48dfad3b0f8ff07a1fbe987994999c918bdf285b3360dae1903 SHA512 26e7b85090c48cdc2f26877ce4b5e308a633c941ec1d0e7d6764d42802cd7d80ba0d23a8a8f57ea4a99913a84126b1171bf12e2e202e519070e9da6038618798
-EBUILD vlc-9999.ebuild 13132 BLAKE2B faeab356cafdaf2b56e286b8efc8a9c7427eb9ceaf654d9b9b46d236eba8ea74a8c4afab6171cdb1200a12184ceee5b289c8885e47130774d4c0994da9298209 SHA512 36fd343422f83b932fe7cab47ede87729d820fd5aa829d4f62327739d3dba1a6c21136efb02eca949279477ddc60cc23e9b77236df836ca615662c8e065498c9
+EBUILD vlc-3.0.9999.ebuild 13173 BLAKE2B 456f3698e7f801cd40497f5066c8ed7b844c1388f0b13f33aa0d1c50172b875278a7f1cda750471e85a26f1547ee427bda7e0d60cd171d3b247f4a39858fe14f SHA512 1fc424fd83edfa8ff486fa8fdbdf36a4ca9d752115b3b0ea354014d2d725a393e2421b4e4eaa82cfd6d0782548c6d26b618175eb22d32f1f6b9276f8d5e2354e
+EBUILD vlc-9999.ebuild 13194 BLAKE2B 6bd25c1fad765c7306871e5664741c0727953c1d0352e74f938051c8a917759508f3b23a3dd47f55a1276aafe8d761871a060957d4f185d88c11105fc1a1d851 SHA512 6bbbca0089d3940a797aa4e6cb802437df03c8b660d1a8579a6fbf722aa3e73b983f6f66158b4f7e17f0c9ab4995ea736b527cfa13b144e9326cb37a9173a1a6
 MISC metadata.xml 4911 BLAKE2B 689cbaf21ee9adbae82ea670b575286cecfe49865aaff92a92d1cb78305c26306a72d9b010e052955c79e0c39723f03301f7a858de198948759ec228e90e7baf SHA512 62442acac34bf27c40e5cf41313c2f9ed3efd54cfb9c0dc42ca0ba3b37cb8e23690e88f04a3629bbe62b774c2bc6740a33f7336d371589982c8b2578050f13d1
diff --git a/media-video/vlc/files/vlc-3.0.11.1-srt-1.4.2.patch b/media-video/vlc/files/vlc-3.0.11.1-srt-1.4.2.patch
new file mode 100644
index 000000000000..d617a8357ff7
--- /dev/null
+++ b/media-video/vlc/files/vlc-3.0.11.1-srt-1.4.2.patch
@@ -0,0 +1,25 @@
+net-libs/srt renamed the SRTO_TSBPDDELAY constant to SRTRO_LATENCY.
+https://github.com/Haivision/srt/pull/1364
+https://bugs.gentoo.org/758062
+--- b/modules/access/srt.c
++++ a/modules/access/srt.c
+@@ -165,7 +165,7 @@ static bool srt_schedule_reconnect(strea
+ 
+     /* Set latency */
+     i_latency = var_InheritInteger( p_stream, "latency" );
+-    srt_setsockopt( p_sys->sock, 0, SRTO_TSBPDDELAY,
++    srt_setsockopt( p_sys->sock, 0, SRTO_LATENCY,
+         &i_latency, sizeof( int ) );
+ 
+     psz_passphrase = var_InheritString( p_stream, "passphrase" );
+--- a/modules/access_output/srt.c
++++ b/modules/access_output/srt.c
+@@ -162,7 +162,7 @@ static bool srt_schedule_reconnect(sout_
+ 
+     /* Set latency */
+     i_latency = var_InheritInteger( p_access, "latency" );
+-    srt_setsockopt( p_sys->sock, 0, SRTO_TSBPDDELAY,
++    srt_setsockopt( p_sys->sock, 0, SRTO_LATENCY,
+         &i_latency, sizeof( int ) );
+ 
+     if ( psz_passphrase != NULL && psz_passphrase[0] != '\0')
diff --git a/media-video/vlc/vlc-3.0.11.1-r1.ebuild b/media-video/vlc/vlc-3.0.11.1-r1.ebuild
new file mode 100644
index 000000000000..5191f5315723
--- /dev/null
+++ b/media-video/vlc/vlc-3.0.11.1-r1.ebuild
@@ -0,0 +1,492 @@
+# Copyright 2000-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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
+	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 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 vorbis 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 )
+	skins? ( qt5 truetype X xml )
+	ssl? ( gcrypt )
+	vaapi? ( ffmpeg X )
+	vdpau? ( ffmpeg X )
+"
+BDEPEND="
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	amd64? ( dev-lang/yasm )
+	x86? ( dev-lang/yasm )
+"
+RDEPEND="
+	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:= )
+	cddb? ( media-libs/libcddb )
+	chromaprint? ( media-libs/chromaprint:= )
+	chromecast? (
+		>=dev-libs/protobuf-2.5.0:=
+		>=net-libs/libmicrodns-0.0.9:=
+	)
+	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-4.9:0=
+		>=media-libs/libdvdread-4.9: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? ( >=dev-lang/lua-5.1:0= )
+	mad? ( media-libs/libmad )
+	matroska? (
+		>=dev-libs/libebml-1.3.6:=
+		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
+	)
+	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 )
+	vorbis? ( media-libs/libvorbis )
+	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.8-qt-5.15.patch # TODO: upstream
+	"${FILESDIR}"/${PN}-3.0.11.1-srt-1.4.2.patch # bug 758062
+)
+
+DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
+
+S="${WORKDIR}/${MY_P}"
+
+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"
+
+	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
+		$(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 vorbis)
+		$(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
+
+	# 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 "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	if [[ -z ${ROOT} ]] && [[ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then
+		einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on /usr/$(get_libdir)/vlc/plugins/"
+		"/usr/$(get_libdir)/vlc/vlc-cache-gen" "/usr/$(get_libdir)/vlc/plugins/"
+	else
+		ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)"
+		ewarn "Please run /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 /usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then
+		rm /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.11.1-r100.ebuild b/media-video/vlc/vlc-3.0.11.1-r101.ebuild
index 23ebcaad281a..f07316c92781 100644
--- a/media-video/vlc/vlc-3.0.11.1-r100.ebuild
+++ b/media-video/vlc/vlc-3.0.11.1-r101.ebuild
@@ -184,7 +184,7 @@ RDEPEND="
 		>=media-libs/speex-1.2.0
 		media-libs/speexdsp
 	)
-	srt? ( net-libs/srt )
+	srt? ( >=net-libs/srt-1.4.2 )
 	ssl? ( net-libs/gnutls:= )
 	svg? (
 		gnome-base/librsvg:2
@@ -233,12 +233,19 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290
 	"${FILESDIR}"/${PN}-3.0.8-qt-5.15.patch # TODO: upstream
 	"${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch
+	"${FILESDIR}"/${PN}-3.0.11.1-srt-1.4.2.patch # bug 758062
 )
 
 DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
 
 S="${WORKDIR}/${MY_P}"
 
+pkg_setup() {
+	if use lua; then
+		lua-single_pkg_setup
+	fi
+}
+
 src_prepare() {
 	xdg_src_prepare # bug 608256
 
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index 2cd26034d19a..eeb60b76f41a 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -237,6 +237,12 @@ DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
 
 S="${WORKDIR}/${MY_P}"
 
+pkg_setup() {
+	if use lua; then
+		lua-single_pkg_setup
+	fi
+}
+
 src_prepare() {
 	xdg_src_prepare # bug 608256
 
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index bd6ded539cc6..97191e56c23d 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -240,6 +240,12 @@ DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
 
 S="${WORKDIR}/${MY_P}"
 
+pkg_setup() {
+	if use lua; then
+		lua-single_pkg_setup
+	fi
+}
+
 src_prepare() {
 	xdg_src_prepare # bug 608256
 
diff --git a/media-video/xine-ui/Manifest b/media-video/xine-ui/Manifest
index de064fa35bd8..692db9f6748c 100644
--- a/media-video/xine-ui/Manifest
+++ b/media-video/xine-ui/Manifest
@@ -1,7 +1,4 @@
 AUX xine-ui-0.99.10-desktop.patch 996 BLAKE2B 3ea4d4f4c3a9c3fd93f211c949694abef94d9f115d41f45afce07632f96473912e393b14de8fba714f9d11bb351ff8df41d056d6c4aebd680f03f84b5498d60a SHA512 f4d40ff11f851ab2e56e902fd9c5cf51f530c76308d6f7f6675cd5b90486a1e265d29b12375c10a57a8a825b45132fef9ca471dad056c5524e817678ce79626f
-AUX xine-ui-0.99.10-libcaca.patch 977 BLAKE2B f91dd8813b549ea00db0028e6a86d04ff7a27575f749509e27e331cfa9d76ac50349e52bc74ebdf4b7ae9b357209e5da292f2eee24c0a79204202417adfa9c98 SHA512 edde19d900c19ca6530877041a0d78d9a0d7fad44d3ec62f76e5907c8907ffe338434161d1c59066ddce132b61ee6072981ef00899588bb6adebbdb461d0d2ce
-DIST xine-ui-0.99.10.tar.xz 1762968 BLAKE2B eede1a7b43f3fca37c092541145a4d13813185a740c396503bdfc93fd96d4d3bf52ad2daed4389634e2a517972c1233e3d9b1af74b718dd9def58eb2e702d967 SHA512 73cbc72375b27335e9d5f5527c35dab12d1ae40539b587630b3d8709471e4c61ce7b619062b75f587252c0647c234ffcf611f3b4e38e0447f7041b7ca5d7289e
 DIST xine-ui-0.99.12.tar.xz 1980672 BLAKE2B ac1a9b17b48005c667d53129e51f4db2cfe2933c0fca9ba8b6f1d999f903568217a061c84806abfec31d4afcc238579c232a1ae6f4b04afcac465c340826f037 SHA512 bc04cb8df730abce147485b488250331a304e4318fc28ebab890c6485242a5edeafd953547c637622e2312c65aa1e36aaae6117d608dd668781d841804f2ae86
-EBUILD xine-ui-0.99.10.ebuild 2028 BLAKE2B 153fb6819a95fab8058fc3d7241419ac9f5b5797042ba077088bec627f3906017da9f349c3af63da76b3a1a74505c2d5a3103ac5689411177355116cd46a12fc SHA512 ae9301c83a7d404229d6b7714f5b761e1224f173f01666ce9fd47c6be74fb765ffc091717674e484af2c15d7954acf1d559c5563eb1f730b6cc23c7da12fa64f
-EBUILD xine-ui-0.99.12.ebuild 2004 BLAKE2B 91945b6d3b4983f7ff33a63f450acc9e48ed4c76615d31fe3d9b9b01ad69306f32a615f6bf7afd7c3be68b3881b7b8901651c3cc787b318e2ab66727d68962cb SHA512 670c1c65bd22d5e01f104f58cacedd53744190ac530ada52f8b771bfdb74c215f858d73666eff9ab0e5c250b02dd26ed8392eb9022ffd23c432a073813a0f903
+EBUILD xine-ui-0.99.12.ebuild 2003 BLAKE2B 8e0d1e5e84f1950b83d31c134f8f9e9e410271fdd3980801d05025ca540400511630869d7b9ff4beaa3991c6aacf757067d6227edafc921cc5cbc4f9095635d9 SHA512 bcdca5162cd33839d715dec37be63e15d80c9b0e5f8e063ab64cf4eca8e8f87a73b4629aaf26ac4e7623749995d39ed08203a3c0ea31ad7e81385f2cac46a1c7
 MISC metadata.xml 386 BLAKE2B 8874545c1b0a0b9f60505dc08c933e3268f42b64fb1eed4e889d30af4ba3b6c74b1b1986f06425aa00ca81ab91e993a37e2c723ec4f53bbf69a2ccae8ba3ed69 SHA512 ead8587493161ece36b38168e0c628a05a97d1dfc7dddec3d7a966a783621634be28bd661a6e0d65e370dd7066ef49019265967f7394aa4026b3ae97de26a820
diff --git a/media-video/xine-ui/files/xine-ui-0.99.10-libcaca.patch b/media-video/xine-ui/files/xine-ui-0.99.10-libcaca.patch
deleted file mode 100644
index c5a359758d4a..000000000000
--- a/media-video/xine-ui/files/xine-ui-0.99.10-libcaca.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -r efe11fb1562e configure.ac
---- a/configure.ac	Thu Dec 28 18:08:02 2017 +0200
-+++ b/configure.ac	Sun Apr 01 23:00:22 2018 -0600
-@@ -374,7 +374,7 @@
-    if test "x$with_caca" = "xyes" && test "x$have_caca" = "xno"; then
-       AC_MSG_ERROR([CACA support requested, but libcaca 0.99 not found])
-    fi
--   if test test "x$have_caca" = "xyes"; then
-+   if test "x$have_caca" = "xyes"; then
-      AM_DL()
-    fi
-    AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([[#include <caca.h> 
-
---- a/configure 	Thu Dec 28 18:08:02 2017 +0200
-+++ b/configure 	Sun Apr 01 23:00:22 2018 -0600
-@@ -12651,7 +12651,7 @@
-    if test "x$with_caca" = "xyes" && test "x$have_caca" = "xno"; then
-       as_fn_error $? "CACA support requested, but libcaca 0.99 not found" "$LINENO" 5
-    fi
--   if test test "x$have_caca" = "xyes"; then
-+   if test "x$have_caca" = "xyes"; then
-
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lc" >&5
- $as_echo_n "checking for dlopen in -lc... " >&6; }
diff --git a/media-video/xine-ui/xine-ui-0.99.10.ebuild b/media-video/xine-ui/xine-ui-0.99.10.ebuild
deleted file mode 100644
index eacab2930ba0..000000000000
--- a/media-video/xine-ui/xine-ui-0.99.10.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools gnome2-utils xdg-utils
-
-DESCRIPTION="Xine movie player"
-HOMEPAGE="https://xine-project.org/home"
-SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86"
-IUSE="aalib curl debug libcaca lirc nls readline vdr X xinerama"
-
-RDEPEND="
-	|| ( app-arch/tar app-arch/libarchive )
-	media-libs/libpng:0=
-	>=media-libs/xine-lib-1.2:=[aalib?,libcaca?]
-	virtual/jpeg:0
-	aalib? ( media-libs/aalib:= )
-	curl? ( >=net-misc/curl-7.10.2:= )
-	libcaca? ( media-libs/libcaca:= )
-	lirc? ( app-misc/lirc:= )
-	nls? ( virtual/libintl )
-	readline? ( >=sys-libs/readline-6.2:= )
-	X? (
-		x11-libs/libICE:=
-		x11-libs/libSM:=
-		x11-libs/libX11:=
-		x11-libs/libXext:=
-		x11-libs/libXft:=
-		x11-libs/libXrender:=
-		x11-libs/libXScrnSaver:=
-		x11-libs/libXtst:=
-		x11-libs/libXv:=
-		x11-libs/libXxf86vm:=
-		xinerama? ( x11-libs/libXinerama:= )
-	)
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( >=sys-devel/gettext-0.18.3 )
-	X? (
-		x11-base/xorg-proto
-		x11-libs/libXt
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-desktop.patch
-	"${FILESDIR}"/${P}-libcaca.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-	rm misc/xine-bugreport || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable xinerama) \
-		$(use_enable lirc) \
-		$(use_enable vdr vdr-keys) \
-		--disable-nvtvsimple \
-		$(use_enable debug) \
-		$(use_with X x) \
-		$(use_with readline) \
-		$(use_with curl) \
-		$(use_with aalib) \
-		$(use_with libcaca caca) \
-		--without-fb
-}
-
-src_install() {
-	# xine-list apparently may cause sandbox violation, bug 654394
-	addpredict /dev/dri
-
-	emake \
-		DESTDIR="${D}" \
-		docdir="/usr/share/doc/${PF}" \
-		docsdir="/usr/share/doc/${PF}" \
-		install
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-video/xine-ui/xine-ui-0.99.12.ebuild b/media-video/xine-ui/xine-ui-0.99.12.ebuild
index 4564f30e7d86..f1ab7d8539fa 100644
--- a/media-video/xine-ui/xine-ui-0.99.12.ebuild
+++ b/media-video/xine-ui/xine-ui-0.99.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 ~x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86"
 IUSE="aalib curl debug libcaca lirc nls readline vdr X xinerama"
 
 RDEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2020-12-25 23:06:25 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-12-25 23:06:25 +0000
commit	441d1370330332b7d78f238d2f5e13f7aed5e4e0 (patch)
tree	6a5171dd615dfeee62a45044144c66e864738fb0 /media-video
parent	ab3da91fb6c91a9df52fff8f991570f456fd3c7a (diff)