gentoo resync : 03.03.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-03-03 13:42:34 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-03-03 13:42:34 +0000
commit: 066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (patch)
tree: 3cb05783d73b2c33589ba305144a31c718e123cd /media-video
parent: 16449a80e28af2209916cc66d19c9a44ca2b90d9 (diff)
36 files changed, 401 insertions, 1582 deletions
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 44feed75281a..122df9057a92 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/bino/Manifest b/media-video/bino/Manifest
index 12b5a28011c8..938a11810ea2 100644
--- a/media-video/bino/Manifest
+++ b/media-video/bino/Manifest
@@ -1,4 +1,3 @@
-AUX bino.html 658 BLAKE2B 9eab6fd2e14b72928ce0c73c21a61ac26981bb23df9eaf3f89132729debc32a10fa0d703c5f3340aa758d741aa1ac733df3718e5577148609f1ae1e1e5c4e47f SHA512 c4861b4536ebc08fd9a68a9b8d420b323eb16ab057b74a83fd56c5c4e0c1f7c4fc7665a0933eabf58e5eca7c38206597e7b6ddb99722054804a64821950f23be
 DIST bino-1.6.7.tar.xz 825068 BLAKE2B d9019a793838f33ea1315849aa994b20a1c6127995315dc03972fe6c64a742c73434c07ba06402a1e2bd5357781d18aaf3d19ab2d61788745b2aa99ad3f4c6f4 SHA512 ae8f72b200100664b9fd55963371ce64a2f39e240676494d69b422d662f2295560ba458eb04707b82f88d3c6b3fab98a1ecb40d74799300f96b8eb8be680c9b8
 EBUILD bino-1.6.7.ebuild 1632 BLAKE2B b27ff4ad1e063849af669fe1e81137d0e764713c648bcb054be3563aee410a4c94002a58b4aa2de7a71bc5b246a7f593caa5ec0f91115a1f00fe4124a4da2a3a SHA512 3394e7ba97b01718f28473c03284d44361375b62b0a268058556d7cd1e61438101665d9a56666897454c05c9e6232735af22818fd1627db5610970576869a411
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-video/bino/files/bino.html b/media-video/bino/files/bino.html
deleted file mode 100644
index 28a6982c1697..000000000000
--- a/media-video/bino/files/bino.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<html lang="en">
-<head>
-<title>Bino</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="description" content="Bino">
-<meta http-equiv="Content-Style-Type" content="text/css">
-</head>
-
-<body>
-<h1 class="settitle">Bino</h1>
-<div class="node">
-<p><hr>
-Up:&nbsp;<a rel="up" accesskey="u" href="../">(dir)</a>
-</div>
-
-<h2 class="unnumbered">Warning</h2>
-
-<p>You have chosen not to install the documentation of Bino.
-<p>If you want to have the documentation installed, please enable the <b>doc</b> use flag of <i>media-video/bino</i>.
-<p>Alternatively you may do a:
-<pre>
-USE="doc" emerge media-video/bino
-</pre>
-</body></html>
diff --git a/media-video/emovix/Manifest b/media-video/emovix/Manifest
index 9dc9e5821111..8913966e83d7 100644
--- a/media-video/emovix/Manifest
+++ b/media-video/emovix/Manifest
@@ -1,3 +1,3 @@
 DIST emovix-0.9.0.tar.gz 11297252 BLAKE2B 38e077285443ab5b447a4e3e4ede52474e63003601335b5ef012d6764a9501ba28066ebf46f2de60887ae7d1485b52bd9e05b7f7bce288d67931c4077c780bb0 SHA512 87df6f124d8478d0704472adf80e541b3573bc448836f4525d99b614aba5bffbeea8f73b0b8e0b4a9a95375ee78d0f78352254eeb4f99be67611f4d17f5c3e2a
-EBUILD emovix-0.9.0.ebuild 597 BLAKE2B dde5b0d69ae57815725554464c99d2a0fbb1465810ffb9d0a9edc0c6c368eef3bbf104f241b4be6969c6ecacd3331380135dc9cfb3116f45e0954474f589db38 SHA512 9ffb87debe92466d85768db0e9688080b1e20989670fff1024c74d69a32b7150ef70aa2750c6e975fb810000fd934185cc23afac67d917f5d3a883d635e63f40
+EBUILD emovix-0.9.0.ebuild 601 BLAKE2B 5bfd55818b31f72ace3e3f7bd8be30146ee2e7ff1dc7317438381f0ffbdccdb3675a1eb7c187bc6740241457e642030e16f6430cea1b6f482116bf768a43cd2d SHA512 86eaf0acde6a0b72ccdb9721813d3000ba670480010c006f166ae4507279454637cdac6c858c89090afef39cf319809b4ffb0ae62b3eec194df5813cfdf81875
 MISC metadata.xml 298 BLAKE2B 869929382a92e3868813734d914dc0b43f8de6eea72d4503b4131c34ede406b0f1516c4625c04e0e35fc5f726c27ab5c62e2acb9a3defb079b4316bd2a21d890 SHA512 1a8c14b452885e3e7bf4baf9468df6d5fdf58676031fd7f97b75ba78f5701abb9ce1b6a6b449745cf509b2d8ced78e3fa337b243885ec09988ebc45ba36c46d6
diff --git a/media-video/emovix/emovix-0.9.0.ebuild b/media-video/emovix/emovix-0.9.0.ebuild
index 1a5e74cbb0dc..b2cad98b149a 100644
--- a/media-video/emovix/emovix-0.9.0.ebuild
+++ b/media-video/emovix/emovix-0.9.0.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=0
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/movix/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
 
 RDEPEND="virtual/cdrtools"
 DEPEND="dev-lang/perl
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index c0c1b7fe550b..68f1613fc86e 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -17,5 +17,5 @@ EBUILD ffmpeg-3.3.6.ebuild 15809 BLAKE2B b78701e736d5b1a8c029bbbec3c5ce40356223c
 EBUILD ffmpeg-3.3.8.ebuild 15815 BLAKE2B 2bce668121996c1bbdf472dcede998450fa4b53b36dfa25ef62b1eaa988cb6b7f8ab216ef29ebefae026ee06b9d4ad001ecb90076efb61e1c6bbaff9b09dce1f SHA512 8650a978d1283d35f37b549e937f9c04cdc860540f7e7ee1871c07b21c13c3c165322075dd00ffbbeaf629d2c79b445b0fd715ae88fba3e59b0fd217b4c3dc72
 EBUILD ffmpeg-3.4.5.ebuild 15587 BLAKE2B be24d2ba751b0487ce6b7c07d5263db490a6457e3b3752336582ab049b1bf665274fe9a6e161f695775be3d5186013e294c1cb219e65c07a640b4601287240e5 SHA512 689a613b63222b45f332b2352a137d3cfd60e4608eb2b639d63d0a70d54896cfa71947d2e5648e6374a4fc831f5a31ab66f9e282764b72673c30ba9316d8896a
 EBUILD ffmpeg-4.1.1.ebuild 17011 BLAKE2B b3f3bc7e9731b1da8163ce023723a71fe1ff541d5a8234ba6caf52850db3c9c9e35b797af52968c58e9acbe24de1bf9eebfabd5ee4769f029150c40c022ba224 SHA512 b688bf2ca304ae900faf283b752d5c603d0f70f02c496b4319753b745d68a75d43c3442a40236fe5424e1ddc9f491ffe3a8e2891f1ca4cf27a55a64c996bcf87
