diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2017-09-14 07:45:45 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-09-14 07:45:45 +0200 |
| commit | 4405c6a6b85ed84d97b396530f8780ed3995079b (patch) | |
| tree | 872981566cae471fe73c1ad8b0763bebb606d835 | |
| parent | 0815fb06f1135f6f276d2d534a569e6b10b52241 (diff) | |
| parent | f9c23b51e7acfaa5f0900e4e5f7b4b5c23b572b1 (diff) | |
| download | nx-libs-4405c6a6b85ed84d97b396530f8780ed3995079b.tar.gz nx-libs-4405c6a6b85ed84d97b396530f8780ed3995079b.tar.bz2 nx-libs-4405c6a6b85ed84d97b396530f8780ed3995079b.zip | |
Merge branch 'sunweaver-pr/assure-that-Mesa-includes-headers-from-libNX_X11' into 3.6.x
Attributes GH PR #513: https://github.com/ArcticaProject/nx-libs/pull/513
| -rw-r--r-- | nx-X11/extras/Mesa.patches_6.4.2/4005_adapt-all-libX11-include-paths-to-libNX_X11.patch | 68 | ||||
| -rw-r--r-- | nx-X11/extras/Mesa.patches_6.4.2/series | 1 |
2 files changed, 69 insertions, 0 deletions
diff --git a/nx-X11/extras/Mesa.patches_6.4.2/4005_adapt-all-libX11-include-paths-to-libNX_X11.patch b/nx-X11/extras/Mesa.patches_6.4.2/4005_adapt-all-libX11-include-paths-to-libNX_X11.patch new file mode 100644 index 000000000..e5327c339 --- /dev/null +++ b/nx-X11/extras/Mesa.patches_6.4.2/4005_adapt-all-libX11-include-paths-to-libNX_X11.patch @@ -0,0 +1,68 @@ +Description: Assure that headers from libNX_X11 are always included from ${INCDIR}/nx-X11/. +Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> + +Index: Mesa/include/GL/xmesa.h +=================================================================== +--- Mesa.orig/include/GL/xmesa.h ++++ Mesa/include/GL/xmesa.h +@@ -75,8 +75,8 @@ extern "C" { + #ifdef XFree86Server + #include "xmesa_xf86.h" + #else +-#include <X11/Xlib.h> +-#include <X11/Xutil.h> ++#include <nx-X11/Xlib.h> ++#include <nx-X11/Xutil.h> + #include "xmesa_x.h" + #endif + #include "GL/gl.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,7 +39,7 @@ + # include "imports.h" + # define __glXMemset memset + #else +-# include <X11/X.h> ++# include <nx-X11/X.h> + # include <GL/glx.h> + # include "GL/glxint.h" + +@@ -49,7 +49,7 @@ + # define _mesa_malloc(b) malloc(b) + # define _mesa_free(m) free(m) + # else +-# include <X11/Xlibint.h> ++# include <nx-X11/Xlibint.h> + # define __glXMemset memset + # define _mesa_malloc(b) malloc(b) + # define _mesa_free(m) free(m) +Index: Mesa/src/mesa/drivers/x11/glxheader.h +=================================================================== +--- Mesa.orig/src/mesa/drivers/x11/glxheader.h ++++ Mesa/src/mesa/drivers/x11/glxheader.h +@@ -43,8 +43,8 @@ + + #else + +-# include <X11/Xlib.h> +-# include <X11/Xutil.h> ++# include <nx-X11/Xlib.h> ++# include <nx-X11/Xutil.h> + # ifdef USE_XSHM /* was SHM */ + # include <sys/ipc.h> + # include <sys/shm.h> +Index: Mesa/src/mesa/glapi/glthread.h +=================================================================== +--- Mesa.orig/src/mesa/glapi/glthread.h ++++ Mesa/src/mesa/glapi/glthread.h +@@ -180,7 +180,7 @@ typedef CRITICAL_SECTION _glthread_Mutex + * We wrap it again for GL. + */ + #ifdef USE_XTHREADS +-#include <X11/Xthreads.h> ++#include <nx-X11/Xthreads.h> + + typedef struct { + xthread_key_t key; diff --git a/nx-X11/extras/Mesa.patches_6.4.2/series b/nx-X11/extras/Mesa.patches_6.4.2/series index f52839991..09e99f2b5 100644 --- a/nx-X11/extras/Mesa.patches_6.4.2/series +++ b/nx-X11/extras/Mesa.patches_6.4.2/series @@ -3,3 +3,4 @@ 4003_CreatePixmap-AllocationHints.patch 4004_define-USE_IEEE-macro-for-more-platforms.patch 5001_nasty-typo-fixes.patch +4005_adapt-all-libX11-include-paths-to-libNX_X11.patch |