{glproto,libdrm}-git: update pkg

2 files changed, 49 insertions, 54 deletions

diff --git a/pcr/glproto-git/PKGBUILD b/pcr/glproto-git/PKGBUILD
index fed5caa70..0ff8f2840 100644
--- a/pcr/glproto-git/PKGBUILD
+++ b/pcr/glproto-git/PKGBUILD
@@ -4,8 +4,10 @@
 # Contributor: Cilyan Olowen <gaknar at gmail dot com>
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
+pkgbase=glproto
 pkgname=glproto-git
-pkgver=20120905
+pkgver=$(LC_ALL=C date -u +%Y%m%d)
+_pkgver=1.4.16
 pkgrel=1
 pkgdesc='X11 OpenGL extension wire protocol'
 arch=(
@@ -14,23 +16,19 @@ arch=(
   mips64el
 )
 url=http://xorg.freedesktop.org/
-license=(
-  custom
-)
+license=custom
 provides=(
-  ${pkgname%-git}
-  glproto=1.4.15
+  $pkgbase
+  "$pkgbase=$_pkgver"
 )
+conflicts=$pkgbase
 makedepends=(
   git
   'xorg-util-macros>=1.2'
 )
-conflicts=(
-  ${pkgname%-git}
-)
 
-_gitroot=git://git.freedesktop.org/git/xorg/proto/${pkgname%-git}
-_gitname=${pkgname%-git}
+_gitroot=git://git.freedesktop.org/git/xorg/proto/$pkgbase
+_gitname=$pkgbase
 
 build() {
   cd $srcdir
@@ -51,13 +49,13 @@ build() {
 
   msg 'Starting make...'
   cd $srcdir/$_gitname-build
-  ./autogen.sh --prefix=/usr
-  make
+  setarch $CARCH ./autogen.sh --prefix=/usr
+  setarch $CARCH make
 }
 
 package() {
   cd $srcdir/$_gitname-build
-  make DESTDIR=$pkgdir install
-  install -m755 -d $pkgdir/usr/share/licenses/${pkgname%-git}
-  install -m644 COPYING $pkgdir/usr/share/licenses/${pkgname%-git}
+  setarch $CARCH make DESTDIR=$pkgdir install
+  install -m755 -d $pkgdir/usr/share/licenses/$pkgbase
+  install -m644 COPYING $pkgdir/usr/share/licenses/$pkgbase
 }
diff --git a/pcr/libdrm-git/PKGBUILD b/pcr/libdrm-git/PKGBUILD
index 94b7dca85..fc4c80e8e 100644
--- a/pcr/libdrm-git/PKGBUILD
+++ b/pcr/libdrm-git/PKGBUILD
@@ -1,9 +1,10 @@
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
+pkgbase=libdrm
 pkgname=libdrm-git
 pkgver=$(LC_ALL=C date -u +%Y%m%d)
-_pkgver=2.4.39
+_pkgver=2.4.41
 pkgrel=1
 pkgdesc='Userspace interface to kernel DRM services'
 arch=(
@@ -11,42 +12,32 @@ arch=(
   x86_64
   mips64el
 )
-license=(
-  MIT
-)
-depends=(
-  libpciaccess
-  )
+license=custom
+depends=libpciaccess
 makedepends=(
   cairo
   git
   valgrind
 )
-options=(
-  !libtool
-)
+options='!libtool'
 url=http://dri.freedesktop.org/
 provides=(
-  ${pkgname%-git}=$_pkgver
-  ${pkgname%-git}-nouveau1
+  $pkgbase=$_pkgver
+  $pkgbase-nouveau1
 )
 conflicts=(
-  ${pkgname%-git}
-  ${pkgname%-git}-new
-  ${pkgname%-git}-nouveau
-  ${pkgname%-git}-nouveau1
-  ${pkgname%-git}-old
+  $pkgbase
+  $pkgbase-new
+  $pkgbase-nouveau
+  $pkgbase-nouveau1
+  $pkgbase-old
 )
 replaces=(
-  ${pkgname%-git}-new
-  ${pkgname%-git}-nouveau
-)
-source=(
-  COPYING
-)
-sha512sums=(
-  b0ca349b882a4326b19f81f22804fabdb6fb7aef31cdc7b16b0a7ae191bfbb50c7daddb2fc4e6c33f1136af06d060a273de36f6f3412ea326f16fa4309fda660
+  $pkgbase-new
+  $pkgbase-nouveau
 )
+source=COPYING
+sha512sums=b0ca349b882a4326b19f81f22804fabdb6fb7aef31cdc7b16b0a7ae191bfbb50c7daddb2fc4e6c33f1136af06d060a273de36f6f3412ea326f16fa4309fda660
 
 _gitroot=git://git.freedesktop.org/git/mesa/drm
 _gitname=drm
@@ -65,10 +56,11 @@ build() {
   msg 'GIT checkout done or server timeout'
   msg 'Starting build...'
 
-  rm -rf $srcdir}/$_gitname-build
+  rm -rf $srcdir/$_gitname-build
   git clone $srcdir/$_gitname $srcdir/$_gitname-build
   cd $srcdir/$_gitname-build
 
+  # no-pthread-stubs
   sed -i '/PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs)/d;/AC_SUBST(PTHREADSTUBS_CFLAGS)/d;/AC_SUBST(PTHREADSTUBS_LIBS)/d' \
     configure.ac
   sed -i '/	$(PTHREADSTUBS_CFLAGS) /d;s/ @PTHREADSTUBS_LIBS@//' \
@@ -82,25 +74,30 @@ build() {
   sed -i '/	$(PTHREADSTUBS_CFLAGS) /d;s/ @PTHREADSTUBS_LIBS@//' \
     radeon/Makefile.am
 
-  ./autogen.sh --prefix=/usr \
-    --enable-exynos-experimental-api \
-    --enable-intel \
-    --enable-nouveau \
-    --enable-omap-experimental-api \
-    --enable-radeon \
-    --enable-udev \
+  # man/Makefile.in is missing
+  #sed -i '#^	man/Makefile#d' configure.ac
+
+  # libtoolize --force
+  setarch $CARCH autoreconf --force --install
+  setarch $CARCH ./autogen.sh --prefix=/usr\
+    --enable-exynos-experimental-api\
+    --enable-intel\
+    --enable-nouveau\
+    --enable-omap-experimental-api\
+    --enable-radeon\
+    --enable-udev\
     --enable-vmwgfx
-  make V=0
+  setarch $CARCH make V=0
 }
 
 check() {
   cd $srcdir/$_gitname-build
-  make -k check
+  setarch $CARCH make -k check
 }
 
 package() {
   cd $srcdir/$_gitname-build
-  make DESTDIR=$pkgdir install
-  install -m755 -d $pkgdir/usr/share/licenses/${pkgname%-git}
-  install -m644 ../COPYING $pkgdir/usr/share/licenses/${pkgname%-git}
+  setarch $CARCH make DESTDIR=$pkgdir install
+  install -m755 -d $pkgdir/usr/share/licenses/$pkgbase
+  install -m644 ../COPYING $pkgdir/usr/share/licenses/$pkgbase
 }