-EBUILD ffmpeg-9999.ebuild 16992 BLAKE2B 5acc14ec7d85b7c1cd5eec92ac2b1b579aef80f85d1712a4cffb4f2cfe741484696bad480ac820ebd6b2b11b037bdee3a25f709029dd7013cd036dcc4628e1ad SHA512 97b0c64b57950054a399eb87aec57f1c5fbcf0f5c3692aba9119bbf8f1723e62db648dcbca24718bf6ffd14b4a30efd4e108cd255ef703e82d62de791cbd7a15
-MISC metadata.xml 5697 BLAKE2B dc170e50190c36f1f6bf5ee36de0a757fd4815bbd41b8c284a55ea29894783ffa89a419b04d57d8489cac17f436df3e9a9d88266c256ca4c4a7672e857e73557 SHA512 ca3a7e0e712fef9fef181e9888dc97c62905b8b5b54623a58ef40743c1a4b58711ed47e9b391960421d720451ac816bfc1625be3fdeeb228d2041480f4f298b0
+EBUILD ffmpeg-9999.ebuild 17072 BLAKE2B f6418b49bbd0554064da2adf75eee09edbb16314c143847996bb4ecce9b3815f5f02552ad42549ee915a351c7028bb6a03d0e2259b743a279bf82be850e7516e SHA512 f84b01792f0cc9269530e28bace35b14d72dceb6e451046beb2d97fe63efc36f67364f132392a68b81fc73dcc131ef4e9fd8a50eddb84c2e3a22bdabc607d769
+MISC metadata.xml 5817 BLAKE2B 694fe00d148e4fe34245524f9d8a9071839b4d714ab0ef5a54bea572e63562a42f6999359ea2a0f1bf692ecd9fc78df84e140e4b931386e9060d3a9d0b6e7cab SHA512 dfd4544f02416735a1a75a5d0b69639fcd93ed0ef97344dd237f6b811381e323c237f215a96fa06d8f66adad30d3fd050585679223b3a2aa9402c2084f4a2197
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 855682dc540e..df4ddb5f0091 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -81,7 +81,7 @@ FFMPEG_FLAG_MAP=(
 		# libavfilter options
 		appkit
 		bs2b:libbs2b chromaprint flite:libflite frei0r
-		fribidi:libfribidi fontconfig ladspa libass lv2 truetype:libfreetype
+		fribidi:libfribidi fontconfig ladspa libass lv2 truetype:libfreetype vidstab:libvidstab
 		rubberband:librubberband zeromq:libzmq zimg:libzimg
 		# libswresample options
 		libsoxr
@@ -236,6 +236,7 @@ RDEPEND="
 	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
 	video_cards_nvidia? ( >=media-libs/nv-codec-headers-8.1.24.2[${MULTILIB_USEDEP}] )
 	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
+	vidstab? ( >=media-libs/vidstab-1.1.0[${MULTILIB_USEDEP}] )
 	vorbis? (
 		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
 		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml
index 35024c9f8c5f..5a7a9e5dcefe 100644
--- a/media-video/ffmpeg/metadata.xml
+++ b/media-video/ffmpeg/metadata.xml
@@ -54,6 +54,7 @@
 	<flag name="srt">Enable support for Secure Reliable Transport (SRT) via <pkg>net-libs/srt</pkg></flag>
 	<flag name="ssh">Enable SSH/sftp support via <pkg>net-libs/libssh</pkg>.</flag>
 	<flag name="twolame">Enables MP2 encoding via <pkg>media-sound/twolame</pkg> as an alternative to the internal encoder.</flag>
+	<flag name="vidstab">Enables video stabilization filter using vid.stab library (<pkg>media-libs/vidstab</pkg>).</flag>
 	<flag name="vpx">Enables vp8 codec support using libvpx: Decoding vp8 does not require this to be enabled but libvpx can also be used for decoding; encoding vp8 requires this useflag to be enabled though.</flag>
 	<flag name="x265">Enables HEVC encoding with <pkg>media-libs/x265</pkg>.</flag>
 	<flag name="zeromq">Enables <pkg>net-libs/zeromq</pkg> support with the zmq/azmq filters.</flag>
diff --git a/media-video/kaffeine/Manifest b/media-video/kaffeine/Manifest
index 103e81457144..b042991e3069 100644
--- a/media-video/kaffeine/Manifest
+++ b/media-video/kaffeine/Manifest
@@ -1,6 +1,3 @@
-AUX kaffeine-2.0.15-qt-5.11.patch 40573 BLAKE2B 2e782013fcdc06e3ba19170da714e7565c27f467ec9f2ba7d4c3a352d4b1f0ed8dfe9e562ca4bae6a0f8ed424783f6d2f52f40aaacbf40a7574ad460fc10a963 SHA512 3cdeea289406493b668bf6ff1f48f9fde1efa39fdc92b0eda90942fa79620b2c9b65321c03d63d7e593b1ceaf17b5f03f04d7da572ead71f602c04c8da97c13b
-DIST kaffeine-2.0.15.tar.xz 5988584 BLAKE2B a9361b321a0af13013596c2d06e53053a889a0697fcf5c644195d6bd7e43fb3c108d2c03cf3250c6cb8b14383e10735e883e5ebb17be1b5f9fe5ca81f012dd28 SHA512 d2b21df76710eb79395a0d4e762ecdde4610945de3d1105002a44a56725aea3f10003f4ebefe4cd67f58f561e79aa3f5561639ad5c3afba488146dcb9360f53d
 DIST kaffeine-2.0.16-2.tar.xz 5995824 BLAKE2B a472be60d10be077fd7ab3828e6958b0c3a2a8fef66318d33c0972e08cf3f5f19ce9d99cf42c21fed0aba67e296b639624e78d0e5567a9dc291a342c0ccf9249 SHA512 1b39bf59127c777b34f3076a237c53973af827191d2a279d40e7f14891dcd3d7bba1444b0b456d0e614807bf6bff494568aed958632dfba54515de8de5b06f21
-EBUILD kaffeine-2.0.15.ebuild 1385 BLAKE2B 1b1824ace75e0878cab888e50b3bec8fec65e21f4666aa07914435f9299429189871780237806ece7f6a6a27caa259e68d37d3808a3e7dc66698ef5f8e9ab400 SHA512 c20977403fa0b1d57b4231283b301ccc692aab5b6214e2bc47185254d3438887932fe7499da289f712ba5cda29edcfbbeb9c25adc0b8485374d2c011da83173b
-EBUILD kaffeine-2.0.16.2.ebuild 1360 BLAKE2B c363621821c9fac01745816fc9e9b1f50a0f6d15755e401951f300c624407d7fba25e09bc1c04d0b76db461e330d88e792497161038b39174795ded0872de177 SHA512 9062f32123227286c9f4de816df053d2b3c950505efac2f18fee6fc6cd913f963d33f369a86ced612d8d0f2262570dd4b762652d6452365a3684a06e4e326041
+EBUILD kaffeine-2.0.16.2.ebuild 1359 BLAKE2B e399a99f40969f54df4cc01ccd105bb2062a1e4fb28b6296dd81ceda19d2f154e905f7e277c2305e2c61656f982142f11653bc6c297daeb519d70157c148ebaf SHA512 9323a80ace09ae95e3a3440552062e4861db492623cba0f8d5f85d3577205e158c9e7d449930aa2a0a0411e86cf5b168fcbb05c74da6f94a01161a05a739b151
 MISC metadata.xml 369 BLAKE2B 2ba0f7bed05089f04c57eaeae806308ef4fe560461e5f44b32e05ffcb2cd2ee064d81a07589e1d9ad067acb56f9dd43d0acda9a87cdaf42187aae8cb67306a54 SHA512 f58a7acad05449a5cfc6ee4bc9d52677b06b9d994bb109a279d04e71ff7368cd697b286767b463e4f5d42a1194b268789fb373b17a19e581927c25d64d46a083
diff --git a/media-video/kaffeine/files/kaffeine-2.0.15-qt-5.11.patch b/media-video/kaffeine/files/kaffeine-2.0.15-qt-5.11.patch
deleted file mode 100644
index 659815263489..000000000000
--- a/media-video/kaffeine/files/kaffeine-2.0.15-qt-5.11.patch
+++ /dev/null
@@ -1,989 +0,0 @@
-From cef89684e41b90c644f369edbca2bf079b8b0454 Mon Sep 17 00:00:00 2001
-From: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
-Date: Wed, 16 May 2018 12:34:10 -0300
-Subject: [PATCH] don't use qPrintable() anymore
-
-As commented on: https://bugreports.qt.io/browse/QTBUG-68307,
-qt5 is explicitly breaking qPrintable().
-
-So, let's define our own version of it.
-
-Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
-
-diff --git a/src/backend-vlc/vlcmediawidget.cpp b/src/backend-vlc/vlcmediawidget.cpp
-index 2421dd69e285..c03b7dd732c6 100644
---- a/src/backend-vlc/vlcmediawidget.cpp
-+++ b/src/backend-vlc/vlcmediawidget.cpp
-@@ -55,7 +55,7 @@ bool VlcMediaWidget::init()
- 
- 	vlcInstance = libvlc_new(argc, argv);
- 	if (!vlcInstance) {
--		qCWarning(logMediaWidget, "libVLC: failed to use extra args: %s", qPrintable(args));
-+		qCWarning(logMediaWidget, "libVLC: failed to use extra args: %s", toPrintable(args));
- 		argc = 0;
- 		vlcInstance = libvlc_new(0, NULL);
- 		if (vlcInstance)
-@@ -63,7 +63,7 @@ bool VlcMediaWidget::init()
- 	}
- 
- 	if (vlcInstance == NULL) {
--		qFatal("Cannot create vlc instance %s", qPrintable(libvlc_errmsg()));
-+		qFatal("Cannot create vlc instance %s", toPrintable(libvlc_errmsg()));
- 		delete argv;
- 		return false;
- 	}
-@@ -73,14 +73,14 @@ bool VlcMediaWidget::init()
- 		for (int i = 0; i < argc; i++)
- 			log += " " + QLatin1String(argv[i]);
- 
--		qCDebug(logVlc, "%s", qPrintable(log));
-+		qCDebug(logVlc, "%s", toPrintable(log));
- 	}
- 	delete argv;
- 
- 	vlcMediaPlayer = libvlc_media_player_new(vlcInstance);
- 
- 	if (vlcMediaPlayer == NULL) {
--		qFatal("Cannot create vlc media player %s", qPrintable(libvlc_errmsg()));
-+		qFatal("Cannot create vlc media player %s", toPrintable(libvlc_errmsg()));
- 		return false;
- 	}
- 
-@@ -95,7 +95,7 @@ bool VlcMediaWidget::init()
- 
- 	for (uint i = 0; i < (sizeof(eventTypes) / sizeof(eventTypes[0])); ++i) {
- 		if (libvlc_event_attach(eventManager, eventTypes[i], vlcEventHandler, this) != 0) {
--			qCCritical(logMediaWidget, "Cannot attach event handler %s", qPrintable(eventTypes[i]));
-+			qCCritical(logMediaWidget, "Cannot attach event handler %s", toPrintable(eventTypes[i]));
- 			return false;
- 		}
- 	}
-@@ -167,7 +167,7 @@ void VlcMediaWidget::setAudioDevice(QString device)
- 	for (i = vlcAudioOutput; i != NULL; i = i->p_next) {
- 		if (device.compare(QString::fromUtf8(i->psz_description)))
- 			continue;
--		qCDebug(logVlc, "Setting audio output to: %s", qPrintable(i->psz_device));
-+		qCDebug(logVlc, "Setting audio output to: %s", toPrintable(i->psz_device));
- 
- 		libvlc_audio_output_device_set(vlcMediaPlayer, NULL, i->psz_device);
- 	}
-@@ -319,7 +319,7 @@ void VlcMediaWidget::play(const MediaSource &source)
- 
- 	if (vlcMedia == NULL) {
- 		libvlc_media_player_stop(vlcMediaPlayer);
--		qCWarning(logMediaWidget, "Cannot create media %s", qPrintable(source.getUrl().toDisplayString()));
-+		qCWarning(logMediaWidget, "Cannot create media %s", toPrintable(source.getUrl().toDisplayString()));
- 		return;
- 	}
- 
-@@ -328,7 +328,7 @@ void VlcMediaWidget::play(const MediaSource &source)
- 
- 	for (uint i = 0; i < (sizeof(eventTypes) / sizeof(eventTypes[0])); ++i) {
- 		if (libvlc_event_attach(eventManager, eventTypes[i], vlcEventHandler, this) != 0) {
--			qCWarning(logMediaWidget, "Cannot attach event handler %s", qPrintable(eventTypes[i]));
-+			qCWarning(logMediaWidget, "Cannot attach event handler %s", toPrintable(eventTypes[i]));
- 		}
- 	}
- 
-@@ -340,7 +340,7 @@ void VlcMediaWidget::play(const MediaSource &source)
- //		setExternalSubtitle(source.subtitleUrl);
- 
- 	if (libvlc_media_player_play(vlcMediaPlayer) != 0) {
--		qCWarning(logMediaWidget, "Cannot play media %s", qPrintable(source.getUrl().toDisplayString()));
-+		qCWarning(logMediaWidget, "Cannot play media %s", toPrintable(source.getUrl().toDisplayString()));
- 	}
- 
- 	setCursor(Qt::BlankCursor);
-@@ -408,7 +408,7 @@ void VlcMediaWidget::setCurrentSubtitle(int currentSubtitle)
- 		}
- 
- 		if (track->i_id == requestedSubtitle)
--			qCDebug(logVlc, "Subtitle set to id %d: %s", track->i_id, qPrintable(subtitle));
-+			qCDebug(logVlc, "Subtitle set to id %d: %s", track->i_id, toPrintable(subtitle));
- 		track = track->p_next;
- 	}
- 	libvlc_track_description_list_release(track);
-@@ -424,11 +424,11 @@ void VlcMediaWidget::setExternalSubtitle(const QUrl &url)
- 					  libvlc_media_slave_type_subtitle,
- 					  url.toEncoded().constData(),
- 					  true) == 0)
--		qCWarning(logMediaWidget, "Cannot set subtitle file %s", qPrintable(fname));
-+		qCWarning(logMediaWidget, "Cannot set subtitle file %s", toPrintable(fname));
- #else
- 	if (libvlc_video_set_subtitle_file(vlcMediaPlayer,
--					   qPrintable(fname)) == 0)
--		qCWarning(logMediaWidget, "Cannot set subtitle file %s", qPrintable(fname));
-+					   toPrintable(fname)) == 0)
-+		qCWarning(logMediaWidget, "Cannot set subtitle file %s", toPrintable(fname));
- #endif
- }
- 
-@@ -625,7 +625,7 @@ void VlcMediaWidget::updateSubtitles()
- 		// currentSubtitle
- 		subtitleId[track->i_id] = ++i;
- 		subtitles.append(subtitle);
--		qCDebug(logVlc, "Got subtitle id#%d: %s", track->i_id, qPrintable(subtitle));
-+		qCDebug(logVlc, "Got subtitle id#%d: %s", track->i_id, toPrintable(subtitle));
- 		track = track->p_next;
- 	}
- 	libvlc_track_description_list_release(track);
-diff --git a/src/dvb/dvbcam_linux.cpp b/src/dvb/dvbcam_linux.cpp
-index 7e1c483ac674..5ef445a34c6a 100644
---- a/src/dvb/dvbcam_linux.cpp
-+++ b/src/dvb/dvbcam_linux.cpp
-@@ -66,7 +66,7 @@ void DvbLinuxCam::startCa(const QString &path)
- 	caFd = open(QFile::encodeName(path).constData(), O_RDWR | O_NONBLOCK);
- 
- 	if (caFd < 0) {
--		qCWarning(logCam, "Cannot open CA device node %s", qPrintable(path));
-+		qCWarning(logCam, "Cannot open CA device node %s", toPrintable(path));
- 		return;
- 	}
- 
-diff --git a/src/dvb/dvbchannel.cpp b/src/dvb/dvbchannel.cpp
-index 8395f6fa52fa..1c3aa973e327 100644
---- a/src/dvb/dvbchannel.cpp
-+++ b/src/dvb/dvbchannel.cpp
-@@ -146,7 +146,7 @@ DvbChannelModel *DvbChannelModel::createSqlModel(QObject *parent)
- 	}
- 
- 	if (!file.open(QIODevice::ReadOnly)) {
--		qCWarning(logDvb, "Cannot open %s", qPrintable(file.fileName()));
-+		qCWarning(logDvb, "Cannot open %s", toPrintable(file.fileName()));
- 		return channelModel;
- 	}
- 
-@@ -212,7 +212,7 @@ DvbChannelModel *DvbChannelModel::createSqlModel(QObject *parent)
- 		channel.isScrambled = (flags & 0x1) != 0;
- 
- 		if (stream.status() != QDataStream::Ok) {
--			qCWarning(logDvb, "Invalid channels in file %s", qPrintable(file.fileName()));
-+			qCWarning(logDvb, "Invalid channels in file %s", toPrintable(file.fileName()));
- 			break;
- 		}
- 
-@@ -223,7 +223,7 @@ DvbChannelModel *DvbChannelModel::createSqlModel(QObject *parent)
- 	channelModel->channelFlush();
- 
- 	if (!file.remove()) {
--		qCWarning(logDvb, "Cannot remove '%s' from DB", qPrintable(file.fileName()));
-+		qCWarning(logDvb, "Cannot remove '%s' from DB", toPrintable(file.fileName()));
- 	}
- 
- 	return channelModel;
-diff --git a/src/dvb/dvbconfigdialog.cpp b/src/dvb/dvbconfigdialog.cpp
-index fc444595cd34..d0a7bf0c82fe 100644
---- a/src/dvb/dvbconfigdialog.cpp
-+++ b/src/dvb/dvbconfigdialog.cpp
-@@ -546,7 +546,7 @@ void DvbConfigDialog::accept()
- 	foreach (RegexInputLine *regexInputLine, regexInputList)
- 	{
- 		manager->addRecordingRegex(regexInputLine->lineEdit->text());
--		qCDebug(logDvb, "saved regex: %s", qPrintable(regexInputLine->lineEdit->text()));
-+		qCDebug(logDvb, "saved regex: %s", toPrintable(regexInputLine->lineEdit->text()));
- 		manager->addRecordingRegexPriority(regexInputLine->spinBox->value());
- 		qCDebug(logDvb, "saved priority: %i", regexInputLine->spinBox->value());
- 	}
-@@ -1539,7 +1539,7 @@ void DvbSLnbConfigObject::configure()
- 
- 	for (i = 0; i < size; i++) {
- 		struct lnbSat lnb = device->getLnbSatModels().at(i);
--		QRadioButton *radioButton = new QRadioButton(i18nd("libdvbv5", qPrintable(lnb.name)), mainWidget);
-+		QRadioButton *radioButton = new QRadioButton(i18nd("libdvbv5", toPrintable(lnb.name)), mainWidget);
- 		mainLayout->addWidget(radioButton);
- 		lnbSelectionGroup->addButton(radioButton, i + 1);
- 		gridLayout->addWidget(radioButton, i % ((size + 1) / 2), i / ((size + 1) / 2));
-diff --git a/src/dvb/dvbdevice.cpp b/src/dvb/dvbdevice.cpp
-index d4c7150e39e6..27a304931477 100644
---- a/src/dvb/dvbdevice.cpp
-+++ b/src/dvb/dvbdevice.cpp
-@@ -226,7 +226,7 @@ DvbDataDumper::DvbDataDumper()
- 		QLatin1String(".bin"));
- 
- 	if (!open(QIODevice::WriteOnly | QIODevice::Truncate)) {
--		qCWarning(logDev, "Can't open %s", qPrintable(fileName()));
-+		qCWarning(logDev, "Can't open %s", toPrintable(fileName()));
- 	}
- }
- 
-@@ -343,7 +343,7 @@ void DvbDevice::tune(const DvbTransponder &transponder)
- 		}
- 
- 		if (!ok)
--			qCWarning(logDev, "Can't extract orbital position from %s", qPrintable(config->scanSource));
-+			qCWarning(logDev, "Can't extract orbital position from %s", toPrintable(config->scanSource));
- 
- 		double radius = 6378;
- 		double semiMajorAxis = 42164;
-diff --git a/src/dvb/dvbdevice_linux.cpp b/src/dvb/dvbdevice_linux.cpp
-index 1f6c4ad4e1b2..82b29305700a 100644
---- a/src/dvb/dvbdevice_linux.cpp
-+++ b/src/dvb/dvbdevice_linux.cpp
-@@ -95,7 +95,7 @@ void DvbLinuxDevice::startDevice(const QString &deviceId_)
- 	struct dvb_v5_fe_parms *parms = dvb_fe_open2(adapter, index, verbose, 0, dvbv5_log);
- 
- 	if (!parms) {
--		qCWarning(logDev, "Cannot open frontend %s", qPrintable(frontendPath));
-+		qCWarning(logDev, "Cannot open frontend %s", toPrintable(frontendPath));
- 		return;
- 	}
- 
-@@ -184,7 +184,7 @@ void DvbLinuxDevice::startDevice(const QString &deviceId_)
- 
- 	ready = true;
- 
--	qCInfo(logDev, "Found dvb device %s: %s", qPrintable(deviceId), qPrintable(frontendName));
-+	qCInfo(logDev, "Found dvb device %s: %s", toPrintable(deviceId), toPrintable(frontendName));
- }
- 
- void DvbLinuxDevice::startCa()
-@@ -264,14 +264,14 @@ bool DvbLinuxDevice::acquire()
- 	dvbv5_parms = dvb_fe_open2(adapter, index, verbose, 0, dvbv5_log);
- 
- 	if (!dvbv5_parms) {
--		qCWarning(logDev, "Cannot open frontend %s", qPrintable(frontendPath));
-+		qCWarning(logDev, "Cannot open frontend %s", toPrintable(frontendPath));
- 		return false;
- 	}
- 
- 	dvrFd = open(QFile::encodeName(dvrPath).constData(), O_RDONLY | O_NONBLOCK | O_CLOEXEC);
- 
- 	if (dvrFd < 0) {
--		qCWarning(logDev, "Cannot open dvr %s", qPrintable(dvrPath));
-+		qCWarning(logDev, "Cannot open dvr %s", toPrintable(dvrPath));
- 		dvb_fe_close(dvbv5_parms);
- 		dvbv5_parms = NULL;
- 		return false;
-@@ -298,7 +298,7 @@ bool DvbLinuxDevice::sendMessage(const char *message, int length)
- 	Q_ASSERT(dvbv5_parms && (length >= 0) && (length <= 6));
- 
- 	if (dvb_fe_diseqc_cmd(dvbv5_parms, length, (const unsigned char *)message) != 0) {
--		qCWarning(logDev, "ioctl FE_DISEQC_SEND_MASTER_CMD failed for frontend %s", qPrintable(frontendPath));
-+		qCWarning(logDev, "ioctl FE_DISEQC_SEND_MASTER_CMD failed for frontend %s", toPrintable(frontendPath));
- 		return false;
- 	}
- 
-@@ -310,7 +310,7 @@ bool DvbLinuxDevice::sendBurst(SecBurst burst)
- 	Q_ASSERT(dvbv5_parms);
- 
- 	if (dvb_fe_diseqc_burst(dvbv5_parms, burst == BurstMiniB) != 0) {
--		qCWarning(logDev, "ioctl FE_DISEQC_SEND_BURST failed for frontend %s", qPrintable(frontendPath));
-+		qCWarning(logDev, "ioctl FE_DISEQC_SEND_BURST failed for frontend %s", toPrintable(frontendPath));
- 		return false;
- 	}
- 
-@@ -885,11 +885,11 @@ bool DvbLinuxDevice::satSetup(QString lnbModel, int satNumber, int bpf)
- 	int lnb = dvb_sat_search_lnb(lnbModel.toUtf8());
- 	dvbv5_parms->lnb = dvb_sat_get_lnb(lnb);
- 	if (!dvbv5_parms->lnb) {
--		qCCritical(logDev, "Cannot set LNBf type to %s", qPrintable(lnbModel));
-+		qCCritical(logDev, "Cannot set LNBf type to %s", toPrintable(lnbModel));
- 		return false;
- 	}
- 
--	qCDebug(logDev, "Using LNBf type %s", qPrintable(lnbModel));
-+	qCDebug(logDev, "Using LNBf type %s", toPrintable(lnbModel));
- 
- 	dvbv5_parms->sat_number = satNumber;
- 	dvbv5_parms->freq_bpf = bpf;
-@@ -903,7 +903,7 @@ bool DvbLinuxDevice::tune(const DvbTransponder &transponder)
- 	stopDvr();
- 	fe_delivery_system_t delsys;
- 
--	qCDebug(logDev, "tune to: %s", qPrintable(transponder.toString()));
-+	qCDebug(logDev, "tune to: %s", toPrintable(transponder.toString()));
- 
- 	// FIXME: add support for LNA on/off
- 
-@@ -1067,7 +1067,7 @@ bool DvbLinuxDevice::tune(const DvbTransponder &transponder)
- 	}
- 
- 	if (dvb_fe_set_parms(dvbv5_parms) != 0) {
--		qCWarning(logDev, "ioctl FE_SET_PROPERTY failed for frontend %s", qPrintable(frontendPath));
-+		qCWarning(logDev, "ioctl FE_SET_PROPERTY failed for frontend %s", toPrintable(frontendPath));
- 		return false;
- 	}
- 
-@@ -1245,7 +1245,7 @@ bool DvbLinuxDevice::getProps(DvbTransponder &transponder)
- 		qCWarning(logDev, "Invalid transmission type");
- 		return false;
- 	default:
--		qCWarning(logDev, "Unknown transmission type %s", qPrintable(transponder.getTransmissionType()));
-+		qCWarning(logDev, "Unknown transmission type %s", toPrintable(transponder.getTransmissionType()));
- 		return false;
- 	}
- 	return true;
-@@ -1270,12 +1270,12 @@ bool DvbLinuxDevice::isTuned()
- 	uint32_t status = 0;
- 
- 	if (dvb_fe_get_stats(dvbv5_parms) != 0) {
--		qCWarning(logDev, "ioctl FE_READ_STATUS failed for frontend %s", qPrintable(frontendPath));
-+		qCWarning(logDev, "ioctl FE_READ_STATUS failed for frontend %s", toPrintable(frontendPath));
- 		return false;
- 	}
- 
- 	if (dvb_fe_retrieve_stats(dvbv5_parms, DTV_STATUS, &status) != 0) {
--		qCWarning(logDev, "ioctl FE_READ_STATUS failed for frontend %s", qPrintable(frontendPath));
-+		qCWarning(logDev, "ioctl FE_READ_STATUS failed for frontend %s", toPrintable(frontendPath));
- 		return false;
- 	}
- 
-@@ -1291,7 +1291,7 @@ float DvbLinuxDevice::getSignal(Scale &scale)
- 	scale = DvbBackendDevice::NotSupported;
- 
- 	if (dvb_fe_get_stats(dvbv5_parms) != 0) {
--		qCWarning(logDev, "ioctl FE_READ_STATUS failed for frontend %s", qPrintable(frontendPath));
-+		qCWarning(logDev, "ioctl FE_READ_STATUS failed for frontend %s", toPrintable(frontendPath));
- 		return false;
- 	}
- 
-@@ -1334,7 +1334,7 @@ float DvbLinuxDevice::getSnr(Scale &scale)
- 
- 	scale = DvbBackendDevice::NotSupported;
- 	if (dvb_fe_get_stats(dvbv5_parms) != 0) {
--		qCWarning(logDev, "ioctl FE_READ_STATUS failed for frontend %s", qPrintable(frontendPath));
-+		qCWarning(logDev, "ioctl FE_READ_STATUS failed for frontend %s", toPrintable(frontendPath));
- 		return false;
- 	}
- 
-@@ -1380,7 +1380,7 @@ bool DvbLinuxDevice::addPidFilter(int pid)
- 	int dmxFd = open(QFile::encodeName(demuxPath).constData(), O_RDONLY | O_NONBLOCK | O_CLOEXEC);
- 
- 	if (dmxFd < 0) {
--		qCWarning(logDev, "Cannot open demux %s", qPrintable(demuxPath));
-+		qCWarning(logDev, "Cannot open demux %s", toPrintable(demuxPath));
- 		return false;
- 	}
- 
-@@ -1393,7 +1393,7 @@ bool DvbLinuxDevice::addPidFilter(int pid)
- 	pes_filter.flags = DMX_IMMEDIATE_START;
- 
- 	if (ioctl(dmxFd, DMX_SET_PES_FILTER, &pes_filter) != 0) {
--		qCWarning(logDev, "Cannot set up PID filter for demux %s", qPrintable(demuxPath));
-+		qCWarning(logDev, "Cannot set up PID filter for demux %s", toPrintable(demuxPath));
- 		close(dmxFd);
- 		return false;
- 	}
-@@ -1505,7 +1505,7 @@ void DvbLinuxDevice::startDvr()
- 					continue;
- 				}
- 
--				qCWarning(logDev, "Cannot read from dvr %s: error: %d", qPrintable(dvrPath), errno);
-+				qCWarning(logDev, "Cannot read from dvr %s: error: %d", toPrintable(dvrPath), errno);
- 				return;
- 			}
- 		}
-@@ -1573,7 +1573,7 @@ void DvbLinuxDevice::run()
- 					continue;
- 				}
- 
--				qCWarning(logDev, "Cannot read from dvr %s: error %d", qPrintable(dvrPath), errno);
-+				qCWarning(logDev, "Cannot read from dvr %s: error %d", toPrintable(dvrPath), errno);
- 				dataSize = int(read(dvrFd, dvrBuffer.data, bufferSize));
- 
- 				if (dataSize < 0) {
-@@ -1585,7 +1585,7 @@ void DvbLinuxDevice::run()
- 						continue;
- 					}
- 
--					qCWarning(logDev, "Cannot read from dvr %s: error %d", qPrintable(dvrPath), errno);
-+					qCWarning(logDev, "Cannot read from dvr %s: error %d", toPrintable(dvrPath), errno);
- 					return;
- 				}
- 			}
-@@ -1643,16 +1643,16 @@ void DvbLinuxDeviceManager::componentAdded(const QString &udi)
- 	QString devicePath = QString(QLatin1String("/dev/dvb/adapter%1/%2%3")).arg(adapter).arg(type).arg(index);
- 
- 	if ((adapter < 0) || (adapter > 0x7fff) || (index < 0) || (index > 0x7fff)) {
--		qCWarning(logDev, "Cannot determine adapter or index for device %s", qPrintable(udi));
-+		qCWarning(logDev, "Cannot determine adapter or index for device %s", toPrintable(udi));
- 		return;
- 	}
- 
- 	if (devicePath.isEmpty()) {
--		qCWarning(logDev, "Cannot determine path for device %s", qPrintable(udi));
-+		qCWarning(logDev, "Cannot determine path for device %s", toPrintable(udi));
- 		return;
- 	}
- 
--	qCDebug(logDev, "New device detected: %s", qPrintable(udi));
-+	qCDebug(logDev, "New device detected: %s", toPrintable(udi));
- 
- 	int deviceIndex = ((adapter << 16) | index);
- 	DvbLinuxDevice *device = devices.value(deviceIndex);
-@@ -1800,7 +1800,7 @@ void DvbLinuxDeviceManager::componentRemoved(const QString &udi)
- 	bool removeDevice = false;
- 
- 	if (device->isReady())
--		qCInfo(logDev, "Digital TV device removed %s: %s", qPrintable(device->getDeviceId()), qPrintable(device->getFrontendName()));
-+		qCInfo(logDev, "Digital TV device removed %s: %s", toPrintable(device->getDeviceId()), toPrintable(device->getFrontendName()));
- 
- 	if (udi == device->caUdi) {
- 		device->caPath.clear();
-diff --git a/src/dvb/dvbepg.cpp b/src/dvb/dvbepg.cpp
-index 46746c85acee..ff3890d09547 100644
---- a/src/dvb/dvbepg.cpp
-+++ b/src/dvb/dvbepg.cpp
-@@ -76,7 +76,7 @@ DvbEpgModel::DvbEpgModel(DvbManager *manager_, QObject *parent) : QObject(parent
- 	QFile file(QStandardPaths::writableLocation(QStandardPaths::DataLocation) + QLatin1String("/epgdata.dvb"));
- 
- 	if (!file.open(QIODevice::ReadOnly)) {
--		qCWarning(logEpg, "Cannot open %s", qPrintable(file.fileName()));
-+		qCWarning(logEpg, "Cannot open %s", toPrintable(file.fileName()));
- 		return;
- 	}
- 
-@@ -94,7 +94,7 @@ DvbEpgModel::DvbEpgModel(DvbManager *manager_, QObject *parent) : QObject(parent
- 	} else if (version == 0x140c37b5) {
- 		hasMultilang = false;
- 	} else if (version != 0x20171112) {
--		qCWarning(logEpg, "Wrong DB version for: %s", qPrintable(file.fileName()));
-+		qCWarning(logEpg, "Wrong DB version for: %s", toPrintable(file.fileName()));
- 		return;
- 	}
- 
-@@ -161,7 +161,7 @@ DvbEpgModel::DvbEpgModel(DvbManager *manager_, QObject *parent) : QObject(parent
- 		}
- 
- 		if (stream.status() != QDataStream::Ok) {
--			qCWarning(logEpg, "Corrupt data %s", qPrintable(file.fileName()));
-+			qCWarning(logEpg, "Corrupt data %s", toPrintable(file.fileName()));
- 			break;
- 		}
- 
-@@ -182,7 +182,7 @@ DvbEpgModel::~DvbEpgModel()
- 	QFile file(QStandardPaths::writableLocation(QStandardPaths::DataLocation) + QLatin1String("/epgdata.dvb"));
- 
- 	if (!file.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
--		qCWarning(logEpg, "Cannot open %s", qPrintable(file.fileName()));
-+		qCWarning(logEpg, "Cannot open %s", toPrintable(file.fileName()));
- 		return;
- 	}
- 
-@@ -277,8 +277,8 @@ void DvbEpgModel::Debug(QString text, const DvbSharedEpgEntry &entry)
- 	QTime end = entry->begin.addSecs(QTime(0, 0, 0).secsTo(entry->duration)).toLocalTime().time();
- 
- 	qCDebug(logEpg, "event %s: type %d, from %s to %s: %s: %s: %s : %s",
--		qPrintable(text), entry->type, qPrintable(QLocale().toString(begin, QLocale::ShortFormat)), qPrintable(QLocale().toString(end)),
--		qPrintable(entry->title()), qPrintable(entry->subheading()), qPrintable(entry->details()), qPrintable(entry->content));
-+		toPrintable(text), entry->type, toPrintable(QLocale().toString(begin, QLocale::ShortFormat)), toPrintable(QLocale().toString(end)),
-+		toPrintable(entry->title()), toPrintable(entry->subheading()), toPrintable(entry->details()), toPrintable(entry->content));
- }
- 
- DvbSharedEpgEntry DvbEpgModel::addEntry(const DvbEpgEntry &entry)
-diff --git a/src/dvb/dvbliveview.cpp b/src/dvb/dvbliveview.cpp
-index b47ba9968413..05ff52ede4a3 100644
---- a/src/dvb/dvbliveview.cpp
-+++ b/src/dvb/dvbliveview.cpp
-@@ -448,14 +448,14 @@ void DvbLiveView::playbackStatusChanged(MediaWidget::PlaybackStatus playbackStat
- 
- 		if (internal->timeShiftFile.exists() ||
- 		    !internal->timeShiftFile.open(QIODevice::WriteOnly)) {
--			qCWarning(logDvb, "Cannot open file %s", qPrintable(internal->timeShiftFile.fileName()));
-+			qCWarning(logDvb, "Cannot open file %s", toPrintable(internal->timeShiftFile.fileName()));
- 			internal->timeShiftFile.setFileName(QDir::homePath() + QLatin1String("/TimeShift-") +
- 				QDateTime::currentDateTime().toString(QLatin1String("yyyyMMddThhmmss")) +
- 				QLatin1String(".m2t"));
- 
- 			if (internal->timeShiftFile.exists() ||
- 			    !internal->timeShiftFile.open(QIODevice::WriteOnly)) {
--				qCWarning(logDvb, "Cannot open file %s", qPrintable(internal->timeShiftFile.fileName()));
-+				qCWarning(logDvb, "Cannot open file %s", toPrintable(internal->timeShiftFile.fileName()));
- 				mediaWidget->stop();
- 				break;
- 			}
-diff --git a/src/dvb/dvbmanager.cpp b/src/dvb/dvbmanager.cpp
-index 467eeb5f27b7..3134ddec61f4 100644
---- a/src/dvb/dvbmanager.cpp
-+++ b/src/dvb/dvbmanager.cpp
-@@ -326,7 +326,7 @@ bool DvbManager::updateScanData(const QByteArray &data)
- 	QFile file(QStandardPaths::writableLocation(QStandardPaths::DataLocation) + QLatin1String("/scanfile.dvb"));
- 
- 	if (!file.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
--		qCWarning(logDvb, "Cannot open %s", qPrintable(file.fileName()));
-+		qCWarning(logDvb, "Cannot open %s", toPrintable(file.fileName()));
- 		return false;
- 	}
- 
-@@ -579,11 +579,11 @@ void DvbManager::loadDeviceManager()
- 		QObject *deviceManager = QPluginLoader(path).instance();
- 
- 		if (deviceManager == NULL) {
--			qCWarning(logDvb, "Cannot load dvb device manager %s", qPrintable(path));
-+			qCWarning(logDvb, "Cannot load dvb device manager %s", toPrintable(path));
- 			break;
- 		}
- 
--		qCInfo(logDvb, "Using dvb device manager %s", qPrintable(path));
-+		qCInfo(logDvb, "Using dvb device manager %s", toPrintable(path));
- 		deviceManager->setParent(this);
- 		connect(deviceManager, SIGNAL(requestBuiltinDeviceManager(QObject*&)),
- 			this, SLOT(requestBuiltinDeviceManager(QObject*&)));
-@@ -610,7 +610,7 @@ void DvbManager::readDeviceConfigs()
- 	const char *errMsg;
- 
- 	if (!file.open(QIODevice::ReadOnly)) {
--		qCWarning(logDvb, "Cannot open %s", qPrintable(file.fileName()));
-+		qCWarning(logDvb, "Cannot open %s", toPrintable(file.fileName()));
- 		return;
- 	}
- 
-@@ -680,7 +680,7 @@ void DvbManager::readDeviceConfigs()
- 	}
- 
- 	if (!reader.isValid())
--		qCWarning(logDvb, "Found some problems at %s: %s", qPrintable(file.fileName()), errMsg);
-+		qCWarning(logDvb, "Found some problems at %s: %s", toPrintable(file.fileName()), errMsg);
- }
- 
- void DvbManager::writeDeviceConfigs()
-@@ -688,7 +688,7 @@ void DvbManager::writeDeviceConfigs()
- 	QFile file(QStandardPaths::writableLocation(QStandardPaths::DataLocation) + QLatin1String("/config.dvb"));
- 
- 	if (!file.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
--		qCWarning(logDvb, "Cannot open %s", qPrintable(file.fileName()));
-+		qCWarning(logDvb, "Cannot open %s", toPrintable(file.fileName()));
- 		return;
- 	}
- 
-@@ -769,12 +769,12 @@ void DvbManager::readScanData()
- 		globalDate = DvbScanData(globalFile.read(1024)).readDate();
- 
- 		if (globalDate.isNull()) {
--			qCWarning(logDvb, "Cannot parse %s", qPrintable(globalFile.fileName()));
-+			qCWarning(logDvb, "Cannot parse %s", toPrintable(globalFile.fileName()));
- 		}
- 
- 		globalFile.close();
- 	} else {
--		qCWarning(logDvb, "Cannot open global scanfile %s", qPrintable(globalFile.fileName()));
-+		qCWarning(logDvb, "Cannot open global scanfile %s", toPrintable(globalFile.fileName()));
- 	}
- 
- 	QFile localFile(QStandardPaths::writableLocation(QStandardPaths::DataLocation) + QLatin1String("/scanfile.dvb"));
-@@ -786,7 +786,7 @@ void DvbManager::readScanData()
- 		localDate = DvbScanData(localData).readDate();
- 
- 		if (localDate.isNull()) {
--			qCWarning(logDvb, "Cannot parse %s", qPrintable(localFile.fileName()));
-+			qCWarning(logDvb, "Cannot parse %s", toPrintable(localFile.fileName()));
- 		}
- 
- 		localFile.close();
-@@ -796,18 +796,18 @@ void DvbManager::readScanData()
- 		localData.clear();
- 
- 		if (localFile.exists() && !localFile.remove()) {
--			qCWarning(logDvb, "Cannot remove %s", qPrintable(localFile.fileName()));
-+			qCWarning(logDvb, "Cannot remove %s", toPrintable(localFile.fileName()));
- 		}
- 
- 		if (!globalFile.copy(localFile.fileName())) {
--			qCWarning(logDvb, "Cannot copy %s to %s", qPrintable(globalFile.fileName()), qPrintable(localFile.fileName()));
-+			qCWarning(logDvb, "Cannot copy %s to %s", toPrintable(globalFile.fileName()), toPrintable(localFile.fileName()));
- 		}
- 
- 		if (localFile.open(QIODevice::ReadOnly)) {
- 			localData = localFile.readAll();
- 			localFile.close();
- 		} else {
--			qCWarning(logDvb, "Cannot open %s", qPrintable(localFile.fileName()));
-+			qCWarning(logDvb, "Cannot open %s", toPrintable(localFile.fileName()));
- 			scanDataDate = QDate(1900, 1, 1);
- 			return;
- 		}
-@@ -817,7 +817,7 @@ void DvbManager::readScanData()
- 	scanDataDate = data.readDate();
- 
- 	if (!scanDataDate.isValid()) {
--		qCWarning(logDvb, "Cannot parse %s", qPrintable(localFile.fileName()));
-+		qCWarning(logDvb, "Cannot parse %s", toPrintable(localFile.fileName()));
- 		scanDataDate = QDate(1900, 1, 1);
- 		return;
- 	}
-@@ -857,7 +857,7 @@ void DvbManager::readScanData()
- 		else if (!typeStr.compare("isdb-t", Qt::CaseInsensitive))
- 			type = IsdbT;
- 		else {
--			qCWarning(logDvb, "Transmission type '%s' unknown", qPrintable(typeStr));
-+			qCWarning(logDvb, "Transmission type '%s' unknown", toPrintable(typeStr));
- 			continue;
- 		}
- 
-@@ -882,7 +882,7 @@ void DvbManager::readScanData()
- 				DvbTransponder::fromString(QString::fromLatin1(line));
- 
- 			if (!transponder.isValid()) {
--				qCWarning(logDvb, "Error parsing line : '%s'", qPrintable(line));
-+				qCWarning(logDvb, "Error parsing line : '%s'", toPrintable(line));
- 			} else {
- 				transponders.append(transponder);
- 
-diff --git a/src/dvb/dvbrecording.cpp b/src/dvb/dvbrecording.cpp
-index 101845572469..92685cb0d608 100644
---- a/src/dvb/dvbrecording.cpp
-+++ b/src/dvb/dvbrecording.cpp
-@@ -77,7 +77,7 @@ DvbRecordingModel::DvbRecordingModel(DvbManager *manager_, QObject *parent) : QO
- 	}
- 
- 	if (!file.open(QIODevice::ReadOnly)) {
--		qCWarning(logDvb, "Cannot open file %s", qPrintable(file.fileName()));
-+		qCWarning(logDvb, "Cannot open file %s", toPrintable(file.fileName()));
- 		return;
- 	}
- 
-@@ -115,7 +115,7 @@ DvbRecordingModel::DvbRecordingModel(DvbManager *manager_, QObject *parent) : QO
- 		stream >> recording.details;
- 
- 		if (stream.status() != QDataStream::Ok) {
--			qCWarning(logDvb, "Invalid recordings in file %s", qPrintable(file.fileName()));
-+			qCWarning(logDvb, "Invalid recordings in file %s", toPrintable(file.fileName()));
- 			break;
- 		}
- 
-@@ -123,7 +123,7 @@ DvbRecordingModel::DvbRecordingModel(DvbManager *manager_, QObject *parent) : QO
- 	}
- 
- 	if (!file.remove()) {
--		qCWarning(logDvb, "Cannot remove file %s", qPrintable(file.fileName()));
-+		qCWarning(logDvb, "Cannot remove file %s", toPrintable(file.fileName()));
- 	}
- }
- 
-@@ -262,19 +262,19 @@ void DvbRecordingModel::disableLessImportant(DvbSharedRecording &recording1, Dvb
- 	if (recording1->priority < recording2->priority) {
- 		DvbRecording rec1 = *(recording1.constData());
- 		rec1.disabled = true;
--		qCWarning(logDvb, "Disabled %s because %s has more priority", qPrintable(recording1->name), qPrintable(recording2->name));
-+		qCWarning(logDvb, "Disabled %s because %s has more priority", toPrintable(recording1->name), toPrintable(recording2->name));
- 	}
- 	if (recording2->priority < recording1->priority) {
- 		DvbRecording rec2 = *(recording1.constData());
- 		rec2.disabled = true;
--		qCWarning(logDvb, "Disabled %s because %s has more priority", qPrintable(recording2->name), qPrintable(recording1->name));
-+		qCWarning(logDvb, "Disabled %s because %s has more priority", toPrintable(recording2->name), toPrintable(recording1->name));
- 	}
- }
- 
- void DvbRecordingModel::addToUnwantedRecordings(DvbSharedRecording recording)
- {
- 	unwantedRecordings.append(recording);
--	qCDebug(logDvb, "executed %s", qPrintable(recording->name));
-+	qCDebug(logDvb, "executed %s", toPrintable(recording->name));
- }
- 
- void DvbRecordingModel::executeActionAfterRecording(DvbRecording recording)
-@@ -321,7 +321,7 @@ void DvbRecordingModel::removeDuplicates()
- 					&& loopEntry1.name == loopEntry2.name) {
- 					recordings.remove(recordings.key(rec1));
- 					recordingMap.remove(rec1);
--					qCDebug(logDvb, "Removed. %s", qPrintable(loopEntry1.name));
-+					qCDebug(logDvb, "Removed. %s", toPrintable(loopEntry1.name));
- 				}
- 			}
- 			j = j + 1;
-@@ -375,7 +375,7 @@ bool DvbRecordingModel::existsSimilarRecording(DvbEpgEntry recording)
- 				&& QString::compare(entry.channel->name, loopEntry.channel->name) == 0
- 				&& QString::compare((entry.duration).toString(),
- 						loopEntry.duration.addSecs(- manager->getBeginMargin() - manager->getEndMargin()).toString()) == 0) {
--			qCDebug(logDvb, "Found from unwanteds %s", qPrintable(loopEntry.name));
-+			qCDebug(logDvb, "Found from unwanteds %s", toPrintable(loopEntry.name));
- 			found = true;
- 			break;
- 		}
-@@ -409,7 +409,7 @@ void DvbRecordingModel::disableConflicts()
- 		{
- 			if (isInConflictWithAll(rec2, conflictList)) {
- 				conflictList.append(rec2);
--				qCDebug(logDvb, "conflict: '%s' '%s' and '%s' '%s'", qPrintable(rec1->name), qPrintable(rec1->begin.toString()), qPrintable(rec2->name), qPrintable(rec2->begin.toString()));
-+				qCDebug(logDvb, "conflict: '%s' '%s' and '%s' '%s'", toPrintable(rec1->name), toPrintable(rec1->begin.toString()), toPrintable(rec2->name), toPrintable(rec2->begin.toString()));
- 
- 			}
- 
-@@ -473,13 +473,13 @@ DvbSharedRecording DvbRecordingModel::getLeastImportant(QList<DvbSharedRecording
- 	DvbSharedRecording leastImportant = recList.value(0);
- 	foreach(DvbSharedRecording listRec, recList)
- 	{
--		qCDebug(logDvb, "name and priority %s %s", qPrintable(listRec->name), qPrintable(listRec->priority));
-+		qCDebug(logDvb, "name and priority %s %s", toPrintable(listRec->name), toPrintable(listRec->priority));
- 		if (listRec->priority < leastImportant->priority) {
- 			leastImportant = listRec;
- 		}
- 	}
- 
--	qCDebug(logDvb, "least important: %s", qPrintable(leastImportant->name));
-+	qCDebug(logDvb, "least important: %s", toPrintable(leastImportant->name));
- 	return leastImportant;
- }
- 
-@@ -496,7 +496,7 @@ void DvbRecordingModel::disableLeastImportants(QList<DvbSharedRecording> recList
- 			if (listRecShared->priority == leastImportance) {
- 				listRec.disabled = true;
- 				updateRecording(listRecShared, listRec);
--				qCDebug(logDvb, "disabled: %s %s", qPrintable(listRec.name), qPrintable(listRec.begin.toString()));
-+				qCDebug(logDvb, "disabled: %s %s", toPrintable(listRec.name), toPrintable(listRec.begin.toString()));
- 			}
- 		}
- 	}
-@@ -528,7 +528,7 @@ void DvbRecordingModel::findNewRecordings()
- 					int priority = manager->getRecordingRegexPriorityList().value(i);
- 					epgModel->scheduleProgram(epgMap.value(key), manager->getBeginMargin(),
- 							manager->getEndMargin(), false, priority);
--					qCDebug(logDvb, "scheduled %s", qPrintable(title));
-+					qCDebug(logDvb, "scheduled %s", toPrintable(title));
- 					}
- 				}
- 			}
-@@ -628,7 +628,7 @@ int DvbRecordingModel::getSecondsUntilNextRecording() const
- 		}
- 		if (end > QDateTime::currentDateTime().toUTC() && rec.begin <= QDateTime::currentDateTime().toUTC()) {
- 			timeUntil = 0;
--			qCDebug(logDvb, "Rec ongoing %s", qPrintable(rec.name));
-+			qCDebug(logDvb, "Rec ongoing %s", toPrintable(rec.name));
- 			break;
- 		}
- 		if (rec.begin > QDateTime::currentDateTime().toUTC()) {
-@@ -688,7 +688,7 @@ void DvbRecordingModel::scanChannels()
- 			}
- 			if (channel.isValid()) {
- 				// TODO update tab
--				qCDebug(logDvb, "Executed %s", qPrintable(channel->name));
-+				qCDebug(logDvb, "Executed %s", toPrintable(channel->name));
- 				manager->getLiveView()->playChannel(channel);
- 				delay(5);
- 			}
-@@ -814,7 +814,7 @@ bool DvbRecordingFile::start(DvbRecording &recording)
- 			if (file.open(QIODevice::WriteOnly)) {
- 				break;
- 			} else {
--				qCWarning(logDvb, "Cannot open file %s. Error: %d", qPrintable(file.fileName()), errno);
-+				qCWarning(logDvb, "Cannot open file %s. Error: %d", toPrintable(file.fileName()), errno);
- 			}
- 
- 			if ((attempt == 0) && !QDir(folder).exists()) {
-@@ -822,7 +822,7 @@ bool DvbRecordingFile::start(DvbRecording &recording)
- 					attempt = -1;
- 					continue;
- 				} else {
--					qCWarning(logDvb, "Cannot create folder %s", qPrintable(folder));
-+					qCWarning(logDvb, "Cannot create folder %s", toPrintable(folder));
- 				}
- 			}
- 
-@@ -855,7 +855,7 @@ bool DvbRecordingFile::start(DvbRecording &recording)
- 		}
- 
- 		if (!file.isOpen()) {
--			qCWarning(logDvb, "Cannot open file %s", qPrintable(file.fileName()));
-+			qCWarning(logDvb, "Cannot open file %s", toPrintable(file.fileName()));
- 			return false;
- 		}
- 	}
-diff --git a/src/dvb/dvbscan.cpp b/src/dvb/dvbscan.cpp
-index 8c8c9ec5aba0..6558272d1fa5 100644
---- a/src/dvb/dvbscan.cpp
-+++ b/src/dvb/dvbscan.cpp
-@@ -773,7 +773,7 @@ void DvbScan::updateState()
- 						       arg(channel.transportStreamId).
- 						       arg(channel.serviceId);
- 				}
--				qCDebug(logDvb, "Found channel %s", qPrintable(channel.name));
-+				qCDebug(logDvb, "Found channel %s", toPrintable(channel.name));
- 			}
- 
- 			if (!channels.isEmpty()) {
-@@ -918,7 +918,7 @@ void DvbScan::processSdt(const DvbSdtSection &section)
- 			sdtEntry.name = serviceDescriptor.serviceName();
- 			sdtEntry.provider = serviceDescriptor.providerName();
- 
--			qCDebug(logDvb, "New SDT entry: service ID 0x%04x, name '%s', provider '%s'", entry.serviceId(), qPrintable(sdtEntry.name), qPrintable(sdtEntry.provider));
-+			qCDebug(logDvb, "New SDT entry: service ID 0x%04x, name '%s', provider '%s'", entry.serviceId(), toPrintable(sdtEntry.name), toPrintable(sdtEntry.provider));
- 			sdtEntries.append(sdtEntry);
- 		}
- 	}
-@@ -966,7 +966,7 @@ void DvbScan::processVct(const AtscVctSection &section)
- 			sdtEntry.name = majorminor + QString(shortName, nameLength);
- 		}
- 
--		qCDebug(logDvb, "New SDT entry: name %s", qPrintable(sdtEntry.name));
-+		qCDebug(logDvb, "New SDT entry: name %s", toPrintable(sdtEntry.name));
- 		sdtEntries.append(sdtEntry);
- 
- 		if (i < entryCount - 1)
-diff --git a/src/iso-codes.cpp b/src/iso-codes.cpp
-index fe1d7bbed20a..1d352edde54e 100644
---- a/src/iso-codes.cpp
-+++ b/src/iso-codes.cpp
-@@ -37,7 +37,7 @@ namespace IsoCodes
- 		if (fileName.isEmpty()) {
- 			qCInfo(logConfig,
- 			       "Could not locate %s (is iso-codes installed?)",
--			       qPrintable(file));
-+			       toPrintable(file));
- 			return;
- 		}
- 
-@@ -45,8 +45,8 @@ namespace IsoCodes
- 		if (!f.open(QIODevice::ReadOnly)) {
- 			qCWarning(logConfig,
- 			          "Could not open %s (%s)",
--			          qPrintable(fileName),
--				  qPrintable(f.errorString()));
-+			          toPrintable(fileName),
-+				  toPrintable(f.errorString()));
- 			return;
- 		}
- 
-@@ -88,7 +88,7 @@ namespace IsoCodes
- 		if (hash.isEmpty())
- 			qCWarning(logConfig,
- 			          "Error parsing %s: no entries found.",
--			          qPrintable(fileName));
-+			          toPrintable(fileName));
- 	}
- 
- 	/*
-diff --git a/src/log.h b/src/log.h
-index cf23a7797905..61f7dc224d8c 100644
---- a/src/log.h
-+++ b/src/log.h
-@@ -40,3 +40,5 @@ Q_DECLARE_LOGGING_CATEGORY(logMediaWidget)
- Q_DECLARE_LOGGING_CATEGORY(logPlaylist)
- Q_DECLARE_LOGGING_CATEGORY(logSql)
- Q_DECLARE_LOGGING_CATEGORY(logVlc)
-+
-+#define toPrintable(string) QString(string).toLocal8Bit().constData()
-diff --git a/src/playlist/playlistmodel.cpp b/src/playlist/playlistmodel.cpp
-index 4327fe38235b..1b8e2815377e 100644
---- a/src/playlist/playlistmodel.cpp
-+++ b/src/playlist/playlistmodel.cpp
-@@ -45,7 +45,7 @@ bool Playlist::load(const QUrl &url_, Format format)
- 	QFile file(localFile);
- 
- 	if (!file.open(QIODevice::ReadOnly)) {
--		qCWarning(logPlaylist, "Cannot open file %s", qPrintable(file.fileName()));
-+		qCWarning(logPlaylist, "Cannot open file %s", toPrintable(file.fileName()));
- 		return false;
- 	}
- 
-@@ -78,7 +78,7 @@ bool Playlist::save(Format format) const
- 	QFile file(localFile);
- 
- 	if (!file.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
--		qCWarning(logPlaylist, "Cannot open file %s", qPrintable(file.fileName()));
-+		qCWarning(logPlaylist, "Cannot open file %s", toPrintable(file.fileName()));
- 		return false;
- 	}
- 
-diff --git a/src/playlist/playlisttab.cpp b/src/playlist/playlisttab.cpp
-index 01f1290f2167..34cc8d5cbf69 100644
---- a/src/playlist/playlisttab.cpp
-+++ b/src/playlist/playlisttab.cpp
-@@ -48,7 +48,7 @@ PlaylistBrowserModel::PlaylistBrowserModel(PlaylistModel *playlistModel_,
- 		file.setFileName(QStandardPaths::writableLocation(QStandardPaths::DataLocation) + QLatin1String("/playlists"));
- 
- 		if (!file.open(QIODevice::ReadOnly)) {
--			qCWarning(logPlaylist, "Cannot open file %s", qPrintable(file.fileName()));
-+			qCWarning(logPlaylist, "Cannot open file %s", toPrintable(file.fileName()));
- 			return;
- 		}
- 	}
-@@ -69,7 +69,7 @@ PlaylistBrowserModel::PlaylistBrowserModel(PlaylistModel *playlistModel_,
- 		// compatibility code
- 		hasSubtitles = false;
- 	} else if (version != 0x361c4a3c) {
--		qCWarning(logPlaylist, "Cannot read file %s", qPrintable(file.fileName()));
-+		qCWarning(logPlaylist, "Cannot read file %s", toPrintable(file.fileName()));
- 		return;
- 	}
- 
-@@ -112,7 +112,7 @@ PlaylistBrowserModel::PlaylistBrowserModel(PlaylistModel *playlistModel_,
- 		}
- 
- 		if (stream.status() != QDataStream::Ok) {
--			qCWarning(logPlaylist, "Cannot read file %s", qPrintable(file.fileName()));
-+			qCWarning(logPlaylist, "Cannot read file %s", toPrintable(file.fileName()));
- 			delete playlist;
- 			break;
- 		}
-@@ -126,7 +126,7 @@ PlaylistBrowserModel::~PlaylistBrowserModel()
- 	QFile file(QStandardPaths::writableLocation(QStandardPaths::DataLocation) + QLatin1String("/playlistsK4"));
- 
- 	if (!file.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
--		qCWarning(logPlaylist, "Cannot open file %s", qPrintable(file.fileName()));
-+		qCWarning(logPlaylist, "Cannot open file %s", toPrintable(file.fileName()));
- 		return;
- 	}
- 
-diff --git a/src/sqlhelper.cpp b/src/sqlhelper.cpp
-index 089b6970aec2..c48762371ab6 100644
---- a/src/sqlhelper.cpp
-+++ b/src/sqlhelper.cpp
-@@ -80,7 +80,7 @@ QSqlQuery SqlHelper::prepare(const QString &statement)
- 	query.setForwardOnly(true);
- 
- 	if (!query.prepare(statement)) {
--		qCWarning(logSql, "Error while preparing statement '%s'", qPrintable(query.lastError().text()));
-+		qCWarning(logSql, "Error while preparing statement '%s'", toPrintable(query.lastError().text()));
- 	}
- 
- 	return query;
-@@ -92,7 +92,7 @@ QSqlQuery SqlHelper::exec(const QString &statement)
- 	query.setForwardOnly(true);
- 
- 	if (!query.exec(statement)) {
--		qCWarning(logSql, "Error while executing statement '%s'", qPrintable(query.lastError().text()));
-+		qCWarning(logSql, "Error while executing statement '%s'", toPrintable(query.lastError().text()));
- 	}
- 
- 	return query;
-@@ -101,7 +101,7 @@ QSqlQuery SqlHelper::exec(const QString &statement)
- void SqlHelper::exec(QSqlQuery &query)
- {
- 	if (!query.exec()) {
--		qCWarning(logSql, "Error while executing statement '%s'", qPrintable(query.lastError().text()));
-+		qCWarning(logSql, "Error while executing statement '%s'", toPrintable(query.lastError().text()));
- 	}
- }
- 
-diff --git a/src/sqlinterface.cpp b/src/sqlinterface.cpp
-index 8cc3bbd239c5..40886f67fddd 100644
---- a/src/sqlinterface.cpp
-+++ b/src/sqlinterface.cpp
-@@ -135,7 +135,7 @@ void SqlInterface::sqlInsert(SqlKey key)
- 		break;
- 	}
- 
--	qCWarning(logSql, "Invalid pending statement '%s'", qPrintable(pendingStatement));
-+	qCWarning(logSql, "Invalid pending statement '%s'", toPrintable(pendingStatement));
- }
- 
- void SqlInterface::sqlUpdate(SqlKey key)
-@@ -155,7 +155,7 @@ void SqlInterface::sqlUpdate(SqlKey key)
- 		break;
- 	}
- 
--	qCWarning(logSql, "Invalid pending statement '%s'", qPrintable(pendingStatement));
-+	qCWarning(logSql, "Invalid pending statement '%s'", toPrintable(pendingStatement));
- }
- 
- void SqlInterface::sqlRemove(SqlKey key)
-@@ -176,7 +176,7 @@ void SqlInterface::sqlRemove(SqlKey key)
- 		break;
- 	}
- 
--	qCWarning(logSql, "Invalid pending statement %s", qPrintable(pendingStatement));
-+	qCWarning(logSql, "Invalid pending statement %s", toPrintable(pendingStatement));
- }
- 
- void SqlInterface::requestSubmission()
-@@ -226,7 +226,7 @@ void SqlInterface::sqlSubmit()
- 			continue;
- 		}
- 
--		qCWarning(logSql, "Invalid pending statement %s", qPrintable(pendingStatement));
-+		qCWarning(logSql, "Invalid pending statement %s", toPrintable(pendingStatement));
- 	}
- 
- 	pendingStatements.clear();
-
diff --git a/media-video/kaffeine/kaffeine-2.0.15.ebuild b/media-video/kaffeine/kaffeine-2.0.15.ebuild
deleted file mode 100644
index 56f1d1f4177e..000000000000
--- a/media-video/kaffeine/kaffeine-2.0.15.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-inherit kde5
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="amd64 x86"
-	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-fi
-
-DESCRIPTION="Media player with digital TV support by KDE"
-HOMEPAGE="https://kaffeine.kde.org/"
-LICENSE="GPL-2+ handbook? ( FDL-1.3 )"
-IUSE="dvb"
-
-CDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsql 'sqlite')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	$(add_qt_dep qtxml)
-	media-video/vlc[X]
-	x11-libs/libXScrnSaver
-	dvb? ( media-libs/libv4l )
-"
-DEPEND="${CDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-RDEPEND="${CDEPEND}
-	!media-video/kaffeine:4
-"
-
-DOCS=( Changelog NOTES README.md )
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
-
-src_configure() {
-	# tools working on $HOME directory for a local git checkout
-	local mycmakeargs=(
-		-DBUILD_TOOLS=OFF
-		$(cmake-utils_use_find_package dvb Libdvbv5)
-	)
-
-	kde5_src_configure
-}
diff --git a/media-video/kaffeine/kaffeine-2.0.16.2.ebuild b/media-video/kaffeine/kaffeine-2.0.16.2.ebuild
index 6cc5ae4f8576..7bd747eeec59 100644
--- a/media-video/kaffeine/kaffeine-2.0.16.2.ebuild
+++ b/media-video/kaffeine/kaffeine-2.0.16.2.ebuild
@@ -7,7 +7,7 @@ KDE_HANDBOOK="optional"
 inherit kde5
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="~amd64 x86"
+	KEYWORDS="amd64 x86"
 	SRC_URI="mirror://kde/stable/${PN}/${PN}-$(ver_rs 3 -).tar.xz"
 fi
 
diff --git a/media-video/libav/Manifest b/media-video/libav/Manifest
index 8db0976a6ba8..7380226722b8 100644
--- a/media-video/libav/Manifest
+++ b/media-video/libav/Manifest
@@ -1,5 +1,3 @@
-AUX libav-11.3-libvpx-1.5.0.patch 2168 BLAKE2B a667702aaf67f1dc5d3355c5f9808694a40f9d7758c66ac5320a0caa627a1d42363a794570883b09ff2c446752727c996e3cc66c16b23ab8c6f9625b4eef579a SHA512 ef4a50d710eb11658fbf13fa29e5f60a64dbb3bf99ed56e12480a595679c242876ea7e0211048c3013e762c9484c3cd3363244c1b040fc8fd11f010b497d2e9e
-AUX libav-11.8-perl526.patch 575 BLAKE2B cda427336a8d2fec7dc8633bec072e7b765c586cd56fae5c6dc94bcdde0634fc2032e73d46efc2946ddafad06dead628f48c7c608c4f96fd5d9622d4b6f2d2d6 SHA512 27a3df5ae92032536c6d79074b8513aeb3dc0e781a8bad46dcea8cd4a5279bff79f21b11b651fafa1ec24515c355ca2f4e1fd4fc4e99584860d9f60aa15396ac
 DIST fate-12-r1.tar.xz 763758260 BLAKE2B 299e1a2a773e49c7a51c1222ac34eaea24f77420570a1b0c0b18db5517736656f52ad0a7ca807f65f5e9f9597709265fcd950cf989ad995aa4289ba0e364950e SHA512 084f584c34d34b66c1f4d4742a11376ee2b90f6a07529b5aba6d50421dc8f863fded73dd57ad2c201aadfd529f0f923fa531ea9b41aaaa7b682846ef565a1018
 DIST fate-12.tar.xz 755165356 BLAKE2B 031cef24bcfae6205cd6546f453cddb17387176ae837086dd38c8c7132ad9b8dee5367be5fb1b8c604b2203a1e2a55f0c3be2a62f825a95a7ace1aceb4593b70 SHA512 f6ffb3b673b01debd71d7c79cd5c3c4d6f6adb975ed0bdb7c791d674efd8a84ac98f7db3943dfbe3756a3f8819ceab2bdf4633c15fefddf0f8e10adfc805c1e1
 DIST libav-12.3.tar.xz 5267988 BLAKE2B 92147dde4f41a5aa05d93824d3ffa9a21b067f99cec5fa17bc4b8e3600f2b1913f7e74d4ea766c864cdba686dd14d5d3a8bc8af8f9e6de4c956f14cb8e20ab88 SHA512 fd4838a934792797a975ece034cbd63760c94ee6becc99b8707e8345e41777baf26e30ef6937ab30b7d2f722977e69aabc2cfca3fcdf88373d579f9cc9d69162
diff --git a/media-video/libav/files/libav-11.3-libvpx-1.5.0.patch b/media-video/libav/files/libav-11.3-libvpx-1.5.0.patch
deleted file mode 100644
index 6844a152b7a5..000000000000
--- a/media-video/libav/files/libav-11.3-libvpx-1.5.0.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-https://bugs.gentoo.org/565696
-
-commit 4d05e9392f84702e3c833efa86e84c7f1cf5f612
-Author: James Zern <jzern@google.com>
-Date:   Mon Oct 19 22:44:11 2015 -0700
-
-    libvpxenc: remove some unused ctrl id mappings
-    
-    VP8E_UPD_ENTROPY, VP8E_UPD_REFERENCE, VP8E_USE_REFERENCE were removed
-    from libvpx and the remaining values were never used here
-    
-    Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
-    Signed-off-by: James Zern <jzern@google.com>
-    Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
-
-diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c
-index 563117f..d1e2523 100644
---- a/libavcodec/libvpxenc.c
-+++ b/libavcodec/libvpxenc.c
-@@ -71,23 +71,15 @@ typedef struct VP8EncoderContext {
- 
- /** String mappings for enum vp8e_enc_control_id */
- static const char *const ctlidstr[] = {
--    [VP8E_UPD_ENTROPY]           = "VP8E_UPD_ENTROPY",
--    [VP8E_UPD_REFERENCE]         = "VP8E_UPD_REFERENCE",
--    [VP8E_USE_REFERENCE]         = "VP8E_USE_REFERENCE",
--    [VP8E_SET_ROI_MAP]           = "VP8E_SET_ROI_MAP",
--    [VP8E_SET_ACTIVEMAP]         = "VP8E_SET_ACTIVEMAP",
--    [VP8E_SET_SCALEMODE]         = "VP8E_SET_SCALEMODE",
-+    [VP8E_SET_ARNR_MAXFRAMES]    = "VP8E_SET_ARNR_MAXFRAMES",
-+    [VP8E_SET_ARNR_STRENGTH]     = "VP8E_SET_ARNR_STRENGTH",
-+    [VP8E_SET_ARNR_TYPE]         = "VP8E_SET_ARNR_TYPE",
-     [VP8E_SET_CPUUSED]           = "VP8E_SET_CPUUSED",
-+    [VP8E_SET_CQ_LEVEL]          = "VP8E_SET_CQ_LEVEL",
-     [VP8E_SET_ENABLEAUTOALTREF]  = "VP8E_SET_ENABLEAUTOALTREF",
-     [VP8E_SET_NOISE_SENSITIVITY] = "VP8E_SET_NOISE_SENSITIVITY",
--    [VP8E_SET_SHARPNESS]         = "VP8E_SET_SHARPNESS",
-     [VP8E_SET_STATIC_THRESHOLD]  = "VP8E_SET_STATIC_THRESHOLD",
-     [VP8E_SET_TOKEN_PARTITIONS]  = "VP8E_SET_TOKEN_PARTITIONS",
--    [VP8E_GET_LAST_QUANTIZER]    = "VP8E_GET_LAST_QUANTIZER",
--    [VP8E_SET_ARNR_MAXFRAMES]    = "VP8E_SET_ARNR_MAXFRAMES",
--    [VP8E_SET_ARNR_STRENGTH]     = "VP8E_SET_ARNR_STRENGTH",
--    [VP8E_SET_ARNR_TYPE]         = "VP8E_SET_ARNR_TYPE",
--    [VP8E_SET_CQ_LEVEL]          = "VP8E_SET_CQ_LEVEL",
- };
- 
- static av_cold void log_encoder_error(AVCodecContext *avctx, const char *desc)
diff --git a/media-video/libav/files/libav-11.8-perl526.patch b/media-video/libav/files/libav-11.8-perl526.patch
deleted file mode 100644
index d9625c653dec..000000000000
--- a/media-video/libav/files/libav-11.8-perl526.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN libav-11.8.orig/doc/texi2pod.pl libav-11.8/doc/texi2pod.pl
---- libav-11.8.orig/doc/texi2pod.pl	2016-09-06 18:09:14.000000000 +0200
-+++ libav-11.8/doc/texi2pod.pl	2018-02-16 18:25:11.823113370 +0100
-@@ -379,7 +379,7 @@
-     # @* is also impossible in .pod; we discard it and any newline that
-     # follows it.  Similarly, our macro @gol must be discarded.
- 
--    s/\@anchor{(?:[^\}]*)\}//g;
-+    s/\@anchor\{(?:[^\}]*)\}//g;
-     s/\(?\@xref\{(?:[^\}]*)\}(?:[^.<]|(?:<[^<>]*>))*\.\)?//g;
-     s/\s+\(\@pxref\{(?:[^\}]*)\}\)//g;
-     s/;\s+\@pxref\{(?:[^\}]*)\}//g;
diff --git a/media-video/libva-utils/Manifest b/media-video/libva-utils/Manifest
index 7d2a23e13836..6ecacd0d1095 100644
--- a/media-video/libva-utils/Manifest
+++ b/media-video/libva-utils/Manifest
@@ -1,8 +1,12 @@
 DIST libva-utils-2.0.0.tar.gz 1033292 BLAKE2B 5f9e36d2a69a6a65f3d47b0e29aa1807201da8bd69eb00da5dc232b2629fdd01279c38af77335244f673b4f2e849ea3cc89a572b7ce26fd614f44461603c0c19 SHA512 5c435b558fdeec6dc597c531b1e72e1a6e8b4f59f5f97af30d01b39a20430446cce7af5553b924144fbc54a64f0e39ab232c76e4e8a266329cc9868d60be0c4b
 DIST libva-utils-2.1.0.tar.gz 1034951 BLAKE2B 88fb075bd1946bbba79c460640c3242a6ad85fcb6396a77b549ce3d2193fb4ab6df35b70a0981d56cbc40822a9b2146074255f573783547b23ee0e7d8670fce3 SHA512 2dbf1e1849136804be8970b1f02957e6e3eb593a72e34289e8e2c087b3a358596e5eed7d17d3c56701045116a0658450c37b26600a352dcb37ed0d58d5e14ba6
 DIST libva-utils-2.2.0.tar.gz 1037165 BLAKE2B 7d86ab23972be8abd7703fcf38025ddf3dfce1fab00d7b5ac083004cb33fef1cc4d8aab7ebba6e20b33377f0e4b3b9b0ff9b3e47a2ddc0c2bfcd7b256cd2ade9 SHA512 c4394755f500c0839d8ab40baa40deae26dbdd7b4782993b9a46e011712e943a1a55afe1b0b05dc8af80eccb327c8bc388576e4843447715248133e2a5c706ec
