Debian Codegraph @

nx-X11/extras/Mesa.patches/4005_adapt-all-libX11-include-paths-to-libNX_X11.patch

raw
1 Description: Assure that headers from libNX_X11 are always included from ${INCDIR}/nx-X11/.
2 Author: Mike Gabriel <[email protected]>
3
4 Index: Mesa/include/GL/xmesa.h
5 ===================================================================
6 --- Mesa.orig/include/GL/xmesa.h
7 +++ Mesa/include/GL/xmesa.h
8 @@ -75,8 +75,8 @@ extern "C" {
9 #ifdef XFree86Server
10 #include "xmesa_xf86.h"
11 #else
12 -#include <X11/Xlib.h>
13 -#include <X11/Xutil.h>
14 +#include <nx-X11/Xlib.h>
15 +#include <nx-X11/Xutil.h>
16 #include "xmesa_x.h"
17 #endif
18 #include "GL/gl.h"
19 Index: Mesa/src/mesa/drivers/dri/common/glcontextmodes.c
20 ===================================================================
21 --- Mesa.orig/src/mesa/drivers/dri/common/glcontextmodes.c
22 +++ Mesa/src/mesa/drivers/dri/common/glcontextmodes.c
23 @@ -39,7 +39,7 @@
24 # include "imports.h"
25 # define __glXMemset memset
26 #else
27 -# include <X11/X.h>
28 +# include <nx-X11/X.h>
29 # include <GL/glx.h>
30 # include "GL/glxint.h"
31
32 @@ -49,7 +49,7 @@
33 # define _mesa_malloc(b) malloc(b)
34 # define _mesa_free(m) free(m)
35 # else
36 -# include <X11/Xlibint.h>
37 +# include <nx-X11/Xlibint.h>
38 # define __glXMemset memset
39 # define _mesa_malloc(b) malloc(b)
40 # define _mesa_free(m) free(m)
41 Index: Mesa/src/mesa/drivers/x11/glxheader.h
42 ===================================================================
43 --- Mesa.orig/src/mesa/drivers/x11/glxheader.h
44 +++ Mesa/src/mesa/drivers/x11/glxheader.h
45 @@ -43,8 +43,8 @@
46
47 #else
48
49 -# include <X11/Xlib.h>
50 -# include <X11/Xutil.h>
51 +# include <nx-X11/Xlib.h>
52 +# include <nx-X11/Xutil.h>
53 # ifdef USE_XSHM /* was SHM */
54 # include <sys/ipc.h>
55 # include <sys/shm.h>
56 Index: Mesa/src/mesa/glapi/glthread.h
57 ===================================================================
58 --- Mesa.orig/src/mesa/glapi/glthread.h
59 +++ Mesa/src/mesa/glapi/glthread.h
60 @@ -180,7 +180,7 @@ typedef CRITICAL_SECTION _glthread_Mutex
61 * We wrap it again for GL.
62 */
63 #ifdef USE_XTHREADS
64 -#include <X11/Xthreads.h>
65 +#include <nx-X11/Xthreads.h>
66
67 typedef struct {
68 xthread_key_t key;