From 78ca4b29d3ae01632121cc913cae68c2ada36c9c Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Thu, 1 Aug 2013 12:59:00 +0000
Subject: [PATCH] extra/vlc to 2.0.8-1

---
 extra/vlc/PKGBUILD                     | 29 +++++++++++++++-----------
 extra/vlc/vlc-2.0.7-vaapi-compat.patch | 11 ++++++++++
 2 files changed, 28 insertions(+), 12 deletions(-)
 create mode 100644 extra/vlc/vlc-2.0.7-vaapi-compat.patch

diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD
index 9888be2da..eb0a46daa 100644
--- a/extra/vlc/PKGBUILD
+++ b/extra/vlc/PKGBUILD
@@ -7,15 +7,15 @@
 #  - drop oss support
 
 pkgname=vlc
-pkgver=2.0.7
-pkgrel=2
+pkgver=2.0.8
+pkgrel=1
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 arch=('i686' 'x86_64')
 url="http://www.videolan.org/vlc/"
 license=('LGPL2.1' 'GPL2')
 depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'qt4' 'libproxy' 
          'sdl_image' 'libdvdnav' 'libtiger' 'lua51' 'libmatroska' 
-         'zvbi' 'taglib' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp' 
+         'zvbi' 'taglib' 'libmpcdec' 'ffmpeg-compat' 'faad2' 'libupnp' 
          'libshout' 'libmad' 'libmpeg2' 'xcb-util-keysyms')
 makedepends=('live-media' 'libnotify' 'libbluray' 'flac' 'kdelibs'
              'libdc1394' 'libavc1394' 'lirc-utils' 'libcaca' 
@@ -58,20 +58,25 @@ backup=('usr/share/vlc/lua/http/.hosts'
         'usr/share/vlc/lua/http/dialogs/.hosts')
 options=('!libtool' '!emptydirs')
 install=vlc.install
-source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz")
-md5sums=('3b0e465b0990097b65abaf3e25589957')
+source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz"
+        vlc-2.0.7-vaapi-compat.patch)
+md5sums=('3b0e465b0990097b65abaf3e25589957'
+         '6df10774bb7acf20e09d6139e5c7839e')
+
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  patch -Np1 -i ../vlc-2.0.7-vaapi-compat.patch
+
+  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
+}
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  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
-
-  # fix for flac-1.3.0
-  sed -i -e 's:stream_decoder.h:FLAC/stream_decoder.h:' modules/codec/flac.c
-  sed -i -e 's:stream_encoder.h:FLAC/stream_encoder.h:' modules/codec/flac.c
-
   CFLAGS+="-I/usr/include/samba-4.0" CPPFLAGS+="-I/usr/include/samba-4.0" \
+  PKG_CONFIG_PATH+="/usr/lib/ffmpeg-compat/pkgconfig" \
   ./configure --prefix=/usr \
               --sysconfdir=/etc \
               --disable-rpath \
diff --git a/extra/vlc/vlc-2.0.7-vaapi-compat.patch b/extra/vlc/vlc-2.0.7-vaapi-compat.patch
new file mode 100644
index 000000000..4fd29710b
--- /dev/null
+++ b/extra/vlc/vlc-2.0.7-vaapi-compat.patch
@@ -0,0 +1,11 @@
+diff -rupN a/modules/codec/avcodec/vaapi.c b/modules/codec/avcodec/vaapi.c
+--- a/modules/codec/avcodec/vaapi.c	2013-01-22 09:51:40.000000000 +0000
++++ b/modules/codec/avcodec/vaapi.c	2013-07-27 17:23:37.965202118 +0000
+@@ -47,6 +47,7 @@
+ 
+ #include <X11/Xlib.h>
+ #include <va/va_x11.h>
++#include <va/va_compat.h>
+ 
+ typedef struct
+ {