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

5 files changed, 48 insertions, 40 deletions

diff --git a/abs/core/apr-util/PKGBUILD b/abs/core/apr-util/PKGBUILD
index b44720c..0af3cc8 100644
--- a/abs/core/apr-util/PKGBUILD
+++ b/abs/core/apr-util/PKGBUILD
@@ -1,25 +1,28 @@
-# $Id: PKGBUILD 72241 2010-03-13 20:27:07Z jgc $
+# $Id$
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=apr-util
-pkgver=1.3.9
-pkgrel=4
+pkgver=1.3.12
+pkgrel=2
 pkgdesc="The Apache Portable Runtime"
 arch=('i686' 'x86_64')
 url="http://apr.apache.org/"
-depends=('apr>=1.4.2' 'gdbm' 'expat' 'db>=4.8' 'libldap' 'unixodbc')
+depends=('apr' 'gdbm' 'expat' 'db' 'libldap' 'unixodbc')
 options=('!libtool')
 license=('APACHE')
 source=("http://www.apache.org/dist/apr/apr-util-${pkgver}.tar.bz2")
-md5sums=('29dd557f7bd891fc2bfdffcfa081db59')
+md5sums=('0f671b037ca62751a8a7005578085560')
 
 build() {
-	cd "${srcdir}/apr-util-${pkgver}"
+  cd "${srcdir}/apr-util-${pkgver}"
+  ./configure --prefix=/usr --with-apr=/usr \
+    --without-pgsql --without-mysql --without-sqlite2 --without-sqlite3 \
+    --with-berkeley-db=/usr --with-gdbm=/usr --with-ldap
+  make
+}
 