+DIST libva-utils-2.3.0.tar.gz 1086331 BLAKE2B d983831605cc28c361ef0609699560c655186ecf4d4ee045b377d5928e7b0a127126aa92cf986b17f6eae3de9dde311321fdc58caada9545d1afd047f380c1b6 SHA512 ae36afb19f3414f4a3b857bbaeedd088e91e8a11cc785c4b945af0c7bf0e7bca7821ea5731b0868a26f273e323c0b155b12d87b4740fe8b2893ef024b8a979d8
+DIST libva-utils-2.4.0.tar.bz2 1030271 BLAKE2B b57947f9bd63f34b27a403484ae6b66e750f854dd87c8448afb3d361581d83b20a5ffd8d7e22c9dbf5fae6f7ff3fd62d70cc248b29a862066ff10928629e4d11 SHA512 c5c674179ed589968fd296a7e33dd57a3476c237d8e15258938b364051d501e156c22b41b98fe59d6bc36805495a934dee602ec9e9bb5350c72aa65d3d300ff6
 EBUILD libva-utils-2.0.0-r1.ebuild 1352 BLAKE2B 24cd83a890efeb1edc3794e58140590676b901c5e6df3374362bcfa3032515d9b2fbf19f55adc4dcb2fe10bc57aeb405a768b84c30f688c37de2b5d60b1f5f05 SHA512 7687c4c1a7093b6a645e2c08ff4ff14890d84e08c380c30033952792ab063e0d19ae79f360cb7306b0ccb3e6082558296a148e076939173e6b63f25ffcb0281f
 EBUILD libva-utils-2.1.0.ebuild 1352 BLAKE2B a53ee0ce8a047e995eb7ea3f1f79efc5f44eb33965f1a13db7302a3cf89bcfd38bb6966ad14ba57acbf2d50f703c3b795e0368c11be9bb43e00b2af810a47e82 SHA512 9020017ce01eb0d3abe946e1de006287c03cc110338c4fd9b18aa64fc6ddd996f3c7758bf88e02fbb556e5a65717caaff193b47d79f9afa28c343b5b47462d1e
 EBUILD libva-utils-2.2.0.ebuild 1352 BLAKE2B 700a90494c689b3260d0d0d09be5671aaec976b03bdd57b2b01de0469a4b3f678f2d3f5c9ec9dd311df059f612fa3ab1d7395bb2bbed51bfe5163cccec6d0062 SHA512 b64978b6b8b880d134d92edfb03cc0b2dc13389e76c4ce594549377ec688141756ff16f6d0a9bdb5439e1e5dd038cd20658b18c70dace5826b211916605bdf96
