summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2007-07-03 11:12:54 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2007-07-03 11:12:54 +0000
commit53069e1fd2d5d2993d47df165e1b9806e583d9ee (patch)
treec3e75cfa3d7ec115ea443d7412ccae1f4d6012ae
parent1811e7955c524ce4909575905c10320be3160a7a (diff)
downloadpoky-53069e1fd2d5d2993d47df165e1b9806e583d9ee.tar.gz
xorg-xserver: X11 cleanup
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2082 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb (renamed from meta/packages/xorg-xserver/xserver-kdrive-xomap_X11R7.1-1.1.99.3.bb)2
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive_1.1.0.bb (renamed from meta/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb)4
-rw-r--r--meta/packages/xorg-xserver/xserver-xorg_1.1.0.bb (renamed from meta/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb)2
3 files changed, 5 insertions, 3 deletions
diff --git a/meta/packages/xorg-xserver/xserver-kdrive-xomap_X11R7.1-1.1.99.3.bb b/meta/packages/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb
index 2ca4fab50b..62b509a2ef 100644
--- a/meta/packages/xorg-xserver/xserver-kdrive-xomap_X11R7.1-1.1.99.3.bb
+++ b/meta/packages/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb
@@ -7,7 +7,7 @@ SECTION = "x11/base"
7DESCRIPTION = "X server from freedesktop.org" 7DESCRIPTION = "X server from freedesktop.org"
8DESCRIPTION_xserver-kdrive-xomap = "X server for the OMAP in the Nokia 800" 8DESCRIPTION_xserver-kdrive-xomap = "X server for the OMAP in the Nokia 800"
9 9
10PR = "r5" 10PE = "1"
11 11
12COMPATIBLE_MACHINE = "nokia(800|770)" 12COMPATIBLE_MACHINE = "nokia(800|770)"
13 13
diff --git a/meta/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb b/meta/packages/xorg-xserver/xserver-kdrive_1.1.0.bb
index 053c0abf06..0adce50bbb 100644
--- a/meta/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb
+++ b/meta/packages/xorg-xserver/xserver-kdrive_1.1.0.bb
@@ -10,7 +10,7 @@ DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting ge
10DESCRIPTION_xserver-kdrive-fake = "Fake X server" 10DESCRIPTION_xserver-kdrive-fake = "Fake X server"
11DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window" 11DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window"
12 12
13PR="r2" 13PE = "1"
14 14
15FILES_${PN} = "${libdir}/xserver" 15FILES_${PN} = "${libdir}/xserver"
16FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev" 16FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev"
@@ -21,7 +21,7 @@ RDEPENDS_xserver-kdrive-fbdev = "${PN}"
21RDEPENDS_xserver-kdrive-fake = "${PN}" 21RDEPENDS_xserver-kdrive-fake = "${PN}"
22RDEPENDS_xserver-kdrive-xephyr = "${PN}" 22RDEPENDS_xserver-kdrive-xephyr = "${PN}"
23 23
24SRC_URI = "http://ftp.x.org/pub/X11R7.1/src/xserver/xorg-server-X11R7.1-1.1.0.tar.bz2 \ 24SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-1.1.0.tar.bz2 \
25 file://kmode.patch;patch=1 \ 25 file://kmode.patch;patch=1 \
26 file://disable-apm.patch;patch=1 \ 26 file://disable-apm.patch;patch=1 \
27 file://no-serial-probing.patch;patch=1 \ 27 file://no-serial-probing.patch;patch=1 \
diff --git a/meta/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb b/meta/packages/xorg-xserver/xserver-xorg_1.1.0.bb
index 3db5c640c7..7881bb21f6 100644
--- a/meta/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb
+++ b/meta/packages/xorg-xserver/xserver-xorg_1.1.0.bb
@@ -4,6 +4,8 @@ SRC_URI += "file://drmfix.patch;patch=1"
4 4
5EXTRA_OECONF += " ac_cv_file__usr_share_X11_sgml_defs_ent=no " 5EXTRA_OECONF += " ac_cv_file__usr_share_X11_sgml_defs_ent=no "
6 6
7PE = "1"
8
7#DESCRIPTION = "" 9#DESCRIPTION = ""
8 10
9#DEPENDS += " " 11#DEPENDS += " "