diff options
Diffstat (limited to 'yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg')
4 files changed, 0 insertions, 123 deletions
diff --git a/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/configure.ac-Use-libsystemd-in-REQUIRED_LIBS-check.patch b/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/configure.ac-Use-libsystemd-in-REQUIRED_LIBS-check.patch deleted file mode 100644 index cd3099952..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/configure.ac-Use-libsystemd-in-REQUIRED_LIBS-check.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 0c2153d468229f56e6fef71d2f002e0cae14aa55 Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen <jussi.kukkonen@intel.com> -Date: Mon, 16 Nov 2015 16:18:40 +0200 -Subject: [PATCH] configure.ac: Use libsystemd in REQUIRED_LIBS check - -REQUIRED_LIBS needs to be set to the correct systemd library, -otherwise the later check will either fail or use the wrong -pc file. - -Upstream-Status: Submitted [xorg-devel@lists.x.org] -Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> ---- - configure.ac | 13 ++++++++++--- - 1 file changed, 10 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 96c0242..f63eca1 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -837,9 +837,16 @@ AC_ARG_WITH([systemd-daemon], - [support systemd socket activation (default: auto)]), - [WITH_SYSTEMD_DAEMON=$withval], [WITH_SYSTEMD_DAEMON=auto]) - PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd-daemon], -- [HAVE_SYSTEMD_DAEMON=yes], -+ [REQUIRED_SYSTEMD_DAEMON=libsystemd-daemon], - [PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd], -- [HAVE_SYSTEMD_DAEMON=yes], [HAVE_SYSTEMD_DAEMON=no])]) -+ [REQUIRED_SYSTEMD_DAEMON=libsystemd], -+ [REQUIRED_SYSTEMD_DAEMON=])]) -+if test "x$REQUIRED_SYSTEMD_DAEMON" = x; then -+ HAVE_SYSTEMD_DAEMON=no -+else -+ HAVE_SYSTEMD_DAEMON=yes -+fi -+ - if test "x$WITH_SYSTEMD_DAEMON" = xauto; then - WITH_SYSTEMD_DAEMON="$HAVE_SYSTEMD_DAEMON" - fi -@@ -848,7 +855,7 @@ if test "x$WITH_SYSTEMD_DAEMON" = xyes; then - AC_MSG_ERROR([systemd support requested but no library has been found]) - fi - AC_DEFINE(HAVE_SYSTEMD_DAEMON, 1, [Define to 1 if libsystemd-daemon is available]) -- REQUIRED_LIBS="$REQUIRED_LIBS libsystemd-daemon" -+ REQUIRED_LIBS="$REQUIRED_LIBS $REQUIRED_SYSTEMD_DAEMON" - fi - AM_CONDITIONAL([HAVE_SYSTEMD_DAEMON], [test "x$HAVE_SYSTEMD_DAEMON" = "xyes"]) - --- -2.1.4 - diff --git a/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch b/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch deleted file mode 100644 index ec0eea6ca..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch +++ /dev/null @@ -1,25 +0,0 @@ -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 diff --git a/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/modesetting_libdrm_requirements.patch b/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/modesetting_libdrm_requirements.patch deleted file mode 100644 index 5f186cb84..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/modesetting_libdrm_requirements.patch +++ /dev/null @@ -1,30 +0,0 @@ -From bf23db42a4e5943129501223a47b48884cdeb62f Mon Sep 17 00:00:00 2001 -From: Adam Jackson <ajax@redhat.com> -Date: Wed, 27 Jan 2016 11:50:13 -0500 -Subject: modesetting: Require sufficiently new libdrm - -Bugzilla: https://bugs.freedesktop.org/93883 -Signed-off-by: Adam Jackson <ajax@redhat.com> -Reviewed-by: Alex Deucher <alexander.deucher@amd.com> -Reviewed-by: Julien Cristau <jcristau@debian.org> - -Upstream-Status: Backport -Signed-off-by: Johannes Pointner <johannes.pointner@gmail.com> - -diff --git a/configure.ac b/configure.ac -index ac3bb64..312fc69 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2035,8 +2035,7 @@ if test "x$XORG" = xyes; then - - if test "x$DRM" = xyes; then - dnl 2.4.46 is required for cursor hotspot support. -- PKG_CHECK_EXISTS(libdrm >= 2.4.46) -- XORG_DRIVER_MODESETTING=yes -+ PKG_CHECK_EXISTS(libdrm >= 2.4.46, XORG_DRIVER_MODESETTING=yes, XORG_DRIVER_MODESETTING=no) - fi - - AC_SUBST([XORG_LIBS]) --- -cgit v0.10.2 - diff --git a/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/musl-arm-inb-outb.patch b/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/musl-arm-inb-outb.patch deleted file mode 100644 index 4be441fb7..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/musl-arm-inb-outb.patch +++ /dev/null @@ -1,18 +0,0 @@ -inb/outb family for arm is only implemented on glibc -so assumption across linux is wrong - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Pending -Index: xorg-server-1.18.0/hw/xfree86/common/compiler.h -=================================================================== ---- xorg-server-1.18.0.orig/hw/xfree86/common/compiler.h -+++ xorg-server-1.18.0/hw/xfree86/common/compiler.h -@@ -758,7 +758,7 @@ inl(unsigned short port) - return xf86ReadMmio32Le((void *) ioBase, port); - } - --#elif defined(__arm__) && defined(__linux__) -+#elif defined(__arm__) && defined(__GLIBC__) - - /* for Linux on ARM, we use the LIBC inx/outx routines */ - /* note that the appropriate setup via "ioperm" needs to be done */ |