-EBUILD libva-utils-9999.ebuild 1352 BLAKE2B 700a90494c689b3260d0d0d09be5671aaec976b03bdd57b2b01de0469a4b3f678f2d3f5c9ec9dd311df059f612fa3ab1d7395bb2bbed51bfe5163cccec6d0062 SHA512 b64978b6b8b880d134d92edfb03cc0b2dc13389e76c4ce594549377ec688141756ff16f6d0a9bdb5439e1e5dd038cd20658b18c70dace5826b211916605bdf96
+EBUILD libva-utils-2.3.0.ebuild 1295 BLAKE2B 593c4fd0478068527e1e4d1b4e353d4bc7814d68b897bbf13491087ef91414e3c627fc1082c720025c533206d77e0b9159648c01c1f18f9b1e9b9d7c1d28017b SHA512 caf1cd6c81bf5dbdee999bee5aeeba4ec6cabf67144376a43ac0e9397903b6c1bed4de3f7bbde3057b2cca7d631e5dfeaa797f1d1ccf499bb89d2f2119a29f6d
+EBUILD libva-utils-2.4.0.ebuild 1243 BLAKE2B 61e8d03195a05298aab400f82ad970e2da8324638f0eab1de330518be906ca847b46727493f1c82555ccd5e31548e8ad05c61d194ede83ad53895147d8ac5c49 SHA512 7375fcf7be6c59d86bde4cff1b9578dc66a859043f4e09508e05465fa095910b6f87e142cf21f400984e3d152af4ce4d06be1b79af6732d79e4f5f7e2a018a90
+EBUILD libva-utils-9999.ebuild 1243 BLAKE2B 61e8d03195a05298aab400f82ad970e2da8324638f0eab1de330518be906ca847b46727493f1c82555ccd5e31548e8ad05c61d194ede83ad53895147d8ac5c49 SHA512 7375fcf7be6c59d86bde4cff1b9578dc66a859043f4e09508e05465fa095910b6f87e142cf21f400984e3d152af4ce4d06be1b79af6732d79e4f5f7e2a018a90
 MISC metadata.xml 414 BLAKE2B 38e8ac043ae6960cdc20190dd2f7f802b006c4d1f71920d1b699a8750a53c65ceeaa32f4d82f0699a5989f2f252daa1fbe5e2dfa330b9eb745a12cce8da045f8 SHA512 a515f432546c6063a66694fb5fbd310d498d2970cac15dea1c9497d086cb517557c15da0837f068bf28bd2e000345f95c68f4aa6170d65b960ba7e6d44e8ad57
