diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-02-20 12:54:14 +0100 |
|---|---|---|
| committer | ftrapero <frantracer@gmail.com> | 2017-06-15 14:16:38 +0200 |
| commit | c20b946b4abe2aeccfdb85e54f38e65041948741 (patch) | |
| tree | db7df26245e2ea177592f7f9cc4ecca1dea87d0a /nx-X11/extras/Mesa.patches_6.4.1/4002_no-special-glx-memfunctions.patch | |
| parent | 209657f69055b17b00c3db3f99c7f411a6e8d176 (diff) | |
| download | nx-libs-c20b946b4abe2aeccfdb85e54f38e65041948741.tar.gz nx-libs-c20b946b4abe2aeccfdb85e54f38e65041948741.tar.bz2 nx-libs-c20b946b4abe2aeccfdb85e54f38e65041948741.zip | |
Mesa subtree: Adapt build process for building against Mesa that gets pulled in via git subtree.
Diffstat (limited to 'nx-X11/extras/Mesa.patches_6.4.1/4002_no-special-glx-memfunctions.patch')
| -rw-r--r-- | nx-X11/extras/Mesa.patches_6.4.1/4002_no-special-glx-memfunctions.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/nx-X11/extras/Mesa.patches_6.4.1/4002_no-special-glx-memfunctions.patch b/nx-X11/extras/Mesa.patches_6.4.1/4002_no-special-glx-memfunctions.patch new file mode 100644 index 000000000..4f6803730 --- /dev/null +++ b/nx-X11/extras/Mesa.patches_6.4.1/4002_no-special-glx-memfunctions.patch @@ -0,0 +1,28 @@ +Description: Turn glx_ansic.h into a no-op include. (by using memset, malloc, free directly) +Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> + +Index: Mesa/src/mesa/drivers/dri/common/glcontextmodes.c +=================================================================== +--- Mesa.orig/src/mesa/drivers/dri/common/glcontextmodes.c ++++ Mesa/src/mesa/drivers/dri/common/glcontextmodes.c +@@ -48,15 +48,14 @@ + + # ifdef XFree86Server + # include "GL/glx_ansic.h" +-extern void * __glXMalloc( size_t size ); +-extern void __glXFree( void * ptr ); +-# define _mesa_malloc(b) __glXMalloc(b) +-# define _mesa_free(m) __glXFree(m) ++# define __glXMemset memset ++# define _mesa_malloc(b) malloc(b) ++# define _mesa_free(m) free(m) + # else + # include <X11/Xlibint.h> + # define __glXMemset memset +-# define _mesa_malloc(b) Xmalloc(b) +-# define _mesa_free(m) Xfree(m) ++# define _mesa_malloc(b) malloc(b) ++# define _mesa_free(m) free(m) + # endif /* XFree86Server */ + #endif /* !defined(IN_MINI_GLX) */ + |