diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-01-06 14:48:00 -0200 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-01-06 14:48:00 -0200 |
| commit | b55fd244d3f98bc156578f5dce0ae2870657212a (patch) | |
| tree | a8cca241faaef7460578a9e602b77f41d247452e | |
| parent | b87fe580cb6702a2a3f1f67b0225add0f2e613d0 (diff) | |
| download | abslibre-b55fd244d3f98bc156578f5dce0ae2870657212a.tar.gz abslibre-b55fd244d3f98bc156578f5dce0ae2870657212a.tar.bz2 abslibre-b55fd244d3f98bc156578f5dce0ae2870657212a.zip | |
mesa-libcl-10.0.1-2: revert GLXContextID typedef from glx.h (FS#38392 => https://bugs.archlinux.org/task/38392)
| -rw-r--r-- | libre/mesa-libcl/PKGBUILD | 19 | ||||
| -rw-r--r-- | libre/mesa-libcl/revert.remove.GLXContextID.typedef.patch | 30 |
2 files changed, 46 insertions, 3 deletions
diff --git a/libre/mesa-libcl/PKGBUILD b/libre/mesa-libcl/PKGBUILD index 232805e89..d97f31df7 100644 --- a/libre/mesa-libcl/PKGBUILD +++ b/libre/mesa-libcl/PKGBUILD @@ -5,7 +5,7 @@ _pkgname=libcl pkgname=$pkgbase-$_pkgname _pkgflag=libre pkgver=10.0.1 -pkgrel=1 +pkgrel=2 pkgdesc='Mesa 3-D OpenCL library' url=http://${pkgbase}3d.sourceforge.net license=(MIT Khronos LGPL) @@ -26,8 +26,21 @@ 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 -sha512sums=7abdc38cb5b8b09bd586e6045b1d67cb809951f467d67a95e866d49b972c0c56d6a5b8612c411580bf59759a7ce49992eaf4dcc1c16aa1d67513f16b869bdfc1 +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 +} 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 new file mode 100644 index 000000000..92232dd2d --- /dev/null +++ b/libre/mesa-libcl/revert.remove.GLXContextID.typedef.patch @@ -0,0 +1,30 @@ +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 + |