diff options
| author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2015-11-11 15:27:02 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-11-25 08:04:23 +0000 |
| commit | 9057678e75ec09af081b27d5935907ec955c3664 (patch) | |
| tree | c4853f3c0ba0d034b6185489ed5dbcba65ab1db2 /meta/recipes-graphics/xorg-xserver/xserver-xorg | |
| parent | 39c6dae9286f649ff02acb56d0214d9d2a3cadf7 (diff) | |
| download | openembedded-core-9057678e75ec09af081b27d5935907ec955c3664.tar.gz openembedded-core-9057678e75ec09af081b27d5935907ec955c3664.tar.bz2 openembedded-core-9057678e75ec09af081b27d5935907ec955c3664.zip | |
xserver-xorg: Upgrade 1.17.2 -> 1.18.0
* Remove glibc-guard patch: xserver no longer uses termio.h on linux
in any case.
* Remove "--enable-glx-tls": this hasn't done anything since glapi
was separated from glx
* Note that xserver no longer installs evdev configuration
(evdev and/or libinput should do it instead)
* Add patch to check for libsystemd correctly
* Add PACKAGECONFIG for libsystemd
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver/xserver-xorg')
2 files changed, 50 insertions, 31 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-use-__GLIBC__-guard-for-glibc-specific-code.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-use-__GLIBC__-guard-for-glibc-specific-code.patch deleted file mode 100644 index 21e4ed4d20..0000000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-use-__GLIBC__-guard-for-glibc-specific-code.patch +++ /dev/null @@ -1,31 +0,0 @@ -From f242740f6488a25e6ca84968b0e2319a9a3975b4 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 6 Apr 2015 20:52:50 -0700 -Subject: [PATCH] use __GLIBC__ guard for glibc specific code - -Using __linux__ is a tad bit wrong assumption since -linux != glibc - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - hw/xfree86/os-support/xf86_OSlib.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h -index eb0a338..c366ffc 100644 ---- a/hw/xfree86/os-support/xf86_OSlib.h -+++ b/hw/xfree86/os-support/xf86_OSlib.h -@@ -178,7 +178,7 @@ - #include <sys/types.h> - #include <assert.h> - --#ifdef __linux__ -+#ifdef __GLIBC__ - #include <termio.h> - #else /* __GLIBC__ */ - #include <termios.h> --- -2.1.4 - diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/configure.ac-Use-libsystemd-in-REQUIRED_LIBS-check.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/configure.ac-Use-libsystemd-in-REQUIRED_LIBS-check.patch new file mode 100644 index 0000000000..cd30999520 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/configure.ac-Use-libsystemd-in-REQUIRED_LIBS-check.patch @@ -0,0 +1,50 @@ +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 + |