diff options
| -rw-r--r-- | user/glew/APKBUILD | 11 | ||||
| -rw-r--r-- | user/glew/mesa-compat.patch | 53 | ||||
| -rw-r--r-- | user/mesa-demos/APKBUILD | 2 | ||||
| -rw-r--r-- | user/trigger-rally/APKBUILD | 2 |
4 files changed, 6 insertions, 62 deletions
diff --git a/user/glew/APKBUILD b/user/glew/APKBUILD index e5f6c1b18..374a8d512 100644 --- a/user/glew/APKBUILD +++ b/user/glew/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Carlo Landmeter # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=glew -pkgver=2.1.0 -pkgrel=2 +pkgver=2.2.0 +pkgrel=0 pkgdesc="Cross-platform C/C++ extension loading library" url="http://glew.sourceforge.net" arch="all" @@ -12,9 +12,7 @@ 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 - mesa-compat.patch - " +source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tgz" prepare() { default_prepare @@ -30,5 +28,4 @@ package() { install -D -m644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } -sha512sums="9a9b4d81482ccaac4b476c34ed537585ae754a82ebb51c3efa16d953c25cc3931be46ed2e49e79c730cd8afc6a1b78c97d52cd714044a339c3bc29734cd4d2ab glew-2.1.0.tgz -6598a3d8263b8e49ca45cea00fed6b6921b6e75ff120d7f4f86b6e181dd9c8d56d52d1664a1693cf807dda130cfebd1a9a0bf8b2edc02552c1831486378adf1a mesa-compat.patch" +sha512sums="57453646635609d54f62fb32a080b82b601fd471fcfd26e109f479b3fef6dfbc24b83f4ba62916d07d62cd06d1409ad7aa19bc1cd7cf3639c103c815b8be31d1 glew-2.2.0.tgz" diff --git a/user/glew/mesa-compat.patch b/user/glew/mesa-compat.patch deleted file mode 100644 index 14404ed30..000000000 --- a/user/glew/mesa-compat.patch +++ /dev/null @@ -1,53 +0,0 @@ -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) diff --git a/user/mesa-demos/APKBUILD b/user/mesa-demos/APKBUILD index 7a79aa829..31c298de0 100644 --- a/user/mesa-demos/APKBUILD +++ b/user/mesa-demos/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=mesa-demos pkgver=8.4.0 -pkgrel=1 +pkgrel=2 pkgdesc="Mesa demos and utils" url="https://mesa3d.org" arch="all" diff --git a/user/trigger-rally/APKBUILD b/user/trigger-rally/APKBUILD index 9e71972d1..14e56deca 100644 --- a/user/trigger-rally/APKBUILD +++ b/user/trigger-rally/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=trigger-rally pkgver=0.6.6.1 -pkgrel=0 +pkgrel=1 pkgdesc="Fast-paced rally racing game" url="http://trigger-rally.sourceforge.net/" arch="all" |