diff options
Diffstat (limited to 'nx-X11/extras')
| l--------- | nx-X11/extras/Mesa.patches | 1 | ||||
| -rw-r--r-- | nx-X11/extras/Mesa.patches/series | 2 | ||||
| -rw-r--r-- | nx-X11/extras/Mesa.patches_6.4.1/4001_Fix-non-working-GLX-in-64bit-Xorg-7.0.patch | 54 | ||||
| -rw-r--r-- | nx-X11/extras/Mesa.patches_6.4.1/4002_no-special-glx-memfunctions.patch | 28 | ||||
| -rw-r--r-- | nx-X11/extras/Mesa.patches_6.4.1/4003_CreatePixmap-AllocationHints.patch (renamed from nx-X11/extras/Mesa.patches/4001_CreatePixmap-AllocationHints.patch) | 0 | ||||
| -rw-r--r-- | nx-X11/extras/Mesa.patches_6.4.1/4004_define-USE_IEEE-macro-for-more-platforms.patch (renamed from nx-X11/extras/Mesa.patches/4002_define-USE_IEEE-macro-for-more-platforms.patch) | 0 | ||||
| -rw-r--r-- | nx-X11/extras/Mesa.patches_6.4.1/series | 4 |
7 files changed, 87 insertions, 2 deletions
diff --git a/nx-X11/extras/Mesa.patches b/nx-X11/extras/Mesa.patches new file mode 120000 index 000000000..5807689b4 --- /dev/null +++ b/nx-X11/extras/Mesa.patches @@ -0,0 +1 @@ +Mesa.patches_6.4.1
\ No newline at end of file diff --git a/nx-X11/extras/Mesa.patches/series b/nx-X11/extras/Mesa.patches/series deleted file mode 100644 index 8dd25b553..000000000 --- a/nx-X11/extras/Mesa.patches/series +++ /dev/null @@ -1,2 +0,0 @@ -4001_CreatePixmap-AllocationHints.patch -4002_define-USE_IEEE-macro-for-more-platforms.patch diff --git a/nx-X11/extras/Mesa.patches_6.4.1/4001_Fix-non-working-GLX-in-64bit-Xorg-7.0.patch b/nx-X11/extras/Mesa.patches_6.4.1/4001_Fix-non-working-GLX-in-64bit-Xorg-7.0.patch new file mode 100644 index 000000000..c73be3643 --- /dev/null +++ b/nx-X11/extras/Mesa.patches_6.4.1/4001_Fix-non-working-GLX-in-64bit-Xorg-7.0.patch @@ -0,0 +1,54 @@ +From 44518d07398d663448d79e4f546736b40752630c Mon Sep 17 00:00:00 2001 +From: Ulrich Sibiller <uli42@gmx.de> +Date: Wed, 16 Mar 2016 14:40:08 +0100 +Subject: [PATCH] Fix non-working GLX in 64bit Xorg 7.0 + +Found the needed patch in debian bugtracker at +https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=364233 +--- + src/glx/x11/indirect_vertex_array.c | 2 +- + src/mesa/drivers/dri/common/glcontextmodes.c | 3 +++ + src/mesa/main/glheader.h | 3 +++ + 3 files changed, 7 insertions(+), 1 deletion(-) + +Index: Mesa/src/glx/x11/indirect_vertex_array.c +=================================================================== +--- Mesa.orig/src/glx/x11/indirect_vertex_array.c ++++ Mesa/src/glx/x11/indirect_vertex_array.c +@@ -530,7 +530,7 @@ static GLubyte * + emit_DrawArrays_header_old( __GLXcontext * gc, + struct array_state_vector * arrays, + size_t * elements_per_request, +- size_t * total_requests, ++ unsigned int * total_requests, + GLenum mode, GLsizei count ) + { + size_t command_size; +Index: Mesa/src/mesa/main/glheader.h +=================================================================== +--- Mesa.orig/src/mesa/main/glheader.h ++++ Mesa/src/mesa/main/glheader.h +@@ -46,6 +46,9 @@ + #ifndef GLHEADER_H + #define GLHEADER_H + ++#ifdef HAVE_DIX_CONFIG_H ++#include "dix-config.h" ++#endif + + #if defined(XFree86LOADER) && defined(IN_MODULE) + #include "xf86_ansic.h" +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 +@@ -39,6 +39,9 @@ + # include "imports.h" + # define __glXMemset memset + #else ++# if defined (HAVE_DIX_CONFIG_H) ++# include <dix-config.h> ++# endif + # include <X11/X.h> + # include <GL/glx.h> + # include "GL/glxint.h" 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) */ + diff --git a/nx-X11/extras/Mesa.patches/4001_CreatePixmap-AllocationHints.patch b/nx-X11/extras/Mesa.patches_6.4.1/4003_CreatePixmap-AllocationHints.patch index f2caf2812..f2caf2812 100644 --- a/nx-X11/extras/Mesa.patches/4001_CreatePixmap-AllocationHints.patch +++ b/nx-X11/extras/Mesa.patches_6.4.1/4003_CreatePixmap-AllocationHints.patch diff --git a/nx-X11/extras/Mesa.patches/4002_define-USE_IEEE-macro-for-more-platforms.patch b/nx-X11/extras/Mesa.patches_6.4.1/4004_define-USE_IEEE-macro-for-more-platforms.patch index 7db909b91..7db909b91 100644 --- a/nx-X11/extras/Mesa.patches/4002_define-USE_IEEE-macro-for-more-platforms.patch +++ b/nx-X11/extras/Mesa.patches_6.4.1/4004_define-USE_IEEE-macro-for-more-platforms.patch diff --git a/nx-X11/extras/Mesa.patches_6.4.1/series b/nx-X11/extras/Mesa.patches_6.4.1/series new file mode 100644 index 000000000..2d4d626b2 --- /dev/null +++ b/nx-X11/extras/Mesa.patches_6.4.1/series @@ -0,0 +1,4 @@ +4001_Fix-non-working-GLX-in-64bit-Xorg-7.0.patch +4002_no-special-glx-memfunctions.patch +4003_CreatePixmap-AllocationHints.patch +4004_define-USE_IEEE-macro-for-more-platforms.patch
\ No newline at end of file |