aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/extras/Mesa.patches_6.4.1/4001_Fix-non-working-GLX-in-64bit-Xorg-7.0.patch
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-02-20 12:54:14 +0100
committerftrapero <frantracer@gmail.com>2017-06-15 14:16:38 +0200
commitc20b946b4abe2aeccfdb85e54f38e65041948741 (patch)
treedb7df26245e2ea177592f7f9cc4ecca1dea87d0a /nx-X11/extras/Mesa.patches_6.4.1/4001_Fix-non-working-GLX-in-64bit-Xorg-7.0.patch
parent209657f69055b17b00c3db3f99c7f411a6e8d176 (diff)
downloadnx-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/4001_Fix-non-working-GLX-in-64bit-Xorg-7.0.patch')
-rw-r--r--nx-X11/extras/Mesa.patches_6.4.1/4001_Fix-non-working-GLX-in-64bit-Xorg-7.0.patch54
1 files changed, 54 insertions, 0 deletions
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"