Merge branch '3.0' into 3.1

ffmpeg/.md5sum

@@ -1 +1 @@
-581affe5d820d89ce21fe3f0316ef2c3  ffmpeg-2.2.2.tar.bz2
+5b85aea53d8dcd5b0f7b497f233bc101  ffmpeg-2.2.4.tar.bz2

ffmpeg/Pkgfile

@@ -5,8 +5,8 @@
 # Depends on: gnutls imlib2 lame libass libbluray libmodplug libsdl libtheora libva libvdpau libxvid opencore-amr opus rtmpdump schroedinger speex x264 openjpeg libvpx
 
 name=ffmpeg
-version=2.2.2
-release=2
+version=2.2.4
+release=1
 source=(http://ffmpeg.org/releases/$name-$version.tar.bz2)
 
 build() {

libva-intel/.md5sum

@@ -1 +1 @@
-8248d224d35c9544777f1c7250f581b2  libva-intel-driver-1.2.1.tar.bz2
+3f4f08f1d42ee451b2fb9c239ee0b8d7  libva-intel-driver-1.3.2.tar.bz2

libva-intel/Pkgfile

@@ -1,18 +1,22 @@
 # Description: libva video acceleration for newer intel based setups
 # URL:         http://freedesktop.org/wiki/Software/vaapi
 # Maintainer:  Thomas Penteker, tek at serverop dot de
-# Depends on:  libva mesa3d libvdpau glu ffmpeg
+# Depends on:  glu ffmpeg
 
 name=libva-intel
-version=1.2.1
+version=1.3.2
 release=1
 source=(http://freedesktop.org/software/vaapi/releases/$name-driver/$name-driver-${version}.tar.bz2)
 
 build() {
   cd $name-driver-$version
 
+  sed -i '14113,14209d' configure
+
   ./configure --prefix=/usr
 
+  sed -i '1265,1266d' src/Makefile
+
   make
   make DESTDIR=$PKG install
 }