diff options
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver/xserver-xorg.inc')
-rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc index 269fa63048..4a5f9a6a1e 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | |||
@@ -27,7 +27,7 @@ inherit distro_features_check | |||
27 | REQUIRED_DISTRO_FEATURES = "x11" | 27 | REQUIRED_DISTRO_FEATURES = "x11" |
28 | 28 | ||
29 | PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto xproto xf86dgaproto xf86miscproto xf86vidmodeproto compositeproto recordproto resourceproto videoproto scrnsaverproto xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto presentproto" | 29 | PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto xproto xf86dgaproto xf86miscproto xf86vidmodeproto compositeproto recordproto resourceproto videoproto scrnsaverproto xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto presentproto" |
30 | LIB_DEPS = "pixman libxfont xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess" | 30 | LIB_DEPS = "pixman libxfont2 xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess" |
31 | DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} font-util" | 31 | DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} font-util" |
32 | 32 | ||
33 | # Split out some modules and extensions from the main package | 33 | # Split out some modules and extensions from the main package |
@@ -117,7 +117,9 @@ EXTRA_OECONF += "--with-fop=no \ | |||
117 | --sysconfdir=/etc/X11 \ | 117 | --sysconfdir=/etc/X11 \ |
118 | --localstatedir=/var \ | 118 | --localstatedir=/var \ |
119 | --with-xkb-output=/var/lib/xkb \ | 119 | --with-xkb-output=/var/lib/xkb \ |
120 | WAYLAND_PROTOCOLS_SYSROOT_DIR=${STAGING_DIR}/${MACHINE} \ | ||
120 | " | 121 | " |
122 | EXTRA_OECONF[vardepsexclude] = "MACHINE" | ||
121 | 123 | ||
122 | PACKAGECONFIG ??= "dri2 udev ${XORG_CRYPTO} \ | 124 | PACKAGECONFIG ??= "dri2 udev ${XORG_CRYPTO} \ |
123 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri glx', '', d)} \ | 125 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri glx', '', d)} \ |
@@ -138,7 +140,7 @@ PACKAGECONFIG[xmlto] = "--with-xmlto, --without-xmlto, xmlto-native docbook-xml- | |||
138 | PACKAGECONFIG[systemd-logind] = "--enable-systemd-logind=yes,--enable-systemd-logind=no,dbus," | 140 | PACKAGECONFIG[systemd-logind] = "--enable-systemd-logind=yes,--enable-systemd-logind=no,dbus," |
139 | PACKAGECONFIG[systemd] = "--with-systemd-daemon,--without-systemd-daemon,systemd" | 141 | PACKAGECONFIG[systemd] = "--with-systemd-daemon,--without-systemd-daemon,systemd" |
140 | PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama,xineramaproto" | 142 | PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama,xineramaproto" |
141 | PACKAGECONFIG[xwayland] = "--enable-xwayland,--disable-xwayland,wayland libepoxy" | 143 | PACKAGECONFIG[xwayland] = "--enable-xwayland,--disable-xwayland,wayland wayland-native wayland-protocols libepoxy" |
142 | 144 | ||
143 | # Xorg requires a SHA1 implementation, pick one | 145 | # Xorg requires a SHA1 implementation, pick one |
144 | XORG_CRYPTO ??= "openssl" | 146 | XORG_CRYPTO ??= "openssl" |