summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcoadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu>2014-09-10 00:25:10 -0300
committercoadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu>2014-09-10 00:25:10 -0300
commit5b1fe8d60e17695e59916bcb8d5bbf16f6fe5e29 (patch)
tree4bf03f96891e47bf61b353ee2fd130bce557578b
parent7af3112a9a2474773ad9526934657533bb94252d (diff)
downloadabslibre-5b1fe8d60e17695e59916bcb8d5bbf16f6fe5e29.tar.gz
abslibre-5b1fe8d60e17695e59916bcb8d5bbf16f6fe5e29.tar.bz2
abslibre-5b1fe8d60e17695e59916bcb8d5bbf16f6fe5e29.zip
update mesa-libcl
-rw-r--r--libre/mesa-libcl/PKGBUILD115
-rw-r--r--libre/mesa-libcl/llvm35.patch26
2 files changed, 72 insertions, 69 deletions
diff --git a/libre/mesa-libcl/PKGBUILD b/libre/mesa-libcl/PKGBUILD
index 11f7e4a35..aa4193921 100644
--- a/libre/mesa-libcl/PKGBUILD
+++ b/libre/mesa-libcl/PKGBUILD
@@ -4,85 +4,62 @@
pkgbase=mesa
_pkgname=libcl
pkgname=$pkgbase-$_pkgname
-_pkgflag=libre
pkgver=10.2.7
-pkgrel=1
+pkgrel=2
pkgdesc='Mesa 3-D OpenCL library'
-url=http://${pkgbase}3d.sourceforge.net
-license=(
- custom
-)
-arch=(
- mips64el
- x86_64
- i686
-)
-depends=(
- libclc
- $pkgbase
-)
-optdepends=(
- 'opencl-headers: headers necessary for OpenCL development'
-)
-makedepends=(
- clang
- dri2proto
- dri3proto
- glproto
- imake
- libxml2
- presentproto
- python2
-)
-provides=(
- $_pkgname-$_pkgflag
- $_pkgname
- opencl-nvidia
- opencl-nvidia-304xx
- opencl-$pkgbase
-)
-conflicts=(
- $_pkgname-$_pkgflag
- $_pkgname
- opencl-nvidia
- opencl-nvidia-304xx
- opencl-$pkgbase
-)
-replaces=(
- $_pkgname-$_pkgflag
- $_pkgname
- opencl-nvidia
- opencl-nvidia-304xx
- opencl-$pkgbase
-)
-source=(
- ftp://ftp.freedesktop.org/pub/$pkgbase/${pkgver%.0}/${pkgbase^}Lib-$pkgver.tar.bz2
-)
-sha512sums=(
- c6d346499ef9596d3b5cd0bdc0ec64b58e8170203e0c977c54b55652c8792beb471822c101461745f7228a7d15a43924211f56fc0cc989defdc1acc4ea7b8a71
-)
+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')
+source=("ftp://ftp.freedesktop.org/pub/$pkgbase/${pkgver%.0}/${pkgbase^}Lib-$pkgver.tar.bz2":w
+ "llvm35.patch")
+sha512sums=('c6d346499ef9596d3b5cd0bdc0ec64b58e8170203e0c977c54b55652c8792beb471822c101461745f7228a7d15a43924211f56fc0cc989defdc1acc4ea7b8a71'
+ 'dbf6792c94c80e067f3d1a33237ca1e28be7069a366c46b36997afab97c8a712758b07dc7f9fce0b3e20b8280d41539f02d70ee5c7e16188d8f6db9731fb6881')
+
+prepare() {
+ cd $srcdir/${pkgbase^}-$pkgver
+
+ patch -Np1 -i ../llvm35.patch
+}
build() {
cd $srcdir/${pkgbase^}-$pkgver
- autoreconf -vfi
- ./configure --prefix=/usr\
- --enable-opencl --enable-opencl-icd\
- --enable-gallium-llvm\
- --enable-r600-llvm-compiler\
- --enable-dri3\
- --with-clang-libdir=/usr/lib\
- --enable-llvm-shared-libs\
- --with-gallium-drivers=i915,nouveau,r300,r600,radeonsi,svga,swrast
+
+ autoreconf -vfi # our automake is far too new for their build system :)
+
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --enable-llvm-shared-libs \
+ --enable-opencl \
+ --with-clang-libdir=/usr/lib
+ # --enable-opencl-icd
make
+
+ # fake installation
+ mkdir $srcdir/fakeinstall
+ make DESTDIR=$srcdir/fakeinstall install
}
package() {
cd $srcdir/${pkgbase^}-$pkgver
- make -C src/gallium/targets/opencl DESTDIR=$pkgdir install
- ln -sv libMesaOpenCL.so.1.0.0 $pkgdir/usr/lib/libOpenCL.so
- ln -sv libMesaOpenCL.so.1.0.0 $pkgdir/usr/lib/libOpenCL.so.1
- ln -sv libMesaOpenCL.so.1.0.0 $pkgdir/usr/lib/libOpenCL.so.1.0.0
- install -vdm755 $pkgdir/usr/share/licenses/$pkgname
+
+ #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/
+
+ 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/mesa-libcl/llvm35.patch b/libre/mesa-libcl/llvm35.patch
new file mode 100644
index 000000000..b8dc6fe26
--- /dev/null
+++ b/libre/mesa-libcl/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
+