Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

1 files changed, 20 insertions, 43 deletions

diff --git a/libre/libcl-libre/PKGBUILD b/libre/libcl-libre/PKGBUILD
index a564c2ffb..425525492 100644
--- a/libre/libcl-libre/PKGBUILD
+++ b/libre/libcl-libre/PKGBUILD
@@ -1,8 +1,9 @@
 # Maintainer: Márcio Silva <coadde@lavabit.com>
 
+pkgbase=mesa
 pkgname=libcl-libre
-true && pkgver=9.0.git20120905
-true && pkgrel=1
+pkgver=9.0
+pkgrel=2
 arch=(
   i686
   x86_64
@@ -26,7 +27,7 @@ license=(
   Khronos
   LGPL
 )
-url=http://mesa3d.sourceforge.net
+url="http://${pkgbase}3d.sourceforge.net"
 depends=(
   gcc-libs
   libdrm
@@ -43,56 +44,32 @@ provides=(
 replaces=(
   ${pkgname%-libre}
 )
-pkgdesc='A libre version of OpenCL library and ICD loader, (Mesa OpenCL)'
-#source=(
-#  ftp://ftp.freedesktop.org/pub/mesa/$pkgver/MesaLib-$pkgver.tar.bz2
-#)
-#sha512sums=(
-#  b7e8879e92252d0588d9eeeed904fd502ce1f48551b9a97f52aeb1318c79a80fab27504521107d61fbb5d986b2d778d89023a892baf9f1c5a5d2ee3746fefa57
-#)
-
-_gitroot=git://anongit.freedesktop.org/git/mesa/mesa
-_gitname=mesa
+pkgdesc='Mesa OpenCL library and ICD loader'
+source=(
+  ftp://ftp.freedesktop.org/pub/$pkgbase/$pkgver/${pkgbase^}Lib-$pkgver.tar.bz2
+)
+sha512sums=(
+  878dc8e3f87aa4ad8d96599a87c733c15b725251c797cdfa6d03fee3c2959fd81a07ac7363e7a8946cf597303398aa581356b46827e7ffa27b33971d39bd29a2
+)
 
 build() {
-  msg 'Connecting to git.freedesktop.org GIT server....'
-  if [ -d $_gitname ] ; then
-    cd $_gitname && git pull origin
-  else
-    git clone $_gitroot --depth 1
-  fi
-  msg 'GIT checkout done or server timeout'
-  msg 'Starting make...'
-
-  cd $srcdir
-
-  # Cleanup and prepare the build dir
-  [ -d build ] && rm -rf build
-  cp -r $_gitname build
-  cd build
-
-  #cd $srcdir/Mesa-$pkgver
+  cd $srcdir/${pkgbase^}-$pkgver
 
   autoreconf -vfi
-  ./autogen.sh --prefix=/usr \
+  ./configure --prefix=/usr \
     --enable-opencl \
     --enable-gallium-llvm \
     --enable-r600-llvm-compiler \
     --with-clang-libdir=/usr/lib \
-    --with-dri-drivers=nouveau,radeon,swrast \
-    --with-gallium-drivers=r300,r600,nouveau,swrast
-  make
+    --with-dri-drivers=i915,i965,nouveau,r200,radeon,swrast \
+    --with-gallium-drivers=i915,nouveau,r300,r600,radeonsi,svga,swrast
+  make V=0
 }
 
 package() {
-  make -C $srcdir/build/src/gallium/targets/opencl DESTDIR=$pkgdir install
-
-  cd $srcdir/build
-  #install -m755 -d $pkgdir/usr/lib/opencl
+  cd $srcdir/${pkgbase^}-$pkgver
+  make -C src/gallium/targets/opencl DESTDIR=$pkgdir install
   install -m755 -d $pkgdir/usr/share/licenses/${pkgname%-libre}
-  #bin/minstall src/gallium/targets/opencl/libOpenCL.la $pkgdir/usr/lib
-  #bin/minstall lib/libOpenCL.so*                       $pkgdir/usr/lib
-  #bin/minstall src/gallium/targets/pipe-loader/*.so    $pkgdir/usr/lib/${pkgname%-libre}
-  bin/minstall docs/COPYING                            $pkgdir/usr/share/licenses/${pkgname%-libre}
-  bin/minstall docs/license.html                       $pkgdir/usr/share/licenses/${pkgname%-libre}
+  bin/minstall docs/COPYING      $pkgdir/usr/share/licenses/${pkgname%-libre}
+  bin/minstall docs/license.html $pkgdir/usr/share/licenses/${pkgname%-libre}
 }