Merge branch 'master' of ssh://projects.parabola.nu/~git/abslibre

5 files changed, 45 insertions, 24 deletions

diff --git a/libre-multilib/lib32-mesa-libcl/PKGBUILD b/libre-multilib/lib32-mesa-libcl/PKGBUILD
index 18dcc88ac..f73d748df 100644
--- a/libre-multilib/lib32-mesa-libcl/PKGBUILD
+++ b/libre-multilib/lib32-mesa-libcl/PKGBUILD
@@ -4,13 +4,13 @@
 pkgbase=mesa
 _pkgname=libcl
 pkgname=lib32-$pkgbase-$_pkgname
-pkgver=10.2.8
-pkgrel=1
+pkgver=10.3.0
+pkgrel=3
 pkgdesc='Mesa 3-D OpenCL library and ICD loader (32-bit)'
 arch=('x86_64')
 url="http://${pkgbase}3d.sourceforge.net"
 license=('custom')
-depends=("$pkgbase-$_pkgname" "lib32-$pkgbase=$pkgver" 'lib32-libclc' 'lib32-clang')
+depends=("$pkgbase-$_pkgname" "lib32-$pkgbase" 'lib32-libclc' 'lib32-clang')
 # please use libretools, install "multilib-devel" on chroot and add
 #  "CHROOTEXTRAPKG=(multilib-devel)" on "/etc/libretools.d/chroot.conf" file.
 makedepends=('dri2proto' 'dri3proto' 'glproto' 'presentproto' 'python2')
@@ -18,19 +18,26 @@ provides=("lib32-$_pkgname")
 conflicts=("lib32-$_pkgname" "lib32-$_pkgname-libre" 'lib32-opencl-nvidia' 'lib32-opencl-nvidia-304xx')
 replaces=("lib32-$_pkgname" "lib32-$_pkgname-libre" 'lib32-opencl-nvidia' 'lib32-opencl-nvidia-304xx')
 source=("ftp://ftp.freedesktop.org/pub/$pkgbase/${pkgver%.0}/${pkgbase^}Lib-$pkgver.tar.bz2")
