diff options
Diffstat (limited to 'recipes-graphics/xorg-xserver/xserver-xorg')
| -rw-r--r-- | recipes-graphics/xorg-xserver/xserver-xorg/0001-sysmacros.h-follow-changed-include-files.patch | 41 | ||||
| -rwxr-xr-x | recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch | 25 |
2 files changed, 66 insertions, 0 deletions
diff --git a/recipes-graphics/xorg-xserver/xserver-xorg/0001-sysmacros.h-follow-changed-include-files.patch b/recipes-graphics/xorg-xserver/xserver-xorg/0001-sysmacros.h-follow-changed-include-files.patch new file mode 100644 index 0000000..87a3112 --- /dev/null +++ b/recipes-graphics/xorg-xserver/xserver-xorg/0001-sysmacros.h-follow-changed-include-files.patch @@ -0,0 +1,41 @@ +From ee80095e03efcb6ff62983939c3f7c49c291f12e Mon Sep 17 00:00:00 2001 +From: Max Krummenacher <max.krummenacher@toradex.com> +Date: Wed, 19 Sep 2018 20:37:47 +0000 +Subject: [PATCH] sysmacros.h: follow changed include files + +minor/major is no longer provided by sys/types.h. +explicitely include sysmacros.h where needed. + +Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> +--- + 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 1fb5b16..4fc5a65 100644 +--- a/hw/xfree86/common/xf86Xinput.c ++++ b/hw/xfree86/common/xf86Xinput.c +@@ -82,6 +82,7 @@ + #include <stdarg.h> + #include <stdint.h> /* for int64_t */ + #include <sys/types.h> ++#include <sys/sysmacros.h> + #include <sys/stat.h> + #include <unistd.h> + #ifdef HAVE_SYS_MKDEV_H +diff --git a/hw/xfree86/os-support/linux/lnx_init.c b/hw/xfree86/os-support/linux/lnx_init.c +index 4acaf33..ceae0f1 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 +-- +2.13.6 + diff --git a/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch b/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch new file mode 100755 index 0000000..ec0eea6 --- /dev/null +++ b/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch @@ -0,0 +1,25 @@ +This is the revised version of files/macro_tweak.patch for +xorg-server 1.8.99.904 and newer. + +Upstream-Status: Pending + +Signed-off-by: Yu Ke <ke.yu@intel.com> + +diff --git a/xorg-server.m4 b/xorg-server.m4 +index bdecf62..040fdb8 100644 +--- a/xorg-server.m4 ++++ b/xorg-server.m4 +@@ -28,10 +28,12 @@ dnl + # Checks for the $1 define in xorg-server.h (from the sdk). If it + # is defined, then add $1 to $REQUIRED_MODULES. + ++m4_pattern_allow(PKG_CONFIG_SYSROOT_DIR) ++ + AC_DEFUN([XORG_DRIVER_CHECK_EXT],[ + AC_REQUIRE([PKG_PROG_PKG_CONFIG]) + SAVE_CFLAGS="$CFLAGS" +- CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`" ++ CFLAGS="$CFLAGS -I$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=sdkdir xorg-server`" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include "xorg-server.h" + #if !defined $1 |