gentoo resync : 24.12.2018

4 files changed, 28 insertions, 6 deletions

diff --git a/media-libs/mediastreamer/Manifest b/media-libs/mediastreamer/Manifest
index e447d8d29a62..ba0d9504eb43 100644
--- a/media-libs/mediastreamer/Manifest
+++ b/media-libs/mediastreamer/Manifest
@@ -1,9 +1,10 @@
 AUX mediastreamer-2.9.0-ffmpeg3.patch 16778 BLAKE2B 43f6502123f3e452a900a6b93578ee1aec721a50ffe2917c3fa0b996a3f11432a2a9be5382742eb6bfc74fb10256bbdea19491323f9817ba825b759b8086965a SHA512 15170cf0089fde5ace41b7c9d9b155fc42b621691a7b86b08414139b4a6a896c4fe4a8de6f082039044699761774ac02c75e0e637b7d813a1228bc9fd8ab0b83
+AUX mediastreamer-2.9.0-ffmpeg4.patch 781 BLAKE2B 70a920a6957e88266eab3b1dfafc74410c95ee655b57318d6ac31c93a4629d44ae72714097aa66137703b2084809da5e18a2e86e8d3ab04f289f91e1632ffd93 SHA512 0f8287ce1552b13a78a5e570095eb3dbf447cfac46302691eeb14baadbc22f9eed7335a9abb5acc59b362e01ba5a0a281796898c9238d2d1ae2a9be8913016b3
 AUX mediastreamer-2.9.0-libav9.patch 4535 BLAKE2B a4808495632059169c52261504fe1c0d1a1d100fce5981e1285f67dac9582e323569b99aafbdfa36be929de7eb8e582495301820a0f87d61dd606fe549f4db3b SHA512 1fe44aeac23c0f97a2cba2e7312ed57833b0d7a2bf382de7727000c833159ae3123cc2c4b22b00a9977c9481a633efaad8c0d4615f0e6118baf3c326ccdb5fde
 AUX mediastreamer-2.9.0-tests.patch 587 BLAKE2B a8cdf7645cc2555e05aa7ca08c3da2525cfc184f1037d2d84f59d3ff48e8af67c59da5f6c24ac9a76472aa72ba2fb4aa9443ac50f11294e31fd1c1ec32634c99 SHA512 9298a6b2979c7f0f7a119a0bf5c943f9e03d860d4ea82de23a224b288e9e953da22bde5c1d01aa6b357dd897d5cda7fd9ca91ff05d6e1d54100f48f82e6b0011
 AUX mediastreamer-2.9.0-underlinking.patch 1969 BLAKE2B 6c820661cc5cb0c8dee4523e9b8b0cd91131ba41e2d537da60cb58fc921a4dae59ae0ca9133503df3ab834c05a1077c8df3fd01278bf2f1239d8204c3d2cdad1 SHA512 35103d8fc617d8202031cb9157e757d9a4822ad90595b2842a0715420c69b60bc4c99bedf0d4b6aee419c3a663104e8d0f05c743c7a374c3ae3bc5d7630a761e
 AUX mediastreamer-2.9.0-v4l-automagic.patch 1563 BLAKE2B 142852a63e1aaf4166464a3f9411ec3d91ddb4b2e2880d5bac8b2cdc4aba5b5a0b18830f975401b35bfde23409215f40a2ed8ec8847e8173f36bf1ff021e592f SHA512 0de2d426e0b9594695fea4c3cfe5fb832d351380c53ed671ede2c4c7d0142205af22c3fc9048812bbcd2e20c6b3f7fb8828baa4704466e2da1906112193d7dcf
 AUX mediastreamer-2.9.0-xxd.patch 642 BLAKE2B eba083c86b405da0aa7a96b192e70e87a45d25a98f13cb93d2b13c85d7e9e59ddfcbf59f73aec859d725ed6ee4bff015cde0d22cdcff1325e6893c965a2b29b2 SHA512 763a8d90b278b75574c8a3cd14a780ec069f3bb6267e4ae5425ead390b274662a6c31ca924b418df5454cd7a842929dbadf621acb65e52c5af7835a2bc21bca2
 DIST mediastreamer-2.9.0.tar.gz 3578877 BLAKE2B 14db241196f5d98cd7fc06ebe9e59317d47248a6c0ba103c4382ad5a2e48ebf87293f344320215380a0b9ddf76c7d4986db2c27cf114734d883505424c21a6a7 SHA512 8c31ab07c659dce84c410dfb5814b6cdf3defcd4055814922f58e2886bfeecfd5bab294c408858a29e72fcf53f35a1f7748113e1f2863baa329daedae07ef2f0
