gentoo resync : 24.12.2018

13 files changed, 151 insertions, 91 deletions

diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 771e74d6fe0b..ba0e66dfc43b 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,4 +1,4 @@
-AUX chromium-r1.patch 1492 BLAKE2B efa332eb9cc842e2a9fa949c6c00d3c1956ae7ad55b5567e880e48a2fe21325ffcb7a7bc13f726cb8cfad44f0f63e23887c16d9938fcf80ed7427cc2f9253035 SHA512 55d7a06b630ac28c7b8e91112536fd67356664c7c91c3ca38b02733beb91d9a8a28247fd122e4b1d94009ffce5b83d29de10f331323179ae268e42851af10000
+AUX chromium-r1.patch 1582 BLAKE2B 48547a7d53fd1f0f44b682c7e2306e79f007f8e96b36253f76775c4a3ced54ffaaf403dfaae94e81aa26c60887677b2dabdd2c5cef9fc4553e203f8259453910 SHA512 808daad5afed13a6d3926c9f9ab5cb58f80e16969533022c7ee959147908bb2c12d066d2125a6b6975ef9304d9b8d49c39aeb0a047009adabb4529e3cf54498f
 AUX chromium.patch 1420 BLAKE2B 1acf931cd2e635b0b6c2c42d649d1bc92ac59321acc451501c70076d84449fd17b3a95c24a33208994df9aac8f8959a084f0ebaedaf0c997f535008594872bd8 SHA512 1f3f6d08aac64bb8c9d8a974170064b8a3531a6d06cea6fb208439dc687addeaf0c90f7f407dd7e71f50cd524f69c110c92d5276d04fe3bcaf7fb1ff2494ec59
 AUX ffmpeg-4.1-vaapi-tools.patch 850 BLAKE2B 2303915fce02ea555118c1dbac8f84ceb803f6ad43de31af7ef2c49cedc37c15bb5f968aa83949ccd393a8710f9b59389eff1fea54940fdd45e52d67eb998d4d SHA512 836b5737e6714daa1a5c9f7f390b9cd473cd7e05ed184c96a860cf5ef145561dcbbfd214e4e55db525d46b1c0dec7ba7b81aca7d5835d9ce4fb9bee1819bdfb0
 AUX ffmpeg32-openjpeg22.patch 4777 BLAKE2B 4ea7ed6b6b31c6d0d3e99358231ce27f18423aab866ceed75c10bf2c4b514ae4d023f9b0f4dd91346773f2ef2014943a08e6093e53266fa307557da69d766c8b SHA512 0d619b0e353ee9f80dffdb94bedd31b55fb4e6a18a0e60d8ef7119e5012583c1c0531b0b200b41c32caaa71cbade4899f74c9d0ae70d15403ef0aa6f3d77e07d
@@ -13,14 +13,14 @@ DIST ffmpeg-3.4.5.tar.bz2 10183082 BLAKE2B f72157baefcd6a0ca8f389309bbe947ad2199
 DIST ffmpeg-4.0.2.tar.bz2 10424065 BLAKE2B 0d3e072fa31bfae37722d8113f9c9cfd2071067b2a29ed5c7332ae49b388b91e8646b6bc8a816517bcebcdcc8d923d1e8b5a080dbdc63ea2a153aea8ecfb2af9 SHA512 92a3bedcd070df72b26dbe3ebf4a3faea0a02289fbefdb6a6c73d65801cf60a7e11cd832d29ab46b7749a1ffd0a31505cf75bb46bd01ea06423b454ca04e9b7b
 DIST ffmpeg-4.0.3.tar.bz2 10425117 BLAKE2B 1517d66d5a0c931b866df5206ae660a01daf49d375f7750a7b027ce62ab7dc8131fc02b8a6320e5ff7295b9bccdafbbaf25e206c55fad420ea206c1b9638e777 SHA512 8d600adf55f2fc1574a7013700129766a4a3db83bb33ec32fe07759310f1d8804c00e74b58fd1fcbdd91efec214764e4b2fadf7b01c948dc2ccdcd1b4d56e303
 DIST ffmpeg-4.1.tar.bz2 10687291 BLAKE2B 07293af1b13c6c6cad72e368207db21bdbc4b991931166c24ff40b00c3b3c8e1242be1876af8e3f154cc840fcd90d87b762fe77faccf06936dd096478d5d074b SHA512 ccf6d07268dc47e08ca619eb182a003face2a8ee73ec1a28157330dd7de1df88939def1fc1c7e6b6ac7b59752cdad84657d589b2fafb73e14e5ef03fb6e33417
