From cd3e25625999a62fa1c10e233f371a30d03f67c8 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 3 Dec 2012 02:08:07 -0800 Subject: Mon Dec 3 02:06:13 PST 2012 --- extra/glew/PKGBUILD | 17 ++++++++++++----- extra/glew/glxew_export_fix.diff | 30 ++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 5 deletions(-) create mode 100644 extra/glew/glxew_export_fix.diff (limited to 'extra/glew') diff --git a/extra/glew/PKGBUILD b/extra/glew/PKGBUILD index bb4cde357..95d564082 100644 --- a/extra/glew/PKGBUILD +++ b/extra/glew/PKGBUILD @@ -1,20 +1,27 @@ -# $Id: PKGBUILD 169747 2012-10-27 23:41:49Z eric $ -# Maintainer: Stéphane Gaudreault +# $Id: PKGBUILD 172301 2012-12-02 09:47:22Z andyrtr $ +# Maintainer: Andreas Radke +# Contributor: Stéphane Gaudreault # Contributor: SleepyDog pkgname=glew pkgver=1.9.0 -pkgrel=1 +pkgrel=2 pkgdesc="The OpenGL Extension Wrangler Library" arch=('i686' 'x86_64') url="http://glew.sourceforge.net" license=('BSD' 'MIT' 'GPL') depends=('libxmu' 'libxi' 'glu') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tgz) -sha1sums=('9291f5c5afefd482c7f3e91ffb3cd4716c6c9ffe') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tgz + glxew_export_fix.diff) +sha1sums=('9291f5c5afefd482c7f3e91ffb3cd4716c6c9ffe' + 'f389645a1400aebdadce596fec970cfe0be6c15b') build() { cd "${srcdir}/${pkgname}-${pkgver}" + + # fix compilation for some 3rd party apps; FS#32835 + patch -Np1 -i ${srcdir}/glxew_export_fix.diff + sed -i 's|lib64|lib|' config/Makefile.linux make } diff --git a/extra/glew/glxew_export_fix.diff b/extra/glew/glxew_export_fix.diff new file mode 100644 index 000000000..8a179e0a7 --- /dev/null +++ b/extra/glew/glxew_export_fix.diff @@ -0,0 +1,30 @@ +X-Git-Url: +http://glew.git.sourceforge.net/git/gitweb.cgi?p=glew%2Fglew;a=blobdiff_plain;f=auto%2Fsrc%2Fglxew_mid.h;h=e9a3391acefafcc1b2979d2cfad1d43c602521c1;hp=cfcd20d472a790f461e01e6e20a570582452236c;hb=6d14805de58321e8a7b1881323e604bb0ba27217;hpb=38a3d857549e7ac31b7edb2a1cfa1ead52f72220 + +diff --git a/auto/src/glxew_mid.h b/auto/src/glxew_mid.h +index cfcd20d..e9a3391 100644 +--- a/auto/src/glxew_mid.h ++++ b/auto/src/glxew_mid.h +@@ -1,7 +1,7 @@ + /* ------------------------------------------------------------------------- */ + + #ifdef GLEW_MX +-#define GLXEW_FUN_EXPORT ++#define GLXEW_FUN_EXPORT GLEW_FUN_EXPORT + #define GLXEW_VAR_EXPORT + #else + #define GLXEW_FUN_EXPORT GLEW_FUN_EXPORT +Index: glew-1.8.0/include/GL/glxew.h +=================================================================== +--- glew-1.8.0.orig/include/GL/glxew.h 2012-08-08 20:56:17.574088414 +0200 ++++ glew-1.8.0/include/GL/glxew.h 2012-08-08 20:57:34.350092129 +0200 +@@ -1360,7 +1360,7 @@ + /* ------------------------------------------------------------------------- */ + + #ifdef GLEW_MX +-#define GLXEW_FUN_EXPORT ++#define GLXEW_FUN_EXPORT GLEW_FUN_EXPORT + #define GLXEW_VAR_EXPORT + #else + #define GLXEW_FUN_EXPORT GLEW_FUN_EXPORT + -- cgit v1.2.3-54-g00ecf