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:08:14 +0000 |
commit | a1003f5004c55b5e1cd0b8bcd5084f82b8ad73e4 (patch) | |
tree | 30a377e4509ae94197ff65dfcfee189128df5c9a /meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | |
parent | a336b8a93af227a70675a14051caf6eb50cea8e7 (diff) | |
download | poky-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/recipes-graphics/xorg-xserver/xserver-xorg.inc')
-rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 4 |
1 files changed, 3 insertions, 1 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 | ||
127 | PACKAGECONFIG ??= "dri2 udev ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri glx', '', d)} \ | 127 | PACKAGECONFIG ??= "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 | ||
131 | PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev" | 132 | PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev" |
@@ -133,11 +134,12 @@ PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,glproto virtual/mesa xf86dripro | |||
133 | PACKAGECONFIG[dri2] = "--enable-dri2,--disable-dri2,dri2proto" | 134 | PACKAGECONFIG[dri2] = "--enable-dri2,--disable-dri2,dri2proto" |
134 | # DRI3 requires xshmfence to also be enabled | 135 | # DRI3 requires xshmfence to also be enabled |
135 | PACKAGECONFIG[dri3] = "--enable-dri3,--disable-dri3,dri3proto" | 136 | PACKAGECONFIG[dri3] = "--enable-dri3,--disable-dri3,dri3proto" |
136 | PACKAGECONFIG[glx] = "--enable-glx --enable-glx-tls,--disable-glx,glproto virtual/libgl virtual/libx11" | 137 | PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,glproto virtual/libgl virtual/libx11" |
137 | PACKAGECONFIG[unwind] = "--enable-libunwind,--disable-libunwind,libunwind" | 138 | PACKAGECONFIG[unwind] = "--enable-libunwind,--disable-libunwind,libunwind" |
138 | PACKAGECONFIG[xshmfence] = "--enable-xshmfence,--disable-xshmfence,libxshmfence" | 139 | PACKAGECONFIG[xshmfence] = "--enable-xshmfence,--disable-xshmfence,libxshmfence" |
139 | PACKAGECONFIG[xmlto] = "--with-xmlto, --without-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" | 140 | PACKAGECONFIG[xmlto] = "--with-xmlto, --without-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" |
140 | PACKAGECONFIG[systemd-logind] = "--enable-systemd-logind=yes,--enable-systemd-logind=no,dbus," | 141 | PACKAGECONFIG[systemd-logind] = "--enable-systemd-logind=yes,--enable-systemd-logind=no,dbus," |
142 | PACKAGECONFIG[systemd] = "--with-systemd-daemon,--without-systemd-daemon,systemd" | ||
141 | PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama,xineramaproto" | 143 | PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama,xineramaproto" |
142 | PACKAGECONFIG[xwayland] = "--enable-xwayland,--disable-xwayland,wayland libepoxy" | 144 | PACKAGECONFIG[xwayland] = "--enable-xwayland,--disable-xwayland,wayland libepoxy" |
143 | 145 | ||