diff --git a/media-video/libva-utils/libva-utils-2.3.0.ebuild b/media-video/libva-utils/libva-utils-2.3.0.ebuild
new file mode 100644
index 000000000000..45318abddb59
--- /dev/null
+++ b/media-video/libva-utils/libva-utils-2.3.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+SCM=""
+if [[ "${PV%9999}" != "${PV}" ]] ; then # Live ebuild
+	SCM=git-r3
+	EGIT_BRANCH=master
+	EGIT_REPO_URI="https://github.com/intel/libva-utils"
+fi
+
+AUTOTOOLS_AUTORECONF="yes"
+inherit autotools-utils ${SCM} multilib
+
+DESCRIPTION="Collection of utilities and tests for VA-API"
+HOMEPAGE="https://01.org/linuxmedia/vaapi"
+if [[ "${PV%9999}" != "${PV}" ]] ; then # Live ebuild
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/intel/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="+drm test wayland X"
+
+RDEPEND="
+	>=x11-libs/libva-2.0.0:=[drm?,wayland?,X?]
+	drm? ( >=x11-libs/libdrm-2.4 )
+	X? (
+		>=x11-libs/libX11-1.6.2
+		>=x11-libs/libXext-1.3.2
+		>=x11-libs/libXfixes-5.0.1
+	)
+	wayland? ( >=dev-libs/wayland-1.0.6 )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+REQUIRED_USE="|| ( drm wayland X )"
+
+DOCS=( CONTRIBUTING.md README.md )
+
+src_prepare() {
+	sed -e 's/-Werror//' -i test/Makefile.am || die
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable X x11)
+		$(use_enable wayland)
+		$(use_enable drm)
+		$(use_enable test tests)
+	)
+	autotools-utils_src_configure
+}
diff --git a/media-video/libva-utils/libva-utils-2.4.0.ebuild b/media-video/libva-utils/libva-utils-2.4.0.ebuild
new file mode 100644
index 000000000000..928d6f126f65
--- /dev/null
+++ b/media-video/libva-utils/libva-utils-2.4.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} = *9999* ]] ; then # Live ebuild
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/intel/libva-utils"
+fi
+inherit autotools
+
+DESCRIPTION="Collection of utilities and tests for VA-API"
+HOMEPAGE="https://01.org/linuxmedia/vaapi"
+if [[ ${PV} != *9999* ]] ; then
+	SRC_URI="https://github.com/intel/libva-utils/releases/download/${PV}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="+drm test wayland X"
+
+REQUIRED_USE="|| ( drm wayland X )"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	>=x11-libs/libva-2.0.0:=[drm?,wayland?,X?]
+	drm? ( >=x11-libs/libdrm-2.4 )
+	wayland? ( >=dev-libs/wayland-1.0.6 )
+	X? (
+		>=x11-libs/libX11-1.6.2
+		>=x11-libs/libXext-1.3.2
+		>=x11-libs/libXfixes-5.0.1
+	)
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( NEWS )
+
+src_prepare() {
+	default
+	sed -e 's/-Werror//' -i test/Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable drm)
+		$(use_enable test tests)
+		$(use_enable wayland)
+		$(use_enable X x11)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	[[ ${PV} = *9999* ]] && DOCS+=( CONTRIBUTING.md README.md )
+	default
+}
diff --git a/media-video/libva-utils/libva-utils-9999.ebuild b/media-video/libva-utils/libva-utils-9999.ebuild
index 6c7521ce0786..928d6f126f65 100644
--- a/media-video/libva-utils/libva-utils-9999.ebuild
+++ b/media-video/libva-utils/libva-utils-9999.ebuild
@@ -1,63 +1,61 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SCM=git-r3
-	EGIT_BRANCH=master
+if [[ ${PV} = *9999* ]] ; then # Live ebuild
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/intel/libva-utils"
 fi
-
-AUTOTOOLS_AUTORECONF="yes"
-inherit autotools-utils ${SCM} multilib
+inherit autotools
 
 DESCRIPTION="Collection of utilities and tests for VA-API"
 HOMEPAGE="https://01.org/linuxmedia/vaapi"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/intel/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz"
+if [[ ${PV} != *9999* ]] ; then
+	SRC_URI="https://github.com/intel/libva-utils/releases/download/${PV}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="MIT"
 SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-else
-	KEYWORDS=""
-fi
 IUSE="+drm test wayland X"
 
-RDEPEND="
+REQUIRED_USE="|| ( drm wayland X )"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
 	>=x11-libs/libva-2.0.0:=[drm?,wayland?,X?]
 	drm? ( >=x11-libs/libdrm-2.4 )
+	wayland? ( >=dev-libs/wayland-1.0.6 )
 	X? (
 		>=x11-libs/libX11-1.6.2
 		>=x11-libs/libXext-1.3.2
 		>=x11-libs/libXfixes-5.0.1
 	)
-	wayland? ( >=dev-libs/wayland-1.0.6 )"
+"
+RDEPEND="${DEPEND}"
 
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-REQUIRED_USE="|| ( drm wayland X )"
-
-DOCS=( CONTRIBUTING.md README.md )
+DOCS=( NEWS )
 
 src_prepare() {
+	default
 	sed -e 's/-Werror//' -i test/Makefile.am || die
-	autotools-utils_src_prepare
+	eautoreconf
 }
 
 src_configure() {
 	local myeconfargs=(
-		$(use_enable X x11)
-		$(use_enable wayland)
 		$(use_enable drm)
 		$(use_enable test tests)
+		$(use_enable wayland)
+		$(use_enable X x11)
 	)
-	autotools-utils_src_configure
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	[[ ${PV} = *9999* ]] && DOCS+=( CONTRIBUTING.md README.md )
+	default
 }
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index f2d167b9a7b2..3a7af31b9dd0 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -9,7 +9,7 @@ EBUILD mkvtoolnix-21.0.0-r1.ebuild 2776 BLAKE2B 86398031edf9b7f0a3a4e6f4847e72d2
 EBUILD mkvtoolnix-22.0.0.ebuild 2776 BLAKE2B 86398031edf9b7f0a3a4e6f4847e72d2ee9025af58a7ddd524dfad296a15e0b6f79f629f0ddb7ed1ed1cdc629d43d3d74ab4413fcc593e60fb08ddb1ef3b2a2b SHA512 28b5a3406f1f89c2839ed2f859d790c3171740cbff1a871111aeb31a7bedb9df0680cb96c64eb36363af680eb409d1069f5fd9bc33d1840d89ac0b5f6c9f4613
 EBUILD mkvtoolnix-23.0.0.ebuild 2776 BLAKE2B 86398031edf9b7f0a3a4e6f4847e72d2ee9025af58a7ddd524dfad296a15e0b6f79f629f0ddb7ed1ed1cdc629d43d3d74ab4413fcc593e60fb08ddb1ef3b2a2b SHA512 28b5a3406f1f89c2839ed2f859d790c3171740cbff1a871111aeb31a7bedb9df0680cb96c64eb36363af680eb409d1069f5fd9bc33d1840d89ac0b5f6c9f4613
 EBUILD mkvtoolnix-29.0.0-r1.ebuild 2884 BLAKE2B b5e5337a678e01457f2fc967f077c757e3b73bffdbcfbad49cc4479c71e25e536232d2ad47ad68ca5e15c0cdd311a2ee9400eefdbe7320aa4a5906dcfc3e44a8 SHA512 751ea92e2107310d27ddad995305878da9a465318a6bbf8b3acb4940f008a54a1643661430a20c65b430963481c7097f3e6a5e6b7641222cae0ba19ffe9d30f4
