summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-01-14 16:08:48 -0200
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-01-14 16:08:48 -0200
commitd9b2c1eef677b31aa93a2b44b167767c2ef528af (patch)
tree5effba467c01a7fc823aa108dd288f5cd97fce29
parent6f54fd8c932bf4d3e886bf2a2ac658f92cda7d57 (diff)
mesa-libcl-10.0.2-1: updating version
-rw-r--r--libre/mesa-libcl/PKGBUILD21
-rw-r--r--libre/mesa-libcl/revert.remove.GLXContextID.typedef.patch30
2 files changed, 4 insertions, 47 deletions
diff --git a/libre/mesa-libcl/PKGBUILD b/libre/mesa-libcl/PKGBUILD
index d97f31df7..88c817dcd 100644
--- a/libre/mesa-libcl/PKGBUILD
+++ b/libre/mesa-libcl/PKGBUILD
@@ -4,8 +4,8 @@ pkgbase=mesa
_pkgname=libcl
pkgname=$pkgbase-$_pkgname
_pkgflag=libre
-pkgver=10.0.1
-pkgrel=2
+pkgver=10.0.2
+pkgrel=1
pkgdesc='Mesa 3-D OpenCL library'
url=http://${pkgbase}3d.sourceforge.net
license=(MIT Khronos LGPL)
@@ -26,21 +26,8 @@ makedepends=(
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)
-source=(
- ftp://ftp.freedesktop.org/pub/$pkgbase/${pkgver%.0}/${pkgbase^}Lib-$pkgver.tar.bz2
- revert.remove.GLXContextID.typedef.patch
-)
-sha512sums=(
- 7abdc38cb5b8b09bd586e6045b1d67cb809951f467d67a95e866d49b972c0c56d6a5b8612c411580bf59759a7ce49992eaf4dcc1c16aa1d67513f16b869bdfc1
- a2a92d997e1615548371ef618daf47011c7fc71d51d31dbdf47a54d56e078f98af624bde5cd7779c3d8ffb60f3b64aa8ebb5d6363cad261e52605926b47d7a35
-)
-
-prepare() {
- cd $srcdir/${pkgbase^}-$pkgver
-
- # Cherry picked from mesa branch 10.0, this fix wxgtk rebuild (FS#38392)
- patch -Np1 -i ../revert.remove.GLXContextID.typedef.patch
-}
+source=ftp://ftp.freedesktop.org/pub/$pkgbase/${pkgver%.0}/${pkgbase^}Lib-$pkgver.tar.bz2
+sha512sums=15741b916e6338645a28961fb7a731f8c2a33afe11e91c0bd144f9d9afca96837c9caf7fb2fd769aedbeba2b8b12443e7a7eb8ab6cd2270024308ca11e88ff24
build() {
cd $srcdir/${pkgbase^}-$pkgver
diff --git a/libre/mesa-libcl/revert.remove.GLXContextID.typedef.patch b/libre/mesa-libcl/revert.remove.GLXContextID.typedef.patch
deleted file mode 100644
index 92232dd2d..000000000
--- a/libre/mesa-libcl/revert.remove.GLXContextID.typedef.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 347f1493320e1bc2194c70d4d66bfe2b5883bf1e Mon Sep 17 00:00:00 2001
-From: Kenneth Graunke <kenneth@whitecape.org>
-Date: Mon, 30 Dec 2013 07:19:36 +0000
-Subject: Revert "mesa: Remove GLXContextID typedef from glx.h."
-
-This reverts commit 136a12ac98868d82c2ae9fcc80d11044a7ec56d1.
-
-According to belak51 on IRC, this commit broke Allegro, which would no
-longer compile. Applications apparently expect the GLXContextID typedef
-to exist in glx.h; removing it breaks them. A bit of searching around
-the internet revealed other complaints since upgrading to Mesa 10.
-
-Cc: "10.0" <mesa-stable@lists.freedesktop.org>
-(cherry picked from commit f425d56ba41382be04366d011536ee78a03a2f33)
----
-diff --git a/include/GL/glx.h b/include/GL/glx.h
-index 62d0ede..234abc0 100644
---- a/include/GL/glx.h
-+++ b/include/GL/glx.h
-@@ -168,6 +168,7 @@ typedef XID GLXDrawable;
- /* GLX 1.3 and later */
- typedef struct __GLXFBConfigRec *GLXFBConfig;
- typedef XID GLXFBConfigID;
-+typedef XID GLXContextID;
- typedef XID GLXWindow;
- typedef XID GLXPbuffer;
-
---
-cgit v0.9.0.2-2-gbebe
-