gentoo resync : 19.03.2019

5 files changed, 10 insertions, 7 deletions

diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 68f1613fc86e..b48b8a376f51 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -15,7 +15,7 @@ EBUILD ffmpeg-3.2.7.ebuild 14784 BLAKE2B 709df5de9f58af7d57a01a4a90f5eb3eacc132a
 EBUILD ffmpeg-3.3.4.ebuild 15808 BLAKE2B c64f1cd480d0bf2e8834073571f40eef01093b6384003653d3da534534f4a23fa1e5315de5e05dc808b1743dedc587439b4959ae843feee252f848b826308d9a SHA512 a29e5beb75cdacb1ce07b34910b419013c7dc8b906c5927aff6492338e02ec9d8ec0813e2d2aabce4d0aca70e027001c8aa50be23e9cfabc1f6aa860975e1b4b
 EBUILD ffmpeg-3.3.6.ebuild 15809 BLAKE2B b78701e736d5b1a8c029bbbec3c5ce40356223c35e78e160cb93a3e30732441abe1a14ab5940d302556abffde9d798de3ad160a98cd274334d467b0e9ba5de80 SHA512 b71dfc45bf7e29e8a5e70402c1dccfe2148223e60a1270a58918c3c3486472193e269e81cd8a1074a792b12b3d24d7a8733f62e3ef5002689d46ce9ce588f605
 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 17072 BLAKE2B f6418b49bbd0554064da2adf75eee09edbb16314c143847996bb4ecce9b3815f5f02552ad42549ee915a351c7028bb6a03d0e2259b743a279bf82be850e7516e SHA512 f84b01792f0cc9269530e28bace35b14d72dceb6e451046beb2d97fe63efc36f67364f132392a68b81fc73dcc131ef4e9fd8a50eddb84c2e3a22bdabc607d769
-MISC metadata.xml 5817 BLAKE2B 694fe00d148e4fe34245524f9d8a9071839b4d714ab0ef5a54bea572e63562a42f6999359ea2a0f1bf692ecd9fc78df84e140e4b931386e9060d3a9d0b6e7cab SHA512 dfd4544f02416735a1a75a5d0b69639fcd93ed0ef97344dd237f6b811381e323c237f215a96fa06d8f66adad30d3fd050585679223b3a2aa9402c2084f4a2197
+EBUILD ffmpeg-3.4.5.ebuild 15585 BLAKE2B 654672fdf106446d113b6ccad72340c969ef3afeb203c5b645d8a29368ccdbfd816488354657ac7bc3b4c1e711c819739e510432af8e6a418270ed51199f576a SHA512 4c000319b3229fbb0e28c6719fe990000800d839a3bca199516f393b97acd1ac0c70f38291b82bfad82d5f5561fed972bb5edd6ec3fa65900a3ceeedad369f85
+EBUILD ffmpeg-4.1.1.ebuild 17072 BLAKE2B 4e3d25a7b01920c2e89740ef5847b3f99aa283e8926efcb641687ce9064f69aac5a25132f1295fd0c1dd1dff0f532d12acda72acaf09671549adb8d626266229 SHA512 3e2f5362b30dc2dc9a14356887304af89768774efb3025c4af7276da03ee75ae0a0ed85afd43c0a04b59c687aee901eba4db868720d130b0e282d25324e77977
+EBUILD ffmpeg-9999.ebuild 17133 BLAKE2B 665a24c4ebff82ce44d4743a62f7c18e59af4cdccbb964984ed2e1679ae7ae0ac0d606db6cb13e279532a3761965ede242a807026a269c4ad6a82604fcd4cf5d SHA512 d56bb09cf5367ecc7b26d2ae28b89829c1883b696bc6d4b4c933301b121902b926f60cffe7af34868546da66761058352c6efa296be51ff34baab8625113a931
+MISC metadata.xml 5912 BLAKE2B 42331876f9be4dd19b3850c473d2f9b669c33944e482bdb50bf23263b39ad59a68456b4e74514c74f0c88c19d299393d9391e9cde1ec903624c948ff4d03ff38 SHA512 e9309b4c548b829a9827503de6db9b04c1428f157aaadab3b167a46ae4cb26f9715ae852ec41e0e9744365ee9cf4d2c08284c82c1b2cd46ac7baae51fe76e482
diff --git a/media-video/ffmpeg/ffmpeg-3.4.5.ebuild b/media-video/ffmpeg/ffmpeg-3.4.5.ebuild
index 20e79edba04c..591ccca00aea 100644
--- a/media-video/ffmpeg/ffmpeg-3.4.5.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.4.5.ebuild
@@ -54,7 +54,7 @@ LICENSE="
 	samba? ( GPL-3 )
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 # Options to use as use_enable in the foo[:bar] form.
diff --git a/media-video/ffmpeg/ffmpeg-4.1.1.ebuild b/media-video/ffmpeg/ffmpeg-4.1.1.ebuild
index e83dfb437272..12b71fa688bb 100644
--- a/media-video/ffmpeg/ffmpeg-4.1.1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.1.1.ebuild
@@ -64,7 +64,7 @@ fi
 # foo is added to IUSE.
 FFMPEG_FLAG_MAP=(
 		+bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt gnutls gmp
-		+gpl +hardcoded-tables +iconv libressl:libtls lzma +network opencl
+		+gpl +hardcoded-tables +iconv libressl:libtls libxml2 lzma +network opencl
 		openssl +postproc samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau
 		X:xlib xcb:libxcb xcb:libxcb-shm xcb:libxcb-xfixes +zlib
 		# libavdevice options
@@ -215,6 +215,7 @@ RDEPEND="
 	libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] )
 	libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
 	libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