-EBUILD mkvtoolnix-29.0.0.ebuild 2920 BLAKE2B 57f7ebdaa2d39f180bc123ccef3f976a28e58aac54b1ec851c0b1f5d7d8a53b5915082718e380d851fddd7173fb53ab90d86ba89fe40f5c89aeb3e914dbb6b60 SHA512 fce50ac64933c2a20d6606395810bb21887756d0e447da65dae01a006db8964d04e303b8b61c7f471209de8c5b553ab189aafb4e96db3f03193181e84dc9df0d
+EBUILD mkvtoolnix-29.0.0.ebuild 2917 BLAKE2B 0a6f43f3976acee9843c486ecfc2901a585b56cdc5c1f3edfff86322e356c58cefb7ac41e42df32e2cb9cafb14d8bc5d3868f30363538a6464bab073d08225d3 SHA512 4604578ff5449024a7333a6d1613d1fa558d24009e4c1f73a05ece43413f76e62613f8436536815e0062778a73d5921646a3bf37429ac43fdb0167d6fabc243c
 EBUILD mkvtoolnix-30.1.0.ebuild 2884 BLAKE2B b5e5337a678e01457f2fc967f077c757e3b73bffdbcfbad49cc4479c71e25e536232d2ad47ad68ca5e15c0cdd311a2ee9400eefdbe7320aa4a5906dcfc3e44a8 SHA512 751ea92e2107310d27ddad995305878da9a465318a6bbf8b3acb4940f008a54a1643661430a20c65b430963481c7097f3e6a5e6b7641222cae0ba19ffe9d30f4
 EBUILD mkvtoolnix-9999.ebuild 2918 BLAKE2B 75f39a5be50cfad1ef9c21cd11691aecc53071e2b9167f3f5f8b5b9eba6431ce876a56048abe7bd3818df8f8a25be5035f7c4dac55a7ec6536e43cbd2728d018 SHA512 3d2048d6b89efe936fafa3860e349c5faa0656837715cc0f6ac25d7404d0830445d79dc93ca824b54b6db8bc52cd0ee90f9f3262fe49cbebe5d2302d8f10be35
 MISC metadata.xml 255 BLAKE2B 84855d12acedab301e8e709820ef74f658689209ce914cad2c71d11f4248a7d3356109d93573ed675698031eca1e0b6e0372a61c2a43a9f09840e295f94b74ef SHA512 92b56f4d9c86ad69341e67e8cc74db0bd068e45afdf2f3d3f9ea410fc5e64f3476143b656f2cb3d26b97ae01a967d71766952eba22e2278aab907c20b00ae0e9
diff --git a/media-video/mkvtoolnix/mkvtoolnix-29.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-29.0.0.ebuild
index 865f816c46ce..da56ecf94444 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-29.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-29.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index c502d5414050..157407f78d19 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -9,6 +9,6 @@ DIST MPlayer-1.3.0.tar.xz 13278984 BLAKE2B 4e2d67f6fda893f3b200bc92598c23410a2a3
 DIST font-arial-cp1250.tar.bz2 249705 BLAKE2B eb4366a110d917dc975b8add168ab43b1e8a0db7342647f69f5421fc1170719015c97ffa770e89892cbb4cee8e5b2fb74a4772c8f6cbef9606ee12c3746d78c9 SHA512 4f77ff5ceb8ec6e5d9f8f34d8950a6a6276d1fd5a947772fcbdb6554988b1ea665c12b82f45164f91fb7bd08000cb4afc26fa35beb4c760464160e22b9b8c340
 DIST font-arial-iso-8859-1.tar.bz2 234242 BLAKE2B 0671854e1a257d27b502affb59de681942a93990d3ac2575bbf1a6dd9eef026969f2f9ce4e9c11a68ea3d8aed48063f826a1e153f7468437a39791672c92a5d0 SHA512 a1d03b6f09c48f48b7733f3bc0402ceab239a9abf88b860d852ea9fe69b4da690208a79d6f29d30204f5b37becf10672e8e8c0bfef201846d80ec54df617d029
 DIST font-arial-iso-8859-2.tar.bz2 222208 BLAKE2B 94b1a04672bf9b4b20a0e6981591e761f751bd637deddcb801855296c525bf3b5e8feb1cb11cef282c0269f2c963ded22846089076e7e6763f258b8a932af454 SHA512 5671e628303fd816f64a51ad10e2f4dd9c3dc1b34c379a2ecf489b83931db7af668aaa4e00e96a00cacd63ed98daeae6b6a4d5925edfb06fc98d3a923f70257d
-EBUILD mplayer-1.3.0-r5.ebuild 17117 BLAKE2B 474223f6e45cc661f61576d476ae7d942ff34cafc72a83b75887caf0e6d09b4bf963674b4fccd76bfc78ef78ce971b01dba281e404f7878fae3938c4c526f259 SHA512 b64e449dc10417f19d497f27ff6efdf043aa52a096a2406baf8538f090ed43a6defe6c3a90c5d87913c995796f16524097a5cbcee9e201605380bfc289a5cbba
-EBUILD mplayer-9999.ebuild 16823 BLAKE2B cb7d0916716f757c7cb924ebc2cdebadd52258d2b17ab371415117aa0fa3e67b8ca3b35e5205247623d22a4f70d102ce50d60406a68ea4c6047e03f9a588f59b SHA512 31660c7a8c3cf6abe1011fcbe13cb93dd5d3d3952be00430676859aeb3275fc57c707dd2514155e9e041ceda9c34f546e243edd970cf25efdbf356aed31ba426
+EBUILD mplayer-1.3.0-r5.ebuild 17117 BLAKE2B f9107395e9b1f6810b6c885e5a9f27ba6f1ee5a562e66f4f57b49260921ecfc2c7239cbc171b243d86c72583ca3842819ab1dd01288ceedd704f2681fa88cbbf SHA512 6ed47ef75d7a64f12108af9cfde00ff180c05511af5b5920c345a3c6efb5956a57aefef76ac84e24983b0c54eaceb2a09e53d09d2657edc94b3fc4b0dbcf3d7d
+EBUILD mplayer-9999.ebuild 16817 BLAKE2B 770e2b8169b87d1688fb5fea4e15a9baadf4668155aa5b3bf0d3720ba5307c1b938f0085a810f66098831b714f6171d69eb0bf7d3a8ace02a47720675c4e9b9a SHA512 155bccb39c5b5c5ccc7a2b2db6b27bd3d8f9e32ccdda3fa73f0e5fe906d4b0cade9610e19f09d2f0ddebb8f7b6a884c51559b584d853e8bf91796fb6b4b17765
 MISC metadata.xml 2457 BLAKE2B c0d722886466f46e09a28b2384a6b8ccf15bb080b69b513500633a03a1fc784fe85a167824879c9dde6417bde4852c4ec1f30a444e4d520b7d47315cfa4cc91e SHA512 578de48a26eddf8d8eb522141df02d9c948d97e1334c94897cad5a4a9a386e8207c90e6d931e1d2defe20d34504c0d4f993746f1cc0907cea1ed2740d02b49d5
