- rel 4; build with ffmpeg 2.4

diff --git a/vlc-ffmpeg.patch b/vlc-ffmpeg.patch
new file mode 100644 (file)
index 0000000..3a3f509
--- /dev/null
+++ b/vlc-ffmpeg.patch
@@ -0,0 +1,12 @@
+--- vlc-2.1.5/configure.ac~    2014-10-07 18:53:53.000000000 +0200
++++ vlc-2.1.5/configure.ac     2014-10-07 18:56:10.350367495 +0200
+@@ -2242,9 +2242,6 @@
+ [  --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.])
+-    ])
+     VLC_SAVE_FLAGS
+     CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}"
+     CFLAGS="${CFLAGS} ${AVCODEC_CFLAGS}"

diff --git a/vlc.spec b/vlc.spec
index b6c039d85b237658c37e02f4a0adbd3326f1e330..c95e09038b3cc0e7dd17f21735dd11e1a4d4ba05 100644 (file)
--- a/vlc.spec
+++ b/vlc.spec
@@ -57,7 +57,7 @@ Summary:      VLC - a multimedia player and stream server
 Summary(pl.UTF-8):     VLC - odtwarzacz multimedialny oraz serwer strumieni
 Name:          vlc
 Version:       2.1.5
-Release:       3
+Release:       4
 License:       GPL v2+
 Group:         X11/Applications/Multimedia
 Source0:       http://download.videolan.org/pub/videolan/vlc/%{version}/%{name}-%{version}.tar.xz
@@ -66,6 +66,7 @@ Patch0:               %{name}-buildflags.patch
 Patch1:                %{name}-defaultfont.patch
 Patch2:                %{name}-system-minizip.patch
 Patch3:                xmas-sucks.patch
+Patch4:                %{name}-ffmpeg.patch
 Patch7:                no-cache.patch
 URL:           http://www.videolan.org/vlc/
 %{?with_directfb:BuildRequires:        DirectFB-devel}
@@ -321,6 +322,7 @@ Akcje klienta VLC dla Solid.
 %if %{without xmas}
 %patch3 -p1
 %endif
+%patch4 -p1
 %patch7 -p1
 
 %build