-EBUILD mediastreamer-2.9.0-r2.ebuild 4631 BLAKE2B 25462c1ef45ee9e5aa2aa20a1736ca44a59d5220381ea9adc7c99e1e23c65d3b3b82f8710c0f44cf12e4363d91b484d434769edc297ef6f3817955a0bac14d09 SHA512 096d19166bdd2b0c63786563fc5fc1ecb012e0d12e5a6343dcc6b494486a32c2d20335842edab8bcd3f43a5dee4eaa8086f18d7d0828a6af5e3c6ff22a5a4af3
-MISC metadata.xml 881 BLAKE2B 9802cfcae35af83d1ee2da0b0fad0c48b2ffd027605628bb45e1b0ce4126d9e407fae3a6d2e27b5fe52875424414fbf5b850dcea2b1432a330c10b90be81c212 SHA512 0a764a56f797f8294bcc723069ad0d066055594e37cac460d0234ceb1db99a9df8aebb5b19a92771579c0eab4715069d255c4f62e936cda8d7c5091255aa5e70
+EBUILD mediastreamer-2.9.0-r2.ebuild 4599 BLAKE2B ffb46b92a84dff6d72bfd658d2446d4ad8f73ea8f114072539c03da1ea40209c9eb923b85b6ce73da70f90b54bb3efec821f79206a0e92240308b185531dc050 SHA512 8435c1f5347d2c4db6af9cb840dfa0a041529b1ba9033ebb7d13e5c6f3425a186725af74b90f4e170ddffac32984c24606e61108572b58a197d0e8f701af5ab6
+MISC metadata.xml 815 BLAKE2B 9bf63033f9e0b69f3f6e8d0d66534c6c93408cb33bdad955b42a536767cf0c641c00dd8430cab979bd1adc9a1a3d717e49e5ee6b3e35d30741d9db6abfea2a8e SHA512 97b32950d71cf40df5df5488aff7fa56914deb1e76bc7779d67442d19609892240ff8dfe037c69d88b5c5b11b155cbfcfd2e4c09365eb9a7a7a65a8226ad39e9
diff --git a/media-libs/mediastreamer/files/mediastreamer-2.9.0-ffmpeg4.patch b/media-libs/mediastreamer/files/mediastreamer-2.9.0-ffmpeg4.patch
new file mode 100644
index 000000000000..7a164d51639f
--- /dev/null
+++ b/media-libs/mediastreamer/files/mediastreamer-2.9.0-ffmpeg4.patch
@@ -0,0 +1,22 @@
+diff --git a/src/videofilters/nowebcam.c b/src/videofilters/nowebcam.c
+index 60e38530..52cc3359 100644
+--- a/src/videofilters/nowebcam.c
++++ b/src/videofilters/nowebcam.c
+@@ -32,7 +32,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ #ifndef NO_FFMPEG
+ #include "ffmpeg-priv.h"
+ #else
+-#define FF_INPUT_BUFFER_PADDING_SIZE 32
++#define AV_INPUT_BUFFER_PADDING_SIZE 32
+ #endif
+ 
+ #if TARGET_OS_IPHONE
+@@ -1740,7 +1740,7 @@ mblk_t *ms_load_jpeg_as_yuv(const char *jpgpath, MSVideoSize *reqsize){
+ 			m=ms_load_generate_yuv(reqsize);
+ 			return m;
+ 		}
+-		jpgbuf=(uint8_t*)ms_malloc0(statbuf.st_size + FF_INPUT_BUFFER_PADDING_SIZE);
++		jpgbuf=(uint8_t*)ms_malloc0(statbuf.st_size + AV_INPUT_BUFFER_PADDING_SIZE);
+ 		if (jpgbuf==NULL)
+ 		{
+ 			close(fd);
\ No newline at end of file
diff --git a/media-libs/mediastreamer/mediastreamer-2.9.0-r2.ebuild b/media-libs/mediastreamer/mediastreamer-2.9.0-r2.ebuild
index b86f9ade9547..f600c88f5813 100644
--- a/media-libs/mediastreamer/mediastreamer-2.9.0-r2.ebuild
+++ b/media-libs/mediastreamer/mediastreamer-2.9.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ KEYWORDS="amd64 ppc ppc64 x86"
 # TODO: run-time test for ipv6: does it really need ortp[ipv6] ?
 IUSE="+alsa amr bindist coreaudio debug doc examples +filters g726 g729 gsm ilbc
 	ipv6 libav ntp-timestamp opengl opus +ortp oss pcap portaudio pulseaudio sdl
-	silk +speex static-libs test theora upnp v4l video x264 X"
+	+speex static-libs test theora upnp v4l video x264 X"
 
 REQUIRED_USE="|| ( oss alsa portaudio coreaudio pulseaudio )
 	opengl? ( video )
@@ -72,7 +72,6 @@ PDEPEND="
 	amr? ( !bindist? ( media-plugins/mediastreamer-amr ) )
 	g729? ( !bindist? ( media-plugins/mediastreamer-bcg729 ) )
 	ilbc? ( media-plugins/mediastreamer-ilbc )
-	silk? ( !bindist? ( media-plugins/mediastreamer-silk ) )
 	video? ( x264? ( media-plugins/mediastreamer-x264 ) )
 "
 
@@ -83,6 +82,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-tests.patch"
 	"${FILESDIR}/${P}-xxd.patch"
 	"${FILESDIR}/${P}-ffmpeg3.patch"
+	"${FILESDIR}/${P}-ffmpeg4.patch"
 )
 
 src_prepare() {
diff --git a/media-libs/mediastreamer/metadata.xml b/media-libs/mediastreamer/metadata.xml
index 4f26788fccdf..dd4bdefeb442 100644
--- a/media-libs/mediastreamer/metadata.xml
+++ b/media-libs/mediastreamer/metadata.xml
@@ -15,7 +15,6 @@
 			packet</flag>
 		<flag name="ortp">Enable usage of <pkg>net-libs/ortp</pkg></flag>
 		<flag name="pcap">Enable usage of <pkg>net-libs/libpcap</pkg></flag>
-		<flag name="silk">Use silk (skype protocol) codec plugin</flag>
 		<flag name="video">Enable video support</flag>
 	</use>
 </pkgmetadata>