summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libre-multilib/lib32-mesa-libcl/PKGBUILD20
-rw-r--r--libre-multilib/lib32-opencl-mesa/PKGBUILD65
-rw-r--r--libre-multilib/lib32-opencl-mesa/llvm35.patch26
-rw-r--r--libre/mesa-libcl/PKGBUILD20
4 files changed, 105 insertions, 26 deletions
diff --git a/libre-multilib/lib32-mesa-libcl/PKGBUILD b/libre-multilib/lib32-mesa-libcl/PKGBUILD
index 15f91e819..c7c9e7b24 100644
--- a/libre-multilib/lib32-mesa-libcl/PKGBUILD
+++ b/libre-multilib/lib32-mesa-libcl/PKGBUILD
@@ -5,20 +5,18 @@ pkgbase=mesa
_pkgname=libcl
pkgname=lib32-$pkgbase-$_pkgname
pkgver=10.2.7
-pkgrel=2
-pkgdesc='Mesa 3-D OpenCL library (32-bit)'
+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')
-optdepends=('opencl-headers: headers necessary for OpenCL development')
# please use libretools, install "multilib-devel" on chroot and add
# "CHROOTEXTRAPKG=(multilib-devel)" on "/etc/libretools.d/chroot.conf" file.
-makedepends=('python2' 'lib32-libxml2' 'glproto' 'dri2proto' 'dri3proto' 'presentproto'
- 'lib32-libvdpau' 'lib32-clang')
-provides=("lib32-$_pkgname-libre" "lib32-$_pkgname" 'lib32-opencl-nvidia' 'lib32-opencl-nvidia-304xx' "lib32-opencl-$pkgbase")
-conflicts=("lib32-$_pkgname-libre" "lib32-$_pkgname" 'lib32-opencl-nvidia' 'lib32-opencl-nvidia-304xx' "lib32-opencl-$pkgbase")
-replaces=("lib32-$_pkgname-libre" "lib32-$_pkgname" 'lib32-opencl-nvidia' 'lib32-opencl-nvidia-304xx' "lib32-opencl-$pkgbase")
+makedepends=('dri2proto' 'dri3proto' 'glproto' 'presentproto' 'python2')
+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"
"llvm35.patch")
sha512sums=('c6d346499ef9596d3b5cd0bdc0ec64b58e8170203e0c977c54b55652c8792beb471822c101461745f7228a7d15a43924211f56fc0cc989defdc1acc4ea7b8a71'
@@ -45,7 +43,6 @@ build() {
--enable-llvm-shared-libs \
--enable-opencl \
--with-clang-libdir=/usr/lib32
- # --enable-opencl-icd
make
# fake installation
@@ -56,11 +53,8 @@ build() {
package() {
cd $srcdir/${pkgbase^}-$pkgver
- #install -vm755 -d $pkgdir/etc
- #mv -v $srcdir/fakeinstall/etc/OpenCL $pkgdir/etc/
-
install -vm755 -d $pkgdir/usr/lib32/
- mv -v $srcdir/fakeinstall/usr/lib32/lib*OpenCL* $pkgdir/usr/lib32/
+ mv -v $srcdir/fakeinstall/usr/lib32/libOpenCL* $pkgdir/usr/lib32/
install -vm755 -d $pkgdir/usr/share/licenses/$pkgname
install -vm644 docs/COPYING $pkgdir/usr/share/licenses/$pkgname
diff --git a/libre-multilib/lib32-opencl-mesa/PKGBUILD b/libre-multilib/lib32-opencl-mesa/PKGBUILD
new file mode 100644
index 000000000..e153b3afa
--- /dev/null
+++ b/libre-multilib/lib32-opencl-mesa/PKGBUILD
@@ -0,0 +1,65 @@
+# Maintainer: André Silva <emulatorman@parabola.nu>
+# Contributor: Márcio Silva <coadde@parabola.nu>
+
+pkgbase=mesa
+_pkgname=libcl
+pkgname=lib32-opencl-$pkgbase
+pkgver=10.2.7
+pkgrel=2
+pkgdesc='OpenCL support for AMD/ATI Radeon mesa drivers (32-bit)'
+arch=('x86_64')
+url="http://${pkgbase}3d.sourceforge.net"
+license=('custom')
+depends=("opencl-$pkgbase" "lib32-$pkgbase-libgl" "lib32-$pkgbase-$_pkgname" "lib32-$pkgbase=$pkgver" 'lib32-libclc' 'lib32-clang')
+optdepends=('opencl-headers: headers necessary for OpenCL development')
+# 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')
+source=("ftp://ftp.freedesktop.org/pub/$pkgbase/${pkgver%.0}/${pkgbase^}Lib-$pkgver.tar.bz2"
+ "llvm35.patch")
+sha512sums=('c6d346499ef9596d3b5cd0bdc0ec64b58e8170203e0c977c54b55652c8792beb471822c101461745f7228a7d15a43924211f56fc0cc989defdc1acc4ea7b8a71'
+ 'dbf6792c94c80e067f3d1a33237ca1e28be7069a366c46b36997afab97c8a712758b07dc7f9fce0b3e20b8280d41539f02d70ee5c7e16188d8f6db9731fb6881')
+
+prepare() {
+ cd $srcdir/${pkgbase^}-$pkgver
+
+ patch -Np1 -i ../llvm35.patch
+}
+
+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
+
+ autoreconf -vfi # our automake is far too new for their build system :)
+
+ ./configure --prefix=/usr --libdir=/usr/lib32 --enable-32-bit \
+ --sysconfdir=/etc \
+ --enable-llvm-shared-libs \
+ --enable-opencl-icd \
+ --with-clang-libdir=/usr/lib32
+ make
+
+ # fake installation
+ mkdir $srcdir/fakeinstall
+ make DESTDIR=$srcdir/fakeinstall install
+}
+
+package() {
+ cd $srcdir/${pkgbase^}-$pkgver
+
+ install -vm755 -d $pkgdir/etc
+ mv -v $srcdir/fakeinstall/etc/OpenCL $pkgdir/etc/
+
+ install -vm755 -d $pkgdir/usr/lib32/
+ mv -v $srcdir/fakeinstall/usr/lib32/lib*OpenCL* $pkgdir/usr/lib32/
+
+ install -vm755 -d $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
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre-multilib/lib32-opencl-mesa/llvm35.patch b/libre-multilib/lib32-opencl-mesa/llvm35.patch
new file mode 100644
index 000000000..b8dc6fe26
--- /dev/null
+++ b/libre-multilib/lib32-opencl-mesa/llvm35.patch
@@ -0,0 +1,26 @@
+From 564821c917f4a9d5a0de2ee77b90b0cd85e3d3a6 Mon Sep 17 00:00:00 2001
+From: Aaron Watry <awatry@gmail.com>
+Date: Fri, 20 Jun 2014 19:13:30 -0500
+Subject: gallivm: Fix build after LLVM commit 211259
+
+Signed-off-by: Aaron Watry <awatry@gmail.com>
+Reviewed-by: Tom Stellard <thomas.stellard@amd.com>
+
+diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
+index df26883..413a0c2 100644
+--- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
++++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
+@@ -51,7 +51,9 @@
+ #include <llvm/MC/MCInstPrinter.h>
+ #include <llvm/MC/MCRegisterInfo.h>
+
+-#if HAVE_LLVM >= 0x0303
++#if HAVE_LLVM >= 0x0305
++#define OwningPtr std::unique_ptr
++#elif HAVE_LLVM >= 0x0303
+ #include <llvm/ADT/OwningPtr.h>
+ #endif
+
+--
+cgit v0.10.2
+
diff --git a/libre/mesa-libcl/PKGBUILD b/libre/mesa-libcl/PKGBUILD
index 81f5560bd..e8f24759d 100644
--- a/libre/mesa-libcl/PKGBUILD
+++ b/libre/mesa-libcl/PKGBUILD
@@ -5,20 +5,18 @@ pkgbase=mesa
_pkgname=libcl
pkgname=$pkgbase-$_pkgname
pkgver=10.2.7
-pkgrel=2
-pkgdesc='Mesa 3-D OpenCL library'
+pkgrel=3
+pkgdesc='Mesa 3-D OpenCL library and ICD loader'
arch=('i686' 'x86_64' 'mips64el')
url="http://${pkgbase}3d.sourceforge.net"
license=('custom')
depends=("$pkgbase=$pkgver" 'libclc' 'clang')
-optdepends=('opencl-headers: headers necessary for OpenCL development')
-makedepends=('python2' 'libxml2' 'glproto' 'dri2proto' 'dri3proto' 'presentproto'
- 'libvdpau' 'clang')
-provides=("$_pkgname-libre" "$_pkgname" 'opencl-nvidia' 'opencl-nvidia-304xx' 'opencl-$pkgbase')
-conflicts=("$_pkgname-libre" "$_pkgname" 'opencl-nvidia' 'opencl-nvidia-304xx' 'opencl-$pkgbase')
-replaces=("$_pkgname-libre" "$_pkgname" 'opencl-nvidia' 'opencl-nvidia-304xx' 'opencl-$pkgbase')
+makedepends=('dri2proto' 'dri3proto' 'glproto' 'presentproto' 'python2')
+provides=("$_pkgname")
+conflicts=("$_pkgname" "$_pkgname-libre" 'opencl-nvidia' 'opencl-nvidia-304xx')
+replaces=("$_pkgname" "$_pkgname-libre" 'opencl-nvidia' 'opencl-nvidia-304xx')
source=("ftp://ftp.freedesktop.org/pub/$pkgbase/${pkgver%.0}/${pkgbase^}Lib-$pkgver.tar.bz2"
"llvm35.patch")
sha512sums=('c6d346499ef9596d3b5cd0bdc0ec64b58e8170203e0c977c54b55652c8792beb471822c101461745f7228a7d15a43924211f56fc0cc989defdc1acc4ea7b8a71'
@@ -40,7 +38,6 @@ build() {
--enable-llvm-shared-libs \
--enable-opencl \
--with-clang-libdir=/usr/lib
- # --enable-opencl-icd
make
# fake installation
@@ -51,11 +48,8 @@ build() {
package() {
cd $srcdir/${pkgbase^}-$pkgver
- #install -vm755 -d $pkgdir/etc
- #mv -v $srcdir/fakeinstall/etc/OpenCL $pkgdir/etc/
-
install -vm755 -d $pkgdir/usr/lib/
- mv -v $srcdir/fakeinstall/usr/lib/lib*OpenCL* $pkgdir/usr/lib/
+ mv -v $srcdir/fakeinstall/usr/lib/libOpenCL* $pkgdir/usr/lib/
install -vm755 -d $pkgdir/usr/share/licenses/$pkgname
install -vm644 docs/COPYING $pkgdir/usr/share/licenses/$pkgname
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-02 07:58:52 +0000