aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpsykose <alice@ayaya.dev>2023-02-13 13:47:57 +0000
committerpsykose <alice@ayaya.dev>2023-02-13 14:47:57 +0100
commitbf9b38070e4983dcc7f999ca7b633e68a9e12f6c (patch)
tree2523a597d3a8f292ad9f460570757a05adfc1a77
parent18563897040f7ee425b8a63cc53a588688464fd8 (diff)
community/glew: remove broken egl patch
i probably did not read this correctly and it's libopengl specific
-rw-r--r--community/glew/APKBUILD4
-rw-r--r--community/glew/egl.patch170
2 files changed, 1 insertions, 173 deletions
diff --git a/community/glew/APKBUILD b/community/glew/APKBUILD
index 3358ee39420..35cbb1dec6c 100644
--- a/community/glew/APKBUILD
+++ b/community/glew/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=glew
pkgver=2.2.0
-pkgrel=4
+pkgrel=5
pkgdesc="A cross-platform C/C++ extension loading library"
url="https://glew.sourceforge.net/"
arch="all"
@@ -12,7 +12,6 @@ depends_dev="libxmu-dev libxi-dev mesa-dev glu-dev"
makedepends="$depends_dev"
subpackages="$pkgname-dev $pkgname-tools"
source="https://downloads.sourceforge.net/glew/glew-$pkgver.tgz
- egl.patch
glew.patch
makefile.patch
"
@@ -38,7 +37,6 @@ tools() {
sha512sums="
57453646635609d54f62fb32a080b82b601fd471fcfd26e109f479b3fef6dfbc24b83f4ba62916d07d62cd06d1409ad7aa19bc1cd7cf3639c103c815b8be31d1 glew-2.2.0.tgz
-3cb6cb3f2fe2e635045d48919d6d7845ec4082202c2b30e2e3bf32bc8b68c3a6d6bbf05f07bf152e2bee20a6d3ea9ec9a03b4f4d3046e0d098f501bb3e6b7fa6 egl.patch
ceee2d21ce0f4f6cd4b8d9e524440a30c31cd2aa4fa206f2a8081c49d10db5779979bfb15087218d6f290faed9a4ed01e3d26c6a88768fe3ed66f8b171ae2b34 glew.patch
ee51ed18be51d722d0f159b376af29e0da66dca491726d1d2ed5fbfc08a4f173fbb3926cbb915be97fceb872be4dbe5f32e94defab3f70f27b30ed3b0afda343 makefile.patch
"
diff --git a/community/glew/egl.patch b/community/glew/egl.patch
deleted file mode 100644
index 0ce5ffd2ee3..00000000000
--- a/community/glew/egl.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-Patch-Source: https://github.com/archlinux/svntogit-packages/blob/d49529f0636cd084a87ef9140b0e738ff6eb4298/trunk/egl+glx.patch
---
---- a/src/glew.c
-+++ b/src/glew.c
-@@ -36,11 +36,13 @@
- # include GLEW_INCLUDE
- #endif
-
-+#if defined(GLEW_EGL)
-+# include <GL/eglew.h>
-+#endif
-+
- #if defined(GLEW_OSMESA)
- # define GLAPI extern
- # include <GL/osmesa.h>
--#elif defined(GLEW_EGL)
--# include <GL/eglew.h>
- #elif defined(_WIN32)
- /*
- * If NOGDI is defined, wingdi.h won't be included by windows.h, and thus
-@@ -57,8 +59,7 @@
-
- #include <stddef.h> /* For size_t */
-
--#if defined(GLEW_EGL)
--#elif defined(GLEW_REGAL)
-+#if defined(GLEW_REGAL)
-
- /* In GLEW_REGAL mode we call direcly into the linked
- libRegal.so glGetProcAddressREGAL for looking up
-@@ -159,23 +160,37 @@
- * Define glewGetProcAddress.
- */
- #if defined(GLEW_REGAL)
--# define glewGetProcAddress(name) regalGetProcAddress((const GLchar *)name)
-+# define _glewGetProcAddress(name) regalGetProcAddress((const GLchar *)name)
- #elif defined(GLEW_OSMESA)
--# define glewGetProcAddress(name) OSMesaGetProcAddress((const char *)name)
--#elif defined(GLEW_EGL)
--# define glewGetProcAddress(name) eglGetProcAddress((const char *)name)
-+# define _glewGetProcAddress(name) OSMesaGetProcAddress((const char *)name)
- #elif defined(_WIN32)
--# define glewGetProcAddress(name) wglGetProcAddress((LPCSTR)name)
-+# define _glewGetProcAddress(name) wglGetProcAddress((LPCSTR)name)
- #elif defined(__APPLE__) && !defined(GLEW_APPLE_GLX)
--# define glewGetProcAddress(name) NSGLGetProcAddress(name)
-+# define _glewGetProcAddress(name) NSGLGetProcAddress(name)
- #elif defined(__sgi) || defined(__sun) || defined(__HAIKU__)
--# define glewGetProcAddress(name) dlGetProcAddress(name)
-+# define _glewGetProcAddress(name) dlGetProcAddress(name)
- #elif defined(__ANDROID__)
--# define glewGetProcAddress(name) NULL /* TODO */
-+# define _glewGetProcAddress(name) NULL /* TODO */
- #elif defined(__native_client__)
--# define glewGetProcAddress(name) NULL /* TODO */
-+# define _glewGetProcAddress(name) NULL /* TODO */
- #else /* __linux */
--# define glewGetProcAddress(name) (*glXGetProcAddressARB)(name)
-+# define _glewGetProcAddress(name) (*glXGetProcAddressARB)(name)
-+#endif
-+
-+#if defined(GLEW_EGL)
-+static GLboolean _EGL_available = GL_FALSE;
-+static void (*glewGetProcAddress (const GLubyte *name)) (void)
-+{
-+ void (*addr)(void);
-+ if (_EGL_available)
-+ {
-+ addr = eglGetProcAddress((const char *)name);
-+ if (addr) return addr;
-+ }
-+ return _glewGetProcAddress(name);
-+}
-+#else
-+# define glewGetProcAddress(name) _glewGetProcAddress(name)
- #endif
-
- /*
-@@ -19297,9 +19312,7 @@
- }
-
-
--#if defined(GLEW_OSMESA)
--
--#elif defined(GLEW_EGL)
-+#if defined(GLEW_EGL)
-
- PFNEGLCHOOSECONFIGPROC __eglewChooseConfig = NULL;
- PFNEGLCOPYBUFFERSPROC __eglewCopyBuffers = NULL;
-@@ -20490,8 +20503,8 @@
- PFNEGLQUERYSTRINGPROC queryString = NULL;
-
- /* Load necessary entry points */
-- initialize = (PFNEGLINITIALIZEPROC) glewGetProcAddress("eglInitialize");
-- queryString = (PFNEGLQUERYSTRINGPROC) glewGetProcAddress("eglQueryString");
-+ initialize = (PFNEGLINITIALIZEPROC) eglGetProcAddress("eglInitialize");
-+ queryString = (PFNEGLQUERYSTRINGPROC) eglGetProcAddress("eglQueryString");
- if (!initialize || !queryString)
- return 1;
-
-@@ -21029,7 +21042,9 @@
- return GLEW_OK;
- }
-
--#elif defined(_WIN32)
-+#endif
-+
-+#if defined(_WIN32)
-
- PFNWGLSETSTEREOEMITTERSTATE3DLPROC __wglewSetStereoEmitterState3DL = NULL;
-
-@@ -23105,13 +23120,26 @@
- GLenum r;
- #if defined(GLEW_EGL)
- PFNEGLGETCURRENTDISPLAYPROC getCurrentDisplay = NULL;
-+ EGLDisplay display;
- #endif
- r = glewContextInit();
- if ( r != 0 ) return r;
- #if defined(GLEW_EGL)
-- getCurrentDisplay = (PFNEGLGETCURRENTDISPLAYPROC) glewGetProcAddress("eglGetCurrentDisplay");
-- return eglewInit(getCurrentDisplay());
--#elif defined(GLEW_OSMESA) || defined(__ANDROID__) || defined(__native_client__) || defined(__HAIKU__)
-+ getCurrentDisplay = (PFNEGLGETCURRENTDISPLAYPROC) eglGetProcAddress("eglGetCurrentDisplay");
-+ if (getCurrentDisplay)
-+ display = getCurrentDisplay();
-+ else
-+ display = EGL_NO_DISPLAY;
-+ if (display != EGL_NO_DISPLAY)
-+ {
-+ r = eglewInit(display);
-+ if ( r == 0 ) {
-+ _EGL_available = GL_TRUE;
-+ return r;
-+ }
-+ }
-+#endif
-+#if defined(GLEW_OSMESA) || defined(__ANDROID__) || defined(__native_client__) || defined(__HAIKU__)
- return r;
- #elif defined(_WIN32)
- return wglewInit();
-@@ -29785,7 +29813,7 @@
- return ret;
- }
-
--#if defined(_WIN32) && !defined(GLEW_EGL) && !defined(GLEW_OSMESA)
-+#if defined(_WIN32) && !defined(GLEW_OSMESA)
-
- GLboolean GLEWAPIENTRY wglewIsSupported (const char* name)
- {
-@@ -30228,7 +30256,7 @@
- return ret;
- }
-
--#elif !defined(GLEW_OSMESA) && !defined(GLEW_EGL) && !defined(__ANDROID__) && !defined(__native_client__) && !defined(__HAIKU__) && !defined(__APPLE__) || defined(GLEW_APPLE_GLX)
-+#elif !defined(GLEW_OSMESA) && !defined(__ANDROID__) && !defined(__native_client__) && !defined(__HAIKU__) && !defined(__APPLE__) || defined(GLEW_APPLE_GLX)
-
- GLboolean glxewIsSupported (const char* name)
- {
-@@ -30805,7 +30833,9 @@
- return ret;
- }
-
--#elif defined(GLEW_EGL)
-+#endif
-+
-+#if defined(GLEW_EGL)
-
- GLboolean eglewIsSupported (const char* name)
- {