| 1 |
commit: 6ea32cd71c72c4ed9b94ea474b0933294562adf7 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Nov 29 21:25:43 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Nov 29 21:31:27 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ea32cd7 |
| 7 |
|
| 8 |
media-libs/mediastreamer: Fix build with ffmpeg-4 |
| 9 |
|
| 10 |
Tnanks-to: Bastien Le Querrec <bastien <AT> silence.im> |
| 11 |
Closes: https://bugs.gentoo.org/655170 |
| 12 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
| 13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 14 |
|
| 15 |
.../files/mediastreamer-2.9.0-ffmpeg4.patch | 22 ++++++++++++++++++++++ |
| 16 |
.../mediastreamer/mediastreamer-2.9.0-r2.ebuild | 3 ++- |
| 17 |
2 files changed, 24 insertions(+), 1 deletion(-) |
| 18 |
|
| 19 |
diff --git a/media-libs/mediastreamer/files/mediastreamer-2.9.0-ffmpeg4.patch b/media-libs/mediastreamer/files/mediastreamer-2.9.0-ffmpeg4.patch |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..7a164d51639 |
| 22 |
--- /dev/null |
| 23 |
+++ b/media-libs/mediastreamer/files/mediastreamer-2.9.0-ffmpeg4.patch |
| 24 |
@@ -0,0 +1,22 @@ |
| 25 |
+diff --git a/src/videofilters/nowebcam.c b/src/videofilters/nowebcam.c |
| 26 |
+index 60e38530..52cc3359 100644 |
| 27 |
+--- a/src/videofilters/nowebcam.c |
| 28 |
++++ b/src/videofilters/nowebcam.c |
| 29 |
+@@ -32,7 +32,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
| 30 |
+ #ifndef NO_FFMPEG |
| 31 |
+ #include "ffmpeg-priv.h" |
| 32 |
+ #else |
| 33 |
+-#define FF_INPUT_BUFFER_PADDING_SIZE 32 |
| 34 |
++#define AV_INPUT_BUFFER_PADDING_SIZE 32 |
| 35 |
+ #endif |
| 36 |
+ |
| 37 |
+ #if TARGET_OS_IPHONE |
| 38 |
+@@ -1740,7 +1740,7 @@ mblk_t *ms_load_jpeg_as_yuv(const char *jpgpath, MSVideoSize *reqsize){ |
| 39 |
+ m=ms_load_generate_yuv(reqsize); |
| 40 |
+ return m; |
| 41 |
+ } |
| 42 |
+- jpgbuf=(uint8_t*)ms_malloc0(statbuf.st_size + FF_INPUT_BUFFER_PADDING_SIZE); |
| 43 |
++ jpgbuf=(uint8_t*)ms_malloc0(statbuf.st_size + AV_INPUT_BUFFER_PADDING_SIZE); |
| 44 |
+ if (jpgbuf==NULL) |
| 45 |
+ { |
| 46 |
+ close(fd); |
| 47 |
\ No newline at end of file |
| 48 |
|
| 49 |
diff --git a/media-libs/mediastreamer/mediastreamer-2.9.0-r2.ebuild b/media-libs/mediastreamer/mediastreamer-2.9.0-r2.ebuild |
| 50 |
index b86f9ade954..21fa421ab66 100644 |
| 51 |
--- a/media-libs/mediastreamer/mediastreamer-2.9.0-r2.ebuild |
| 52 |
+++ b/media-libs/mediastreamer/mediastreamer-2.9.0-r2.ebuild |
| 53 |
@@ -1,4 +1,4 @@ |
| 54 |
-# Copyright 1999-2018 Gentoo Foundation |
| 55 |
+# Copyright 1999-2018 Gentoo Authors |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
|
| 58 |
EAPI=6 |
| 59 |
@@ -83,6 +83,7 @@ PATCHES=( |
| 60 |
"${FILESDIR}/${P}-tests.patch" |
| 61 |
"${FILESDIR}/${P}-xxd.patch" |
| 62 |
"${FILESDIR}/${P}-ffmpeg3.patch" |
| 63 |
+ "${FILESDIR}/${P}-ffmpeg4.patch" |
| 64 |
) |
| 65 |
|
| 66 |
src_prepare() { |
Archives