Merge branch 'testing' of ssh://cesman@linhes.org/mount/repository/linhes_pkgbuild into testing

2 files changed, 21 insertions, 17 deletions

diff --git a/abs/extra/libva/PKGBUILD b/abs/extra/libva/PKGBUILD
index 16cb53c..dcd999f 100644
--- a/abs/extra/libva/PKGBUILD
+++ b/abs/extra/libva/PKGBUILD
@@ -1,20 +1,24 @@
-# $Id: PKGBUILD 96203 2010-10-19 09:46:04Z ibiru $
+# $Id$
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 pkgname=libva
-pkgver=1.0.6
+pkgver=1.0.7
 pkgrel=1
 pkgdesc="Video Acceleration (VA) API for Linux"
 arch=('i686' 'x86_64')
 url="http://freedesktop.org/wiki/Software/vaapi"
 license=('MIT')
-depends=('libgl' 'libdrm' 'libxfixes')
+depends=('libgl' 'libdrm>=2.4.23' 'libxfixes')
 makedepends=('mesa')
 optdepends=('vdpau-video: VDPAU backend for VA API')
 options=('!libtool')
-source=(http://cgit.freedesktop.org/libva/snapshot/${pkgname}-${pkgver}.tar.bz2)
+source=(http://cgit.freedesktop.org/libva/snapshot/${pkgname}-${pkgver}.tar.bz2
+        libva-dont-install-tests.patch)
+md5sums=('3903b0463e2892f8afbd631daa5619ae'
+         '0a9bd14c36545c0e9819dfe32ea80f41')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np0 -i "${srcdir}/libva-dont-install-tests.patch"
   ./autogen.sh
   ./configure --prefix=/usr  \
     --enable-i965-driver \
@@ -29,6 +33,4 @@ package() {
 }
 
 # vim:set ts=2 sw=2 et:
-md5sums=('c4680eb0d9004c72cd6e4de45cf479cf'
-         '88f1142a1f437f2de7d8e9fd50c5b33c')
-md5sums=('c4680eb0d9004c72cd6e4de45cf479cf')
+
diff --git a/abs/extra/libva/libva-dont-install-tests.patch b/abs/extra/libva/libva-dont-install-tests.patch
index 0c3d120..43e4cba 100644
--- a/abs/extra/libva/libva-dont-install-tests.patch
+++ b/abs/extra/libva/libva-dont-install-tests.patch
@@ -1,16 +1,19 @@
---- test/basic/Makefile.am~     2010-02-12 09:42:10.000000000 -0500
-+++ test/basic/Makefile.am      2010-03-10 13:36:50.449834525 -0500
+Don't install some useeless tests programs
+
+
+--- test/basic/Makefile.am~	2010-02-12 09:42:10.000000000 -0500
++++ test/basic/Makefile.am	2010-03-10 13:36:50.449834525 -0500
 @@ -20,7 +20,7 @@
  # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  
 -bin_PROGRAMS = test_01 test_02 test_03 test_04 test_05 test_06 \
 +check_PROGRAMS = test_01 test_02 test_03 test_04 test_05 test_06 \
-                test_07 test_08 test_09 test_10 test_11
+ 		test_07 test_08 test_09 test_10 test_11
  
  AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA
---- test/decode/Makefile.am~    2010-02-12 09:42:10.000000000 -0500
-+++ test/decode/Makefile.am     2010-03-10 13:37:09.636843464 -0500
+--- test/decode/Makefile.am~	2010-02-12 09:42:10.000000000 -0500
++++ test/decode/Makefile.am	2010-03-10 13:37:09.636843464 -0500
 @@ -20,7 +20,7 @@
  # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
@@ -20,8 +23,8 @@
  
  AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA
  
---- test/encode/Makefile.am~    2010-02-12 09:42:10.000000000 -0500
-+++ test/encode/Makefile.am     2010-03-10 13:37:26.701846294 -0500
+--- test/encode/Makefile.am~	2010-02-12 09:42:10.000000000 -0500
++++ test/encode/Makefile.am	2010-03-10 13:37:26.701846294 -0500
 @@ -20,7 +20,7 @@
  # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
@@ -31,8 +34,8 @@
  
  AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA
  
---- test/putsurface/Makefile.am~        2010-03-10 13:18:55.270697040 -0500
-+++ test/putsurface/Makefile.am 2010-03-10 13:38:08.106713556 -0500
+--- test/putsurface/Makefile.am~	2010-03-10 13:18:55.270697040 -0500
++++ test/putsurface/Makefile.am	2010-03-10 13:38:08.106713556 -0500
 @@ -20,7 +20,7 @@
  # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
@@ -42,4 +45,3 @@
  
  AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA
  
-