summaryrefslogtreecommitdiffstats
path: root/meta/packages
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2007-07-04 09:27:00 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2007-07-04 09:27:00 +0000
commitb6ad88e4e08e13cd075cdf7c2b8e66f8a92e4cdc (patch)
treeaa2fd7dc964a81fe4e8a546a52abdaa0ae6754ce /meta/packages
parent8f0272c375ae8a9216ba08c72ed66409b568315e (diff)
downloadpoky-b6ad88e4e08e13cd075cdf7c2b8e66f8a92e4cdc.tar.gz
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
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/xorg-app/x11perf_1.4.1.bb7
-rw-r--r--meta/packages/xorg-app/xauth_1.0.2.bb9
-rw-r--r--meta/packages/xorg-app/xdpyinfo_1.0.2.bb6
-rw-r--r--meta/packages/xorg-app/xev_1.0.2.bb5
-rw-r--r--meta/packages/xorg-app/xhost_1.0.1.bb4
-rw-r--r--meta/packages/xorg-app/xinit_1.0.3.bb9
-rw-r--r--meta/packages/xorg-app/xmodmap_1.0.2.bb5
-rw-r--r--meta/packages/xorg-app/xorg-app-common.inc17
-rw-r--r--meta/packages/xorg-app/xrandr_1.2.0.bb7
-rw-r--r--meta/packages/xorg-app/xrdb_1.0.3.bb3
-rw-r--r--meta/packages/xorg-app/xset_1.0.2.bb6
-rw-r--r--meta/packages/xorg-app/xvinfo_1.0.1.bb6
12 files changed, 33 insertions, 51 deletions
diff --git a/meta/packages/xorg-app/x11perf_1.4.1.bb b/meta/packages/xorg-app/x11perf_1.4.1.bb
index 66aeed2d9f..35680e7925 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 @@
1require xorg-app-common.inc 1require xorg-app-common.inc
2 2
3#DESCRIPTION = "" 3DESCRIPTION = "X11 server performance test program"
4 4DEPENDS += "libxmu libxrender libxft libxext fontconfig"
5DEPENDS += " virtual/libx11 libxmu libxrender libxft libxext" 5PR = "r1"
6
7PE = "1" 6PE = "1"
diff --git a/meta/packages/xorg-app/xauth_1.0.2.bb b/meta/packages/xorg-app/xauth_1.0.2.bb
index 45aaafb1ce..93ddf7e828 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 @@
1require xorg-app-common.inc 1require xorg-app-common.inc
2PE = "1"
3
4#DESCRIPTION = ""
5
6DEPENDS += " virtual/libx11 libxau libxext libxmu"
7 2
3DESCRIPTION = "X authority file utility"
4DEPENDS += "libxau libxext libxmu"
5PR = "r1"
6PE = "1"
diff --git a/meta/packages/xorg-app/xdpyinfo_1.0.2.bb b/meta/packages/xorg-app/xdpyinfo_1.0.2.bb
index 62825e5a0f..4764a7089f 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 @@
1require xorg-app-common.inc 1require xorg-app-common.inc
2PE = "1"
3 2
4DESCRIPTION = "X display information utility" 3DESCRIPTION = "X display information utility"
5LICENSE = "MIT" 4LICENSE = "MIT"
6 5DEPENDS += "libxtst libxext libxxf86vm libxxf86dga libxxf86misc libxi libxrender libxinerama libdmx libxp libxau"
7DEPENDS += " libxtst libxext virtual/libx11 libxxf86vm libxxf86dga libxxf86misc libxi libxrender libxinerama libdmx libxp" 6PR = "r1"
7PE = "1"
8 8
9SRC_URI += "file://disable-xkb.patch;patch=1" 9SRC_URI += "file://disable-xkb.patch;patch=1"
10 10
diff --git a/meta/packages/xorg-app/xev_1.0.2.bb b/meta/packages/xorg-app/xev_1.0.2.bb
index fb03136581..b7a4070a8f 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 @@
1require xorg-app-common.inc 1require xorg-app-common.inc
2 2
3PE = "1"
4
5DESCRIPTION = "X Event Viewer" 3DESCRIPTION = "X Event Viewer"
6LICENSE = "MIT" 4LICENSE = "MIT"
7 5PE = "1"
8DEPENDS += " virtual/libx11"
9 6
10SRC_URI += "file://diet-x11.patch;patch=1" 7SRC_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 976fa028aa..af5beadd79 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
2 2
3DESCRIPTION = "Server access control program for X" 3DESCRIPTION = "Server access control program for X"
4LICENSE = "MIT" 4LICENSE = "MIT"
5 5DEPENDS += "libxmu libxau"
6DEPENDS += " virtual/libx11 libxmu libxau"
7
8PE = "1" 6PE = "1"
diff --git a/meta/packages/xorg-app/xinit_1.0.3.bb b/meta/packages/xorg-app/xinit_1.0.3.bb
index 155bfc7c43..9627030488 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 @@
1require xorg-app-common.inc 1require xorg-app-common.inc
2PE = "1"
3
4#DESCRIPTION = ""
5 2
6DEPENDS += " virtual/libx11" 3DESCRIPTION = "X Window System initializer"
7FILES_${PN} += " /usr/lib/X11/xinit" 4PR = "r1"
5PE = "1"
8 6
7FILES_${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 b934ebfa48..4b031293a2 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 @@
1require xorg-app-common.inc 1require xorg-app-common.inc
2PE = "1"
3 2
4DESCRIPTION = "utility for modifying keymaps and pointer button mappings in X" 3DESCRIPTION = "utility for modifying keymaps and pointer button mappings in X"
5LICENSE = "MIT" 4LICENSE = "MIT"
6 5PE = "1"
7DEPENDS += " virtual/libx11"
8
diff --git a/meta/packages/xorg-app/xorg-app-common.inc b/meta/packages/xorg-app/xorg-app-common.inc
index a33d107675..cd7f654be2 100644
--- a/meta/packages/xorg-app/xorg-app-common.inc
+++ b/meta/packages/xorg-app/xorg-app-common.inc
@@ -1,18 +1,19 @@
1DESCRIPTION = "X application" 1DESCRIPTION = "X application"
2HOMEPAGE = "http://www.x.org" 2HOMEPAGE = "http://www.x.org/"
3SECTION = "x11/applications" 3SECTION = "x11/apps"
4LICENSE = "MIT-X" 4LICENSE = "MIT-X"
5DEPENDS = "util-macros-native virtual/libx11"
5 6
6DEPENDS = "util-macros"
7XORG_PN = "${PN}" 7XORG_PN = "${PN}"
8XORG_RELEASE = "${@["individual",bb.data.getVar('PV', d, 1)[0:7]+"/src"][bb.data.getVar('PV', d, 1)[0:4] == "X11R"]}"
9SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/app/${XORG_PN}-${PV}.tar.bz2"
10S = "${WORKDIR}/${XORG_PN}-${PV}"
11 8
12FILES_${PN} += " /usr/lib/X11/${XORG_PN}" 9SRC_URI = "${XORG_MIRROR}/individual/app/${XORG_PN}-${PV}.tar.bz2"
10
11S = "${WORKDIR}/${XORG_PN}-${PV}"
13 12
14inherit autotools pkgconfig 13inherit autotools pkgconfig
15 14
16do_stage() { 15do_stage() {
17 autotools_stage_all 16 autotools_stage_all
18} 17}
18
19FILES_${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 f876ba6b47..efeea388d0 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
2 2
3DESCRIPTION = "X Resize and Rotate extension command." 3DESCRIPTION = "X Resize and Rotate extension command."
4LICENSE= "BSD-X" 4LICENSE= "BSD-X"
5 5DEPENDS += "libxrandr libxrender"
6DEPENDS += " libxrandr libxrender virtual/libx11"
7PE = "1"
8PR = "r1" 6PR = "r1"
7PE = "1"
9 8
10SRC_URI += "file://resolve_symbol_clash.patch;patch=1" \ No newline at end of file 9SRC_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 d8a3cee728..177d3ab23b 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
2 2
3DESCRIPTION = "X server resource database utility" 3DESCRIPTION = "X server resource database utility"
4LICENSE = "xrdb" 4LICENSE = "xrdb"
5 5DEPENDS += "libxmu"
6DEPENDS += " libxmu virtual/libx11 libxext"
7PE = "1" 6PE = "1"
diff --git a/meta/packages/xorg-app/xset_1.0.2.bb b/meta/packages/xorg-app/xset_1.0.2.bb
index 776d1fb99a..fa2e4c25a2 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
2 2
3DESCRIPTION = "user preference utility for X" 3DESCRIPTION = "user preference utility for X"
4LICENSE = "MIT" 4LICENSE = "MIT"
5 5DEPENDS += "libxext libxxf86misc libxfontcache libxmu libxp libxau"
6PE = "1" 6PE = "1"
7 7
8# Remove libraries that are not hard depends
9DEPENDS += " libxext virtual/libx11 libxxf86misc libxfontcache libxmu"
10
11SRC_URI += "file://disable-xkb.patch;patch=1" 8SRC_URI += "file://disable-xkb.patch;patch=1"
12 9
13CFLAGS += "-D_GNU_SOURCE" 10CFLAGS += "-D_GNU_SOURCE"
14EXTRA_OECONF = "--disable-xkb" 11EXTRA_OECONF = "--disable-xkb"
15
diff --git a/meta/packages/xorg-app/xvinfo_1.0.1.bb b/meta/packages/xorg-app/xvinfo_1.0.1.bb
index cbe9251c91..ac27f13f34 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 @@
1require xorg-app-common.inc 1require xorg-app-common.inc
2 2
3#DESCRIPTION = "" 3DESCRIPTION = "Print out X-Video extension adaptor information"
4 4DEPENDS += " libxv"
5DEPENDS += " libxv virtual/libx11"
6
7PE = "1" 5PE = "1"