recipes-graphics: add x11 to REQUIRED_DISTRO_FEATURES

They can't be built withou x11 in DISTRO_FEATURES.

(From OE-Core rev: 908f6f2ded18d5301f428e685bface60335bd791)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Robert Yang 2015-05-10 19:30:03 -07:00 committed by Richard Purdie
parent f609f7aba7
commit b741051080
8 changed files with 32 additions and 8 deletions

View File

@ -11,6 +11,9 @@ SRCREV="7422de5b4be7b19d789136b3bb5f932de42db27c"
S = "${WORKDIR}/git"
inherit autotools pkgconfig
inherit autotools pkgconfig distro_features_check
# The virtual/libx11 requires x11 in DISTRO_FEATURES
REQUIRED_DISTRO_FEATURES = "x11"
DEPENDS = "util-macros virtual/egl virtual/libx11"

View File

@ -17,4 +17,7 @@ SRC_URI = "git://git.yoctoproject.org/${BPN}"
S = "${WORKDIR}/git"
inherit autotools pkgconfig gettext
inherit autotools pkgconfig gettext distro_features_check
# The libxtst requires x11 in DISTRO_FEATURES
REQUIRED_DISTRO_FEATURES = "x11"

View File

@ -7,12 +7,15 @@ SRC_URI = "http://people.freedesktop.org/~chadversary/waffle/files/release/${BPN
SRC_URI[md5sum] = "5020ecc249096c881e1f59ee961f3d41"
SRC_URI[sha256sum] = "340ee04172dba878249469018cd7ec9d1ecd41af26b612c741b8b52e713bca8e"
inherit cmake
inherit cmake distro_features_check
# This should be overridden per-machine to reflect the capabilities of the GL
# stack.
PACKAGECONFIG ??= "glx"
# libx11 requires x11 in DISTRO_FEATURES.
REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'glx', 'x11', '', d)}"
# I say virtual/libgl, actually wants gl.pc
PACKAGECONFIG[glx] = "-Dwaffle_has_glx=1,,virtual/libgl libx11"

View File

@ -10,10 +10,14 @@ RDEPENDS_${PN} = "encodings font-util font-alias"
XORG_PN = "${BPN}"
INC_PR = "r2"
SRC_URI = "${XORG_MIRROR}/individual/font/${XORG_PN}-${PV}.tar.bz2"
S = "${WORKDIR}/${XORG_PN}-${PV}"
inherit autotools pkgconfig
inherit autotools pkgconfig distro_features_check
# The mkfontscale-native requires x11 in DISTRO_FEATURES
REQUIRED_DISTRO_FEATURES = "x11"
EXTRA_OEMAKE += "FCCACHE=/bin/true UTIL_DIR=${STAGING_DIR_TARGET}\$\(MAPFILES_PATH\)"

View File

@ -13,7 +13,10 @@ SRC_URI = "file://misc"
PE = "1"
PR = "r2"
inherit allarch
inherit allarch distro_features_check
# The font-alias requires x11 in DISTRO_FEATURES
REQUIRED_DISTRO_FEATURES = "x11"
S = "${WORKDIR}/misc"

View File

@ -20,7 +20,10 @@ PACKAGES_DYNAMIC = "^libxcb-.*"
FILES_${PN} = "${libdir}/libxcb.so.*"
inherit autotools pkgconfig pythonnative
inherit autotools pkgconfig pythonnative distro_features_check
# The libxau and others requires x11 in DISTRO_FEATURES
REQUIRED_DISTRO_FEATURES = "x11"
python populate_packages_prepend () {
do_split_packages(d, '${libdir}', '^libxcb-(.*)\.so\..*$', 'libxcb-%s', 'XCB library module for %s', allow_links=True)

View File

@ -18,4 +18,6 @@ DEPENDS += "gperf-native"
SRC_URI = "http://xcb.freedesktop.org/dist/${BPN}-${PV}.tar.bz2"
inherit autotools pkgconfig
inherit autotools pkgconfig distro_features_check
REQUIRED_DISTRO_FEATURES = "x11"

View File

@ -11,4 +11,7 @@ SRC_URI = "git://git.yoctoproject.org/test-xvideo"
S = "${WORKDIR}/git"
inherit autotools
inherit autotools distro_features_check
# The libxv requires x11 in DISTRO_FEATURES
REQUIRED_DISTRO_FEATURES = "x11"