commit: 6ea32cd71c72c4ed9b94ea474b0933294562adf7 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Nov 29 21:25:43 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Nov 29 21:31:27 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ea32cd7
media-libs/mediastreamer: Fix build with ffmpeg-4 Tnanks-to: Bastien Le Querrec <bastien <AT> silence.im> Closes: https://bugs.gentoo.org/655170 Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../files/mediastreamer-2.9.0-ffmpeg4.patch | 22 ++++++++++++++++++++++ .../mediastreamer/mediastreamer-2.9.0-r2.ebuild | 3 ++- 2 files changed, 24 insertions(+), 1 deletion(-) 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 00000000000..7a164d51639 --- /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 b86f9ade954..21fa421ab66 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 @@ -83,6 +83,7 @@ PATCHES=( "${FILESDIR}/${P}-tests.patch" "${FILESDIR}/${P}-xxd.patch" "${FILESDIR}/${P}-ffmpeg3.patch" + "${FILESDIR}/${P}-ffmpeg4.patch" ) src_prepare() {
