aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/extras/Mesa.patches
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2017-04-10 16:33:27 +0200
committerMihai Moldovan <ionic@ionic.de>2017-04-10 16:33:27 +0200
commit2d700b147a94fbb92ad9ad90b265a3bc1ceca6e3 (patch)
tree563d66344108d7b00cbf01068cd3e6a88017b0e9 /nx-X11/extras/Mesa.patches
parentcc24d8ba254f1e5062c21adfa07f8b58bb2c5eaa (diff)
parent8b5bb2cdafe5f7bd77826a1fd28f07b7329be899 (diff)
downloadnx-libs-2d700b147a94fbb92ad9ad90b265a3bc1ceca6e3.tar.gz
nx-libs-2d700b147a94fbb92ad9ad90b265a3bc1ceca6e3.tar.bz2
nx-libs-2d700b147a94fbb92ad9ad90b265a3bc1ceca6e3.zip
Merge branch 'sunweaver-pr/createpixmap-alloc-hints-abi-change' into 3.6.x
Attributes GH PR #410: https://github.com/ArcticaProject/nx-libs/pull/410
Diffstat (limited to 'nx-X11/extras/Mesa.patches')
-rw-r--r--nx-X11/extras/Mesa.patches/4001_CreatePixmap-AllocationHints.patch13
-rw-r--r--nx-X11/extras/Mesa.patches/series1
2 files changed, 14 insertions, 0 deletions
diff --git a/nx-X11/extras/Mesa.patches/4001_CreatePixmap-AllocationHints.patch b/nx-X11/extras/Mesa.patches/4001_CreatePixmap-AllocationHints.patch
new file mode 100644
index 000000000..f2caf2812
--- /dev/null
+++ b/nx-X11/extras/Mesa.patches/4001_CreatePixmap-AllocationHints.patch
@@ -0,0 +1,13 @@
+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/series b/nx-X11/extras/Mesa.patches/series
new file mode 100644
index 000000000..2ddad71d6
--- /dev/null
+++ b/nx-X11/extras/Mesa.patches/series
@@ -0,0 +1 @@
+4001_CreatePixmap-AllocationHints.patch