-	./configure --prefix=/usr --with-apr=/usr \
-		--without-pgsql --without-mysql --without-sqlite2 --without-sqlite3 \
-		--with-berkeley-db=/usr --with-gdbm=/usr --with-ldap || return 1
-	make || return 1
-	make DESTDIR="${pkgdir}" install || return 1
+package() {
+  cd "${srcdir}/apr-util-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/abs/core/libart-lgpl/PKGBUILD b/abs/core/libart-lgpl/PKGBUILD
index f56c0b3..92d659f 100644
--- a/abs/core/libart-lgpl/PKGBUILD
+++ b/abs/core/libart-lgpl/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
+# $Id$
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 pkgname=libart-lgpl
-pkgver=2.3.20
+pkgver=2.3.21
 pkgrel=1
 pkgdesc="A library for high-performance 2D graphics"
 url="http://www.levien.com/libart/"
@@ -9,8 +9,8 @@ arch=(i686 x86_64)
 license=('LGPL')
 depends=('glibc')
 source=(http://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/2.3/libart_lgpl-${pkgver}.tar.bz2)
-md5sums=('d0ce67f2ebcef1e51a83136c69242a73')
 options=('!libtool')
+sha256sums=('fdc11e74c10fc9ffe4188537e2b370c0abacca7d89021d4d303afdf7fd7476fa')
 
 build() {
   cd ${startdir}/src/libart_lgpl-${pkgver}
diff --git a/abs/core/libdrm/PKGBUILD b/abs/core/libdrm/PKGBUILD
index b93c2dd..aa350d5 100644
--- a/abs/core/libdrm/PKGBUILD
+++ b/abs/core/libdrm/PKGBUILD
@@ -2,20 +2,20 @@
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libdrm
-pkgver=2.4.25
+pkgver=2.4.26
 pkgrel=1
 pkgdesc="Userspace interface to kernel DRM services"
 arch=(i686 x86_64)
 license=('custom')
-depends=('glibc')
+depends=('glibc' 'libpciaccess')
 options=('!libtool')
 url="http://dri.freedesktop.org/"
 source=(http://dri.freedesktop.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2
         no-pthread-stubs.patch
         COPYING)
-sha1sums=('b950f29cd1c4bb9f1c98a926486a47256b0a4194'
-          'af2d9871565ea4cf524873f897691a18b2bba944'
-          'ba3dcd636997ee0d30df14b03dae05c24ae5d094')
+md5sums=('062569426773f69b11a47a7712bba770'
+         'c722c8406507b7e3a8da7a3030d1d9cf'
+         'ba65e71c481b94ef0fb6c23c7f21ffa1')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/abs/core/libdrm/no-pthread-stubs.patch b/abs/core/libdrm/no-pthread-stubs.patch
index 6602f87..348c2a7 100644
--- a/abs/core/libdrm/no-pthread-stubs.patch
+++ b/abs/core/libdrm/no-pthread-stubs.patch
@@ -1,34 +1,35 @@
 diff -ru libdrm-2.4.0/configure.ac libdrm-2.4.0-nostubs/configure.ac
 --- libdrm-2.4.0/configure.ac	2008-10-09 21:57:09.000000000 +0200
 +++ libdrm-2.4.0-nostubs/configure.ac	2008-10-21 10:48:24.000000000 +0200
-@@ -32,10 +32,6 @@
- AC_HEADER_STDC
- AC_SYS_LARGEFILE
+@@ -47,10 +47,6 @@
+ LT_INIT([disable-static])
+ 
  
 -PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs)
 -AC_SUBST(PTHREADSTUBS_CFLAGS)
 -AC_SUBST(PTHREADSTUBS_LIBS)
 -
- pkgconfigdir=${libdir}/pkgconfig
- AC_SUBST(pkgconfigdir)
- AC_ARG_ENABLE(udev,	AS_HELP_STRING([--enable-udev],
+ PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10])
+ AC_SUBST(PCIACCESS_CFLAGS)
+ AC_SUBST(PCIACCESS_LIBS)
 --- libdrm-2.4.16/intel/Makefile.am	2009-11-20 23:54:36.000000000 +0000
 +++ libdrm-2.4.16/intel/Makefile.am.new	2009-12-07 08:11:32.235748069 +0000
-@@ -26,13 +26,12 @@
+@@ -26,14 +26,13 @@
  	$(WARN_CFLAGS) \
  	-I$(top_srcdir) \
  	-I$(top_srcdir)/intel \
 -	$(PTHREADSTUBS_CFLAGS) \
+ 	$(PCIACCESS_CFLAGS) \
  	-I$(top_srcdir)/include/drm
  
  libdrm_intel_la_LTLIBRARIES = libdrm_intel.la
  libdrm_intel_ladir = $(libdir)
  libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined
--libdrm_intel_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ @CLOCK_LIB@
-+libdrm_intel_la_LIBADD = ../libdrm.la @CLOCK_LIB@
+-libdrm_intel_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ @PCIACCESS_LIBS@ @CLOCK_LIB@
++libdrm_intel_la_LIBADD = ../libdrm.la @PCIACCESS_LIBS@ @CLOCK_LIB@
  
  libdrm_intel_la_SOURCES = \
- 	intel_atomic.h \
+ 	intel_bufmgr.c \
 --- libdrm-2.4.16/radeon/Makefile.am	2009-11-20 23:54:36.000000000 +0000
 +++ libdrm-2.4.16/radeon/Makefile.am.new	2009-12-07 08:12:31.889075388 +0000
 @@ -26,13 +26,12 @@
diff --git a/abs/core/libxi/PKGBUILD b/abs/core/libxi/PKGBUILD
index 6abbf85..42fabdc 100644
--- a/abs/core/libxi/PKGBUILD
+++ b/abs/core/libxi/PKGBUILD
@@ -1,25 +1,29 @@
-# $Id: PKGBUILD 57676 2009-11-01 14:14:29Z jgc $
+# $Id$
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libxi
-pkgver=1.3
-pkgrel=2
+pkgver=1.4.3
+pkgrel=1
 pkgdesc="X11 Input extension library"
 arch=('i686' 'x86_64')
 url="http://xorg.freedesktop.org"
-depends=('libxext>=1.1' 'inputproto>=2.0')
-makedepends=('pkgconfig')
-options=(!libtool force)
+depends=('libxext' 'inputproto')
+makedepends=('pkgconfig' 'xorg-util-macros')
+options=(!libtool)
 license=('custom')
 source=(${url}/releases/individual/lib/libXi-${pkgver}.tar.bz2)
-md5sums=('8df4ece9bd1efb02c28acb2b6f485e09')
+sha1sums=('c66cfdee74e8d169a7992b5f257395e653ca761b')
 
 build() {
   cd "${srcdir}/libXi-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --disable-static || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  ./configure --prefix=/usr --sysconfdir=/etc --disable-static
+  make
+}
+
+package() {
+  cd "${srcdir}/libXi-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
 }