diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-03-20 20:29:54 +0000 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-03-20 20:29:54 +0000 |
| commit | e7e7003ef7dcc228be7da348caf2951735fda062 (patch) | |
| tree | fb986a41e498cf32d59006eb8724ac2db55e5bc2 /user | |
| parent | e10b674b2c32ea171eacd8a7e2932a21f278fd8e (diff) | |
| download | packages-e7e7003ef7dcc228be7da348caf2951735fda062.tar.gz packages-e7e7003ef7dcc228be7da348caf2951735fda062.tar.bz2 packages-e7e7003ef7dcc228be7da348caf2951735fda062.tar.xz packages-e7e7003ef7dcc228be7da348caf2951735fda062.zip | |
user/glew: fix compatibility with Mesa 18.2+
Diffstat (limited to 'user')
| -rw-r--r-- | user/glew/APKBUILD | 13 | ||||
| -rw-r--r-- | user/glew/mesa-compat.patch | 53 |
2 files changed, 60 insertions, 6 deletions
diff --git a/user/glew/APKBUILD b/user/glew/APKBUILD index e9ffea707..e5f6c1b18 100644 --- a/user/glew/APKBUILD +++ b/user/glew/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=glew pkgver=2.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="Cross-platform C/C++ extension loading library" url="http://glew.sourceforge.net" arch="all" @@ -12,22 +12,23 @@ depends="" depends_dev="libxi-dev libxmu-dev mesa-dev" makedepends="$depends_dev glu-dev" subpackages="$pkgname-dev $pkgname-doc" -source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tgz" +source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tgz + mesa-compat.patch + " prepare() { - cd "$builddir" + default_prepare sed -i 's|lib64|lib|' config/Makefile.linux } build() { - cd "$builddir" make CFLAGS.EXTRA="$CFLAGS -fPIC" } package() { - cd "$builddir" make GLEW_DEST="${pkgdir}/usr" install install -D -m644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } -sha512sums="9a9b4d81482ccaac4b476c34ed537585ae754a82ebb51c3efa16d953c25cc3931be46ed2e49e79c730cd8afc6a1b78c97d52cd714044a339c3bc29734cd4d2ab glew-2.1.0.tgz" +sha512sums="9a9b4d81482ccaac4b476c34ed537585ae754a82ebb51c3efa16d953c25cc3931be46ed2e49e79c730cd8afc6a1b78c97d52cd714044a339c3bc29734cd4d2ab glew-2.1.0.tgz +6598a3d8263b8e49ca45cea00fed6b6921b6e75ff120d7f4f86b6e181dd9c8d56d52d1664a1693cf807dda130cfebd1a9a0bf8b2edc02552c1831486378adf1a mesa-compat.patch" diff --git a/user/glew/mesa-compat.patch b/user/glew/mesa-compat.patch new file mode 100644 index 000000000..14404ed30 --- /dev/null +++ b/user/glew/mesa-compat.patch @@ -0,0 +1,53 @@ +From d6c2c3b9ca52af697088f280c30fe5b27f7a694f Mon Sep 17 00:00:00 2001 +From: Deve <deveee@gmail.com> +Date: Wed, 14 Nov 2018 21:07:29 +0100 +Subject: [PATCH] Fixed compilation with current mesa versions. + +As you can see in +https://cgit.freedesktop.org/mesa/mesa/tree/include/GL/glext.h +now the file uses __gl_glext_h_ instead of __glext_h_ +It's precisely caused by commit f7d42ee7d319256608ad60778f6787c140badada +--- + auto/src/glew_head.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/auto/src/glew_head.h b/auto/src/glew_head.h +index 41e5a262..742f27f5 100644 +--- a/auto/src/glew_head.h ++++ b/auto/src/glew_head.h +@@ -14,7 +14,7 @@ + #if defined(__REGAL_H__) + #error Regal.h included before glew.h + #endif +-#if defined(__glext_h_) || defined(__GLEXT_H_) ++#if defined(__glext_h_) || defined(__GLEXT_H_) || defined(__gl_glext_h_) + #error glext.h included before glew.h + #endif + #if defined(__gl_ATI_h_) +@@ -30,6 +30,7 @@ + #define __X_GL_H + #define __glext_h_ + #define __GLEXT_H_ ++#define __gl_glext_h_ + #define __gl_ATI_h_ + + #if defined(_WIN32) +--- glew-2.1.0/include/GL/glew.h.old 2017-07-31 11:25:39.000000000 +0000 ++++ glew-2.1.0/include/GL/glew.h 2019-03-20 19:05:46.240000000 +0000 +@@ -93,7 +93,7 @@ + #if defined(__REGAL_H__) + #error Regal.h included before glew.h + #endif +-#if defined(__glext_h_) || defined(__GLEXT_H_) ++#if defined(__glext_h_) || defined(__GLEXT_H_) || defined(__gl_glext_h_) + #error glext.h included before glew.h + #endif + #if defined(__gl_ATI_h_) +@@ -109,6 +109,7 @@ + #define __X_GL_H + #define __glext_h_ + #define __GLEXT_H_ ++#define __gl_glext_h_ + #define __gl_ATI_h_ + + #if defined(_WIN32) |