summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2019-08-02 21:37:12 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-08-03 23:56:01 +0100
commit4e96b138a61226902ba834479f28170fb6219257 (patch)
treead4129280744f392ae97e1051f639d08f92ceb41
parent85c295bef624ec569c6187bb44c84b75789fac8e (diff)
downloadpoky-4e96b138a61226902ba834479f28170fb6219257.tar.gz
xserver-xorg: clean up xorgproto dependencies
xorgproto is mentioned in the PACKAGECONFIG build dependencies because in the past it was many separate *proto recipes. Now they're all in one recipe, which is in DEPENDS, so we don't need to depend on it several times. (From OE-Core rev: 1c072b42525864e26d4ab17a64f925ce3803d583) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg.inc13
1 files changed, 6 insertions, 7 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 615ad6d9bd..fc05c6a76e 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -27,9 +27,8 @@ inherit autotools pkgconfig
27inherit distro_features_check 27inherit distro_features_check
28REQUIRED_DISTRO_FEATURES = "x11" 28REQUIRED_DISTRO_FEATURES = "x11"
29 29
30PROTO_DEPS = "xorgproto"
31LIB_DEPS = "pixman libxfont2 xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess" 30LIB_DEPS = "pixman libxfont2 xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess"
32DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} font-util" 31DEPENDS = "xorgproto ${LIB_DEPS} font-util"
33 32
34# Split out some modules and extensions from the main package 33# Split out some modules and extensions from the main package
35# These aren't needed for basic operations and only take up space: 34# These aren't needed for basic operations and only take up space:
@@ -128,18 +127,18 @@ PACKAGECONFIG ??= "dri2 udev ${XORG_CRYPTO} \
128" 127"
129 128
130PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev" 129PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev"
131PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,xorgproto virtual/mesa" 130PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,virtual/mesa"
132PACKAGECONFIG[dri2] = "--enable-dri2,--disable-dri2,xorgproto" 131PACKAGECONFIG[dri2] = "--enable-dri2,--disable-dri2"
133# DRI3 requires xshmfence to also be enabled 132# DRI3 requires xshmfence to also be enabled
134PACKAGECONFIG[dri3] = "--enable-dri3,--disable-dri3,xorgproto" 133PACKAGECONFIG[dri3] = "--enable-dri3,--disable-dri3"
135PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,xorgproto virtual/libgl virtual/libx11" 134PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,virtual/libgl virtual/libx11"
136PACKAGECONFIG[glamor] = "--enable-glamor,--disable-glamor,libepoxy virtual/libgbm,libegl" 135PACKAGECONFIG[glamor] = "--enable-glamor,--disable-glamor,libepoxy virtual/libgbm,libegl"
137PACKAGECONFIG[unwind] = "--enable-libunwind,--disable-libunwind,libunwind" 136PACKAGECONFIG[unwind] = "--enable-libunwind,--disable-libunwind,libunwind"
138PACKAGECONFIG[xshmfence] = "--enable-xshmfence,--disable-xshmfence,libxshmfence" 137PACKAGECONFIG[xshmfence] = "--enable-xshmfence,--disable-xshmfence,libxshmfence"
139PACKAGECONFIG[xmlto] = "--with-xmlto, --without-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" 138PACKAGECONFIG[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," 139PACKAGECONFIG[systemd-logind] = "--enable-systemd-logind=yes,--enable-systemd-logind=no,dbus,"
141PACKAGECONFIG[systemd] = "--with-systemd-daemon,--without-systemd-daemon,systemd" 140PACKAGECONFIG[systemd] = "--with-systemd-daemon,--without-systemd-daemon,systemd"
142PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama,xorgproto" 141PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama"
143PACKAGECONFIG[xwayland] = "--enable-xwayland,--disable-xwayland,wayland wayland-native wayland-protocols libepoxy" 142PACKAGECONFIG[xwayland] = "--enable-xwayland,--disable-xwayland,wayland wayland-native wayland-protocols libepoxy"
144 143
145# Xorg requires a SHA1 implementation, pick one 144# Xorg requires a SHA1 implementation, pick one