-EBUILD ffmpeg-3.2.6.ebuild 14876 BLAKE2B 000940b7bb4a00288ca50439b5606b6ab482dab2a8956f72a49ecdc8a8055977a0d6b0c36b226003b5a4ab755036563d2f6ad74c0af6d4d84fbe23fa296d79e5 SHA512 83eb5308fb91b93dffc4e91c7fae0f4ea33c15efac04a97a6a1ac7bc2b6e14d305ed96814d64eebf97e4d15a1aba86f01d365f7f8c989b5326d59eabfb3420af
-EBUILD ffmpeg-3.2.7.ebuild 14881 BLAKE2B 8a4c85d008a5cce7c26880721d4a3533eb16794795e96b40f00808c8142c2d0b68f01b1bb0990603e79158be89d8a2d9a4559fbca4469278b38c0444c754bb8c SHA512 3eb99bffa96b0ef1b3df7a47c54aa59918063888e9d7d1c114386283494c26050d66eb1657f51b5157ce18a04f53f076d5185b177f46a37e9d66f27526e747d0
-EBUILD ffmpeg-3.3.4.ebuild 15905 BLAKE2B 2dcb83a3b7dde73f1d92259e339b46d8fb53b5e17400286e1decfccbdce282ff18bd0bdd1f0a50ed0b1505c8053909f68a4d59992bc8ce5bdeb039469679a8f8 SHA512 e7113d98b89182772bdde3ab0624d0754864e081964ad22fa590eb69ab40ddeb437c21ad08e40d1c494fe8e580220b40695f76fa5171267f8686bf2a3c9707b8
-EBUILD ffmpeg-3.3.6.ebuild 15906 BLAKE2B f38762b837642571aa85c5a828e3fe5ae0706f3bd135dad2d32d62f8fb059bd58e7bf57a239471c5829ed29588f0167ddfcfdae4636db251419ee45c91fb9dff SHA512 2755fcf82f8d2a6eaf04bcbc4bf8e753a511588cf0f505f6129ae1eba6868e60cd05c50a47316eb791ee31b87d85005689d923972f2412ab08b33c7378bbb4f9
-EBUILD ffmpeg-3.3.8.ebuild 15912 BLAKE2B 04ec63d4f194045e71e5e4f475ce3881a472a1b6b804f8d62c5b05e8752e09a40793e2304ff6f498edab7de8760b0b95cf99d275d437ad1af8b3b872380a56a3 SHA512 0e8ffd2a55b0dde6238b4cdefb18271df962417c1f77ad4d344414dc9379cbc7945837d5c8168e7649eff1920d391205fcc553ff8dc4a4f9046c9222df320118
-EBUILD ffmpeg-3.4.5.ebuild 15582 BLAKE2B 745bc41a4cf5430e6df447b49378019d80d448fe49f444afae3b8f6dca9cb509d906506c73594a1be77269f6b5cb32440de7c360806f1878d40f996cd50b90db SHA512 cfd435409eb31bea28826f1e7c6aab9e802354f082a70eb1538d7dc6b97294f4da1df08a27e7e85a76e09c545fb450c7c9a6297e184820655a372e5e35eeecd7
-EBUILD ffmpeg-4.0.2.ebuild 16432 BLAKE2B 74f531fda1e944e12b905a99ba9a230bfb14aab073e8d353af26b4d31ffabc157657337e50031472124f2e6c8238918ca8469a64f942bdbd635d34d15cecb689 SHA512 a209772c384428fc390922358580fd6e71185312fe309c0567cfce3f3992c3ce40d5ec969ea9d21044adc7ae007a98afa48560a58ffb327e3a02ab844d0cf0e9
-EBUILD ffmpeg-4.0.3.ebuild 16445 BLAKE2B 6fa2b440e3f04fbf9494a7f49378e2aa32a57ea19b7a356cc7fd3599d9a54415aa68ed0b4feee98b4ad6f5f92b7b284e620a2ddf42669e4b2615629487f99a40 SHA512 3040d9cf18735fa6ae62236fe7deeec8ea3e2a1726da93714d64f83bd0efbaa29c6b8cff3557f117a5adebc57ab25dedacc13c4fd5c670649ecfee9f94caab39
-EBUILD ffmpeg-4.1.ebuild 16483 BLAKE2B d210f2e72f4abe646771ba8cacd585194cb53d071a6c34ab62b09584533113cb90a9ccabec0931e62973be92a76938e4098cf80fe217a8665d5d064667593b4f SHA512 cf7c1bab3dcb0ae72dd770dba58d5e3b8bd946449da3e00f8fa8d2ca49c6e1599d5f3b457852adade08638831a19ada965f82bcf45c98070cdae45c796020a3b
-EBUILD ffmpeg-9999.ebuild 16445 BLAKE2B 6fa2b440e3f04fbf9494a7f49378e2aa32a57ea19b7a356cc7fd3599d9a54415aa68ed0b4feee98b4ad6f5f92b7b284e620a2ddf42669e4b2615629487f99a40 SHA512 3040d9cf18735fa6ae62236fe7deeec8ea3e2a1726da93714d64f83bd0efbaa29c6b8cff3557f117a5adebc57ab25dedacc13c4fd5c670649ecfee9f94caab39
-MISC metadata.xml 5779 BLAKE2B 7c14dc48960ada6ed913ba8b2d39018f95fcfca9e7f601b93c8f394ffd4bc51c89f7b48fea8a5c4307827e5bf0850ce7802d80a55922694b5e0ae229e91f65f7 SHA512 24e0f020434c76af8bb8a1dfb612ad5a2e1b40e4794829fc2f4f630076ab68172038e0bbe9dbc4be8ff1f13180ab0fc1791b5d64072675baaeca479cc4c15996
+EBUILD ffmpeg-3.2.6.ebuild 14779 BLAKE2B b79fb9e74ed3eaf3d84bb14823cd305dde3f14d5cd5bcf236bfac6443daa4d6c678ad2aea23559021af33afc0488c3fa845c4da52e1c27988a3f504a10475b3f SHA512 31fbf5b2294c6ba34960298347bb7c9523070bead6215b2f17ea7f7cf0b46878d14e22f1888959a4586550630e2f3b3e81ce7feae1270aad12a5cf5e297e51c1
+EBUILD ffmpeg-3.2.7.ebuild 14784 BLAKE2B 709df5de9f58af7d57a01a4a90f5eb3eacc132a6dbed7d7f86a74c984774ad119febd904cede6b77f9ef4b05ae48538b6d18a1b50e5c7406a07dcfe567370a52 SHA512 e9b1439ffbdb2299ddffccf9a6fd43a5ee4a99e39c461a82393ae71226623c042e7a73c093a9c4d70b175aba7fd0eccd3926fb9a9d8de24afd97ac44f189ea9f
+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 15589 BLAKE2B 1adf2d23a2f5944d3b4f147ba74704a4868782e5e3f6b285bd940f5d2d81c74764ecf74b9b2dca8583e08e85da4945b1e527ed1fe7d521b7a0d439f29e1e4ece SHA512 4f8809b7f2e7669bb0ad7d7ecac278666dd2249b09db1e91bf11b9340c189fe19c1260d5919f14c9e80ee1b712c88d33fc96d54293a1ae2d5d4d1486249691bd
+EBUILD ffmpeg-4.0.2.ebuild 16672 BLAKE2B b7445d742b2c680e6a179c959b14cada3c26c6e27d0902fb102179c5b645ca61d62c8130003cc39f8caf66ddbf2617af788697e0d9bdb22346ca8681daee35f3 SHA512 0a51a4771a4814c8e5bd3c8243e38a5197ebe1a762b9e152f2e87053ea627cc75cfeae0bf42ebb959867d38e517bd9c11a4e6a99a8a99ca0cfb6b9063465b39f
+EBUILD ffmpeg-4.0.3.ebuild 16747 BLAKE2B 5c56e917ebc473e445238a1b4e8e51055cdf0afc32cb8cd81a64d1c61e4a3c3836ec875b76de726cc70000c19011d6b3a37ef266684e387e79df3e9887647a5c SHA512 511400d8cb89bf7196dda13f5cce8e311d05b441d3b5bf4edec5c0a12c4f63cad2eba6be6653b1c199a01a0e1e3f2adb9e380b7b8a0e5840a2aeb7b224c88427
+EBUILD ffmpeg-4.1.ebuild 17027 BLAKE2B e4fb8eb8b9dbdfc6b331b70654078fdb9aa6282b68c2759d03fcc0caa8827d91d3df7091ea7e0521641ffe21f1e90c760a84d050c10de591eea421e871f56dfe SHA512 510149a5a3b21b4da99e6c6454497698d9a2122ab02a9f4a1c154fec85b28e39c3d0760d6ccb6c6ab30a6db225acfaab7ab07f1d2c79396b8063675b6d34d96e
+EBUILD ffmpeg-9999.ebuild 16970 BLAKE2B be7189ee427dfd09dbd371656111ae40fbc738d03beb0079a670b37b403e3a03f2eba852fb902d40b6d32adf46f97a04120c7e01a80da25444ff5ce1ff0f5713 SHA512 99ad47c1607966ebc23d634488b13fcec81e4848de0b59390a02379a3dd463d79de7fde42bab19cc8d784e2f49802ab91d87708acd443e90df0450c40879f87e
+MISC metadata.xml 5697 BLAKE2B dc170e50190c36f1f6bf5ee36de0a757fd4815bbd41b8c284a55ea29894783ffa89a419b04d57d8489cac17f436df3e9a9d88266c256ca4c4a7672e857e73557 SHA512 ca3a7e0e712fef9fef181e9888dc97c62905b8b5b54623a58ef40743c1a4b58711ed47e9b391960421d720451ac816bfc1625be3fdeeb228d2041480f4f298b0
diff --git a/media-video/ffmpeg/ffmpeg-3.2.6.ebuild b/media-video/ffmpeg/ffmpeg-3.2.6.ebuild
index 010f59065ed5..a6291d34e905 100644
--- a/media-video/ffmpeg/ffmpeg-3.2.6.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.2.6.ebuild
@@ -75,7 +75,7 @@ FFMPEG_FLAG_MAP=(
 		amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
 		jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
 		mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
-		schroedinger:libschroedinger speex:libspeex vorbis:libvorbis vpx:libvpx
+		speex:libspeex vorbis:libvorbis vpx:libvpx
 		zvbi:libzvbi
 		# libavfilter options
 		bs2b:libbs2b chromaprint ebur128:libebur128 flite:libflite frei0r
@@ -216,8 +216,7 @@ RDEPEND="
 	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
 	librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
 	rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
-	samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
-	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
+	samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] )
 	sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
 	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
 	ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
