From a403e5766a712277897da245707daabcc415b519 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 25 Jun 2014 21:40:00 +0200 Subject: xorg-driver: add x11 to required DISTRO_FEATURES * it's not complete, but recipes depending on virtual/libx11 are easiest to spot, I've long list of PNBLACKLIST for all recipes which cannot be built in distro without x11 in DISTRO_FEATURES Signed-off-by: Martin Jansa --- meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.15.bb | 4 ++++ meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.912.bb | 4 ++++ meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb | 4 ++++ meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb | 4 ++++ meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.3.bb | 4 ++++ meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.2.bb | 4 ++++ 6 files changed, 24 insertions(+) diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.15.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.15.bb index cd8fd63b51..de6a4d8692 100644 --- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.15.bb +++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.15.bb @@ -11,6 +11,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8730ad58d11c7bbad9a7066d69f7808e" DEPENDS += "virtual/libx11 drm libpciaccess pixman" +inherit distro_features_check +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" + SRC_URI += "file://disable-dri2-tests.patch \ file://compat-api-Map-changes-of-DamageUnregister-API-in-1..patch \ " diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.912.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.912.bb index a10cd9e278..23733fdc28 100644 --- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.912.bb +++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.912.bb @@ -19,6 +19,10 @@ SRC_URI[sha256sum] = "7c8ffc492d59f34cac64093deb70717b4d9223cf416ecc6fa016ab2e8b DEPENDS += "virtual/libx11 drm libpciaccess pixman" +inherit distro_features_check +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" + PACKAGECONFIG ??= "sna udev ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri dri1 dri2', '', d)}" PACKAGECONFIG[dri] = "--enable-dri,--disable-dri" diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb b/meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb index 454d0a1fb2..3c92ae0591 100644 --- a/meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb +++ b/meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb @@ -24,6 +24,10 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=10ce5de3b111315ea652a5f74ec0c602" DEPENDS += "virtual/libx11 libdrm xf86driproto" +inherit distro_features_check +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" + SRCREV = "ae0394e687f1a77e966cf72f895da91840dffb8f" PR = "${INC_PR}.3" PV = "0.4.2+gitr${SRCPV}" diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb index 4ad25389cd..eefc6e10ff 100644 --- a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb +++ b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb @@ -9,6 +9,10 @@ LICENSE = "MIT-X & GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=63e2cbac53863f60e2f43343fb34367f" DEPENDS += "virtual/libx11" +inherit distro_features_check +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" + SRCREV = "28c006c94e57ea71df11ec4fff79d7ffcfc4860f" PR = "${INC_PR}.7" PV = "0.1.1+gitr${SRCPV}" diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.3.bb b/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.3.bb index 4052f703b8..cd17068dc7 100644 --- a/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.3.bb +++ b/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.3.bb @@ -13,6 +13,10 @@ PR = "${INC_PR}.0" DEPENDS += "virtual/libx11 randrproto libpciaccess" +inherit distro_features_check +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" + COMPATIBLE_HOST = '(i.86|x86_64).*-linux' RRECOMMENDS_${PN} += "xserver-xorg-module-libint10" diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.2.bb b/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.2.bb index 24041b5cad..619d9fe136 100644 --- a/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.2.bb +++ b/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.2.bb @@ -11,6 +11,10 @@ DEPENDS += "virtual/libx11 xineramaproto videoproto libpciaccess" SRC_URI += "file://0001-configure-fix-build-without-xatracker.patch \ file://0002-add-option-for-vmwgfx.patch" +inherit distro_features_check +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" + SRC_URI[md5sum] = "91d1d7d33181766714405ab013d31244" SRC_URI[sha256sum] = "c8ba3d2cead3620dba2cbf5defb7f1759b2b96f4fe209f4bf6976832b6763c54" -- cgit 1.2.3-korg