diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2014-06-25 21:35:17 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-01-23 11:35:26 +0000 |
| commit | 1cf0245344ce272e7330cfe1b04a0ed7bd18e8f5 (patch) | |
| tree | 3f7e52ad0dfdb203e7d121e9b08fabf73fafc3ba | |
| parent | cb093aca3b78f130dc7da820a8710342a12d1231 (diff) | |
| download | openembedded-core-contrib-1cf0245344ce272e7330cfe1b04a0ed7bd18e8f5.tar.gz | |
xorg-app: add x11 to required DISTRO_FEATURES and cleanup dependencies
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | meta/recipes-graphics/xorg-app/xeyes_1.1.1.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-graphics/xorg-app/xorg-app-common.inc | 5 | ||||
| -rw-r--r-- | meta/recipes-graphics/xorg-app/xprop_1.2.2.bb | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/meta/recipes-graphics/xorg-app/xeyes_1.1.1.bb b/meta/recipes-graphics/xorg-app/xeyes_1.1.1.bb index 96ea030be1..84d0cb8044 100644 --- a/meta/recipes-graphics/xorg-app/xeyes_1.1.1.bb +++ b/meta/recipes-graphics/xorg-app/xeyes_1.1.1.bb @@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3ea51b365051ac32d1813a7dbaa4bfc6" SRC_URI[md5sum] = "a3035dcecdbdb89e864177c080924981" SRC_URI[sha256sum] = "975e98680cd59e1f9439016386609546ed08c284d0f05a95276f96aca6e8a521" -DEPENDS += " virtual/libx11 libxau libxt libxext libxmu libxrender" +DEPENDS += "libxau libxt libxext libxmu libxrender" diff --git a/meta/recipes-graphics/xorg-app/xorg-app-common.inc b/meta/recipes-graphics/xorg-app/xorg-app-common.inc index 524a2d3077..59a04fa494 100644 --- a/meta/recipes-graphics/xorg-app/xorg-app-common.inc +++ b/meta/recipes-graphics/xorg-app/xorg-app-common.inc @@ -5,12 +5,15 @@ SECTION = "x11/apps" LICENSE = "MIT-X" DEPENDS = "util-macros-native virtual/libx11" +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" + INC_PR = "r8" SRC_URI = "${XORG_MIRROR}/individual/app/${BPN}-${PV}.tar.bz2" S = "${WORKDIR}/${BPN}-${PV}" -inherit autotools pkgconfig +inherit autotools pkgconfig distro_features_check FILES_${PN} += " ${libdir}/X11/${BPN} ${datadir}/X11/app-defaults/" diff --git a/meta/recipes-graphics/xorg-app/xprop_1.2.2.bb b/meta/recipes-graphics/xorg-app/xprop_1.2.2.bb index efbb1b3f6c..d78bf0451c 100644 --- a/meta/recipes-graphics/xorg-app/xprop_1.2.2.bb +++ b/meta/recipes-graphics/xorg-app/xprop_1.2.2.bb @@ -10,7 +10,7 @@ formatting information." LIC_FILES_CHKSUM = "file://COPYING;md5=e226ab8db88ac0bc0391673be40c9f91" -DEPENDS += " libxmu virtual/libx11" +DEPENDS += "libxmu" PE = "1" |