From b6ad88e4e08e13cd075cdf7c2b8e66f8a92e4cdc Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openedhand.com>
Date: Wed, 4 Jul 2007 09:27:00 +0000
Subject: xorg-app: X11 cleanup part 2: added DESCRIPTION fields, fixed DEPENDS
 lines, fixed order of fields

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2095 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/packages/xorg-app/x11perf_1.4.1.bb    |  7 +++----
 meta/packages/xorg-app/xauth_1.0.2.bb      |  9 ++++-----
 meta/packages/xorg-app/xdpyinfo_1.0.2.bb   |  6 +++---
 meta/packages/xorg-app/xev_1.0.2.bb        |  5 +----
 meta/packages/xorg-app/xhost_1.0.1.bb      |  4 +---
 meta/packages/xorg-app/xinit_1.0.3.bb      |  9 ++++-----
 meta/packages/xorg-app/xmodmap_1.0.2.bb    |  5 +----
 meta/packages/xorg-app/xorg-app-common.inc | 17 +++++++++--------
 meta/packages/xorg-app/xrandr_1.2.0.bb     |  7 +++----
 meta/packages/xorg-app/xrdb_1.0.3.bb       |  3 +--
 meta/packages/xorg-app/xset_1.0.2.bb       |  6 +-----
 meta/packages/xorg-app/xvinfo_1.0.1.bb     |  6 ++----
 12 files changed, 33 insertions(+), 51 deletions(-)

(limited to 'meta')

diff --git a/meta/packages/xorg-app/x11perf_1.4.1.bb b/meta/packages/xorg-app/x11perf_1.4.1.bb
index 66aeed2d9..35680e792 100644
--- a/meta/packages/xorg-app/x11perf_1.4.1.bb
+++ b/meta/packages/xorg-app/x11perf_1.4.1.bb
@@ -1,7 +1,6 @@
 require xorg-app-common.inc
 
-#DESCRIPTION = ""
-
-DEPENDS += " virtual/libx11 libxmu libxrender libxft libxext"
-
+DESCRIPTION = "X11 server performance test program"
+DEPENDS += "libxmu libxrender libxft libxext fontconfig"
+PR = "r1"
 PE = "1"
diff --git a/meta/packages/xorg-app/xauth_1.0.2.bb b/meta/packages/xorg-app/xauth_1.0.2.bb
index 45aaafb1c..93ddf7e82 100644
--- a/meta/packages/xorg-app/xauth_1.0.2.bb
+++ b/meta/packages/xorg-app/xauth_1.0.2.bb
@@ -1,7 +1,6 @@
 require xorg-app-common.inc
-PE = "1"
-
-#DESCRIPTION = ""
-
-DEPENDS += " virtual/libx11 libxau libxext libxmu"
 
+DESCRIPTION = "X authority file utility"
+DEPENDS += "libxau libxext libxmu"
+PR = "r1"
+PE = "1"
diff --git a/meta/packages/xorg-app/xdpyinfo_1.0.2.bb b/meta/packages/xorg-app/xdpyinfo_1.0.2.bb
index 62825e5a0..4764a7089 100644
--- a/meta/packages/xorg-app/xdpyinfo_1.0.2.bb
+++ b/meta/packages/xorg-app/xdpyinfo_1.0.2.bb
@@ -1,10 +1,10 @@
 require xorg-app-common.inc
-PE = "1"
 
 DESCRIPTION = "X display information utility"
 LICENSE = "MIT"
-
-DEPENDS += " libxtst libxext virtual/libx11 libxxf86vm libxxf86dga libxxf86misc libxi libxrender libxinerama libdmx libxp"
+DEPENDS += "libxtst libxext libxxf86vm libxxf86dga libxxf86misc libxi libxrender libxinerama libdmx libxp libxau"
+PR = "r1"
+PE = "1"
 
 SRC_URI += "file://disable-xkb.patch;patch=1"
 
diff --git a/meta/packages/xorg-app/xev_1.0.2.bb b/meta/packages/xorg-app/xev_1.0.2.bb
index fb0313658..b7a4070a8 100644
--- a/meta/packages/xorg-app/xev_1.0.2.bb
+++ b/meta/packages/xorg-app/xev_1.0.2.bb
@@ -1,10 +1,7 @@
 require xorg-app-common.inc
 
-PE = "1"
-
 DESCRIPTION = "X Event Viewer"
 LICENSE = "MIT"
-
-DEPENDS += " virtual/libx11"
+PE = "1"
 
 SRC_URI += "file://diet-x11.patch;patch=1"
diff --git a/meta/packages/xorg-app/xhost_1.0.1.bb b/meta/packages/xorg-app/xhost_1.0.1.bb
index 976fa028a..af5beadd7 100644
--- a/meta/packages/xorg-app/xhost_1.0.1.bb
+++ b/meta/packages/xorg-app/xhost_1.0.1.bb
@@ -2,7 +2,5 @@ require xorg-app-common.inc
 
 DESCRIPTION = "Server access control program for X"
 LICENSE = "MIT"
-
-DEPENDS += " virtual/libx11 libxmu libxau"
-
+DEPENDS += "libxmu libxau"
 PE = "1"
diff --git a/meta/packages/xorg-app/xinit_1.0.3.bb b/meta/packages/xorg-app/xinit_1.0.3.bb
index 155bfc7c4..962703048 100644
--- a/meta/packages/xorg-app/xinit_1.0.3.bb
+++ b/meta/packages/xorg-app/xinit_1.0.3.bb
@@ -1,8 +1,7 @@
 require xorg-app-common.inc
-PE = "1"
-
-#DESCRIPTION = ""
 
