summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2015-11-11 15:27:02 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-11-25 08:08:14 +0000
commita1003f5004c55b5e1cd0b8bcd5084f82b8ad73e4 (patch)
tree30a377e4509ae94197ff65dfcfee189128df5c9a /meta
parenta336b8a93af227a70675a14051caf6eb50cea8e7 (diff)
downloadpoky-a1003f5004c55b5e1cd0b8bcd5084f82b8ad73e4.tar.gz
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 (From OE-Core rev: 9057678e75ec09af081b27d5935907ec955c3664) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg.inc4
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-use-__GLIBC__-guard-for-glibc-specific-code.patch31
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg/configure.ac-Use-libsystemd-in-REQUIRED_LIBS-check.patch50
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg_1.18.0.bb (renamed from meta/recipes-graphics/xorg-xserver/xserver-xorg_1.17.2.bb)7
4 files changed, 56 insertions, 36 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 91df2b7ced..f512189b23 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -126,6 +126,7 @@ EXTRA_OECONF += "--with-fop=no \
126 126
127PACKAGECONFIG ??= "dri2 udev ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri glx', '', d)} \ 127PACKAGECONFIG ??= "dri2 udev ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri glx', '', d)} \
128 ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "xwayland", "", d)} \ 128 ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "xwayland", "", d)} \
129 ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "systemd", "", d)} \
129" 130"
130 131
131PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev" 132PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev"
@@ -133,11 +134,12 @@ PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,glproto virtual/mesa xf86dripro
133PACKAGECONFIG[dri2] = "--enable-dri2,--disable-dri2,dri2proto" 134PACKAGECONFIG[dri2] = "--enable-dri2,--disable-dri2,dri2proto"
134# DRI3 requires xshmfence to also be enabled 135# DRI3 requires xshmfence to also be enabled
135PACKAGECONFIG[dri3] = "--enable-dri3,--disable-dri3,dri3proto" 136PACKAGECONFIG[dri3] = "--enable-dri3,--disable-dri3,dri3proto"
136PACKAGECONFIG[glx] = "--enable-glx --enable-glx-tls,--disable-glx,glproto virtual/libgl virtual/libx11" 137PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,glproto virtual/libgl virtual/libx11"
137PACKAGECONFIG[unwind] = "--enable-libunwind,--disable-libunwind,libunwind" 138PACKAGECONFIG[unwind] = "--enable-libunwind,--disable-libunwind,libunwind"
138PACKAGECONFIG[xshmfence] = "--enable-xshmfence,--disable-xshmfence,libxshmfence" 139PACKAGECONFIG[xshmfence] = "--enable-xshmfence,--disable-xshmfence,libxshmfence"
139PACKAGECONFIG[xmlto] = "--with-xmlto, --without-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" 140PACKAGECONFIG[xmlto] = "--with-xmlto, --without-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native"
140PACKAGECONFIG[systemd-logind] = "--enable-systemd-logind=yes,--enable-systemd-logind=no,dbus," 141PACKAGECONFIG[systemd-logind] = "--enable-systemd-logind=yes,--enable-systemd-logind=no,dbus,"
142PACKAGECONFIG[systemd] = "--with-systemd-daemon,--without-systemd-daemon,systemd"
141PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama,xineramaproto" 143PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama,xineramaproto"
142PACKAGECONFIG[xwayland] = "--enable-xwayland,--disable-xwayland,wayland libepoxy" 144PACKAGECONFIG[xwayland] = "--enable-xwayland,--disable-xwayland,wayland libepoxy"
143 145
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 @@
1From f242740f6488a25e6ca84968b0e2319a9a3975b4 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 6 Apr 2015 20:52:50 -0700
4Subject: [PATCH] use __GLIBC__ guard for glibc specific code
5
6Using __linux__ is a tad bit wrong assumption since
7linux != glibc
8
9Upstream-Status: Pending
10
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12---
13 hw/xfree86/os-support/xf86_OSlib.h | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h
17index eb0a338..c366ffc 100644
18--- a/hw/xfree86/os-support/xf86_OSlib.h
19+++ b/hw/xfree86/os-support/xf86_OSlib.h
20@@ -178,7 +178,7 @@
21 #include <sys/types.h>
22 #include <assert.h>
23
24-#ifdef __linux__
25+#ifdef __GLIBC__
26 #include <termio.h>
27 #else /* __GLIBC__ */
28 #include <termios.h>
29--
302.1.4
31
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 @@
1From 0c2153d468229f56e6fef71d2f002e0cae14aa55 Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Mon, 16 Nov 2015 16:18:40 +0200
4Subject: [PATCH] configure.ac: Use libsystemd in REQUIRED_LIBS check
5
6REQUIRED_LIBS needs to be set to the correct systemd library,
7otherwise the later check will either fail or use the wrong
8pc file.
9
10Upstream-Status: Submitted [xorg-devel@lists.x.org]
11Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
12---
13 configure.ac | 13 ++++++++++---
14 1 file changed, 10 insertions(+), 3 deletions(-)
15
16diff --git a/configure.ac b/configure.ac
17index 96c0242..f63eca1 100644
18--- a/configure.ac
19+++ b/configure.ac
20@@ -837,9 +837,16 @@ AC_ARG_WITH([systemd-daemon],
21 [support systemd socket activation (default: auto)]),
22 [WITH_SYSTEMD_DAEMON=$withval], [WITH_SYSTEMD_DAEMON=auto])
23 PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd-daemon],
24- [HAVE_SYSTEMD_DAEMON=yes],
25+ [REQUIRED_SYSTEMD_DAEMON=libsystemd-daemon],
26 [PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd],
27- [HAVE_SYSTEMD_DAEMON=yes], [HAVE_SYSTEMD_DAEMON=no])])
28+ [REQUIRED_SYSTEMD_DAEMON=libsystemd],
29+ [REQUIRED_SYSTEMD_DAEMON=])])
30+if test "x$REQUIRED_SYSTEMD_DAEMON" = x; then
31+ HAVE_SYSTEMD_DAEMON=no
32+else
33+ HAVE_SYSTEMD_DAEMON=yes
34+fi
35+
36 if test "x$WITH_SYSTEMD_DAEMON" = xauto; then
37 WITH_SYSTEMD_DAEMON="$HAVE_SYSTEMD_DAEMON"
38 fi
39@@ -848,7 +855,7 @@ if test "x$WITH_SYSTEMD_DAEMON" = xyes; then
40 AC_MSG_ERROR([systemd support requested but no library has been found])
41 fi
42 AC_DEFINE(HAVE_SYSTEMD_DAEMON, 1, [Define to 1 if libsystemd-daemon is available])
43- REQUIRED_LIBS="$REQUIRED_LIBS libsystemd-daemon"
44+ REQUIRED_LIBS="$REQUIRED_LIBS $REQUIRED_SYSTEMD_DAEMON"
45 fi
46 AM_CONDITIONAL([HAVE_SYSTEMD_DAEMON], [test "x$HAVE_SYSTEMD_DAEMON" = "xyes"])
47
48--
492.1.4
50
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.17.2.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.18.0.bb
index 3039d303dc..60973c5ac9 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.17.2.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.18.0.bb
@@ -1,9 +1,8 @@
1require xserver-xorg.inc 1require xserver-xorg.inc
2 2
3SRC_URI += "file://0001-use-__GLIBC__-guard-for-glibc-specific-code.patch \ 3SRC_URI += "file://configure.ac-Use-libsystemd-in-REQUIRED_LIBS-check.patch"
4 " 4SRC_URI[md5sum] = "3c1c1057d3ad27380d8dd87ffcc182cd"
5SRC_URI[md5sum] = "397e405566651150490ff493e463f1ad" 5SRC_URI[sha256sum] = "195670819695d9cedd8dde95fbe069be0d0f488a77797a2d409f9f702daf312e"
6SRC_URI[sha256sum] = "f61120612728f2c5034671d0ca3e2273438c60aba93b3dda4a8aa40e6a257993"
7 6
8# These extensions are now integrated into the server, so declare the migration 7# These extensions are now integrated into the server, so declare the migration
9# path for in-place upgrades. 8# path for in-place upgrades.