+	libxml2? ( dev-libs/libxml2:=[${MULTILIB_USEDEP}] )
 	lv2? ( media-libs/lv2[${MULTILIB_USEDEP}] media-libs/lilv[${MULTILIB_USEDEP}] )
 	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
 	mmal? ( media-libs/raspberrypi-userland )
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index df4ddb5f0091..612d0d3fd708 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -64,7 +64,7 @@ fi
 # foo is added to IUSE.
 FFMPEG_FLAG_MAP=(
 		+bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt gnutls gmp
-		+gpl +hardcoded-tables +iconv libressl:libtls lzma +network opencl
+		+gpl +hardcoded-tables +iconv libressl:libtls libxml2 lzma +network opencl
 		openssl +postproc samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau
 		X:xlib xcb:libxcb xcb:libxcb-shm xcb:libxcb-xfixes +zlib
 		# libavdevice options
@@ -215,6 +215,7 @@ RDEPEND="
 	libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] )
 	libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
 	libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
+	libxml2? ( dev-libs/libxml2:=[${MULTILIB_USEDEP}] )
 	lv2? ( media-libs/lv2[${MULTILIB_USEDEP}] media-libs/lilv[${MULTILIB_USEDEP}] )
 	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
 	mmal? ( media-libs/raspberrypi-userland )
diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml
index 5a7a9e5dcefe..b2b0c975a987 100644
--- a/media-video/ffmpeg/metadata.xml
+++ b/media-video/ffmpeg/metadata.xml
@@ -36,6 +36,7 @@
 	<flag name="librtmp">Enables Real Time Messaging Protocol using librtmp (<pkg>media-video/rtmpdump</pkg>) in addition to FFmpeg's native implementation.</flag>
 	<flag name="libsoxr">Enables audio resampling through <pkg>media-libs/soxr</pkg>.</flag>
 	<flag name="libv4l">Uses <pkg>media-libs/libv4l</pkg> for video4linux instead of direct calls. Adds support for more devices via the userspace library.</flag>
+	<flag name="libxml2">Uses <pkg>dev-libs/libxml2</pkg> to enable dash demuxing support.</flag>
 	<flag name="lv2">Enables lv2 audio filter wrapper.</flag>
 	<flag name="mipsdspr1">Enables MIPS DSP ASE R1 optimizations.</flag>
 	<flag name="mipsdspr2">Enables MIPS DSP ASE R2 optimizations.</flag>