summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2014-06-25 21:35:17 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-23 11:36:29 +0000
commit58d91fa32cf01a9d6b37a615638ccb2103aafc32 (patch)
treea67ed94814e183c23e788140821c04e6b3878c1f /meta
parent1b7b58ac97aafc2c88038bfb1f2301c4013f6761 (diff)
downloadpoky-58d91fa32cf01a9d6b37a615638ccb2103aafc32.tar.gz
xorg-app: add x11 to required DISTRO_FEATURES and cleanup dependencies
(From OE-Core rev: 1cf0245344ce272e7330cfe1b04a0ed7bd18e8f5) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/xorg-app/xeyes_1.1.1.bb2
-rw-r--r--meta/recipes-graphics/xorg-app/xorg-app-common.inc5
-rw-r--r--meta/recipes-graphics/xorg-app/xprop_1.2.2.bb2
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"
11SRC_URI[md5sum] = "a3035dcecdbdb89e864177c080924981" 11SRC_URI[md5sum] = "a3035dcecdbdb89e864177c080924981"
12SRC_URI[sha256sum] = "975e98680cd59e1f9439016386609546ed08c284d0f05a95276f96aca6e8a521" 12SRC_URI[sha256sum] = "975e98680cd59e1f9439016386609546ed08c284d0f05a95276f96aca6e8a521"
13 13
14DEPENDS += " virtual/libx11 libxau libxt libxext libxmu libxrender" 14DEPENDS += "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"
5LICENSE = "MIT-X" 5LICENSE = "MIT-X"
6DEPENDS = "util-macros-native virtual/libx11" 6DEPENDS = "util-macros-native virtual/libx11"
7 7
8# depends on virtual/libx11
9REQUIRED_DISTRO_FEATURES = "x11"
10
8INC_PR = "r8" 11INC_PR = "r8"
9 12
10SRC_URI = "${XORG_MIRROR}/individual/app/${BPN}-${PV}.tar.bz2" 13SRC_URI = "${XORG_MIRROR}/individual/app/${BPN}-${PV}.tar.bz2"
11 14
12S = "${WORKDIR}/${BPN}-${PV}" 15S = "${WORKDIR}/${BPN}-${PV}"
13 16
14inherit autotools pkgconfig 17inherit autotools pkgconfig distro_features_check
15 18
16FILES_${PN} += " ${libdir}/X11/${BPN} ${datadir}/X11/app-defaults/" 19FILES_${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."
10 10
11LIC_FILES_CHKSUM = "file://COPYING;md5=e226ab8db88ac0bc0391673be40c9f91" 11LIC_FILES_CHKSUM = "file://COPYING;md5=e226ab8db88ac0bc0391673be40c9f91"
12 12
13DEPENDS += " libxmu virtual/libx11" 13DEPENDS += "libxmu"
14 14
15PE = "1" 15PE = "1"
16 16