-sha512sums=('dc0e3ece2195be22b3d0e062fd541b049aac190b5cad36dd1ccf745148d2e958cdb7c99ea5280859169ad46624aee0bedeb585bde8d93f52dd9236fec5c1250b')
+sha512sums=('c5edc62dcd953b67307cd8a10921ad3f07bd72cdb81ca69f68706a757fd6c5e439f05f546e401e0b5e6923e0decdf34f0b48dcc1d8a758508a7f8fedb734442c')
 
 build() {
   cd $srcdir/${pkgbase^}-$pkgver
 
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-  export LLVM_CONFIG=/usr/bin/llvm-config32
+  export CC='gcc -m32'
+  export CXX='g++ -m32'
+  export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
+  export LLVM_CONFIG='/usr/bin/llvm-config32'
+  if [[ $(uname -o) == GNU/Hurd ]]; then
+    export _HOST=i686-unknown-gnu
+  elif [[ $(uname -o) == GNU/Linux ]]; then
+    export _HOST=i686-unknown-linux-gnu
+  elif [[ $(uname -o) == GNU/kFreeBSD ]]; then
+    export _HOST=i686-unknown-kfreebsd-gnu
+  fi
 
   autoreconf -vfi # our automake is far too new for their build system :)
 
-  ./configure --prefix=/usr --libdir=/usr/lib32 --enable-32-bit \
+  ./configure --prefix=/usr --libdir=/usr/lib32 --host=$_HOST \
     --sysconfdir=/etc \
     --enable-llvm-shared-libs \
     --enable-opencl \
diff --git a/libre-multilib/lib32-opencl-mesa/PKGBUILD b/libre-multilib/lib32-opencl-mesa/PKGBUILD
index 110445c01..d82342193 100644
--- a/libre-multilib/lib32-opencl-mesa/PKGBUILD
+++ b/libre-multilib/lib32-opencl-mesa/PKGBUILD
@@ -4,9 +4,9 @@
 pkgbase=mesa
 _pkgname=libcl
 pkgname=lib32-opencl-$pkgbase
-pkgver=10.2.8
-pkgrel=1
-pkgdesc='OpenCL support for AMD/ATI Radeon mesa drivers (32-bit)'
+pkgver=10.3.0
+pkgrel=3
+pkgdesc='OpenCL support for mesa drivers (32-bit)'
 arch=('x86_64')
 url="http://${pkgbase}3d.sourceforge.net"
 license=('custom')
@@ -16,21 +16,34 @@ optdepends=('opencl-headers: headers necessary for OpenCL development')
 #  "CHROOTEXTRAPKG=(multilib-devel)" on "/etc/libretools.d/chroot.conf" file.
 makedepends=('dri2proto' 'dri3proto' 'glproto' 'presentproto' 'python2')
 source=("ftp://ftp.freedesktop.org/pub/$pkgbase/${pkgver%.0}/${pkgbase^}Lib-$pkgver.tar.bz2")
-sha512sums=('dc0e3ece2195be22b3d0e062fd541b049aac190b5cad36dd1ccf745148d2e958cdb7c99ea5280859169ad46624aee0bedeb585bde8d93f52dd9236fec5c1250b')
+sha512sums=('c5edc62dcd953b67307cd8a10921ad3f07bd72cdb81ca69f68706a757fd6c5e439f05f546e401e0b5e6923e0decdf34f0b48dcc1d8a758508a7f8fedb734442c')
 
 build() {
   cd $srcdir/${pkgbase^}-$pkgver
 
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-  export LLVM_CONFIG=/usr/bin/llvm-config32
+  export CC='gcc -m32'
+  export CXX='g++ -m32'
+  export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
+  export LLVM_CONFIG='/usr/bin/llvm-config32'
+  if [[ $(uname -o) == GNU/Hurd ]]; then
+    export _HOST=i686-unknown-gnu
+  elif [[ $(uname -o) == GNU/Linux ]]; then
+    export _HOST=i686-unknown-linux-gnu
+  elif [[ $(uname -o) == GNU/kFreeBSD ]]; then
+    export _HOST=i686-unknown-kfreebsd-gnu
+  fi
 
   autoreconf -vfi # our automake is far too new for their build system :)
 
-  ./configure --prefix=/usr --libdir=/usr/lib32 --enable-32-bit \
+  ./configure --prefix=/usr --libdir=/usr/lib32 --host=$_HOST \
     --sysconfdir=/etc \
+    --with-gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast \
+    --with-egl-platforms=x11,drm,wayland \
     --enable-llvm-shared-libs \
+    --enable-egl \
+    --disable-gallium-egl \
+    --disable-gallium-gbm \
+    --enable-gallium-llvm \
     --enable-opencl --enable-opencl-icd \
     --with-clang-libdir=/usr/lib32
   make
@@ -45,6 +58,7 @@ package() {
 
   install -vm755 -d $pkgdir/usr/lib32/
   mv -v $srcdir/fakeinstall/usr/lib32/lib*OpenCL* $pkgdir/usr/lib32/
+  mv -v $srcdir/fakeinstall/usr/lib32/gallium-pipe $pkgdir/usr/lib32/
 
   install -vm755 -d $pkgdir/usr/share/licenses/$pkgname
   install -vm644 docs/COPYING      $pkgdir/usr/share/licenses/$pkgname
diff --git a/libre/ath9k-htc-firmware/PKGBUILD b/libre/ath9k-htc-firmware/PKGBUILD
index 7a8113e93..18e67da95 100644
--- a/libre/ath9k-htc-firmware/PKGBUILD
+++ b/libre/ath9k-htc-firmware/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=ath9k-htc-firmware
 pkgver=1.3.2
-pkgrel=9
+pkgrel=10
 pkgdesc='Free firmware files for the Qualcomm Atheros AR7010 and AR9271 USB 802.11n NICs'
 arch=('any')
 url=('http://wireless.kernel.org/en/users/Drivers/ath9k_htc')
diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD
index 4a90c444e..e5a19b22a 100644
--- a/libre/libretools/PKGBUILD
+++ b/libre/libretools/PKGBUILD
@@ -9,10 +9,10 @@ pkgdesc="Programs for Parabola development"
 url="https://projects.parabolagnulinux.org/packages/libretools.git/"
 license=('GPL3' 'GPL2')
 
-pkgver=20141001
-_libretools_commit=42ed1183c123e9afb7fddadbbc4e62d89f82b63d
+pkgver=20141004
+_libretools_commit=c85ec87841ee34c0d3fee9d753f5094c36daaf25
 _devtools_commit=33f227ec628f30b70ee5b1412fd47564325b4b4c
-md5sums=('854a89ca27dedb4efb52a876b6827812'
+md5sums=('4af9d2b55b5f5b691c561a56affe6dec'
          'db5d0c0889a9f6e481c634d4f36eda49')
 
 _packages_url=https://projects.parabolagnulinux.org/packages
diff --git a/libre/mesa-libcl/PKGBUILD b/libre/mesa-libcl/PKGBUILD
index c4d87279e..08335d720 100644
--- a/libre/mesa-libcl/PKGBUILD
+++ b/libre/mesa-libcl/PKGBUILD
@@ -51,8 +51,8 @@ package() {
   install -vm755 -d $pkgdir/usr/lib/
   mv -v $srcdir/fakeinstall/usr/lib/libOpenCL* $pkgdir/usr/lib/
 
-  install -m755 -d ${pkgdir}/usr/lib/gallium-pipe
-  mv -v ${srcdir}/fakeinstall/usr/lib/gallium-pipe/pipe_{nouveau,r300,swrast,vmwgfx}.so ${pkgdir}/usr/lib/gallium-pipe/
+  install -vm755 -d $pkgdir/usr/lib/gallium-pipe
+  mv -v $srcdir/fakeinstall/usr/lib/gallium-pipe/pipe_{nouveau,r300,swrast,vmwgfx}.so $pkgdir/usr/lib/gallium-pipe/
 
   install -vm755 -d $pkgdir/usr/share/licenses/$pkgname
   install -vm644 docs/COPYING      $pkgdir/usr/share/licenses/$pkgname