Merge branch '3.0' into 3.1

babl/Pkgfile

@@ -7,7 +7,7 @@
 name=babl
 version=0.1.10
 release=1
-source=(ftp://ftp.gtk.org/pub/babl/0.1/$name-$version.tar.bz2)
+source=(http://ftp.gtk.org/pub/babl/0.1/$name-$version.tar.bz2)
 
 build() {
   cd $name-$version

git/.md5sum

@@ -1,2 +1,2 @@
-0646202ae979e4339f3e47f2375b5773  git-2.0.0.tar.xz
-f5d15c6e44e968bdfcdb6df3e612328a  git-manpages-2.0.0.tar.xz
+6d28a5d112379c20c7f7df9e0ffb070c  git-2.0.1.tar.xz
+9a60f1d9e38acfac3f586d2c05a56f92  git-manpages-2.0.1.tar.xz

git/Pkgfile

@@ -6,7 +6,7 @@
 # Nice to have: tk
 
 name=git
-version=2.0.0
+version=2.0.1
 release=1
 source=(https://www.kernel.org/pub/software/scm/git/git-{,manpages-}$version.tar.xz)
 

libva/.footprint

@@ -17,6 +17,7 @@ drwxr-xr-x	root/root	usr/include/va/
 -rw-r--r--	root/root	usr/include/va/va_backend_vpp.h
 -rw-r--r--	root/root	usr/include/va/va_compat.h
 -rw-r--r--	root/root	usr/include/va/va_dec_jpeg.h
+-rw-r--r--	root/root	usr/include/va/va_dec_vp8.h
 -rw-r--r--	root/root	usr/include/va/va_dri2.h
 -rw-r--r--	root/root	usr/include/va/va_dricommon.h
 -rw-r--r--	root/root	usr/include/va/va_drm.h
@@ -34,29 +35,29 @@ drwxr-xr-x	root/root	usr/lib/dri/
 -rwxr-xr-x	root/root	usr/lib/dri/dummy_drv_video.la
 -rwxr-xr-x	root/root	usr/lib/dri/dummy_drv_video.so
 -rwxr-xr-x	root/root	usr/lib/libva-drm.la
-lrwxrwxrwx	root/root	usr/lib/libva-drm.so -> libva-drm.so.1.3400.0
-lrwxrwxrwx	root/root	usr/lib/libva-drm.so.1 -> libva-drm.so.1.3400.0
--rwxr-xr-x	root/root	usr/lib/libva-drm.so.1.3400.0
+lrwxrwxrwx	root/root	usr/lib/libva-drm.so -> libva-drm.so.1.3501.0
+lrwxrwxrwx	root/root	usr/lib/libva-drm.so.1 -> libva-drm.so.1.3501.0
+-rwxr-xr-x	root/root	usr/lib/libva-drm.so.1.3501.0
 -rwxr-xr-x	root/root	usr/lib/libva-egl.la
-lrwxrwxrwx	root/root	usr/lib/libva-egl.so -> libva-egl.so.1.3400.0
-lrwxrwxrwx	root/root	usr/lib/libva-egl.so.1 -> libva-egl.so.1.3400.0
--rwxr-xr-x	root/root	usr/lib/libva-egl.so.1.3400.0
+lrwxrwxrwx	root/root	usr/lib/libva-egl.so -> libva-egl.so.1.3501.0
+lrwxrwxrwx	root/root	usr/lib/libva-egl.so.1 -> libva-egl.so.1.3501.0
+-rwxr-xr-x	root/root	usr/lib/libva-egl.so.1.3501.0
 -rwxr-xr-x	root/root	usr/lib/libva-glx.la
-lrwxrwxrwx	root/root	usr/lib/libva-glx.so -> libva-glx.so.1.3400.0
-lrwxrwxrwx	root/root	usr/lib/libva-glx.so.1 -> libva-glx.so.1.3400.0
--rwxr-xr-x	root/root	usr/lib/libva-glx.so.1.3400.0
+lrwxrwxrwx	root/root	usr/lib/libva-glx.so -> libva-glx.so.1.3501.0
+lrwxrwxrwx	root/root	usr/lib/libva-glx.so.1 -> libva-glx.so.1.3501.0
+-rwxr-xr-x	root/root	usr/lib/libva-glx.so.1.3501.0
 -rwxr-xr-x	root/root	usr/lib/libva-tpi.la
-lrwxrwxrwx	root/root	usr/lib/libva-tpi.so -> libva-tpi.so.1.3400.0
-lrwxrwxrwx	root/root	usr/lib/libva-tpi.so.1 -> libva-tpi.so.1.3400.0
--rwxr-xr-x	root/root	usr/lib/libva-tpi.so.1.3400.0
+lrwxrwxrwx	root/root	usr/lib/libva-tpi.so -> libva-tpi.so.1.3501.0
+lrwxrwxrwx	root/root	usr/lib/libva-tpi.so.1 -> libva-tpi.so.1.3501.0
+-rwxr-xr-x	root/root	usr/lib/libva-tpi.so.1.3501.0
 -rwxr-xr-x	root/root	usr/lib/libva-x11.la
-lrwxrwxrwx	root/root	usr/lib/libva-x11.so -> libva-x11.so.1.3400.0
-lrwxrwxrwx	root/root	usr/lib/libva-x11.so.1 -> libva-x11.so.1.3400.0
--rwxr-xr-x	root/root	usr/lib/libva-x11.so.1.3400.0
+lrwxrwxrwx	root/root	usr/lib/libva-x11.so -> libva-x11.so.1.3501.0
+lrwxrwxrwx	root/root	usr/lib/libva-x11.so.1 -> libva-x11.so.1.3501.0
+-rwxr-xr-x	root/root	usr/lib/libva-x11.so.1.3501.0
 -rwxr-xr-x	root/root	usr/lib/libva.la
-lrwxrwxrwx	root/root	usr/lib/libva.so -> libva.so.1.3400.0
-lrwxrwxrwx	root/root	usr/lib/libva.so.1 -> libva.so.1.3400.0
--rwxr-xr-x	root/root	usr/lib/libva.so.1.3400.0
+lrwxrwxrwx	root/root	usr/lib/libva.so -> libva.so.1.3501.0
+lrwxrwxrwx	root/root	usr/lib/libva.so.1 -> libva.so.1.3501.0
+-rwxr-xr-x	root/root	usr/lib/libva.so.1.3501.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/libva-drm.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/libva-egl.pc

libva/.md5sum

@@ -1 +1 @@
-ca95b343050cf8feaf98dfe08ce0191b  libva-1.2.1.tar.bz2
+eb4db967f068854444b597071c66b480  libva-1.3.1.tar.bz2

libva/Pkgfile

@@ -5,16 +5,20 @@
 # Depends on: mesa3d xorg-libpciaccess
 
 name=libva
-version=1.2.1
+version=1.3.1
 release=1
 source=(http://www.freedesktop.org/software/vaapi/releases/$name/$name-$version.tar.bz2)
 
 build() {
 	cd $name-$version
 
+	# --disable-wayland
+	sed -i -e '17547,17643d' configure
+
 	./configure \
 		--prefix=/usr \
 		--enable-glx \
+		--disable-wayland \
 		--disable-dependency-tracking
 
 	make