Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/nautilus-actions/PKGBUILD
	extra/libdrm/PKGBUILD
	extra/mesa/PKGBUILD
	extra/perl-dbd-mysql/PKGBUILD
	multilib/lib32-freetype2/PKGBUILD
	multilib/lib32-krb5/PKGBUILD
	multilib/lib32-libdrm/PKGBUILD
	multilib/lib32-libdrm/no-pthread-stubs.patch
	multilib/lib32-libpng/PKGBUILD
	multilib/lib32-mesa/PKGBUILD
	multilib/lib32-pango/PKGBUILD
	testing/bind/PKGBUILD
	testing/dmraid/PKGBUILD
	testing/glibc/PKGBUILD

1 files changed, 14 insertions, 20 deletions

diff --git a/extra/libdrm/PKGBUILD b/extra/libdrm/PKGBUILD
index fa9f64eed..d6f5709e9 100644
--- a/extra/libdrm/PKGBUILD
+++ b/extra/libdrm/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 154508 2012-03-29 17:30:54Z andyrtr $
+# $Id: PKGBUILD 161901 2012-06-16 12:11:13Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libdrm
-pkgver=2.4.33
+pkgver=2.4.35
 pkgrel=1
 pkgdesc="Userspace interface to kernel DRM services"
 arch=(i686 x86_64 'mips64el')
@@ -10,43 +10,37 @@ license=('custom')
 depends=('glibc' 'libpciaccess')
 makedepends=('cairo')
 [ "$CARCH" != "mips64el" ] && makedepends+=('valgrind')
+replaces=('libdrm-new' 'libdrm-nouveau')
 options=('!libtool')
 url="http://dri.freedesktop.org/"
-source=(http://dri.freedesktop.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+source=(http://dri.freedesktop.org/$pkgname/$pkgname-$pkgver.tar.bz2
         no-pthread-stubs.patch
         COPYING
-#	git_fixes.diff
 )
-sha1sums=('4da2c635491724e44326871e6a49ccfec0b6b5a6'
-          '825ff5e0c4238b31bdea52f104bfec8949270e25'
+sha1sums=('a1d8d4945f782371d7855dbd693db885bd7e3d83'
+          '2a5410baa3e6e078f9378ce486a88f41d22fd838'
           'ba3dcd636997ee0d30df14b03dae05c24ae5d094')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/no-pthread-stubs.patch"
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../no-pthread-stubs.patch
 
-  # git fixes - currently none
-#  patch -Np1 -i ${srcdir}/git_fixes.diff
-  
   #libtoolize --force
   autoreconf --force --install
   ./configure --prefix=/usr \
       --enable-udev \
-      --enable-intel \
-      --enable-radeon \
-      --enable-vmwgfx-experimental-api \
-      --enable-nouveau-experimental-api
+      --enable-vmwgfx-experimental-api
   make
 }
 
 check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd $pkgname-$pkgver
   make -k check
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 "${srcdir}/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/"
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+  install -m755 -d "$pkgdir/usr/share/licenses/$pkgname"
+  install -m644 ../COPYING "$pkgdir/usr/share/licenses/$pkgname/"
 }