diff --git a/media-video/ffmpeg/ffmpeg-3.2.7.ebuild b/media-video/ffmpeg/ffmpeg-3.2.7.ebuild
index b798bf59bc27..ac8492a79dff 100644
--- a/media-video/ffmpeg/ffmpeg-3.2.7.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.2.7.ebuild
@@ -75,7 +75,7 @@ FFMPEG_FLAG_MAP=(
 		amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
 		jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
 		mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
-		schroedinger:libschroedinger speex:libspeex vorbis:libvorbis vpx:libvpx
+		speex:libspeex vorbis:libvorbis vpx:libvpx
 		zvbi:libzvbi
 		# libavfilter options
 		bs2b:libbs2b chromaprint ebur128:libebur128 flite:libflite frei0r
@@ -216,8 +216,7 @@ RDEPEND="
 	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
 	librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
 	rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
-	samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
-	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
+	samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] )
 	sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
 	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
 	ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
diff --git a/media-video/ffmpeg/ffmpeg-3.3.4.ebuild b/media-video/ffmpeg/ffmpeg-3.3.4.ebuild
index e21349699065..d55a0875bac5 100644
--- a/media-video/ffmpeg/ffmpeg-3.3.4.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.3.4.ebuild
@@ -75,7 +75,7 @@ FFMPEG_FLAG_MAP=(
 		amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
 		jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
 		mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
-		schroedinger:libschroedinger speex:libspeex vorbis:libvorbis vpx:libvpx
+		speex:libspeex vorbis:libvorbis vpx:libvpx
 		zvbi:libzvbi
 		# libavfilter options
 		bs2b:libbs2b chromaprint flite:libflite frei0r
@@ -232,8 +232,7 @@ RDEPEND="
 	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
 	librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
 	rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
-	samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
-	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
+	samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] )
 	sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
 	sofalizer? (
 		>=sci-libs/netcdf-4.3.2-r1[hdf5]
diff --git a/media-video/ffmpeg/ffmpeg-3.3.6.ebuild b/media-video/ffmpeg/ffmpeg-3.3.6.ebuild
index 8edfe99d1be6..c86f3c9aece9 100644
--- a/media-video/ffmpeg/ffmpeg-3.3.6.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.3.6.ebuild
@@ -75,7 +75,7 @@ FFMPEG_FLAG_MAP=(
 		amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
 		jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
 		mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
-		schroedinger:libschroedinger speex:libspeex vorbis:libvorbis vpx:libvpx
+		speex:libspeex vorbis:libvorbis vpx:libvpx
 		zvbi:libzvbi
 		# libavfilter options
 		bs2b:libbs2b chromaprint flite:libflite frei0r
@@ -232,8 +232,7 @@ RDEPEND="
 	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
 	librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
 	rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
-	samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
-	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
+	samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] )
 	sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
 	sofalizer? (
 		>=sci-libs/netcdf-4.3.2-r1[hdf5]
diff --git a/media-video/ffmpeg/ffmpeg-3.3.8.ebuild b/media-video/ffmpeg/ffmpeg-3.3.8.ebuild
index 31f31bd7f750..fe80b8d12625 100644
--- a/media-video/ffmpeg/ffmpeg-3.3.8.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.3.8.ebuild
@@ -75,7 +75,7 @@ FFMPEG_FLAG_MAP=(
 		amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
 		jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
 		mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
-		schroedinger:libschroedinger speex:libspeex vorbis:libvorbis vpx:libvpx
+		speex:libspeex vorbis:libvorbis vpx:libvpx
 		zvbi:libzvbi
 		# libavfilter options
 		bs2b:libbs2b chromaprint flite:libflite frei0r
@@ -232,8 +232,7 @@ RDEPEND="
 	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
 	librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
 	rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
-	samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
-	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
+	samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] )
 	sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
 	sofalizer? (
 		>=sci-libs/netcdf-4.3.2-r1[hdf5]
diff --git a/media-video/ffmpeg/ffmpeg-3.4.5.ebuild b/media-video/ffmpeg/ffmpeg-3.4.5.ebuild
index 671893a16247..ffd21f6cd093 100644
--- a/media-video/ffmpeg/ffmpeg-3.4.5.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.4.5.ebuild
@@ -225,7 +225,7 @@ RDEPEND="
 	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
 	librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
 	rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
-	samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
+	samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] )
 	sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
 	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
 	ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
