Sat Jul 23 23:17:54 UTC 2011

2 files changed, 23 insertions, 22 deletions

diff --git a/extra/libva/PKGBUILD b/extra/libva/PKGBUILD
index 36a228923..3996e0059 100644
--- a/extra/libva/PKGBUILD
+++ b/extra/libva/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 117421 2011-04-01 18:27:40Z ibiru $
+# $Id: PKGBUILD 125889 2011-05-31 13:21:31Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 pkgname=libva
-pkgver=1.0.12
+pkgver=1.0.13
 pkgrel=1
 pkgdesc="Video Acceleration (VA) API for Linux"
 arch=('i686' 'x86_64')
@@ -13,12 +13,12 @@ optdepends=('vdpau-video: VDPAU backend for VA API')
 options=('!libtool')
 source=(http://cgit.freedesktop.org/libva/snapshot/${pkgname}-${pkgver}.tar.bz2
         libva-dont-install-tests.patch)
-md5sums=('84408a0746a63b8cf308dc7b9f2451cf'
-         '0a9bd14c36545c0e9819dfe32ea80f41')
+md5sums=('221207c386129e02fc05827147af7aa6'
+         'd13d1868f2db99bedec1057bbfbd9c61')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np0 -i "${srcdir}/libva-dont-install-tests.patch"
+  patch -Np1 -i "${srcdir}/libva-dont-install-tests.patch"
   ./autogen.sh
   ./configure --prefix=/usr  \
     --enable-i965-driver \
diff --git a/extra/libva/libva-dont-install-tests.patch b/extra/libva/libva-dont-install-tests.patch
index 43e4cbaa7..97f33e32d 100644
--- a/extra/libva/libva-dont-install-tests.patch
+++ b/extra/libva/libva-dont-install-tests.patch
@@ -1,8 +1,6 @@
-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
+diff -Nur libva-1.0.13.orig/test/basic/Makefile.am libva-1.0.13/test/basic/Makefile.am
+--- libva-1.0.13.orig/test/basic/Makefile.am	2011-05-31 13:10:55.021797329 +0000
++++ libva-1.0.13/test/basic/Makefile.am	2011-05-31 13:11:52.252331062 +0000
 @@ -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.
@@ -11,9 +9,10 @@ Don't install some useeless tests programs
 +check_PROGRAMS = test_01 test_02 test_03 test_04 test_05 test_06 \
  		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
+ AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11
+diff -Nur libva-1.0.13.orig/test/decode/Makefile.am libva-1.0.13/test/decode/Makefile.am
+--- libva-1.0.13.orig/test/decode/Makefile.am	2011-05-31 13:10:55.021797329 +0000
++++ libva-1.0.13/test/decode/Makefile.am	2011-05-31 13:12:12.175851534 +0000
 @@ -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.
@@ -21,21 +20,23 @@ Don't install some useeless tests programs
 -bin_PROGRAMS = mpeg2vldemo
 +check_PROGRAMS = mpeg2vldemo
  
- AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA
+ AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11
  
---- test/encode/Makefile.am~	2010-02-12 09:42:10.000000000 -0500
-+++ test/encode/Makefile.am	2010-03-10 13:37:26.701846294 -0500
+diff -Nur libva-1.0.13.orig/test/encode/Makefile.am libva-1.0.13/test/encode/Makefile.am
+--- libva-1.0.13.orig/test/encode/Makefile.am	2011-05-31 13:10:55.021797329 +0000
++++ libva-1.0.13/test/encode/Makefile.am	2011-05-31 13:12:35.499399421 +0000
 @@ -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 = h264encode
-+check_PROGRAMS = h264encode
+-bin_PROGRAMS = h264encode avcenc
++check_PROGRAMS = h264encode avcenc
  
- AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA
+ AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11
  
---- test/putsurface/Makefile.am~	2010-03-10 13:18:55.270697040 -0500
-+++ test/putsurface/Makefile.am	2010-03-10 13:38:08.106713556 -0500
+diff -Nur libva-1.0.13.orig/test/putsurface/Makefile.am libva-1.0.13/test/putsurface/Makefile.am
+--- libva-1.0.13.orig/test/putsurface/Makefile.am	2011-05-31 13:10:55.021797329 +0000
++++ libva-1.0.13/test/putsurface/Makefile.am	2011-05-31 13:12:48.836190403 +0000
 @@ -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.
@@ -43,5 +44,5 @@ Don't install some useeless tests programs
 -bin_PROGRAMS = putsurface
 +check_PROGRAMS = putsurface
  
- AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA
+ AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11