[packages/mediastreamer] - fix building with ffmpeg 4.0 - rel 3
baggins
baggins at pld-linux.org
Sat Apr 28 19:55:11 CEST 2018
commit e4267767a2bcb34d03a3cae0dbafa098855942d2
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sat Apr 28 19:54:49 2018 +0200
- fix building with ffmpeg 4.0
- rel 3
ffmpeg4.patch | 20 ++++++++++++++++++++
mediastreamer.spec | 5 ++++-
2 files changed, 24 insertions(+), 1 deletion(-)
---
diff --git a/mediastreamer.spec b/mediastreamer.spec
index ad2b712..6be5823 100644
--- a/mediastreamer.spec
+++ b/mediastreamer.spec
@@ -20,7 +20,7 @@ Summary: Audio/Video real-time streaming
Summary(pl.UTF-8): Przesyłanie strumieni audio/video w czasie rzeczywistym
Name: mediastreamer
Version: 2.12.1
-Release: 2
+Release: 3
License: GPL v2+
Group: Libraries
Source0: http://download-mirror.savannah.gnu.org/releases/linphone/mediastreamer/%{name}-%{version}.tar.gz
@@ -28,6 +28,7 @@ Source0: http://download-mirror.savannah.gnu.org/releases/linphone/mediastreamer
Patch0: %{name}-imagedir.patch
Patch1: %{name}-ffmpeg.patch
Patch2: %{name}-werror.patch
+Patch3: ffmpeg4.patch
URL: http://www.linphone.org/technical-corner/mediastreamer2/overview
%{?with_opengl:BuildRequires: OpenGL-GLX-devel}
BuildRequires: SDL-devel >= 1.2.0
@@ -144,6 +145,7 @@ Statyczne biblioteki mediastreamer.
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%build
%{__libtoolize}
@@ -152,6 +154,7 @@ Statyczne biblioteki mediastreamer.
%{__autoheader}
%{__automake}
%configure \
+ --disable-strict \
--enable-alsa%{!?with_alsa:=no} \
%{?with_arts:--enable-artsc} \
%{?with_bcg729:--enable-bcg729} \
diff --git a/ffmpeg4.patch b/ffmpeg4.patch
new file mode 100644
index 0000000..6b7558c
--- /dev/null
+++ b/ffmpeg4.patch
@@ -0,0 +1,20 @@
+--- mediastreamer-2.12.1/src/videofilters/nowebcam.c~ 2018-04-28 19:50:35.000000000 +0200
++++ mediastreamer-2.12.1/src/videofilters/nowebcam.c 2018-04-28 19:53:20.814288813 +0200
+@@ -32,7 +32,7 @@
+ #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
+@@ -248,7 +248,7 @@
+ ms_error("Cannot load %s",jpgpath);
+ return NULL;
+ }
+- 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);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mediastreamer.git/commitdiff/e4267767a2bcb34d03a3cae0dbafa098855942d2
More information about the pld-cvs-commit
mailing list