diff --git a/media-video/ffmpeg/ffmpeg-4.0.2.ebuild b/media-video/ffmpeg/ffmpeg-4.0.2.ebuild
index 0ecdf810c4ba..4cb26fd90478 100644
--- a/media-video/ffmpeg/ffmpeg-4.0.2.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.0.2.ebuild
@@ -55,7 +55,7 @@ LICENSE="
 	samba? ( GPL-3 )
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~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.
@@ -226,7 +226,7 @@ RDEPEND="
 	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
 	librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
 	rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
-	samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
+	samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] )
 	sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
 	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
 	ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
@@ -310,6 +310,10 @@ MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/libavutil/avconfig.h
 )
 
+build_separate_libffmpeg() {
+	use opencl
+}
+
 src_prepare() {
 	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
 		export revision=git-N-${FFMPEG_REVISION}
@@ -446,7 +450,7 @@ multilib_src_configure() {
 	echo "${@}"
 	"${@}" || die
 
-	if multilib_is_native_abi && use chromium; then
+	if multilib_is_native_abi && use chromium && build_separate_libffmpeg; then
 		einfo "Configuring for Chromium"
 		mkdir -p ../chromium || die
 		pushd ../chromium >/dev/null || die
@@ -454,7 +458,7 @@ multilib_src_configure() {
 			--disable-shared \
 			--enable-static \
 			--enable-pic \
-			--extra-cflags="-DFF_API_CONVERGENCE_DURATION=0"
+			--disable-opencl
 		echo "${@}"
 		"${@}" || die
 		popd >/dev/null || die
@@ -472,10 +476,14 @@ multilib_src_compile() {
 		done
 
 		if use chromium; then
-			einfo "Compiling for Chromium"
-			pushd ../chromium >/dev/null || die
-			emake V=1 libffmpeg
-			popd >/dev/null || die
+			if build_separate_libffmpeg; then
+				einfo "Compiling for Chromium"
+				pushd ../chromium >/dev/null || die
+				emake V=1 libffmpeg
+				popd >/dev/null || die
+			else
+				emake V=1 libffmpeg
+			fi
 		fi
 	fi
 }
@@ -491,10 +499,14 @@ multilib_src_install() {
 		done
 
 		if use chromium; then
-			einfo "Installing for Chromium"
-			pushd ../chromium >/dev/null || die
-			emake V=1 DESTDIR="${D}" install-libffmpeg
-			popd >/dev/null || die
+			if build_separate_libffmpeg; then
+				einfo "Installing for Chromium"
+				pushd ../chromium >/dev/null || die
+				emake V=1 DESTDIR="${D}" install-libffmpeg
+				popd >/dev/null || die
+			else
+				emake V=1 DESTDIR="${D}" install-libffmpeg
+			fi
 		fi
 	fi
 }
diff --git a/media-video/ffmpeg/ffmpeg-4.0.3.ebuild b/media-video/ffmpeg/ffmpeg-4.0.3.ebuild
index 2a10fdca9482..8e011cb6e0b5 100644
--- a/media-video/ffmpeg/ffmpeg-4.0.3.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.0.3.ebuild
@@ -55,7 +55,7 @@ LICENSE="
 	samba? ( GPL-3 )
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~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.
@@ -71,12 +71,12 @@ FFMPEG_FLAG_MAP=(
 		cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal
 		opengl
 		# indevs
-		libv4l:libv4l2 pulseaudio:libpulse libdrm
+		libv4l:libv4l2 pulseaudio:libpulse libdrm jack:libjack
 		# decoders
 		amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 fdk:libfdk-aac
 		jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
 		mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
-		speex:libspeex svg:librsvg video_cards_nvidia:ffnvcodec
+		speex:libspeex srt:libsrt svg:librsvg video_cards_nvidia:ffnvcodec
 		vorbis:libvorbis vpx:libvpx zvbi:libzvbi
 		# libavfilter options
 		appkit
@@ -98,7 +98,7 @@ FFMPEG_ENCODER_FLAG_MAP=(
 )
 
 IUSE="
-	alsa chromium doc +encode jack oss pic static-libs test v4l
+	alsa chromium doc +encode oss pic static-libs test v4l
 	${FFMPEG_FLAG_MAP[@]%:*}
 	${FFMPEG_ENCODER_FLAG_MAP[@]%:*}
 "
@@ -226,9 +226,10 @@ RDEPEND="
 	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
 	librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
 	rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
-	samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
+	samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] )
 	sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
 	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
+	srt? ( net-libs/srt[${MULTILIB_USEDEP}] )
 	ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
 	svg? ( gnome-base/librsvg:2=[${MULTILIB_USEDEP}] )
 	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
@@ -310,6 +311,10 @@ MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/libavutil/avconfig.h
 )
 
+build_separate_libffmpeg() {
+	use opencl
+}
+
 src_prepare() {
 	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
 		export revision=git-N-${FFMPEG_REVISION}
@@ -446,7 +451,7 @@ multilib_src_configure() {
 	echo "${@}"
 	"${@}" || die
 
-	if multilib_is_native_abi && use chromium; then
+	if multilib_is_native_abi && use chromium && build_separate_libffmpeg; then
 		einfo "Configuring for Chromium"
 		mkdir -p ../chromium || die
 		pushd ../chromium >/dev/null || die
@@ -454,7 +459,7 @@ multilib_src_configure() {
 			--disable-shared \
 			--enable-static \
 			--enable-pic \
-			--extra-cflags="-DFF_API_CONVERGENCE_DURATION=0"
+			--disable-opencl
 		echo "${@}"
 		"${@}" || die
 		popd >/dev/null || die
@@ -472,10 +477,14 @@ multilib_src_compile() {
 		done
 
 		if use chromium; then
-			einfo "Compiling for Chromium"
-			pushd ../chromium >/dev/null || die
-			emake V=1 libffmpeg
-			popd >/dev/null || die
+			if build_separate_libffmpeg; then
+				einfo "Compiling for Chromium"
+				pushd ../chromium >/dev/null || die
+				emake V=1 libffmpeg
+				popd >/dev/null || die
+			else
+				emake V=1 libffmpeg
+			fi
 		fi
 	fi
 }
@@ -491,10 +500,14 @@ multilib_src_install() {
 		done
 
 		if use chromium; then
-			einfo "Installing for Chromium"
-			pushd ../chromium >/dev/null || die
-			emake V=1 DESTDIR="${D}" install-libffmpeg
-			popd >/dev/null || die
+			if build_separate_libffmpeg; then
+				einfo "Installing for Chromium"
+				pushd ../chromium >/dev/null || die
+				emake V=1 DESTDIR="${D}" install-libffmpeg
+				popd >/dev/null || die
+			else
+				emake V=1 DESTDIR="${D}" install-libffmpeg
+			fi
 		fi
 	fi
 }
diff --git a/media-video/ffmpeg/ffmpeg-4.1.ebuild b/media-video/ffmpeg/ffmpeg-4.1.ebuild
index 34b08d7a8e20..7502a685b968 100644
--- a/media-video/ffmpeg/ffmpeg-4.1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.1.ebuild
@@ -55,7 +55,7 @@ LICENSE="
 	samba? ( GPL-3 )
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~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.
@@ -71,12 +71,12 @@ FFMPEG_FLAG_MAP=(
 		cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal
 		opengl
 		# indevs
-		libv4l:libv4l2 pulseaudio:libpulse libdrm
+		libv4l:libv4l2 pulseaudio:libpulse libdrm jack:libjack
 		# decoders
 		amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 fdk:libfdk-aac
 		jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
 		mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
-		speex:libspeex svg:librsvg video_cards_nvidia:ffnvcodec
+		speex:libspeex srt:libsrt svg:librsvg video_cards_nvidia:ffnvcodec
 		vorbis:libvorbis vpx:libvpx zvbi:libzvbi
 		# libavfilter options
 		appkit
@@ -98,7 +98,7 @@ FFMPEG_ENCODER_FLAG_MAP=(
 )
 
 IUSE="
-	alsa chromium doc +encode jack oss pic static-libs test v4l
+	alsa chromium doc +encode oss pic static-libs test v4l
 	${FFMPEG_FLAG_MAP[@]%:*}
 	${FFMPEG_ENCODER_FLAG_MAP[@]%:*}
 "
@@ -226,9 +226,10 @@ RDEPEND="
 	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
 	librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
 	rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
-	samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
+	samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] )
 	sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
 	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
+	srt? ( >=net-libs/srt-1.3.0[${MULTILIB_USEDEP}] )
 	ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
 	svg? ( gnome-base/librsvg:2=[${MULTILIB_USEDEP}] )
 	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
@@ -311,6 +312,10 @@ MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/libavutil/avconfig.h
 )
 
+build_separate_libffmpeg() {
+	use opencl
+}
+
 src_prepare() {
 	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
 		export revision=git-N-${FFMPEG_REVISION}
@@ -404,6 +409,10 @@ multilib_src_configure() {
 		--enable-avfilter
 		--enable-avresample
 		--disable-stripping
+		# This is only for hardcoded cflags; those are used in configure checks that may
+		# interfere with proper detections, bug #671746 and bug #645778
+		# We use optflags, so that overrides them anyway.
+		--disable-optimizations
 		--disable-libcelt # bug #664158
 		"${myconf[@]}"
 	)
@@ -447,7 +456,7 @@ multilib_src_configure() {
 	echo "${@}"
 	"${@}" || die
 
-	if multilib_is_native_abi && use chromium; then
+	if multilib_is_native_abi && use chromium && build_separate_libffmpeg; then
 		einfo "Configuring for Chromium"
 		mkdir -p ../chromium || die
 		pushd ../chromium >/dev/null || die
@@ -455,7 +464,7 @@ multilib_src_configure() {
 			--disable-shared \
 			--enable-static \
 			--enable-pic \
-			--extra-cflags="-DFF_API_CONVERGENCE_DURATION=0"
+			--disable-opencl
 		echo "${@}"
 		"${@}" || die
 		popd >/dev/null || die
@@ -473,10 +482,14 @@ multilib_src_compile() {
 		done
 
 		if use chromium; then
-			einfo "Compiling for Chromium"
-			pushd ../chromium >/dev/null || die
-			emake V=1 libffmpeg
-			popd >/dev/null || die
+			if build_separate_libffmpeg; then
+				einfo "Compiling for Chromium"
+				pushd ../chromium >/dev/null || die
+				emake V=1 libffmpeg
+				popd >/dev/null || die
+			else
+				emake V=1 libffmpeg
+			fi
 		fi
 	fi
 }
@@ -492,10 +505,14 @@ multilib_src_install() {
 		done
 
 		if use chromium; then
-			einfo "Installing for Chromium"
-			pushd ../chromium >/dev/null || die
-			emake V=1 DESTDIR="${D}" install-libffmpeg
-			popd >/dev/null || die
+			if build_separate_libffmpeg; then
+				einfo "Installing for Chromium"
+				pushd ../chromium >/dev/null || die
+				emake V=1 DESTDIR="${D}" install-libffmpeg
+				popd >/dev/null || die
+			else
+				emake V=1 DESTDIR="${D}" install-libffmpeg
+			fi
 		fi
 	fi
 }
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 2a10fdca9482..bf29f67ebbb9 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -71,12 +71,12 @@ FFMPEG_FLAG_MAP=(
 		cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal
 		opengl
 		# indevs
-		libv4l:libv4l2 pulseaudio:libpulse libdrm
+		libv4l:libv4l2 pulseaudio:libpulse libdrm jack:libjack
 		# decoders
 		amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 fdk:libfdk-aac
 		jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
 		mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
-		speex:libspeex svg:librsvg video_cards_nvidia:ffnvcodec
+		speex:libspeex srt:libsrt svg:librsvg video_cards_nvidia:ffnvcodec
 		vorbis:libvorbis vpx:libvpx zvbi:libzvbi
 		# libavfilter options
 		appkit
@@ -98,7 +98,7 @@ FFMPEG_ENCODER_FLAG_MAP=(
 )
 
 IUSE="
-	alsa chromium doc +encode jack oss pic static-libs test v4l
+	alsa chromium doc +encode oss pic static-libs test v4l
 	${FFMPEG_FLAG_MAP[@]%:*}
 	${FFMPEG_ENCODER_FLAG_MAP[@]%:*}
 "
@@ -226,9 +226,10 @@ RDEPEND="
 	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
 	librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
 	rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
-	samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
+	samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] )
 	sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
 	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
+	srt? ( >=net-libs/srt-1.3.0[${MULTILIB_USEDEP}] )
 	ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
 	svg? ( gnome-base/librsvg:2=[${MULTILIB_USEDEP}] )
 	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
@@ -310,6 +311,10 @@ MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/libavutil/avconfig.h
 )
 
+build_separate_libffmpeg() {
+	use opencl
+}
+
 src_prepare() {
 	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
 		export revision=git-N-${FFMPEG_REVISION}
@@ -403,6 +408,10 @@ multilib_src_configure() {
 		--enable-avfilter
 		--enable-avresample
 		--disable-stripping
+		# This is only for hardcoded cflags; those are used in configure checks that may
+		# interfere with proper detections, bug #671746 and bug #645778
+		# We use optflags, so that overrides them anyway.
+		--disable-optimizations
 		--disable-libcelt # bug #664158
 		"${myconf[@]}"
 	)
@@ -446,7 +455,7 @@ multilib_src_configure() {
 	echo "${@}"
 	"${@}" || die
 
-	if multilib_is_native_abi && use chromium; then
+	if multilib_is_native_abi && use chromium && build_separate_libffmpeg; then
 		einfo "Configuring for Chromium"
 		mkdir -p ../chromium || die
 		pushd ../chromium >/dev/null || die
@@ -454,7 +463,7 @@ multilib_src_configure() {
 			--disable-shared \
 			--enable-static \
 			--enable-pic \
-			--extra-cflags="-DFF_API_CONVERGENCE_DURATION=0"
+			--disable-opencl
 		echo "${@}"
 		"${@}" || die
 		popd >/dev/null || die
@@ -472,10 +481,14 @@ multilib_src_compile() {
 		done
 
 		if use chromium; then
-			einfo "Compiling for Chromium"
-			pushd ../chromium >/dev/null || die
-			emake V=1 libffmpeg
-			popd >/dev/null || die
+			if build_separate_libffmpeg; then
+				einfo "Compiling for Chromium"
+				pushd ../chromium >/dev/null || die
+				emake V=1 libffmpeg
+				popd >/dev/null || die
+			else
+				emake V=1 libffmpeg
+			fi
 		fi
 	fi
 }
@@ -491,10 +504,14 @@ multilib_src_install() {
 		done
 
 		if use chromium; then
-			einfo "Installing for Chromium"
-			pushd ../chromium >/dev/null || die
-			emake V=1 DESTDIR="${D}" install-libffmpeg
-			popd >/dev/null || die
+			if build_separate_libffmpeg; then
+				einfo "Installing for Chromium"
+				pushd ../chromium >/dev/null || die
+				emake V=1 DESTDIR="${D}" install-libffmpeg
+				popd >/dev/null || die
+			else
+				emake V=1 DESTDIR="${D}" install-libffmpeg
+			fi
 		fi
 	fi
 }
diff --git a/media-video/ffmpeg/files/chromium-r1.patch b/media-video/ffmpeg/files/chromium-r1.patch
index cfe06a7aec8d..514780035bc0 100644
--- a/media-video/ffmpeg/files/chromium-r1.patch
+++ b/media-video/ffmpeg/files/chromium-r1.patch
@@ -9,17 +9,23 @@ new file mode 100644
 index 0000000..992cf3c
 --- /dev/null
 +++ b/ffbuild/libffmpeg.mak
-@@ -0,0 +1,21 @@
+@@ -0,0 +1,27 @@
 +LIBFFMPEG = $(SLIBPREF)ffmpeg$(SLIBSUF)
 +LIBFFMPEG_LINK = $(LD) -shared -Wl,-soname,$(LIBFFMPEG) -Wl,-Bsymbolic -Wl,-z,now -Wl,-z,relro -Wl,-z,defs -Wl,--gc-sections $(LDFLAGS) $(LDLIBFLAGS) -o $(LIBFFMPEG)
 +
-+libffmpeg-: libavcodec/$(LIBPREF)avcodec$(LIBSUF) libavformat/$(LIBPREF)avformat$(LIBSUF) libavutil/$(LIBPREF)avutil$(LIBSUF) libswresample/$(LIBPREF)swresample$(LIBSUF)
-+	$(LIBFFMPEG_LINK) -Wl,--whole-archive $^ -Wl,--no-whole-archive $(EXTRALIBS-avcodec) $(EXTRALIBS-avformat) $(EXTRALIBS-avutil) $(EXTRALIBS-swresample)
++ifeq ($(CONFIG_SHARED),yes)
++LIBFFMPEG_DEPS = libavcodec/$(SLIBPREF)avcodec$(SLIBSUF) libavformat/$(SLIBPREF)avformat$(SLIBSUF) libavutil/$(SLIBPREF)avutil$(SLIBSUF)
++else
++LIBFFMPEG_DEPS = libavcodec/$(LIBPREF)avcodec$(LIBSUF) libavformat/$(LIBPREF)avformat$(LIBSUF) libavutil/$(LIBPREF)avutil$(LIBSUF) libswresample/$(LIBPREF)swresample$(LIBSUF)
++endif
 +
-+libffmpeg-yes: libavcodec/$(SLIBPREF)avcodec$(SLIBSUF) libavformat/$(SLIBPREF)avformat$(SLIBSUF) libavutil/$(SLIBPREF)avutil$(SLIBSUF)
++$(LIBFFMPEG): $(LIBFFMPEG_DEPS)
++ifeq ($(CONFIG_SHARED),yes)
 +	$(LIBFFMPEG_LINK) -Wl,--no-as-needed -lavcodec -lavformat -lavutil
++else
++	$(LIBFFMPEG_LINK) -Wl,--whole-archive $^ -Wl,--no-whole-archive $(EXTRALIBS-avcodec) $(EXTRALIBS-avformat) $(EXTRALIBS-avutil) $(EXTRALIBS-swresample)
++endif
 +
-+$(LIBFFMPEG): libffmpeg-$(CONFIG_SHARED)
 +libffmpeg: $(LIBFFMPEG)
 +
 +install-libffmpeg: $(LIBFFMPEG)
@@ -30,7 +36,7 @@ index 0000000..992cf3c
 +uninstall-libffmpeg:
 +	$(RM) "$(SHLIBDIR)/chromium/$(LIBFFMPEG)"
 +
-+.PHONY: libffmpeg libffmpeg-* install-libffmpeg
++.PHONY: libffmpeg install-libffmpeg uninstall-libffmpeg
 -- 
 2.13.1
 
diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml
index 7ad4c88a08be..35024c9f8c5f 100644
--- a/media-video/ffmpeg/metadata.xml
+++ b/media-video/ffmpeg/metadata.xml
@@ -49,9 +49,9 @@
 	<flag name="pic">Force shared libraries to be built as PIC (this is slower)</flag>
 	<flag name="postproc">Build and install libpostproc.</flag>
 	<flag name="rubberband">Adds time-stretching and pitch-shifting audio filter based on <pkg>media-libs/rubberband</pkg>.</flag>
-	<flag name="schroedinger">Enable Dirac video support (an advanced royalty-free video compression format) via libschroedinger (high-speed implementation in C of the Dirac codec).</flag>
 	<flag name="snappy">Enable <pkg>app-arch/snappy</pkg> support. Required for e.g. Vidvox Hap encoder.</flag>
 	<flag name="sofalizer">Enables Sofalizer filter</flag>
+	<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="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>