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

Conflicts:
	abs/core/tzdata/PKGBUILD

3 files changed, 3 insertions, 65 deletions

diff --git a/abs/extra/libva/PKGBUILD b/abs/extra/libva/PKGBUILD
index dcd999f..18c2971 100644
--- a/abs/extra/libva/PKGBUILD
+++ b/abs/extra/libva/PKGBUILD
@@ -1,7 +1,7 @@
 # $Id$
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 pkgname=libva
-pkgver=1.0.7
+pkgver=1.0.14
 pkgrel=1
 pkgdesc="Video Acceleration (VA) API for Linux"
 arch=('i686' 'x86_64')
@@ -11,14 +11,11 @@ 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
-        libva-dont-install-tests.patch)
-md5sums=('3903b0463e2892f8afbd631daa5619ae'
-         '0a9bd14c36545c0e9819dfe32ea80f41')
+source=(http://cgit.freedesktop.org/libva/snapshot/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('9a7eba239bffa3b40d7a49e3bb4fb6fb')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np0 -i "${srcdir}/libva-dont-install-tests.patch"
   ./autogen.sh
   ./configure --prefix=/usr  \
     --enable-i965-driver \
@@ -33,4 +30,3 @@ package() {
 }
 
 # vim:set ts=2 sw=2 et:
-
diff --git a/abs/extra/libva/libva-dont-install-tests.patch b/abs/extra/libva/libva-dont-install-tests.patch
deleted file mode 100644
index 43e4cba..0000000
--- a/abs/extra/libva/libva-dont-install-tests.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-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
- 
- 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
-@@ -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 = mpeg2vldemo
-+check_PROGRAMS = mpeg2vldemo
- 
- 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
-@@ -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
- 
- 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
-@@ -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 = putsurface
-+check_PROGRAMS = putsurface
- 
- AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA
- 
diff --git a/abs/extra/libva/patch1.patch b/abs/extra/libva/patch1.patch
deleted file mode 100644
index b455857..0000000
--- a/abs/extra/libva/patch1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- test/basic/Makefile.am.orig	2010-11-10 00:34:13.000000000 +0000
-+++ test/basic/Makefile.am	2010-11-10 00:34:54.000000000 +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 = 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
- 
- AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11