From c20b946b4abe2aeccfdb85e54f38e65041948741 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 20 Feb 2017 12:54:14 +0100 Subject: Mesa subtree: Adapt build process for building against Mesa that gets pulled in via git subtree. --- nx-X11/extras/Mesa.patches | 1 + .../Mesa.patches/4001_CreatePixmap-AllocationHints.patch | 13 ------------- .../4002_define-USE_IEEE-macro-for-more-platforms.patch | 16 ---------------- nx-X11/extras/Mesa.patches/series | 2 -- 4 files changed, 1 insertion(+), 31 deletions(-) create mode 120000 nx-X11/extras/Mesa.patches delete mode 100644 nx-X11/extras/Mesa.patches/4001_CreatePixmap-AllocationHints.patch delete mode 100644 nx-X11/extras/Mesa.patches/4002_define-USE_IEEE-macro-for-more-platforms.patch delete mode 100644 nx-X11/extras/Mesa.patches/series (limited to 'nx-X11/extras/Mesa.patches') 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/4001_CreatePixmap-AllocationHints.patch b/nx-X11/extras/Mesa.patches/4001_CreatePixmap-AllocationHints.patch deleted file mode 100644 index f2caf2812..000000000 --- a/nx-X11/extras/Mesa.patches/4001_CreatePixmap-AllocationHints.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: Mesa/include/GL/xmesa_xf86.h -=================================================================== ---- Mesa.orig/include/GL/xmesa_xf86.h -+++ Mesa/include/GL/xmesa_xf86.h -@@ -130,7 +130,7 @@ do { \ - - /* CreatePixmap returns a PixmapPtr; so, it cannot be inside braces */ - #define XMesaCreatePixmap(__d,__b,__w,__h,__depth) \ -- (*__d->CreatePixmap)(__d, __w, __h, __depth) -+ (*__d->CreatePixmap)(__d, __w, __h, __depth, 0) - - #define XMesaFreePixmap(__d,__b) \ - (*__d->DestroyPixmap)(__b) diff --git a/nx-X11/extras/Mesa.patches/4002_define-USE_IEEE-macro-for-more-platforms.patch b/nx-X11/extras/Mesa.patches/4002_define-USE_IEEE-macro-for-more-platforms.patch deleted file mode 100644 index 7db909b91..000000000 --- a/nx-X11/extras/Mesa.patches/4002_define-USE_IEEE-macro-for-more-platforms.patch +++ /dev/null @@ -1,16 +0,0 @@ -Author: Mike Gabriel -Description: define USE_IEEE for __aarch64__ and __mc68000__, as well - -Index: Mesa/src/mesa/main/imports.h -=================================================================== ---- Mesa.orig/src/mesa/main/imports.h -+++ Mesa/src/mesa/main/imports.h -@@ -204,6 +204,8 @@ typedef union { GLfloat f; GLint i; } fi - defined(ia64) || defined(__ia64__) || \ - defined(__mips) || defined(_MIPS_ARCH) || \ - defined(__arm__) || \ -+ defined(__aarch64__) || \ -+ defined(__mc68000__) || \ - defined(__sh__) || \ - (defined(__alpha__) && (defined(__IEEE_FLOAT) || !defined(VMS))) - #define USE_IEEE 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 -- cgit v1.2.3