aboutsummaryrefslogtreecommitdiff
path: root/debian/patches/0054_nx-X11_ppc64-ftbfs.full.patch
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-02-14 16:23:43 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-02-14 16:23:43 +0100
commit09d2732b4e299eaa06c64b7a683529e337691c59 (patch)
tree3a07c4a95980c0f34b1d3ce2f55388dd7677c685 /debian/patches/0054_nx-X11_ppc64-ftbfs.full.patch
parent8c98a401b49506f969dc9263d9bd566e5b31a572 (diff)
downloadnx-libs-09d2732b4e299eaa06c64b7a683529e337691c59.tar.gz
nx-libs-09d2732b4e299eaa06c64b7a683529e337691c59.tar.bz2
nx-libs-09d2732b4e299eaa06c64b7a683529e337691c59.zip
Patch system: Prepend a "0" to every patch file name in debian/patches/. Adapt only this changelog stanza to this modification.
Diffstat (limited to 'debian/patches/0054_nx-X11_ppc64-ftbfs.full.patch')
-rw-r--r--debian/patches/0054_nx-X11_ppc64-ftbfs.full.patch14
1 files changed, 14 insertions, 0 deletions
diff --git a/debian/patches/0054_nx-X11_ppc64-ftbfs.full.patch b/debian/patches/0054_nx-X11_ppc64-ftbfs.full.patch
new file mode 100644
index 000000000..d60426e91
--- /dev/null
+++ b/debian/patches/0054_nx-X11_ppc64-ftbfs.full.patch
@@ -0,0 +1,14 @@
+Description: Fix FTBFS on ppc64 architecture
+Author: Orion Poplawski <orion@cora.nwra.com>
+diff -up a/nx-X11/lib/GL/mesa/main/Imakefile.inc b/nx-X11/lib/GL/mesa/main/Imakefile.inc
+--- a/nx-X11/lib/GL/mesa/main/Imakefile.inc 2014-01-04 13:39:35.000000000 -0700
++++ b/nx-X11/lib/GL/mesa/main/Imakefile.inc 2014-01-24 12:04:00.085272615 -0700
+@@ -1,5 +1,8 @@
+ XCOMM $XFree86: xc/lib/GL/mesa/src/Imakefile.inc,v 1.7tsi Exp $
+
++/* gcc on ppc64 defines this, causes macro recursion with pixel below */
++#undef pixel
++
+ #ifndef MesaBuildDir
+ #define MesaBuildDir $(GLXLIBSRC)/mesa/main/
+ #endif