summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2019-05-25 07:14:23 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2019-05-25 21:13:17 +0200
commit5b6c75f5dfd3309ad59fb048fa88b88595cdb360 (patch)
treeed95381407f28700556901144c58e5e1fe36082a
parent00ca0656230043bc6833e0f5e3fb38ab79b7a9eb (diff)
downloadptxdist-5b6c75f5dfd3309ad59fb048fa88b88595cdb360.tar.gz
ptxdist-5b6c75f5dfd3309ad59fb048fa88b88595cdb360.tar.xz
xorg-server: fix building with glibc-2.28
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--patches/xorg-server-1.17.2/0002-fix-building-with-glibc-2.28.patch34
-rw-r--r--patches/xorg-server-1.17.2/series3
2 files changed, 36 insertions, 1 deletions
diff --git a/patches/xorg-server-1.17.2/0002-fix-building-with-glibc-2.28.patch b/patches/xorg-server-1.17.2/0002-fix-building-with-glibc-2.28.patch
new file mode 100644
index 000000000..3299f6fb1
--- /dev/null
+++ b/patches/xorg-server-1.17.2/0002-fix-building-with-glibc-2.28.patch
@@ -0,0 +1,34 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Fri, 24 May 2019 22:27:08 +0200
+Subject: [PATCH] fix building with glibc-2.28
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ hw/xfree86/common/xf86Xinput.c | 1 +
+ hw/xfree86/os-support/linux/lnx_init.c | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
+index 1fb5b1635e2c..24e0d3f68368 100644
+--- a/hw/xfree86/common/xf86Xinput.c
++++ b/hw/xfree86/common/xf86Xinput.c
+@@ -84,6 +84,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
++#include <sys/sysmacros.h>
+ #ifdef HAVE_SYS_MKDEV_H
+ #include <sys/mkdev.h> /* for major() & minor() on Solaris */
+ #endif
+diff --git a/hw/xfree86/os-support/linux/lnx_init.c b/hw/xfree86/os-support/linux/lnx_init.c
+index 94853070dc6a..3d89a9d117e6 100644
+--- a/hw/xfree86/os-support/linux/lnx_init.c
++++ b/hw/xfree86/os-support/linux/lnx_init.c
+@@ -37,6 +37,7 @@
+ #include "xf86_OSlib.h"
+
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
+
+ #ifndef K_OFF
+ #define K_OFF 0x4
diff --git a/patches/xorg-server-1.17.2/series b/patches/xorg-server-1.17.2/series
index 47238ab69..a3e7a5cb5 100644
--- a/patches/xorg-server-1.17.2/series
+++ b/patches/xorg-server-1.17.2/series
@@ -1,4 +1,5 @@
# generated by git-ptx-patches
#tag:base --start-number 1
0001-xf86bigfont-always-include-unistd.h.patch
-# 25545eb055796221183d2418bb8d79dc - git-ptx-patches magic
+0002-fix-building-with-glibc-2.28.patch
+# 220b45a212faa8cdb25392d7025c8b2c - git-ptx-patches magic