-DEPENDS += " virtual/libx11"
-FILES_${PN} += "  /usr/lib/X11/xinit"
+DESCRIPTION = "X Window System initializer"
+PR = "r1"
+PE = "1"
 
+FILES_${PN} += "${libdir}X11/xinit"
diff --git a/meta/packages/xorg-app/xmodmap_1.0.2.bb b/meta/packages/xorg-app/xmodmap_1.0.2.bb
index b934ebfa4..4b031293a 100644
--- a/meta/packages/xorg-app/xmodmap_1.0.2.bb
+++ b/meta/packages/xorg-app/xmodmap_1.0.2.bb
@@ -1,8 +1,5 @@
 require xorg-app-common.inc
-PE = "1"
 
 DESCRIPTION = "utility for modifying keymaps and pointer button mappings in X"
 LICENSE = "MIT"
-
-DEPENDS += " virtual/libx11"
-
+PE = "1"
diff --git a/meta/packages/xorg-app/xorg-app-common.inc b/meta/packages/xorg-app/xorg-app-common.inc
index a33d10767..cd7f654be 100644
--- a/meta/packages/xorg-app/xorg-app-common.inc
+++ b/meta/packages/xorg-app/xorg-app-common.inc
@@ -1,18 +1,19 @@
 DESCRIPTION = "X application"
-HOMEPAGE = "http://www.x.org"
-SECTION = "x11/applications"
+HOMEPAGE = "http://www.x.org/"
+SECTION = "x11/apps"
 LICENSE = "MIT-X"
+DEPENDS = "util-macros-native virtual/libx11"
 
-DEPENDS = "util-macros"
 XORG_PN = "${PN}"
-XORG_RELEASE = "${@["individual",bb.data.getVar('PV', d, 1)[0:7]+"/src"][bb.data.getVar('PV', d, 1)[0:4] == "X11R"]}"
-SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/app/${XORG_PN}-${PV}.tar.bz2"
-S = "${WORKDIR}/${XORG_PN}-${PV}"
 
-FILES_${PN} += "  /usr/lib/X11/${XORG_PN}"
+SRC_URI = "${XORG_MIRROR}/individual/app/${XORG_PN}-${PV}.tar.bz2"
+
+S = "${WORKDIR}/${XORG_PN}-${PV}"
 
 inherit autotools pkgconfig
 
 do_stage() {
-	autotools_stage_all
+        autotools_stage_all
 }
+
+FILES_${PN} += "  /usr/lib/X11/${XORG_PN}"
diff --git a/meta/packages/xorg-app/xrandr_1.2.0.bb b/meta/packages/xorg-app/xrandr_1.2.0.bb
index f876ba6b4..efeea388d 100644
--- a/meta/packages/xorg-app/xrandr_1.2.0.bb
+++ b/meta/packages/xorg-app/xrandr_1.2.0.bb
@@ -2,9 +2,8 @@ require xorg-app-common.inc
 
 DESCRIPTION = "X Resize and Rotate extension command."
 LICENSE= "BSD-X"
-
-DEPENDS += " libxrandr libxrender virtual/libx11"
-PE = "1"
+DEPENDS += "libxrandr libxrender"
 PR = "r1"
+PE = "1"
 
-SRC_URI += "file://resolve_symbol_clash.patch;patch=1"
\ No newline at end of file
+SRC_URI += "file://resolve_symbol_clash.patch;patch=1"
diff --git a/meta/packages/xorg-app/xrdb_1.0.3.bb b/meta/packages/xorg-app/xrdb_1.0.3.bb
index d8a3cee72..177d3ab23 100644
--- a/meta/packages/xorg-app/xrdb_1.0.3.bb
+++ b/meta/packages/xorg-app/xrdb_1.0.3.bb
@@ -2,6 +2,5 @@ require xorg-app-common.inc
 
 DESCRIPTION = "X server resource database utility"
 LICENSE = "xrdb"
-
-DEPENDS += " libxmu virtual/libx11 libxext"
+DEPENDS += "libxmu"
 PE = "1"
diff --git a/meta/packages/xorg-app/xset_1.0.2.bb b/meta/packages/xorg-app/xset_1.0.2.bb
index 776d1fb99..fa2e4c25a 100644
--- a/meta/packages/xorg-app/xset_1.0.2.bb
+++ b/meta/packages/xorg-app/xset_1.0.2.bb
@@ -2,14 +2,10 @@ require xorg-app-common.inc
 
 DESCRIPTION = "user preference utility for X"
 LICENSE = "MIT"
-
+DEPENDS += "libxext libxxf86misc libxfontcache libxmu libxp libxau"
 PE = "1"
 
-# Remove libraries that are not hard depends
-DEPENDS += " libxext virtual/libx11 libxxf86misc libxfontcache libxmu"
-
 SRC_URI += "file://disable-xkb.patch;patch=1"
 
 CFLAGS += "-D_GNU_SOURCE"
 EXTRA_OECONF = "--disable-xkb"
-
diff --git a/meta/packages/xorg-app/xvinfo_1.0.1.bb b/meta/packages/xorg-app/xvinfo_1.0.1.bb
index cbe9251c9..ac27f13f3 100644
--- a/meta/packages/xorg-app/xvinfo_1.0.1.bb
+++ b/meta/packages/xorg-app/xvinfo_1.0.1.bb
@@ -1,7 +1,5 @@
 require xorg-app-common.inc
 
-#DESCRIPTION = ""
-
-DEPENDS += " libxv virtual/libx11"
-
+DESCRIPTION = "Print out X-Video extension adaptor information"
+DEPENDS += " libxv"
 PE = "1"
-- 
cgit v1.2.3