summaryrefslogtreecommitdiff
path: root/meta
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
parent2ea41da82043bbe7073e065a7e546b4fcc7b26cb (diff)
downloadopenembedded-core-82819635b896209fa1586727d92f2b3789c5b2cb.tar.gz
openembedded-core-82819635b896209fa1586727d92f2b3789c5b2cb.tar.bz2
openembedded-core-82819635b896209fa1586727d92f2b3789c5b2cb.tar.xz
openembedded-core-82819635b896209fa1586727d92f2b3789c5b2cb.zip
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')
-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 0c0b64bf1..000000000
--- a/meta/packages/xorg-xserver/xserver-kdrive-omap/configure-tslib.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.ac~ 2005-06-03 17:23:36.000000000 +0200
-+++ configure.ac 2005-06-03 17:23:36.000000000 +0200
-@@ -447,10 +447,6 @@
- KDRIVE_INCS="$KDRIVE_PURE_INCS $KDRIVE_OS_INC"
- fi
-
--if test "$TSLIB" = yes; then
-- KDRIVE_LIBS="${KDRIVE_LIBS} -lts"
--fi
--
- AC_SUBST([KDRIVE_PURE_LIBS])
- AC_SUBST([KDRIVE_PURE_INCS])
- 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 f87e7cc2c..000000000
--- a/meta/packages/xorg-xserver/xserver-kdrive-omap/fbdev-not-fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- xserver/hw/kdrive/fbdev/fbdev.c~ 2004-09-15 00:08:10.000000000 +0100
-+++ xserver/hw/kdrive/fbdev/fbdev.c 2004-11-13 17:47:02.000000000 +0000
-@@ -198,6 +198,11 @@
- return FALSE;
- }
-
-+ /* Re-get the "fixed" parameters since they might have changed */
-+ k = ioctl (priv->fd, FBIOGET_FSCREENINFO, &priv->fix);
-+ if (k < 0)
-+ perror ("FBIOGET_FSCREENINFO");
-+
- /* Now get the new screeninfo */
- ioctl (priv->fd, FBIOGET_VSCREENINFO, &priv->var);
- 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 22ad51c5a..000000000
--- a/meta/packages/xorg-xserver/xserver-kdrive-omap/kmode.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: hw/kdrive/src/kmode.c
-===================================================================
-RCS file: /cvs/xserver/xserver/hw/kdrive/src/kmode.c,v
-retrieving revision 1.13
-diff -u -r1.13 kmode.c
---- xserver/hw/kdrive/src/kmode.c 26 Jul 2004 17:14:26 -0000 1.13
-+++ xserver/hw/kdrive/src/kmode.c 28 Aug 2004 14:04:19 -0000
-@@ -41,6 +41,11 @@
- 1, 11, 14, KdSyncNegative,
- },
-
-+ { 240, 320, 64, 0,
-+ 0, 0, 0, KdSyncNegative,
-+ 0, 0, 0, KdSyncNegative,
-+ },
-+
- /* Other VESA modes */
- { 640, 350, 85, 31500, /* VESA */
- 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 b7e192dc7..000000000
--- a/meta/packages/xorg-xserver/xserver-kdrive-omap_6.6.3.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-LICENSE = "MIT"
-DEPENDS = "xsp tslib-maemo xproto libxdmcp xextensions xtrans libxau virtual/libx11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext"
-PROVIDES = "virtual/xserver"
-PACKAGES = "${PN} ${PN}-doc ${PN}-dev ${PN}-locale"
-SECTION = "x11/base"
-DESCRIPTION = "X server from freedesktop.org"
-DESCRIPTION_xserver-kdrive-omap = "X server from freedesktop.org with patches from maemo.org, supporting X on OMAP based devices"
-
-PR = "r2"
-
-FILES_${PN} = "${bindir}/Xomap"
-
-SRC_URI = " http://stage.maemo.org/pool/maemo/ossw/source/x/xserver-kdrive/xserver-kdrive_${PV}-5.tar.gz \
- file://kmode.patch;patch=1 \
- file://fbdev-not-fix.patch;patch=1 \
- file://configure-tslib.patch;patch=1;pnum=0"
-
-S = "${WORKDIR}/xserver"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--enable-composite --disable-xinerama --enable-xomapserver \
- --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 c198a94de..000000000
--- a/meta/packages/xorg-xserver/xserver-kdrive_20050207.bb
+++ /dev/null
@@ -1,74 +0,0 @@
-PV = "0.0+cvs${FIXEDSRCDATE}"
-FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
-DEFAULT_PREFERENCE = "1"
-
-LICENSE = "MIT"
-DEPENDS = "tslib xproto libxdmcp xextensions-1.0.1 xtrans libxau virtual/libx11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext"
-
-# Uncomment the following DEPENDS line and the commented line in SRC_URI
-# to make this snapshot build against X11R7.0 xlibs.
-#DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto"
-
-PROVIDES = "virtual/xserver"
-RPROVIDES = "virtual/xserver"
-PACKAGES = "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"
-SECTION = "x11/base"
-DESCRIPTION = "X server from freedesktop.org"
-DESCRIPTION_xserver-kdrive-i810 = "X server from freedesktop.org, supporting i810 devices"
-DESCRIPTION_xserver-kdrive-ati = "X server from freedesktop.org, supporting ATI devices"
-DESCRIPTION_xserver-kdrive-mga = "X server from freedesktop.org, supporting MGA devices"
-DESCRIPTION_xserver-kdrive-vesa = "X server from freedesktop.org, supporting generic VESA devices"
-DESCRIPTION_xserver-kdrive-mach64 = "X server from freedesktop.org, supporting Mach64 devices"
-DESCRIPTION_xserver-kdrive-via = "X server from freedesktop.org, supporting VIA CLE266 devices"
-DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices"
-DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Epson S1D13806 devices"
-DESCRIPTION_xserver-kdrive-fake = "Fake X server"
-DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window"
-
-PR = "r11"
-
-FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev"
-FILES_xserver-kdrive-ati = "${bindir}/Xati"
-FILES_xserver-kdrive-vesa = "${bindir}/Xvesa"
-FILES_xserver-kdrive-via = "${bindir}/Xvia"
-FILES_xserver-kdrive-mga = "${bindir}/Xmga"
-FILES_xserver-kdrive-mach64 = "${bindir}/Xmach64"
-FILES_xserver-kdrive-fake = "${bindir}/Xfake"
-FILES_xserver-kdrive-i810 = "${bindir}/Xi810"
-FILES_xserver-kdrive-epson = "${bindir}/Xepson"
-FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xserver;module=xserver;date=${FIXEDSRCDATE} \
-# file://build-20050207-against-X11R7.diff;patch=1 \
- file://kmode.patch;patch=1 \
- file://disable-apm.patch;patch=1 \
- file://fbdev-not-fix.patch;patch=1 "
-
-SRC_URI_h3600 = "${FREEDESKTOP_CVS}/xserver;module=xserver;date=${FIXEDSRCDATE} \
- file://kmode.patch;patch=1 \
- file://faster-rotated.patch;patch=1 \
- file://fbdev-not-fix.patch;patch=1 "
-
-
-SRC_URI_append_mnci = " file://onlyfb.patch;patch=1 \
- file://faster-rotated.patch;patch=1 \
- file://devfs.patch;patch=1"
-SRC_URI_append_collie = " file://faster-rotated.patch;patch=1"
-SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1 \
- file://faster-rotated.patch;patch=1"
-SRC_URI_append_spitz = " file://faster-rotated.patch;patch=1"
-SRC_URI_append_akita = " file://faster-rotated.patch;patch=1"
-
-PACKAGE_ARCH_mnci = "mnci"
-PACKAGE_ARCH_collie = "collie"
-PACKAGE_ARCH_poodle = "poodle"
-PACKAGE_ARCH_h3600 = "h3600"
-PACKAGE_ARCH_spitz = "spitz"
-PACKAGE_ARCH_akita = "akita"
-
-S = "${WORKDIR}/xserver"
-
-inherit autotools pkgconfig
-
-LDFLAGS += " -lXfont -lXdmcp -lXau "
-EXTRA_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 f9ba32352..000000000
--- a/meta/packages/xorg-xserver/xserver-kdrive_20050624.bb
+++ /dev/null
@@ -1,49 +0,0 @@
-PV = "0.0+cvs${FIXEDSRCDATE}"
-FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
-
-LICENSE = "MIT"
-DEPENDS = "tslib xproto libxdmcp xextensions xtrans libxau virtual/libx11 libxext libxrandr fixesext damageext libxfont resourceext compositeext xcalibrateext recordext"
-PROVIDES = "virtual/xserver"
-RPROVIDES = "virtual/xserver"
-PACKAGES = "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"
-SECTION = "x11/base"
-DESCRIPTION = "X server from freedesktop.org"
-DESCRIPTION_xserver-kdrive-i810 = "X server from freedesktop.org, supporting i810 devices"
-DESCRIPTION_xserver-kdrive-ati = "X server from freedesktop.org, supporting ATI devices"
-DESCRIPTION_xserver-kdrive-mga = "X server from freedesktop.org, supporting MGA devices"
-DESCRIPTION_xserver-kdrive-vesa = "X server from freedesktop.org, supporting generic VESA devices"
-DESCRIPTION_xserver-kdrive-mach64 = "X server from freedesktop.org, supporting Mach64 devices"
-DESCRIPTION_xserver-kdrive-via = "X server from freedesktop.org, supporting VIA CLE266 devices"
-DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices"
-DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Epson S1D13806 devices"
-DESCRIPTION_xserver-kdrive-fake = "Fake X server"
-DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window"
-
-PR = "r12"
-
-FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev"
-FILES_xserver-kdrive-ati = "${bindir}/Xati"
-FILES_xserver-kdrive-vesa = "${bindir}/Xvesa"
-FILES_xserver-kdrive-via = "${bindir}/Xvia"
-FILES_xserver-kdrive-mga = "${bindir}/Xmga"
-FILES_xserver-kdrive-mach64 = "${bindir}/Xmach64"
-FILES_xserver-kdrive-fake = "${bindir}/Xfake"
-FILES_xserver-kdrive-i810 = "${bindir}/Xi810"
-FILES_xserver-kdrive-epson = "${bindir}/Xepson"
-FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xserver;module=xserver;date=${FIXEDSRCDATE} \
- file://kmode.patch;patch=1 \
- file://no-serial-probing.patch;patch=1 \
- file://fbdev-not-fix.patch;patch=1"
-
-SRC_URI_append_mnci = " file://onlyfb.patch;patch=1"
-SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1"
-PACKAGE_ARCH_poodle = "poodle"
-
-
-S = "${WORKDIR}/xserver"
-
-inherit autotools pkgconfig
-
-EXTRA_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 594b6d74e..000000000
--- a/meta/packages/xorg-xserver/xserver-kdrive_20060312.bb
+++ /dev/null
@@ -1,52 +0,0 @@
-PV = "0.0+cvs${FIXEDSRCDATE}"
-FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
-DEFAULT_PREFERENCE = "1"
-
-LICENSE = "MIT"
-DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto"
-PROVIDES = "virtual/xserver"
-RPROVIDES = "virtual/xserver"
-PACKAGES = "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"
-SECTION = "x11/base"
-DESCRIPTION = "X server from freedesktop.org"
-DESCRIPTION_xserver-kdrive-i810 = "X server from freedesktop.org, supporting i810 devices"
-DESCRIPTION_xserver-kdrive-ati = "X server from freedesktop.org, supporting ATI devices"
-DESCRIPTION_xserver-kdrive-mga = "X server from freedesktop.org, supporting MGA devices"
-DESCRIPTION_xserver-kdrive-vesa = "X server from freedesktop.org, supporting generic VESA devices"
-DESCRIPTION_xserver-kdrive-mach64 = "X server from freedesktop.org, supporting Mach64 devices"
-DESCRIPTION_xserver-kdrive-via = "X server from freedesktop.org, supporting VIA CLE266 devices"
-DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices"
-DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Epson S1D13806 devices"
-DESCRIPTION_xserver-kdrive-fake = "Fake X server"
-DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window"
-
-PR = "r11"
-
-FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev"
-FILES_xserver-kdrive-ati = "${bindir}/Xati"
-FILES_xserver-kdrive-vesa = "${bindir}/Xvesa"
-FILES_xserver-kdrive-via = "${bindir}/Xvia"
-FILES_xserver-kdrive-mga = "${bindir}/Xmga"
-FILES_xserver-kdrive-mach64 = "${bindir}/Xmach64"
-FILES_xserver-kdrive-fake = "${bindir}/Xfake"
-FILES_xserver-kdrive-i810 = "${bindir}/Xi810"
-FILES_xserver-kdrive-epson = "${bindir}/Xepson"
-FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xserver;module=xserver \
- file://kmode.patch;patch=1 \
- file://disable-apm.patch;patch=1 \
- file://no-serial-probing.patch;patch=1 \
- file://kdrive-evdev.patch;patch=1 \
- file://kdrive-use-evdev.patch;patch=1 \
- file://fbdev-not-fix.patch;patch=1"
-
-SRC_URI_append_mnci = " file://onlyfb.patch;patch=1"
-SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1"
-PACKAGE_ARCH_poodle = "poodle"
-
-S = "${WORKDIR}/xserver"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--enable-composite --disable-xinerama"