git » vlc.git » commit e16c19e

diff --git a/PKGBUILD b/PKGBUILD
index 89275f3..80c007d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=vlc
 pkgver=2.1.5
-pkgrel=2
+pkgrel=3
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 arch=('i686' 'x86_64')
 url="http://www.videolan.org/vlc/"
@@ -56,14 +56,18 @@ backup=('usr/share/vlc/lua/http/.hosts'
 options=('!emptydirs')
 install=vlc.install
 source=("http://download.videolan.org/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz"
-        'vlc-2.0.7-vaapi-compat.patch')
+        'vlc-2.0.7-vaapi-compat.patch'
+        'vlc-2.1.5-ffmpeg-2.4.patch')
 md5sums=('3941b561f590cc95ca5e795213cba2f2'
-         '6df10774bb7acf20e09d6139e5c7839e')
+         '6df10774bb7acf20e09d6139e5c7839e'
+         '068a1b792064bb1aff0765a3ffa8a27a')
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   patch -Np1 -i "${srcdir}/vlc-2.0.7-vaapi-compat.patch"
+  patch -p1 -i "${srcdir}/vlc-2.1.5-ffmpeg-2.4.patch"
+  autoreconf -fi
 
   sed -i -e 's:truetype/freefont:TTF:g' modules/text_renderer/freetype.c
   sed -i -e 's:truetype/ttf-dejavu:TTF:g' modules/visualization/projectm.cpp
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..2bd0949
--- /dev/null
+++ b/vlc-2.1.5-ffmpeg-2.4.patch
@@ -0,0 +1,15 @@
+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}"