diff options
author | Chris Larson <kergoth@openedhand.com> | 2006-09-19 09:04:09 +0000 |
---|---|---|
committer | Chris Larson <kergoth@openedhand.com> | 2006-09-19 09:04:09 +0000 |
commit | 4fa2d11bb1fdb58ff426114169583672fc3d65b8 (patch) | |
tree | 0bd4952bbe057c3dc219be7e371a6a9d496c6535 /meta/packages/xorg-xserver | |
parent | 04f695333350e31fa87b7822c17a073af73fcd84 (diff) | |
download | openembedded-core-4fa2d11bb1fdb58ff426114169583672fc3d65b8.tar.gz openembedded-core-4fa2d11bb1fdb58ff426114169583672fc3d65b8.tar.bz2 openembedded-core-4fa2d11bb1fdb58ff426114169583672fc3d65b8.tar.xz openembedded-core-4fa2d11bb1fdb58ff426114169583672fc3d65b8.zip |
Sync up.. all the deb/dpkg changes which I have locally are now in svn.
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@728 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/xorg-xserver')
-rw-r--r-- | meta/packages/xorg-xserver/xserver-kdrive/xfbdev-fb-opt.patch | 36 | ||||
-rw-r--r-- | meta/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb | 3 |
2 files changed, 22 insertions, 17 deletions
diff --git a/meta/packages/xorg-xserver/xserver-kdrive/xfbdev-fb-opt.patch b/meta/packages/xorg-xserver/xserver-kdrive/xfbdev-fb-opt.patch index 89a56719d..a8f002ea2 100644 --- a/meta/packages/xorg-xserver/xserver-kdrive/xfbdev-fb-opt.patch +++ b/meta/packages/xorg-xserver/xserver-kdrive/xfbdev-fb-opt.patch @@ -1,8 +1,18 @@ -diff --git a/hw/kdrive/fbdev/fbdev.c b/hw/kdrive/fbdev/fbdev.c -index 86384f0..904d5f3 100644 ---- a/hw/kdrive/fbdev/fbdev.c -+++ b/hw/kdrive/fbdev/fbdev.c -@@ -38,11 +38,17 @@ fbdevInitialize (KdCardInfo *card, Fbdev +--- + hw/kdrive/fbdev/fbdev.c | 17 ++++++++++++----- + hw/kdrive/fbdev/fbdev.h | 1 + + hw/kdrive/fbdev/fbinit.c | 20 ++++++++++++++++---- + 3 files changed, 29 insertions(+), 9 deletions(-) + +--- xorg-server-X11R7.1-1.1.0.orig/hw/kdrive/fbdev/fbdev.c ++++ xorg-server-X11R7.1-1.1.0/hw/kdrive/fbdev/fbdev.c +@@ -33,16 +33,23 @@ + + extern int KdTsPhyScreen; + ++char *fbdevDevicePath = NULL; + Bool + fbdevInitialize (KdCardInfo *card, FbdevPriv *priv) { int k; unsigned long off; @@ -25,10 +35,8 @@ index 86384f0..904d5f3 100644 /* quiet valgrind */ memset (&priv->fix, '\0', sizeof (priv->fix)); if ((k=ioctl(priv->fd, FBIOGET_FSCREENINFO, &priv->fix)) < 0) { -diff --git a/hw/kdrive/fbdev/fbdev.h b/hw/kdrive/fbdev/fbdev.h -index d37b995..b7951db 100644 ---- a/hw/kdrive/fbdev/fbdev.h -+++ b/hw/kdrive/fbdev/fbdev.h +--- xorg-server-X11R7.1-1.1.0.orig/hw/kdrive/fbdev/fbdev.h ++++ xorg-server-X11R7.1-1.1.0/hw/kdrive/fbdev/fbdev.h @@ -53,6 +53,7 @@ typedef struct _fbdevScrPriv { } FbdevScrPriv; @@ -37,11 +45,9 @@ index d37b995..b7951db 100644 Bool fbdevInitialize (KdCardInfo *card, FbdevPriv *priv); -diff --git a/hw/kdrive/fbdev/fbinit.c b/hw/kdrive/fbdev/fbinit.c -index ba9d1c6..1a7e4bf 100644 ---- a/hw/kdrive/fbdev/fbinit.c -+++ b/hw/kdrive/fbdev/fbinit.c -@@ -54,17 +54,30 @@ InitInput (int argc, char **argv) +--- xorg-server-X11R7.1-1.1.0.orig/hw/kdrive/fbdev/fbinit.c ++++ xorg-server-X11R7.1-1.1.0/hw/kdrive/fbdev/fbinit.c +@@ -59,16 +59,28 @@ InitInput (int argc, char **argv) void ddxUseMsg (void) { @@ -72,7 +78,5 @@ index ba9d1c6..1a7e4bf 100644 + return KdProcessArgument (argc, argv, i); +} -+char *fbdevDevicePath = NULL; KdCardFuncs fbdevFuncs = { fbdevCardInit, /* cardinit */ - fbdevScreenInit, /* scrinit */ diff --git a/meta/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb b/meta/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb index 92857dc62..987b46021 100644 --- a/meta/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb +++ b/meta/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb @@ -2,7 +2,7 @@ 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" +# RPROVIDES = "virtual/xserver" PACKAGES = "xserver-kdrive-fbdev xserver-kdrive-fake xserver-kdrive-xephyr ${PN}-doc ${PN}-dev ${PN}-locale" SECTION = "x11/base" DESCRIPTION = "X server from freedesktop.org" @@ -32,6 +32,7 @@ SRC_URI = "http://ftp.x.org/pub/X11R7.1/src/xserver/xorg-server-X11R7.1-1.1.0.ta SRC_URI_append_mnci = " file://onlyfb.patch;patch=1" SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1" +SRC_URI_append_qemux86 = " file://xserver-kdrive-poodle.patch;patch=1" PACKAGE_ARCH_poodle = "poodle" S = "${WORKDIR}/xorg-server-X11R7.1-1.1.0" |