From daaf0fb5d5da800faad4ad6d0735b896ea90a3cd Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sun, 28 Sep 2014 16:44:50 +0000 Subject: [PATCH] Allow building with ffmpeg24 --- vlc-2.1.5-ffmpeg-2.4.patch | 16 ++++++++++++++++ vlc.spec | 7 ++++++- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 vlc-2.1.5-ffmpeg-2.4.patch diff --git a/vlc-2.1.5-ffmpeg-2.4.patch b/vlc-2.1.5-ffmpeg-2.4.patch new file mode 100644 index 0000000..ed1651c --- /dev/null +++ b/vlc-2.1.5-ffmpeg-2.4.patch @@ -0,0 +1,16 @@ +diff --git a/configure.ac b/configure.ac +index a684338..053713a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2242,8 +2242,8 @@ AC_ARG_ENABLE(avcodec, + [ --enable-avcodec libavcodec codec (default enabled)]) + AS_IF([test "${enable_avcodec}" != "no"], [ + PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 53.34.0 libavutil >= 51.22.0], [ +- PKG_CHECK_EXISTS([libavcodec < 56],, [ +- AC_MSG_ERROR([libavcodec versions 56 and later are not supported yet.]) ++ PKG_CHECK_EXISTS([libavcodec < 57],, [ ++ AC_MSG_ERROR([libavcodec versions 57 and later are not supported yet.]) + ]) + VLC_SAVE_FLAGS + CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}" + diff --git a/vlc.spec b/vlc.spec index 8632f47..d670f5a 100644 --- a/vlc.spec +++ b/vlc.spec @@ -33,12 +33,13 @@ Summary: The cross-platform open-source multimedia framework, player and server Name: vlc Version: 2.1.5 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.videolan.org Source0: http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version}%{?vlc_rc}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: vlc-2.1.5-ffmpeg-2.4.patch BuildRequires: desktop-file-utils @@ -222,6 +223,7 @@ JACK audio plugin for the VLC media player. %prep %setup -q -n %{name}-%{version}%{?vlc_rc} +%patch0 -p1 -b .ffmpeg24 %{?_with_bootstrap: rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || : @@ -491,6 +493,9 @@ fi || : %changelog +* Sun Sep 28 2014 kwizart - 2.1.5-4 +- Allow build with ffmpeg24 + * Fri Sep 26 2014 Nicolas Chauvet - 2.1.5-3 - Rebuilt for FFmpeg 2.4.x