diff --git a/media-video/mplayer/mplayer-1.3.0-r5.ebuild b/media-video/mplayer/mplayer-1.3.0-r5.ebuild
index b5a27b3c40e1..b7f1b8d3f164 100644
--- a/media-video/mplayer/mplayer-1.3.0-r5.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0-r5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-EGIT_REPO_URI="git://git.videolan.org/ffmpeg.git"
+EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git"
 ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
 [[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git-2" || SVN_ECLASS=""
 
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 248afbd492bc..8d1ad1c2a300 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-EGIT_REPO_URI="https://git.videolan.org/git/ffmpeg.git"
+EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git"
 ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
 [[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git-r3"
 
diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest
index 6f41b1a1d87d..9a8eed59297b 100644
--- a/media-video/obs-studio/Manifest
+++ b/media-video/obs-studio/Manifest
@@ -1,6 +1,4 @@
-AUX obs-studio-21.1.2-use-less-automagic.patch 5284 BLAKE2B 43e9b7fc9c4699c77037a7e28668137e0ffb24de285b9f560d2ccb6214c54640893a5d34e179087f7b2dfce49a97ea8465df97bbac232ed7c013d580bbb6019a SHA512 00774c36e3437c5828677f71ff33e467fab3957b9622092ba3d2501769796ab5b6e4328b898ee9e92ee32dfef78f9797d03bb602bc68ad294202f180298afb38
-AUX obs-studio-22.0.3-fdk-build-fix.patch 1722 BLAKE2B 253b26a37c76d602ec10694af9987c1b91e7360bb01c2af1b346faef98762b2674701f526f7fcebac260904d7607ef84fc679e09e17d38f5e47a669e7bc65412 SHA512 527e24c2231d6191639d3255b6e1be37d58d68a596fce747e0fd1ebf80e35bd458d287c3e736993667cfbae458db8e2ebfab25a5457aaf102c58472144cb222b
-DIST obs-studio-22.0.3.tar.gz 6015365 BLAKE2B e2c3aec7f97bbad2ec70a46d59035335d605a478ab1e4ff10a077d81c9ade5deef1ca56cf3ffc46d4d2ab89339d98a68aa5ca8c6ca240ed82939b59803af151c SHA512 491f7ce44c741d144c621eb645fe00604e1eb98ff7dac03dffe51ba78a742e6015e1f96f21aad69e16a22d9546b6cdb51b5c1a4defd96e7c64f099de83a31f04
-EBUILD obs-studio-22.0.3.ebuild 3168 BLAKE2B 7bbdd693dd3e76732fe4f097295ea179117c1ed3b32911ee8f7958a396d4783b9b300e2e66a35412986b4d443d2dc8e710da77b41b0433a39198749d67fae687 SHA512 06c6b315ea1544e1e48369eff4b9dd22278030ba5045756f55a379bba964db9e2dc14dd1a0766e45db52b1e62e405e8d13c8841d5e0d461795fbf72448acde59
-EBUILD obs-studio-9999.ebuild 3010 BLAKE2B 4669e7f87289f4f2d2530edba03d80681d130daaefc84e29dd5590c163736858180a1807b95dc9f991c96373ec076bf6b1959c0a3e736e4a46d90d7d370563e5 SHA512 5e6f735e6037ada9b35a4eed27b61165ee017e57576deb4f5b3278f1476f6f6ea8035873786c2e243041c2822fd2a1675664452c7404ab66e5dd3d2666a0104c
+DIST obs-studio-23.0.1.tar.gz 6223214 BLAKE2B c3b65ad9134aefc36a3fa33b8d185a1ee76f76c10edd30d5ad8a7af86605c4e7b3b8d83c5570203d926655131f7c20f4ef11dcbf55c7af745efc2b68d4933c54 SHA512 6877d4bf635a9769d634683a85075a5fe3a5de1fcc83882647dfbc379a897eee05b69c2159e290ff73f53aa7c03027ea4ea15e1169de57c2c50f4e504eff410f
+EBUILD obs-studio-23.0.1.ebuild 3012 BLAKE2B 5a19f9b6daa0523ef9fe912cb8cbcba3c3b7cbcd714ddfaf41200246fa27f9b4c9c021c096994ed8cadb52dbabe4cb05148a39dc2632c14ceb85c87e3c19d5a0 SHA512 76f6cd30b54f98d732e8cca4bff4fb476435319c44e706ae621c2e7d17bc620a1e784c893c5bb6a79dcaf7a6f3476a604418f855a3dc5d4e0087049d428a64e0
+EBUILD obs-studio-9999.ebuild 2981 BLAKE2B 532a7a5ac6d7db36e6c0e8217310fbd891ed2e24fd1873a7e327d60256e0ed41bfcc33371d2d2ef5669786002b7900a113b62006457ea3405492bab2bd2eb2e4 SHA512 a9885c2461dd79a62410c9de6e2e03428e4345d9bc75a077edadf44e61c558fa75d55d6eae0b98f83a622e8a08b3dbe5a5d6ab3aeb5eed8a8fb65a1aeaafa6a0
 MISC metadata.xml 1122 BLAKE2B 608bff24775bd69702b19d9b1db4260ed1e5bf7d932f917d3a27d284a791374211c7fec019bd3a742552cf11142df3d2a4877d81645244bc81a6df5e60ae9f71 SHA512 29291de223d1d70f78b419c05fec1cca18e8dcd52ed5619dff51a130f9e064369378e9e803f3dd5e7c86c9f505ae506917ec04e2c9adadfcc1a23c9aeb27192f
diff --git a/media-video/obs-studio/files/obs-studio-21.1.2-use-less-automagic.patch b/media-video/obs-studio/files/obs-studio-21.1.2-use-less-automagic.patch
deleted file mode 100644
index 2c28c8e080d5..000000000000
--- a/media-video/obs-studio/files/obs-studio-21.1.2-use-less-automagic.patch
+++ /dev/null
@@ -1,167 +0,0 @@
-From eee6541153cfb6788ee088181781793de100e54c Mon Sep 17 00:00:00 2001
-From: Jimi Huotari <chiitoo@gentoo.org>
-Date: Mon, 9 Jul 2018 02:20:10 +0300
-Subject: [PATCH 1/2] deps/obs-scripting: Use less automagic for Lua/Python
- detection
-
-This adds build-time options for disabling the Lua and/or Python
-scripting support in cases where users do not wish to build
-it, but have the required libraries installed.
----
- deps/obs-scripting/CMakeLists.txt | 73 +++++++++++++++++++------------
- 1 file changed, 45 insertions(+), 28 deletions(-)
-
-diff --git a/deps/obs-scripting/CMakeLists.txt b/deps/obs-scripting/CMakeLists.txt
-index 835c1b30..46412779 100644
---- a/deps/obs-scripting/CMakeLists.txt
-+++ b/deps/obs-scripting/CMakeLists.txt
-@@ -1,6 +1,7 @@
- cmake_minimum_required(VERSION 2.8)
- 
- if(NOT ENABLE_SCRIPTING)
-+	message(STATUS "Scripting plugin disabled")
- 	return()
- endif()
- 
-@@ -11,44 +12,60 @@ if(MSVC)
- 		w32-pthreads)
- endif()
- 
--find_package(Luajit QUIET)
--find_package(PythonDeps QUIET)
--find_package(SwigDeps QUIET 2)
-+option(DISABLE_LUA "Disable Lua scripting support" OFF)
-+option(DISABLE_PYTHON "Disable Python scripting support" OFF)
- 
- set(COMPILE_PYTHON FALSE CACHE BOOL "" FORCE)
- set(COMPILE_LUA FALSE CACHE BOOL "" FORCE)
- 
--if(NOT SWIG_FOUND)
--	message(STATUS "Scripting: SWIG not found; scripting disabled")
--	return()
--endif()
-+if(NOT DISABLE_LUA)
-+	find_package(Luajit QUIET)
- 
--if(NOT PYTHONLIBS_FOUND AND NOT LUAJIT_FOUND)
--	message(STATUS "Scripting: Neither Python 3 nor Luajit was found; scripting plugin disabled")
--	return()
--endif()
--
--if(NOT LUAJIT_FOUND)
--	message(STATUS "Scripting: Luajit not found; Luajit support disabled")
-+	if(NOT DISABLE_LUA AND NOT LUAJIT_FOUND)
-+		message(STATUS "Luajit support not found.")
-+		set(LUAJIT_FOUND FALSE)
-+	else()
-+		message(STATUS "Scripting: Luajit supported")
-+		set(COMPILE_LUA TRUE CACHE BOOL "" FORCE)
-+	endif()
- else()
--	message(STATUS "Scripting: Luajit supported")
--	set(COMPILE_LUA TRUE CACHE BOOL "" FORCE)
-+	message(STATUS "Scripting: Luajit support disabled")
-+	set(LUAJIT_FOUND FALSE)
- endif()
- 
--if(NOT PYTHONLIBS_FOUND)
--	message(STATUS "Scripting: Python 3 not found; Python support disabled")
-+if(NOT DISABLE_PYTHON)
-+	find_package(PythonDeps QUIET)
-+
-+	if(NOT DISABLE_PYTHON AND NOT PYTHONLIBS_FOUND)
-+		message(STATUS "Python support not found.")
-+		set(PYTHON_FOUND FALSE)
-+		set(PYTHONLIBS_FOUND FALSE)
-+	else()
-+		message(STATUS "Scripting: Python 3 supported")
-+		set(PYTHON_FOUND TRUE)
-+		set(COMPILE_PYTHON TRUE CACHE BOOL "" FORCE)
-+
-+		get_filename_component(PYTHON_LIB "${PYTHON_LIBRARIES}" NAME)
-+		string(REGEX REPLACE "\\.[^.]*$" "" PYTHON_LIB ${PYTHON_LIB})
-+
-+		if(WIN32)
-+			string(REGEX REPLACE "_d" "" PYTHON_LIB "${PYTHON_LIB}")
-+		endif()
-+	endif()
-+else()
-+	message(STATUS "Scripting: Python 3 support disabled")
- 	set(PYTHON_FOUND FALSE)
- 	set(PYTHONLIBS_FOUND FALSE)
--else()
--	message(STATUS "Scripting: Python 3 supported")
--	set(PYTHON_FOUND TRUE)
--	set(COMPILE_PYTHON TRUE CACHE BOOL "" FORCE)
--
--	get_filename_component(PYTHON_LIB "${PYTHON_LIBRARIES}" NAME)
--	string(REGEX REPLACE "\\.[^.]*$" "" PYTHON_LIB ${PYTHON_LIB})
--	if(WIN32)
--		string(REGEX REPLACE "_d" "" PYTHON_LIB "${PYTHON_LIB}")
--	endif()
-+endif()
-+
-+find_package(SwigDeps QUIET 2)
-+
-+if(NOT SWIG_FOUND)
-+	message(STATUS "Scripting: SWIG not found; scripting disabled")
-+endif()
-+
-+if(NOT PYTHONLIBS_FOUND AND NOT LUAJIT_FOUND)
-+	message(STATUS "Scripting: Neither Python 3 nor Luajit was found; scripting plugin disabled")
- endif()
- 
- set(SCRIPTING_ENABLED ON CACHE BOOL "Interal global cmake variable" FORCE)
--- 
-2.18.0
-
-From 79006adaf2b93ed4ddc07ff236a9ed1fcd09e47f Mon Sep 17 00:00:00 2001
-From: Jimi Huotari <chiitoo@gentoo.org>
-Date: Wed, 11 Jul 2018 02:08:51 +0300
-Subject: [PATCH 2/2] obs-filters: Use less automagic for SpeexDSP detection
-
-This adds a build-time option for disabling the SpeexDSP-based
-Noise Suppression filter support in cases where users do not
-wish to build it, but have the required library installed.
----
- plugins/obs-filters/CMakeLists.txt | 24 +++++++++++++++++-------
- 1 file changed, 17 insertions(+), 7 deletions(-)
-
-diff --git a/plugins/obs-filters/CMakeLists.txt b/plugins/obs-filters/CMakeLists.txt
-index ec4289cc..4d862b0a 100644
---- a/plugins/obs-filters/CMakeLists.txt
-+++ b/plugins/obs-filters/CMakeLists.txt
-@@ -1,13 +1,23 @@
- project(obs-filters)
- 
--find_package(Libspeexdsp QUIET)
--if(LIBSPEEXDSP_FOUND)
--	set(obs-filters_LIBSPEEXDSP_SOURCES
--		noise-suppress-filter.c)
--	set(obs-filters_LIBSPEEXDSP_LIBRARIES
--		${LIBSPEEXDSP_LIBRARIES})
-+option(DISABLE_SPEEXDSP "Disable building of the SpeexDSP-based Noise Suppression filter" OFF)
-+
-+if(DISABLE_SPEEXDSP)
-+	message(STATUS "SpeexDSP support disabled")
-+	set(LIBSPEEXDSP_FOUND FALSE)
- else()
--	message(STATUS "Speexdsp library not found, speexdsp filters disabled")
-+	find_package(Libspeexdsp QUIET)
-+
-+	if(NOT LIBSPEEXDSP_FOUND)
-+		message(STATUS "SpeexDSP support not found")
-+		set(LIBSPEEXDSP_FOUND FALSE)
-+	else()
-+		message(STATUS "SpeexDSP supported")
-+		set(obs-filters_LIBSPEEXDSP_SOURCES
-+			noise-suppress-filter.c)
-+		set(obs-filters_LIBSPEEXDSP_LIBRARIES
-+			${LIBSPEEXDSP_LIBRARIES})
-+	endif()
- endif()
- 
- configure_file("${CMAKE_CURRENT_SOURCE_DIR}/obs-filters-config.h.in"
--- 
-2.18.0
-
diff --git a/media-video/obs-studio/files/obs-studio-22.0.3-fdk-build-fix.patch b/media-video/obs-studio/files/obs-studio-22.0.3-fdk-build-fix.patch
deleted file mode 100644
index 73329cf8040c..000000000000
--- a/media-video/obs-studio/files/obs-studio-22.0.3-fdk-build-fix.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 5cf2b5fbf925412620e2a40552d6348203851cb3 Mon Sep 17 00:00:00 2001
-From: pkviet <pkv.stream@gmail.com>
-Date: Thu, 29 Nov 2018 21:10:45 +0100
-Subject: [PATCH] obs-libfdk: Compatibility fix for new API
-
-fdk-aac v2.0.0 (aacenc 4.0.0) changes the AACENC_InfoStruct:
-the encoderDelay parameter is replaced by two, nDelay and
-nDelayCore. This patch checks the lib version and adjust the parameter
-accordingly.
----
- plugins/obs-libfdk/obs-libfdk.c | 14 ++++++++------
- 1 file changed, 8 insertions(+), 6 deletions(-)
-
-diff --git a/plugins/obs-libfdk/obs-libfdk.c b/plugins/obs-libfdk/obs-libfdk.c
-index d6eb496184..94b139de57 100644
---- a/plugins/obs-libfdk/obs-libfdk.c
-+++ b/plugins/obs-libfdk/obs-libfdk.c
-@@ -9,7 +9,6 @@
- 
- #include <fdk-aac/aacenc_lib.h>
- 
--
- static const char *libfdk_get_error(AACENC_ERROR err)
- {
- 	switch(err) {
-@@ -224,7 +223,7 @@ static bool libfdk_encode(void *data, struct encoder_frame *frame,
- 	void *in_ptr;
- 	void *out_ptr;
- 	AACENC_ERROR err;
--
-+	int64_t encoderDelay;
- 
- 	in_ptr = frame->data[0];
- 	in_size = enc->frame_size_bytes;
-@@ -261,10 +260,13 @@ static bool libfdk_encode(void *data, struct encoder_frame *frame,
- 	}
- 
- 	*received_packet = true;
--
--	packet->pts  = enc->total_samples -
--	               enc->info.encoderDelay; // TODO: Just a guess, find out if that's actualy right
--	packet->dts  = enc->total_samples - enc->info.encoderDelay;
-+#if (AACENCODER_LIB_VL0 >= 4)
-+	encoderDelay= enc->info.nDelay;
-+#else
-+	encoderDelay= enc->info.encoderDelay;
-+#endif
-+	packet->pts  = enc->total_samples - encoderDelay;
-+	packet->dts  = enc->total_samples - encoderDelay;
- 	packet->data = enc->packet_buffer;
- 	packet->size = out_args.numOutBytes;
- 	packet->type = OBS_ENCODER_AUDIO;
diff --git a/media-video/obs-studio/obs-studio-22.0.3.ebuild b/media-video/obs-studio/obs-studio-23.0.1.ebuild
index c15bd0ab0710..ef63ca589b65 100644
--- a/media-video/obs-studio/obs-studio-22.0.3.ebuild
+++ b/media-video/obs-studio/obs-studio-23.0.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python{3_4,3_5,3_6,3_7} )
 
@@ -24,7 +24,11 @@ SLOT="0"
 IUSE="+alsa fdk imagemagick jack luajit nvenc pulseaudio python speex truetype v4l"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-COMMON_DEPEND="
+BDEPEND="
+	luajit? ( dev-lang/swig )
+	python? ( dev-lang/swig )
+"
+DEPEND="
 	>=dev-libs/jansson-2.5
 	dev-qt/qtcore:5
 	dev-qt/qtdeclarative:5
@@ -61,16 +65,7 @@ COMMON_DEPEND="
 	)
 	v4l? ( media-libs/libv4l )
 "
-DEPEND="${COMMON_DEPEND}
-	luajit? ( dev-lang/swig )
-	python? ( dev-lang/swig )
-"
-RDEPEND="${COMMON_DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-21.1.2-use-less-automagic.patch"
-	"${FILESDIR}/${PN}-22.0.3-fdk-build-fix.patch" # bug 672430
-)
+RDEPEND="${DEPEND}"
 
 CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
 
diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild
index 9cd8bdd75172..abb6a6df16e0 100644
--- a/media-video/obs-studio/obs-studio-9999.ebuild
+++ b/media-video/obs-studio/obs-studio-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python{3_4,3_5,3_6,3_7} )
 
@@ -24,7 +24,11 @@ SLOT="0"
 IUSE="+alsa fdk imagemagick jack luajit nvenc pulseaudio python speex truetype v4l"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-COMMON_DEPEND="
+BDEPEND="
+	luajit? ( dev-lang/swig )
+	python? ( dev-lang/swig )
+"
+DEPEND="
 	>=dev-libs/jansson-2.5
 	dev-qt/qtcore:5
 	dev-qt/qtdeclarative:5
@@ -61,11 +65,7 @@ COMMON_DEPEND="
 	)
 	v4l? ( media-libs/libv4l )
 "
-DEPEND="${COMMON_DEPEND}
-	luajit? ( dev-lang/swig )
-	python? ( dev-lang/swig )
-"
-RDEPEND="${COMMON_DEPEND}"
+RDEPEND="${DEPEND}"
 
 CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
 
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index 6852e6017cc0..aeb88dd261b5 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -1,6 +1,5 @@
 AUX channel_alternative.conf 332 BLAKE2B ec01e5109ecff9c2cf218d89ae9498809f45774a5fd4d5ba103dae957c038d5227e5a300c4ef0db4d418717776ee82e35676dc7e6d0dcdfdaf4195284c803c3e SHA512 738de5d5d99b54a516f41683834509b477590732db4e00b13b2f26e22c7349cb8517965a21251c08d29b0f368b2bb3fa64a1de71da09ffbedc5a401314a0eb5d
 AUX vdr-2.0.6_gentoo.patch 2255 BLAKE2B 36b8f013e363990f831d7d5216eeefe79caba9dbba531e1ec5452dc2c8ec49c7047be236b30fbf299f5167e86f5ed59775e59e9aca9babde5bbfc4bd751bf502 SHA512 7bb087d2f362e28700a6f22b2649bd61742a7967344f0132abaaa2ae30d4aef3e9a7afd06d80d2a4a97248abfa273cb5d7e20e419c8409a5a83744fd043fb7e9
-AUX vdr-2.2.0-r2_gentoo.patch 2578 BLAKE2B f40bd2dadb802285eb229219b2c9e2966073d37cbb6233a309589d22dd875e4457bd4a66f37aba3e0dc679960d310ee718d1bf2d72112c2dbed89a53ca234330 SHA512 46e447fabdfa38dd164dae5aacc932933595f0a068b8c60b19e9aba635c1d4b7cdf368af9e5544933f0ec64550bb685b2705f39ebffba5b1a66897e27bca6ef1
 AUX vdr-2.2.0_gcc7extpng.patch 705 BLAKE2B da34652e596d39c3a8c210a6034c2c2aba6649f9cd5e194f00a0ed21f3d2b67de68c560a4e6d2e927a262152a1998c5c279e4451248a918a757adc543a4eab03 SHA512 1f319f71c3819d82e83f68979f2876d7169d086c161939c105cd15d2107e68cbc95cda09e7e883a74e6c95c7db5b0dc58eb92662833732c180250322413ac85b
 AUX vdr-2.2.0_gentoo.patch 2322 BLAKE2B 7a7a2357bcefe53e251ed3a5b6b1cee1b85c76597c14746236671f044b5a7a5644bd1788e12499588aab87d7c342952c8b55e3a32868299e8c055983a2224b81 SHA512 c6953a7fb77717fdaa8ca05550496e25f4bc60d91c13ed0fb23d27e1a1ec433ec2d5cfb019717cf09eb7b67c9ebb91664b1b731dc28bc4f25e815871f6de0bc7
 AUX vdr-2.2.0_glibc-2.24.patch 1395 BLAKE2B 83a82c516554c2fce3b47078c494ddbbd0dbdbe148f1e6525532865b6f61a79110da5d55d17e6357887655ba840525f7349b221bb356a180813ae28bdfd7d1de SHA512 73acef83ada40d067b1c7207e527d782de5bc16027571a31f6411a5a075ef6fbdbd3ecd466314aaa08a01b0bf90a35c36306b5533ea4fecc0e024f7df939517a
diff --git a/media-video/vdr/files/vdr-2.2.0-r2_gentoo.patch b/media-video/vdr/files/vdr-2.2.0-r2_gentoo.patch
deleted file mode 100644
index 8bdae36ae51e..000000000000
--- a/media-video/vdr/files/vdr-2.2.0-r2_gentoo.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-Support L10N Variable in make.conf to select only the Language will be installed
-as it set in make.conf L10N
-(befor it was LINGUAS)
-correct some install path for libsi
-correct install in the right order
-signed-of-by: Joerg Bornkessel <hd_brummy@gentoo.org> (2018/Jan/21)
-diff -Naur vdr-2.1.7.orig/Makefile vdr-2.1.7/Makefile
---- vdr-2.1.7.orig/Makefile	2015-01-18 12:37:45.506034673 +0100
-+++ vdr-2.1.7/Makefile	2015-01-18 12:38:34.086037162 +0100
-@@ -116,7 +116,7 @@
- VDRVERSION = $(shell sed -ne '/define VDRVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
- APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
- 
--all: vdr i18n plugins
-+all: vdr i18n
- 
- # Implicit rules:
- 
-@@ -170,7 +170,7 @@
- 
- PODIR     = po
- LOCALEDIR = locale
--I18Npo    = $(wildcard $(PODIR)/*.po)
-+I18Npo    = $(foreach dir,$(L10N),$(wildcard $(PODIR)/$(dir)*.po))
- I18Nmo    = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file))))
- I18Nmsgs  = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr.mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
- I18Npot   = $(PODIR)/vdr.pot
-@@ -193,7 +193,7 @@
- 
- install-i18n: i18n
- 	@mkdir -p $(DESTDIR)$(LOCDIR)
--	cp -r $(LOCALEDIR)/* $(DESTDIR)$(LOCDIR)
-+	@(cd $(LOCALEDIR); for l10n in $(L10N); do [ "$$l10n" = "en" ] && continue; cp -r --parents $$l10n* $(DESTDIR)$(LOCDIR); done)
- 
- # The 'include' directory (for plugins):
- 
-@@ -255,7 +255,7 @@
- 
- # Install the files (note that 'install-pc' must be first!):
- 
--install: install-pc install-bin install-dirs install-conf install-doc install-plugins install-i18n install-includes
-+install: install-pc install-bin install-dirs install-conf install-doc install-i18n install-includes
- 
- # VDR binary:
- 
-@@ -267,12 +267,13 @@
- 
- install-dirs:
- 	@mkdir -p $(DESTDIR)$(VIDEODIR)
--	@mkdir -p $(DESTDIR)$(CONFDIR)
--	@mkdir -p $(DESTDIR)$(ARGSDIR)
--	@mkdir -p $(DESTDIR)$(CACHEDIR)
-+#	@mkdir -p $(DESTDIR)$(CONFDIR)
-+#	@mkdir -p $(DESTDIR)$(ARGSDIR)
-+#	@mkdir -p $(DESTDIR)$(CACHEDIR)
- 	@mkdir -p $(DESTDIR)$(RESDIR)
- 
- install-conf:
-+	@mkdir -p $(DESTDIR)$(CONFDIR)
- 	@cp -pn *.conf $(DESTDIR)$(CONFDIR)
- 
- # Documentation:
-@@ -299,8 +300,11 @@
- # Includes:
- 
- install-includes: include-dir
--	@mkdir -p $(DESTDIR)$(INCDIR)
--	@cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR)
-+#	@mkdir -p $(DESTDIR)$(INCDIR)
-+#	@cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR)
-+	@mkdir -p $(DESTDIR)$(INCDIR)/vdr $(DESTDIR)$(INCDIR)/vdr/libsi
-+	@cp -pLR include/vdr $(DESTDIR)$(INCDIR)
-+	@cp -pLR include/libsi Make.config $(DESTDIR)$(INCDIR)/vdr
- 
- # pkg-config file:
- 
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 0cfaeca08ef9..548f80cd957e 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -2,11 +2,14 @@ AUX vlc-2.1.0-fix-libtremor-libs.patch 453 BLAKE2B 526934642617384224faee8d26c0a
 AUX vlc-2.2.4-libav-11.7.patch 291 BLAKE2B 9ad8bac7897976ba50b98ce1063baab311f0ad8e267cbad751b1378280b2f8238e22096448889b4eb69bbec34d08225269c7d2f653676828dc7a7d755fe676bf SHA512 f216833dc1ad5ddbf6a19b497238e9c850582f16eae452862a4c7c9acd110a0033879b3e3555177ac0ef30663cdd3f72d1a1020999c44e1f577ef665dd658315
 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.6-fdk-aac-2.0.0.patch 3436 BLAKE2B 022201ed10fef189feeb36f44ab4194ab7994e4fdd8bad922070b54688d34d051fac28177a0e648d55670e0b9f0c6b45f9a05650476b0ae12ebfe759dd561e28 SHA512 68964adda04cd88e80b586984f1af0cfdccff5dbf8529070d5ab985b23402dfb7380b5d39eacfea433c1ba03434139e4f394c1c25d6b426489883d3a42cb7b5b
+AUX vlc-3.0.6-libav.patch 547 BLAKE2B bff54855b61b7bc29fe50203a08c19b04d037e21f8ef337e6ea78eaad8a655e5e2f8fc38278536335e52adc8d8017ea4b2e9ab1fb716ff58c58e972dfac5b45e SHA512 2b5fb815e3d91971a3566830d24abcab27d7aed9b176212166e7806b99c4387727ae912707ad2d21346c90e84b1d489b0e458c7c3053f8dc40f5f4a55e563be9
+AUX vlc-3.0.6-libvpx-1.8.0.patch 1147 BLAKE2B b12fa40a02dcc5d6ba319b773cb4bcfa521b51a85b8d9a8288c46d059d79f6656cd7958c3003662a9c90599812dc7320781589c554ce2bf44c93c665297f6955 SHA512 bb57ec249174af38b657e2d48728de32998b74a58df3bbcaa17bf5c48338256370066247b278341e92a3116d0f56310cdea6d521c11c3380d39827449056ade3
 AUX vlc-9999-libupnp-slot-1.8.patch 763 BLAKE2B 6bc8cf46f029db27d6d30d96e871d3bcfddee004e4e8469e1526a6a38fb5cc11a24a19888443e5f9062d7145665d594e142c12f3a9693967f195bab3b33ada38 SHA512 dd3375997a1935d3a227231785f35e300e3f992034da6a9c3019e28c68c1f005cbdd67190672264b342abc719e69005f965599f7af975e2bbd4cfccd89e3770d
 DIST vlc-3.0.4.tar.xz 24934112 BLAKE2B b8e680e178f5d34b187d5ee613a75e247b9ef500b18843a6c987479d1afc2e723111a7d3f2ac2ec8c2f34cbd36e2e7a9c0e0add6e594418fc429ec8878f0b1b0 SHA512 55c5a45a1573d559f8d62272dc446bebfb328bd48f938e634693a45032e1a3095148e634de5bc53a3a3c0e4858f7df3ed7e5dc91f3f5447e47d0ab5775171271
 DIST vlc-3.0.6.tar.xz 25699704 BLAKE2B 91c43fa3ceb6f55a3808c64a661ca453f0872f01eecc801921eb1b9f9cc462478b1fcd6f7cc36f33b7e1085320710b27a42a3b7b49dd74338fe63a3a46f36b0f SHA512 7c72e98f30ce5c5a94d74e097fa9960442f89240079b042a729f8a33dd7fedee2538c86c99738ccef2eb27f29055f0221d4c70316e3312c5ebba9565eaa15c52
 EBUILD vlc-3.0.4.ebuild 13153 BLAKE2B 19afd631bdbc5ec35e6a3684fd767e3530c598da299a08826c4502956b093d38b49dba2b9667095a108044501967708e0e28939750a940e31f9b6878e3f208da SHA512 990a9bad72762e3f692901f3729df394473392d0929f23f5914838863fa096cfbf8ca48e9c2e57a9df708f11c5954be6ed1d799a5d729ca2333d19ea135515c2
-EBUILD vlc-3.0.6.ebuild 13326 BLAKE2B 31af51a630d141bec92c6feb0276973e3fd957c2bacc290099ece72a447ed465701f7de533dbe0736e61e599e0e63166b5c7c902f3ac2fe7bf22e55d9f3a5ecf SHA512 77bd3bc9830877f93593ebd186511d12ca65eab98b1576b991d74cf0e3a8fb451d2e332697e8551e2e48c2bfa99fd41a667d0cbc2cc6ca593d68ae233cc3da5e
+EBUILD vlc-3.0.6-r1.ebuild 13329 BLAKE2B aed7c68f1192ecbce79c08a2baae396c66388ca839679db47b47785d357eb028b7f6e55ca93099a626d31375852b315d9ac91e93e9fbf0bae4de7ff0bde58823 SHA512 2ad9048a04e93f0043530daefc4a6f63ad2de92eae4c5afcb10d6f489b3731af76b0553c8778766cb6a7f7757c1ddcea14ba014a69e7f795ede5f761a3805fac
 EBUILD vlc-3.0.9999.ebuild 13072 BLAKE2B c4c50147f95acfa560900430bd8bd044830bc65807084a44224b9523a79aa33078f80f9eadb34ab55d77f25f94da39b11426b81c834f4137633053d8bd0fa0b6 SHA512 6c6ea778f55099774d5013d5f049b15c0eaf0c3adf42a065bcd38e87d12f783f566b41e4f3a2344a13a9008fb2a40742ce446f25714dd20f3e54b31135c8779a
 EBUILD vlc-9999.ebuild 13055 BLAKE2B 06d65e18aff729d603e062339034f07baff1c50947abb91de8ca1c26642e0a93adb28cf827b7f3d0ad43248b0990528b21fe9e0ec7fc5e2c81b35c0ed1a64e20 SHA512 0564d67413b5b99477379017d8384e3b44b67d7d63719c430843d9cd09eaa0f882c7c4923a8530628bb856e339f9633f11c54485e45c47323ab054686b4c6654
 MISC metadata.xml 4965 BLAKE2B 70ae1489394175d3a5b7972089da76553c01b28206eb2c97e748941c685f49a8ef5b98b204f81a748a7da463bb69c4051a1dd9017072b30412b6ae392b2e7fd5 SHA512 9777cc29b4bba9fe74a03f2b4157fb5bf782624a80a7971e6b738a035cd72fbac908eb414ad72c7e1924fa2acff757615ca4b1d66b5ce84c6f0d028a91dfc11e
diff --git a/media-video/vlc/files/vlc-3.0.6-fdk-aac-2.0.0.patch b/media-video/vlc/files/vlc-3.0.6-fdk-aac-2.0.0.patch
new file mode 100644
index 000000000000..a5104d1df6d1
--- /dev/null
+++ b/media-video/vlc/files/vlc-3.0.6-fdk-aac-2.0.0.patch
@@ -0,0 +1,84 @@
+From 6ea9b13fe82fae2b25b7371c6c36d6296db28ccb Mon Sep 17 00:00:00 2001
+From: Antonio Larrosa <antonio.larrosa@gmail.com>
+Date: Thu, 14 Feb 2019 10:09:30 +0100
+Subject: [PATCH] Fix building vlc with libfdk-aac v2
+
+When flushing the encoder, we now need to provide non-null buffer
+parameters for everything, even if they are unused.
+
+The encoderDelay parameter has been replaced by two, nDelay and
+nDelayCore.
+
+This is based on:
+https://git.libav.org/?p=libav.git;a=commitdiff_plain;h=141c960e21d2860e354f9b90df136184dd00a9a8;hp=c8bca9fe466f810fd484e2c6db7ef7bc83b5a943
+
+Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
+---
+ modules/codec/fdkaac.c | 27 +++++++++++++++++++++------
+ 1 file changed, 21 insertions(+), 6 deletions(-)
+
+diff --git a/modules/codec/fdkaac.c b/modules/codec/fdkaac.c
+index e0b3088c4a..3ac7b756a3 100644
+--- a/modules/codec/fdkaac.c
++++ b/modules/codec/fdkaac.c
+@@ -92,6 +92,11 @@ static void CloseEncoder(vlc_object_t *);
+ #define SIGNALING_COMPATIBLE 1
+ #define SIGNALING_HIERARCHICAL 2
+ 
++#define FDKENC_VER_AT_LEAST(vl0, vl1) \
++    (defined(AACENCODER_LIB_VL0) && \
++        ((AACENCODER_LIB_VL0 > vl0) || \
++         (AACENCODER_LIB_VL0 == vl0 && AACENCODER_LIB_VL1 >= vl1)))
++
+ static const int pi_aot_values[] = { PROFILE_AAC_LC, PROFILE_AAC_HE, PROFILE_AAC_HE_v2, PROFILE_AAC_LD, PROFILE_AAC_ELD };
+ static const char *const ppsz_aot_descriptions[] =
+ { N_("AAC-LC"), N_("HE-AAC"), N_("HE-AAC-v2"), N_("AAC-LD"), N_("AAC-ELD") };
+@@ -288,7 +293,11 @@ static int OpenEncoder(vlc_object_t *p_this)
+     p_sys->i_maxoutputsize = 768*p_enc->fmt_in.audio.i_channels;
+     p_enc->fmt_in.audio.i_bitspersample = 16;
+     p_sys->i_frame_size = info.frameLength;
++#if FDKENC_VER_AT_LEAST(4, 0)
++    p_sys->i_encoderdelay = info.nDelay;
++#else
+     p_sys->i_encoderdelay = info.encoderDelay;
++#endif
+ 
+     p_enc->fmt_out.i_extra = info.confSize;
+     if (p_enc->fmt_out.i_extra) {
+@@ -351,21 +360,27 @@ static block_t *EncodeAudio(encoder_t *p_enc, block_t *p_aout_buf)
+         int out_identifier = OUT_BITSTREAM_DATA;
+         int out_size, out_elem_size;
+         void *in_ptr, *out_ptr;
++        uint8_t dummy_buf[1];
+ 
+         if (unlikely(i_samples == 0)) {
+             // this forces the encoder to purge whatever is left in the internal buffer
++            /* Must be a non-null pointer, even if it's a dummy. We could use
++             * the address of anything else on the stack as well. */
++            in_ptr        = dummy_buf;
++            in_size       = 0;
++
+             in_args.numInSamples = -1;
+         } else {
+             in_ptr = p_buffer + (i_samples - i_samples_left)*p_enc->fmt_in.audio.i_channels;
+             in_size = 2*p_enc->fmt_in.audio.i_channels*i_samples_left;
+-            in_elem_size = 2;
+             in_args.numInSamples = p_enc->fmt_in.audio.i_channels*i_samples_left;
+-            in_buf.numBufs = 1;
+-            in_buf.bufs = &in_ptr;
+-            in_buf.bufferIdentifiers = &in_identifier;
+-            in_buf.bufSizes = &in_size;
+-            in_buf.bufElSizes = &in_elem_size;
+         }
++        in_elem_size = 2;
++        in_buf.numBufs = 1;
++        in_buf.bufs = &in_ptr;
++        in_buf.bufferIdentifiers = &in_identifier;
++        in_buf.bufSizes = &in_size;
++        in_buf.bufElSizes = &in_elem_size;
+         block_t *p_block;
+         p_block = block_Alloc(p_sys->i_maxoutputsize);
+         p_block->i_buffer = p_sys->i_maxoutputsize;
+-- 
+2.11.0
+
diff --git a/media-video/vlc/files/vlc-3.0.6-libav.patch b/media-video/vlc/files/vlc-3.0.6-libav.patch
new file mode 100644
index 000000000000..08e13f15fb6e
--- /dev/null
+++ b/media-video/vlc/files/vlc-3.0.6-libav.patch
@@ -0,0 +1,12 @@
+--- a/modules/codec/avcodec/fourcc.c      2019-02-27 22:57:55.878463261 +0100
++++ a/modules/codec/avcodec/fourcc.c_orig 2018-10-28 12:11:19.000000000 +0100
+@@ -182,7 +182,9 @@
+     /* AV_CODEC_ID_V210X */
+     { VLC_CODEC_TMV, AV_CODEC_ID_TMV },
+     { VLC_CODEC_V210, AV_CODEC_ID_V210 },
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 54, 50, 100 ) && LIBAVCODEC_VERSION_MICRO >= 100
+     { VLC_CODEC_VUYA, AV_CODEC_ID_AYUV },
++#endif
+     /* AV_CODEC_ID_DPX */
+     { VLC_CODEC_MAD, AV_CODEC_ID_MAD },
+     { VLC_CODEC_FRWU, AV_CODEC_ID_FRWU },
diff --git a/media-video/vlc/files/vlc-3.0.6-libvpx-1.8.0.patch b/media-video/vlc/files/vlc-3.0.6-libvpx-1.8.0.patch
new file mode 100644
index 000000000000..1b58a03cc8cd
--- /dev/null
+++ b/media-video/vlc/files/vlc-3.0.6-libvpx-1.8.0.patch
@@ -0,0 +1,35 @@
+From 5575fe3eb3fd46bada8662268b74d03493476a84 Mon Sep 17 00:00:00 2001
+From: Danny Milosavljevic <dannym@scratchpost.org>
+Date: Mon, 11 Feb 2019 16:07:12 +0100
+Subject: [PATCH] codec: vpx: Detect libvpx 1.8.0 and, if detected, use fewer
+ frame formats in the chroma_table
+
+Signed-off-by: Steve Lhomme <robux4@ycbcr.xyz>
+---
+ modules/codec/vpx.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/modules/codec/vpx.c b/modules/codec/vpx.c
+index f03c7fae62..59b3acdef7 100644
+--- a/modules/codec/vpx.c
++++ b/modules/codec/vpx.c
+@@ -117,6 +117,7 @@ static const struct
+     { VLC_CODEC_I440, VPX_IMG_FMT_I440, 8, 0 },
+ 
+     { VLC_CODEC_YV12, VPX_IMG_FMT_YV12, 8, 0 },
++#if VPX_IMAGE_ABI_VERSION < 5
+     { VLC_CODEC_YUVA, VPX_IMG_FMT_444A, 8, 0 },
+     { VLC_CODEC_YUYV, VPX_IMG_FMT_YUY2, 8, 0 },
+     { VLC_CODEC_UYVY, VPX_IMG_FMT_UYVY, 8, 0 },
+@@ -129,7 +130,7 @@ static const struct
+ 
+     { VLC_CODEC_ARGB, VPX_IMG_FMT_ARGB, 8, 0 },
+     { VLC_CODEC_BGRA, VPX_IMG_FMT_ARGB_LE, 8, 0 },
+-
++#endif
+     { VLC_CODEC_GBR_PLANAR, VPX_IMG_FMT_I444, 8, 1 },
+     { VLC_CODEC_GBR_PLANAR_10L, VPX_IMG_FMT_I44416, 10, 1 },
+ 
+-- 
+2.11.0
+
diff --git a/media-video/vlc/vlc-3.0.6.ebuild b/media-video/vlc/vlc-3.0.6-r1.ebuild
index 63a6fda40894..61aba8e45383 100644
--- a/media-video/vlc/vlc-3.0.6.ebuild
+++ b/media-video/vlc/vlc-3.0.6-r1.ebuild
@@ -19,7 +19,7 @@ else
 	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 ~x86-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 -sparc x86 ~x86-fbsd"
 fi
 inherit autotools flag-o-matic toolchain-funcs virtualx xdg
 
@@ -60,105 +60,105 @@ BDEPEND="
 "
 RDEPEND="
 	net-dns/libidn:=
-	sys-libs/zlib:0[minizip]
-	virtual/libintl:0
+	sys-libs/zlib[minizip]
+	virtual/libintl
 	virtual/opengl
-	a52? ( media-libs/a52dec:0 )
-	alsa? ( media-libs/alsa-lib:0 )
+	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:0
+		dev-libs/fribidi
 		media-libs/freetype:2[harfbuzz]
 		media-libs/harfbuzz
-		virtual/ttf-fonts:0
+		virtual/ttf-fonts
 	)
-	bluray? ( media-libs/libbluray:0= )
-	cddb? ( media-libs/libcddb:0 )
-	chromaprint? ( media-libs/chromaprint:0= )
+	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:0 )
+	dbus? ( sys-apps/dbus )
 	dc1394? (
 		media-libs/libdc1394:2
-		sys-libs/libraw1394:0
+		sys-libs/libraw1394
 	)
