Author: kwizart Update of /cvs/free/rpms/vlc/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv13204/devel Modified Files: vlc.spec Added Files: vlc-2.1.5-ffmpeg-2.4.patch Log Message: Allow building with ffmpeg24 vlc-2.1.5-ffmpeg-2.4.patch: configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- NEW FILE vlc-2.1.5-ffmpeg-2.4.patch --- 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}" Index: vlc.spec =================================================================== RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v retrieving revision 1.205 retrieving revision 1.206 diff -u -r1.205 -r1.206 --- vlc.spec 26 Sep 2014 19:07:18 -0000 1.205 +++ vlc.spec 28 Sep 2014 16:44:50 -0000 1.206 @@ -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}%{... 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 @@ %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 @@ %changelog +* Sun Sep 28 2014 kwizart <kwizart(a)gmail.com&gt; - 2.1.5-4 +- Allow build with ffmpeg24 + * Fri Sep 26 2014 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 2.1.5-3 - Rebuilt for FFmpeg 2.4.x