summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg.inc12
1 files changed, 9 insertions, 3 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 6648cd370c..f4c5469b56 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
27REQUIRED_DISTRO_FEATURES = "x11" 27REQUIRED_DISTRO_FEATURES = "x11"
28 28
29PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto xproto xf86dgaproto xf86miscproto xf86vidmodeproto compositeproto recordproto resourceproto videoproto scrnsaverproto xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto presentproto" 29PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto xproto xf86dgaproto xf86miscproto xf86vidmodeproto compositeproto recordproto resourceproto videoproto scrnsaverproto xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto presentproto"
30LIB_DEPS = "pixman libxfont xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess openssl libgcrypt" 30LIB_DEPS = "pixman libxfont xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess"
31DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} font-util" 31DEPENDS = "${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,10 +117,10 @@ 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 --with-sha1=libcrypto \
121" 120"
122 121
123PACKAGECONFIG ??= "dri2 udev ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri glx', '', d)} \ 122PACKAGECONFIG ??= "dri2 udev ${XORG_CRYPTO} \
123 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri glx', '', d)} \
124 ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "xwayland", "", d)} \ 124 ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "xwayland", "", d)} \
125 ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "systemd", "", d)} \ 125 ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "systemd", "", d)} \
126" 126"
@@ -139,6 +139,12 @@ PACKAGECONFIG[systemd] = "--with-systemd-daemon,--without-systemd-daemon,systemd
139PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama,xineramaproto" 139PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama,xineramaproto"
140PACKAGECONFIG[xwayland] = "--enable-xwayland,--disable-xwayland,wayland libepoxy" 140PACKAGECONFIG[xwayland] = "--enable-xwayland,--disable-xwayland,wayland libepoxy"
141 141
142# Xorg requires a SHA1 implementation, pick one
143XORG_CRYPTO ??= "openssl"
144PACKAGECONFIG[openssl] = "--with-sha1=libcrypto,,openssl"
145PACKAGECONFIG[nettle] = "--with-sha1=libnettle,,nettle"
146PACKAGECONFIG[gcrypt] = "--with-sha1=libgcrypt,,libgcrypt"
147
142do_install_append () { 148do_install_append () {
143 # Its assumed base-files creates this for us 149 # Its assumed base-files creates this for us
144 rmdir ${D}${localstatedir}/log/ 150 rmdir ${D}${localstatedir}/log/