-	dts? ( media-libs/libdca:0 )
-	dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= )
+	dts? ( media-libs/libdca )
+	dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= )
 	dvd? (
-		>=media-libs/libdvdnav-4.9:0
-		>=media-libs/libdvdread-4.9:0
+		>=media-libs/libdvdnav-4.9
+		>=media-libs/libdvdread-4.9
 	)
-	faad? ( media-libs/faad2:0 )
-	fdk? ( <media-libs/fdk-aac-2.0.0:0= )
+	faad? ( media-libs/faad2 )
+	fdk? ( media-libs/fdk-aac:= )
 	ffmpeg? (
 		!libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] )
 		libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] )
 	)
 	flac? (
-		media-libs/flac:0
-		media-libs/libogg:0
+		media-libs/flac
+		media-libs/libogg
 	)
-	fluidsynth? ( media-sound/fluidsynth:0 )
+	fluidsynth? ( media-sound/fluidsynth:= )
 	fontconfig? ( media-libs/fontconfig:1.0 )
 	gcrypt? (
 		dev-libs/libgcrypt:0=
-		dev-libs/libgpg-error:0
+		dev-libs/libgpg-error
 	)
-	gme? ( media-libs/game-music-emu:0 )
+	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:0
-		sys-libs/libraw1394:0
+		sys-libs/libavc1394
+		sys-libs/libraw1394
 	)
 	jack? ( virtual/jack )
 	jpeg? ( virtual/jpeg:0 )
-	kate? ( media-libs/libkate:0 )
+	kate? ( media-libs/libkate )
 	libass? (
 		media-libs/fontconfig:1.0
-		media-libs/libass:0=
+		media-libs/libass:=
 	)
-	libcaca? ( media-libs/libcaca:0 )
+	libcaca? ( media-libs/libcaca )
 	libnotify? (
 		dev-libs/glib:2
 		x11-libs/gdk-pixbuf:2
 		x11-libs/gtk+:3
-		x11-libs/libnotify:0
+		x11-libs/libnotify
 	)
-	libsamplerate? ( media-libs/libsamplerate:0 )
-	libtar? ( dev-libs/libtar:0 )
-	libtiger? ( media-libs/libtiger:0 )
+	libsamplerate? ( media-libs/libsamplerate )
+	libtar? ( dev-libs/libtar )
+	libtiger? ( media-libs/libtiger )
 	linsys? ( media-libs/zvbi )
-	lirc? ( app-misc/lirc:0 )
-	live? ( media-plugins/live:0 )
-	lua? ( >=dev-lang/lua-5.1:0 )
+	lirc? ( app-misc/lirc )
+	live? ( media-plugins/live:= )
+	lua? ( >=dev-lang/lua-5.1:0= )
 	mad? ( media-libs/libmad )
 	matroska? (
-		dev-libs/libebml:0=
-		media-libs/libmatroska:0=
+		dev-libs/libebml:=
+		media-libs/libmatroska:=
 	)
 	modplug? ( media-libs/libmodplug )
 	mp3? ( media-sound/mpg123 )
 	mpeg? ( media-libs/libmpeg2 )
-	mtp? ( media-libs/libmtp:0= )
-	musepack? ( media-sound/musepack-tools:0 )
+	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:0 )
-	opencv? ( media-libs/opencv:0= )
-	opus? ( >=media-libs/opus-1.0.3:0 )
+	ogg? ( media-libs/libogg )
+	opencv? ( media-libs/opencv:= )
+	opus? ( >=media-libs/opus-1.0.3 )
 	png? ( media-libs/libpng:0= )
-	postproc? ( libav? ( media-libs/libpostproc:0= ) )
+	postproc? ( libav? ( media-libs/libpostproc ) )
 	projectm? (
-		media-fonts/dejavu:0
-		media-libs/libprojectm:0
+		media-fonts/dejavu
+		media-libs/libprojectm
 	)
-	pulseaudio? ( media-sound/pulseaudio:0 )
+	pulseaudio? ( media-sound/pulseaudio )
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
@@ -169,45 +169,45 @@ RDEPEND="
 			x11-libs/libX11
 		)
 	)
-	rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] )
+	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:0 )
-	sftp? ( net-libs/libssh2:0 )
-	shout? ( media-libs/libshout:0 )
+	sdl-image? ( media-libs/sdl-image )
+	sftp? ( net-libs/libssh2 )
+	shout? ( media-libs/libshout )
 	sid? ( media-libs/libsidplay:2 )
 	skins? (
-		x11-libs/libXext:0
-		x11-libs/libXinerama:0
-		x11-libs/libXpm:0
+		x11-libs/libXext
+		x11-libs/libXinerama
+		x11-libs/libXpm
 	)
 	soxr? ( media-libs/soxr )
 	speex? (
-		>=media-libs/speex-1.2.0:0
-		media-libs/speexdsp:0
+		>=media-libs/speex-1.2.0
+		media-libs/speexdsp
 	)
 	srt? ( net-libs/srt )
-	ssl? ( net-libs/gnutls:0 )
+	ssl? ( net-libs/gnutls:= )
 	svg? (
 		gnome-base/librsvg:2
-		x11-libs/cairo:0
+		x11-libs/cairo
 	)
-	taglib? ( >=media-libs/taglib-1.9:0 )
-	theora? ( media-libs/libtheora:0 )
-	tremor? ( media-libs/tremor:0 )
+	taglib? ( >=media-libs/taglib-1.9 )
+	theora? ( media-libs/libtheora )
+	tremor? ( media-libs/tremor )
 	truetype? (
 		media-libs/freetype:2
-		virtual/ttf-fonts:0
-		!fontconfig? ( media-fonts/dejavu:0 )
+		virtual/ttf-fonts
+		!fontconfig? ( media-fonts/dejavu )
 	)
-	twolame? ( media-sound/twolame:0 )
-	udev? ( virtual/udev:0 )
+	twolame? ( media-sound/twolame )
+	udev? ( virtual/udev )
 	upnp? ( net-libs/libupnp:= )
-	v4l? ( media-libs/libv4l:0 )
-	vaapi? ( x11-libs/libva:0=[drm,wayland?,X?] )
-	vdpau? ( x11-libs/libvdpau:0 )
-	vnc? ( net-libs/libvncserver:0 )
-	vorbis? ( media-libs/libvorbis:0 )
-	vpx? ( <media-libs/libvpx-1.8:0= )
+	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
@@ -219,9 +219,9 @@ RDEPEND="
 		x11-libs/xcb-util-keysyms
 	)
 	x264? ( >=media-libs/x264-0.0.20160712:0= )
-	x265? ( media-libs/x265:0= )
+	x265? ( media-libs/x265:= )
 	xml? ( dev-libs/libxml2:2 )
-	zeroconf? ( net-dns/avahi:0[dbus] )
+	zeroconf? ( net-dns/avahi[dbus] )
 	zvbi? ( media-libs/zvbi )
 "
 DEPEND="${RDEPEND}
@@ -232,6 +232,9 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
 	"${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch # bug #593460
 	"${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
+	"${FILESDIR}"/${P}-libvpx-1.8.0.patch # bug 677606
+	"${FILESDIR}"/${P}-fdk-aac-2.0.0.patch # bug 672290
+	"${FILESDIR}"/${P}-libav.patch
 )
 
 DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
author	V3n3RiX <venerix@redcorelinux.org>	2019-03-03 13:42:34 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-03-03 13:42:34 +0000
commit	066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (patch)
tree	3cb05783d73b2c33589ba305144a31c718e123cd /media-video
parent	16449a80e28af2209916cc66d19c9a44ca2b90d9 (diff)