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

2 files changed, 51 insertions, 75 deletions

diff --git a/libre/libcl-libre/PKGBUILD b/libre/libcl-libre/PKGBUILD
deleted file mode 100644
index 425525492..000000000
--- a/libre/libcl-libre/PKGBUILD
+++ /dev/null
@@ -1,75 +0,0 @@
-# Maintainer: Márcio Silva <coadde@lavabit.com>
-
-pkgbase=mesa
-pkgname=libcl-libre
-pkgver=9.0
-pkgrel=2
-arch=(
-  i686
-  x86_64
-  mips64el
-)
-makedepends=(
-  clang
-  dri2proto
-  git
-  glproto
-  imake
-  libdrm
-  libxdamage
-  libxext
-  libxml2
-  llvm
-  python2
-)
-license=(
-  MIT
-  Khronos
-  LGPL
-)
-url="http://${pkgbase}3d.sourceforge.net"
-depends=(
-  gcc-libs
-  libdrm
-  libffi
-  libxcb
-  udev
-)
-conflicts=(
-  ${pkgname%-libre}
-)
-provides=(
-  ${pkgname%-libre}
-)
-replaces=(
-  ${pkgname%-libre}
-)
-pkgdesc='Mesa OpenCL library and ICD loader'
-source=(
-  ftp://ftp.freedesktop.org/pub/$pkgbase/$pkgver/${pkgbase^}Lib-$pkgver.tar.bz2
-)
-sha512sums=(
-  878dc8e3f87aa4ad8d96599a87c733c15b725251c797cdfa6d03fee3c2959fd81a07ac7363e7a8946cf597303398aa581356b46827e7ffa27b33971d39bd29a2
-)
-
-build() {
-  cd $srcdir/${pkgbase^}-$pkgver
-
-  autoreconf -vfi
-  ./configure --prefix=/usr \
-    --enable-opencl \
-    --enable-gallium-llvm \
-    --enable-r600-llvm-compiler \
-    --with-clang-libdir=/usr/lib \
-    --with-dri-drivers=i915,i965,nouveau,r200,radeon,swrast \
-    --with-gallium-drivers=i915,nouveau,r300,r600,radeonsi,svga,swrast
-  make V=0
-}
-
-package() {
-  cd $srcdir/${pkgbase^}-$pkgver
-  make -C src/gallium/targets/opencl DESTDIR=$pkgdir install
-  install -m755 -d $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}
-}
diff --git a/libre/mesa-libcl/PKGBUILD b/libre/mesa-libcl/PKGBUILD
new file mode 100644
index 000000000..554959013
--- /dev/null
+++ b/libre/mesa-libcl/PKGBUILD
@@ -0,0 +1,51 @@
+# Maintainer: Márcio Silva <coadde@lavabit.com>
+
+pkgbase=mesa
+_pkgname=libcl
+pkgname=$pkgbase-$_pkgname
+_pkgflag=libre
+pkgver=9.2.0
+pkgrel=1
+pkgdesc='Mesa 3-D OpenCL library'
+url=http://${pkgbase}3d.sourceforge.net
+license=(MIT Khronos LGPL)
+arch=(mips64el x86_64 i686)
+depends=(
+  libclc
+  mesa
+)
+optdepends='opencl-headers: headers necessary for OpenCL development'
+makedepends=(
+  dri2proto
+  glproto
+  imake
+  libxml2
+  python2
+)
+provides=($_pkgname-$_pkgflag $_pkgname opencl-nvidia opencl-nvidia-304xx)
+conflicts=($_pkgname-$_pkgflag $_pkgname opencl-nvidia opencl-nvidia-304xx)
+replaces=($_pkgname-$_pkgflag $_pkgname opencl-nvidia opencl-nvidia-304xx)
+options=(!libtool)
+source=ftp://ftp.freedesktop.org/pub/$pkgbase/${pkgver%.0}/${pkgbase^}Lib-$pkgver.tar.bz2
+sha512sums=26c4b41b7e1d5284b87e2997a14424c1ee0713e11fd9dd65932987832e43b96986ed5e88c06fad4616fc912ffb8e17a2314b282cbf38a2640d76c39724965910
+
+build() {
+  cd $srcdir/${pkgbase^}-$pkgver
+  autoreconf -vfi
+  ./configure --prefix=/usr\
+    --enable-opencl\
+    --enable-gallium-llvm\
+    --enable-r600-llvm-compiler\
+    --with-clang-libdir=/usr/lib\
+    --with-llvm-shared-libs\
+    --with-gallium-drivers=i915,nouveau,r300,r600,radeonsi,svga,swrast
+  make V=0
+}
+
+package() {
+  cd $srcdir/${pkgbase^}-$pkgver
+  make -C src/gallium/targets/opencl DESTDIR=$pkgdir install
+  install -vdm755 $pkgdir/usr/share/licenses/$pkgname
+  install -vm644 docs/COPYING      $pkgdir/usr/share/licenses/$pkgname
+  install -vm644 docs/license.html $pkgdir/usr/share/licenses/$pkgname/LICENSE
+}