summaryrefslogtreecommitdiffstats
path: root/meta/packages/xorg-xserver
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-09-26 09:50:11 +0000
committerRichard Purdie <richard@openedhand.com>2006-09-26 09:50:11 +0000
commit82819635b896209fa1586727d92f2b3789c5b2cb (patch)
tree75804850391992af7c4b656e9776558126397645 /meta/packages/xorg-xserver
parent2ea41da82043bbe7073e065a7e546b4fcc7b26cb (diff)
downloadpoky-82819635b896209fa1586727d92f2b3789c5b2cb.tar.gz
xserver-kdrive: Prune old unneeded xservers
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@763 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/xorg-xserver')
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive-omap/configure-tslib.patch13
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive-omap/fbdev-not-fix.patch14
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive-omap/kmode.patch19
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive-omap_6.6.3.bb23
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive_20050207.bb74
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive_20050624.bb49
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive_20060312.bb52
7 files changed, 0 insertions, 244 deletions
diff --git a/meta/packages/xorg-xserver/xserver-kdrive-omap/configure-tslib.patch b/meta/packages/xorg-xserver/xserver-kdrive-omap/configure-tslib.patch
deleted file mode 100644
index 0c0b64bf14..0000000000
--- a/meta/packages/xorg-xserver/xserver-kdrive-omap/configure-tslib.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1--- configure.ac~ 2005-06-03 17:23:36.000000000 +0200
2+++ configure.ac 2005-06-03 17:23:36.000000000 +0200
3@@ -447,10 +447,6 @@
4 KDRIVE_INCS="$KDRIVE_PURE_INCS $KDRIVE_OS_INC"
5 fi
6
7-if test "$TSLIB" = yes; then
8- KDRIVE_LIBS="${KDRIVE_LIBS} -lts"
9-fi
10-
11 AC_SUBST([KDRIVE_PURE_LIBS])
12 AC_SUBST([KDRIVE_PURE_INCS])
13 AC_SUBST([KDRIVE_LIBS])
diff --git a/meta/packages/xorg-xserver/xserver-kdrive-omap/fbdev-not-fix.patch b/meta/packages/xorg-xserver/xserver-kdrive-omap/fbdev-not-fix.patch
deleted file mode 100644
index f87e7cc2cd..0000000000
--- a/meta/packages/xorg-xserver/xserver-kdrive-omap/fbdev-not-fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
1--- xserver/hw/kdrive/fbdev/fbdev.c~ 2004-09-15 00:08:10.000000000 +0100
2+++ xserver/hw/kdrive/fbdev/fbdev.c 2004-11-13 17:47:02.000000000 +0000
3@@ -198,6 +198,11 @@
4 return FALSE;
5 }
6
7+ /* Re-get the "fixed" parameters since they might have changed */
8+ k = ioctl (priv->fd, FBIOGET_FSCREENINFO, &priv->fix);
9+ if (k < 0)
10+ perror ("FBIOGET_FSCREENINFO");
11+
12 /* Now get the new screeninfo */
13 ioctl (priv->fd, FBIOGET_VSCREENINFO, &priv->var);
14 depth = priv->var.bits_per_pixel;
diff --git a/meta/packages/xorg-xserver/xserver-kdrive-omap/kmode.patch b/meta/packages/xorg-xserver/xserver-kdrive-omap/kmode.patch
deleted file mode 100644
index 22ad51c5ad..0000000000
--- a/meta/packages/xorg-xserver/xserver-kdrive-omap/kmode.patch
+++ /dev/null
@@ -1,19 +0,0 @@
1Index: hw/kdrive/src/kmode.c
2===================================================================
3RCS file: /cvs/xserver/xserver/hw/kdrive/src/kmode.c,v
4retrieving revision 1.13
5diff -u -r1.13 kmode.c
6--- xserver/hw/kdrive/src/kmode.c 26 Jul 2004 17:14:26 -0000 1.13
7+++ xserver/hw/kdrive/src/kmode.c 28 Aug 2004 14:04:19 -0000
8@@ -41,6 +41,11 @@
9 1, 11, 14, KdSyncNegative,
10 },
11
12+ { 240, 320, 64, 0,
13+ 0, 0, 0, KdSyncNegative,
14+ 0, 0, 0, KdSyncNegative,
15+ },
16+
17 /* Other VESA modes */
18 { 640, 350, 85, 31500, /* VESA */
19 32, 96, 192, KdSyncPositive, /* 26.413 */
diff --git a/meta/packages/xorg-xserver/xserver-kdrive-omap_6.6.3.bb b/meta/packages/xorg-xserver/xserver-kdrive-omap_6.6.3.bb
deleted file mode 100644
index b7e192dc76..0000000000
--- a/meta/packages/xorg-xserver/xserver-kdrive-omap_6.6.3.bb
+++ /dev/null
@@ -1,23 +0,0 @@
1LICENSE = "MIT"
2DEPENDS = "xsp tslib-maemo xproto libxdmcp xextensions xtrans libxau virtual/libx11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext"
3PROVIDES = "virtual/xserver"
4PACKAGES = "${PN} ${PN}-doc ${PN}-dev ${PN}-locale"
5SECTION = "x11/base"
6DESCRIPTION = "X server from freedesktop.org"
7DESCRIPTION_xserver-kdrive-omap = "X server from freedesktop.org with patches from maemo.org, supporting X on OMAP based devices"
8
9PR = "r2"
10
11FILES_${PN} = "${bindir}/Xomap"
12
13SRC_URI = " http://stage.maemo.org/pool/maemo/ossw/source/x/xserver-kdrive/xserver-kdrive_${PV}-5.tar.gz \
14 file://kmode.patch;patch=1 \
15 file://fbdev-not-fix.patch;patch=1 \
16 file://configure-tslib.patch;patch=1;pnum=0"
17
18S = "${WORKDIR}/xserver"
19
20inherit autotools pkgconfig
21
22EXTRA_OECONF = "--enable-composite --disable-xinerama --enable-xomapserver \
23 --enable-xsp --disable-xlocale --disable-rpath --prefix=/usr"
diff --git a/meta/packages/xorg-xserver/xserver-kdrive_20050207.bb b/meta/packages/xorg-xserver/xserver-kdrive_20050207.bb
deleted file mode 100644
index c198a94de2..0000000000
--- a/meta/packages/xorg-xserver/xserver-kdrive_20050207.bb
+++ /dev/null
@@ -1,74 +0,0 @@
1PV = "0.0+cvs${FIXEDSRCDATE}"
2FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
3DEFAULT_PREFERENCE = "1"
4
5LICENSE = "MIT"
6DEPENDS = "tslib xproto libxdmcp xextensions-1.0.1 xtrans libxau virtual/libx11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext"
7
8# Uncomment the following DEPENDS line and the commented line in SRC_URI
9# to make this snapshot build against X11R7.0 xlibs.
10#DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto"
11
12PROVIDES = "virtual/xserver"
13RPROVIDES = "virtual/xserver"
14PACKAGES = "xserver-kdrive-mach64 xserver-kdrive-fbdev xserver-kdrive-vesa xserver-kdrive-mga xserver-kdrive-via xserver-kdrive-ati xserver-kdrive-fake xserver-kdrive-i810 xserver-kdrive-xephyr xserver-kdrive-epson ${PN}-doc ${PN}-dev ${PN}-locale"
15SECTION = "x11/base"
16DESCRIPTION = "X server from freedesktop.org"
17DESCRIPTION_xserver-kdrive-i810 = "X server from freedesktop.org, supporting i810 devices"
18DESCRIPTION_xserver-kdrive-ati = "X server from freedesktop.org, supporting ATI devices"
19DESCRIPTION_xserver-kdrive-mga = "X server from freedesktop.org, supporting MGA devices"
20DESCRIPTION_xserver-kdrive-vesa = "X server from freedesktop.org, supporting generic VESA devices"
21DESCRIPTION_xserver-kdrive-mach64 = "X server from freedesktop.org, supporting Mach64 devices"
22DESCRIPTION_xserver-kdrive-via = "X server from freedesktop.org, supporting VIA CLE266 devices"
23DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices"
24DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Epson S1D13806 devices"
25DESCRIPTION_xserver-kdrive-fake = "Fake X server"
26DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window"
27
28PR = "r11"
29
30FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev"
31FILES_xserver-kdrive-ati = "${bindir}/Xati"
32FILES_xserver-kdrive-vesa = "${bindir}/Xvesa"
33FILES_xserver-kdrive-via = "${bindir}/Xvia"
34FILES_xserver-kdrive-mga = "${bindir}/Xmga"
35FILES_xserver-kdrive-mach64 = "${bindir}/Xmach64"
36FILES_xserver-kdrive-fake = "${bindir}/Xfake"
37FILES_xserver-kdrive-i810 = "${bindir}/Xi810"
38FILES_xserver-kdrive-epson = "${bindir}/Xepson"
39FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr"
40
41SRC_URI = "${FREEDESKTOP_CVS}/xserver;module=xserver;date=${FIXEDSRCDATE} \
42# file://build-20050207-against-X11R7.diff;patch=1 \
43 file://kmode.patch;patch=1 \
44 file://disable-apm.patch;patch=1 \
45 file://fbdev-not-fix.patch;patch=1 "
46
47SRC_URI_h3600 = "${FREEDESKTOP_CVS}/xserver;module=xserver;date=${FIXEDSRCDATE} \
48 file://kmode.patch;patch=1 \
49 file://faster-rotated.patch;patch=1 \
50 file://fbdev-not-fix.patch;patch=1 "
51
52
53SRC_URI_append_mnci = " file://onlyfb.patch;patch=1 \
54 file://faster-rotated.patch;patch=1 \
55 file://devfs.patch;patch=1"
56SRC_URI_append_collie = " file://faster-rotated.patch;patch=1"
57SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1 \
58 file://faster-rotated.patch;patch=1"
59SRC_URI_append_spitz = " file://faster-rotated.patch;patch=1"
60SRC_URI_append_akita = " file://faster-rotated.patch;patch=1"
61
62PACKAGE_ARCH_mnci = "mnci"
63PACKAGE_ARCH_collie = "collie"
64PACKAGE_ARCH_poodle = "poodle"
65PACKAGE_ARCH_h3600 = "h3600"
66PACKAGE_ARCH_spitz = "spitz"
67PACKAGE_ARCH_akita = "akita"
68
69S = "${WORKDIR}/xserver"
70
71inherit autotools pkgconfig
72
73LDFLAGS += " -lXfont -lXdmcp -lXau "
74EXTRA_OECONF = "--enable-static=no --disable-static --enable-composite --disable-xinerama"
diff --git a/meta/packages/xorg-xserver/xserver-kdrive_20050624.bb b/meta/packages/xorg-xserver/xserver-kdrive_20050624.bb
deleted file mode 100644
index f9ba323529..0000000000
--- a/meta/packages/xorg-xserver/xserver-kdrive_20050624.bb
+++ /dev/null
@@ -1,49 +0,0 @@
1PV = "0.0+cvs${FIXEDSRCDATE}"
2FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
3
4LICENSE = "MIT"
5DEPENDS = "tslib xproto libxdmcp xextensions xtrans libxau virtual/libx11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext"
6PROVIDES = "virtual/xserver"
7RPROVIDES = "virtual/xserver"
8PACKAGES = "xserver-kdrive-mach64 xserver-kdrive-fbdev xserver-kdrive-vesa xserver-kdrive-mga xserver-kdrive-via xserver-kdrive-ati xserver-kdrive-fake xserver-kdrive-i810 xserver-kdrive-xephyr xserver-kdrive-epson ${PN}-doc ${PN}-dev ${PN}-locale"
9SECTION = "x11/base"
10DESCRIPTION = "X server from freedesktop.org"
11DESCRIPTION_xserver-kdrive-i810 = "X server from freedesktop.org, supporting i810 devices"
12DESCRIPTION_xserver-kdrive-ati = "X server from freedesktop.org, supporting ATI devices"
13DESCRIPTION_xserver-kdrive-mga = "X server from freedesktop.org, supporting MGA devices"
14DESCRIPTION_xserver-kdrive-vesa = "X server from freedesktop.org, supporting generic VESA devices"
15DESCRIPTION_xserver-kdrive-mach64 = "X server from freedesktop.org, supporting Mach64 devices"
16DESCRIPTION_xserver-kdrive-via = "X server from freedesktop.org, supporting VIA CLE266 devices"
17DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices"
18DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Epson S1D13806 devices"
19DESCRIPTION_xserver-kdrive-fake = "Fake X server"
20DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window"
21
22PR = "r12"
23
24FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev"
25FILES_xserver-kdrive-ati = "${bindir}/Xati"
26FILES_xserver-kdrive-vesa = "${bindir}/Xvesa"
27FILES_xserver-kdrive-via = "${bindir}/Xvia"
28FILES_xserver-kdrive-mga = "${bindir}/Xmga"
29FILES_xserver-kdrive-mach64 = "${bindir}/Xmach64"
30FILES_xserver-kdrive-fake = "${bindir}/Xfake"
31FILES_xserver-kdrive-i810 = "${bindir}/Xi810"
32FILES_xserver-kdrive-epson = "${bindir}/Xepson"
33FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr"
34
35SRC_URI = "${FREEDESKTOP_CVS}/xserver;module=xserver;date=${FIXEDSRCDATE} \
36 file://kmode.patch;patch=1 \
37 file://no-serial-probing.patch;patch=1 \
38 file://fbdev-not-fix.patch;patch=1"
39
40SRC_URI_append_mnci = " file://onlyfb.patch;patch=1"
41SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1"
42PACKAGE_ARCH_poodle = "poodle"
43
44
45S = "${WORKDIR}/xserver"
46
47inherit autotools pkgconfig
48
49EXTRA_OECONF = "--enable-composite --disable-xinerama"
diff --git a/meta/packages/xorg-xserver/xserver-kdrive_20060312.bb b/meta/packages/xorg-xserver/xserver-kdrive_20060312.bb
deleted file mode 100644
index 594b6d74ec..0000000000
--- a/meta/packages/xorg-xserver/xserver-kdrive_20060312.bb
+++ /dev/null
@@ -1,52 +0,0 @@
1PV = "0.0+cvs${FIXEDSRCDATE}"
2FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
3DEFAULT_PREFERENCE = "1"
4
5LICENSE = "MIT"
6DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto"
7PROVIDES = "virtual/xserver"
8RPROVIDES = "virtual/xserver"
9PACKAGES = "xserver-kdrive-mach64 xserver-kdrive-fbdev xserver-kdrive-vesa xserver-kdrive-mga xserver-kdrive-via xserver-kdrive-ati xserver-kdrive-fake xserver-kdrive-i810 xserver-kdrive-xephyr xserver-kdrive-epson ${PN}-doc ${PN}-dev ${PN}-locale"
10SECTION = "x11/base"
11DESCRIPTION = "X server from freedesktop.org"
12DESCRIPTION_xserver-kdrive-i810 = "X server from freedesktop.org, supporting i810 devices"
13DESCRIPTION_xserver-kdrive-ati = "X server from freedesktop.org, supporting ATI devices"
14DESCRIPTION_xserver-kdrive-mga = "X server from freedesktop.org, supporting MGA devices"
15DESCRIPTION_xserver-kdrive-vesa = "X server from freedesktop.org, supporting generic VESA devices"
16DESCRIPTION_xserver-kdrive-mach64 = "X server from freedesktop.org, supporting Mach64 devices"
17DESCRIPTION_xserver-kdrive-via = "X server from freedesktop.org, supporting VIA CLE266 devices"
18DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices"
19DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Epson S1D13806 devices"
20DESCRIPTION_xserver-kdrive-fake = "Fake X server"
21DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window"
22
23PR = "r11"
24
25FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev"
26FILES_xserver-kdrive-ati = "${bindir}/Xati"
27FILES_xserver-kdrive-vesa = "${bindir}/Xvesa"
28FILES_xserver-kdrive-via = "${bindir}/Xvia"
29FILES_xserver-kdrive-mga = "${bindir}/Xmga"
30FILES_xserver-kdrive-mach64 = "${bindir}/Xmach64"
31FILES_xserver-kdrive-fake = "${bindir}/Xfake"
32FILES_xserver-kdrive-i810 = "${bindir}/Xi810"
33FILES_xserver-kdrive-epson = "${bindir}/Xepson"
34FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr"
35
36SRC_URI = "${FREEDESKTOP_CVS}/xserver;module=xserver \
37 file://kmode.patch;patch=1 \
38 file://disable-apm.patch;patch=1 \
39 file://no-serial-probing.patch;patch=1 \
40 file://kdrive-evdev.patch;patch=1 \
41 file://kdrive-use-evdev.patch;patch=1 \
42 file://fbdev-not-fix.patch;patch=1"
43
44SRC_URI_append_mnci = " file://onlyfb.patch;patch=1"
45SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1"
46PACKAGE_ARCH_poodle = "poodle"
47
48S = "${WORKDIR}/xserver"
49
50inherit autotools pkgconfig
51
52EXTRA_OECONF = "--enable-composite --disable-xinerama"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-02-26 07:16:08 +0000