From 6aa76f9f2735a0c414b9abe3f7015b2ee4973e66 Mon Sep 17 00:00:00 2001 From: Yu Ke Date: Wed, 13 Jul 2011 11:08:58 +0800 Subject: xserver-kdrive: add patch upstream status info - add patch upstream status - also remove the obsolete xserver-kdrive-1.3.0.0 patches (From OE-Core rev: 1ec48876d36a415fcd5816c1e4de17f8794b367b) Signed-off-by: Yu Ke Signed-off-by: Richard Purdie --- .../xorg-xserver/xserver-kdrive-1.7.99.2/crosscompile.patch | 4 ++++ .../xorg-xserver/xserver-kdrive-1.7.99.2/disable-apm.patch | 4 ++++ .../xorg-xserver/xserver-kdrive-1.7.99.2/enable-builtin-fonts.patch | 4 ++++ .../xorg-xserver/xserver-kdrive-1.7.99.2/enable-xcalibrate.patch | 4 ++++ .../xorg-xserver/xserver-kdrive-1.7.99.2/extra-kmodes.patch | 4 ++++ .../xorg-xserver/xserver-kdrive-1.7.99.2/fbdev_xrandr_ioctl.patch | 4 ++++ .../xserver-kdrive-1.7.99.2/fix-newer-xorg-headers.patch | 4 ++++ .../xserver-kdrive-1.7.99.2/hide-cursor-and-ppm-root.patch | 4 ++++ .../xorg-xserver/xserver-kdrive-1.7.99.2/kdrive-evdev.patch | 5 +++++ .../xorg-xserver/xserver-kdrive-1.7.99.2/kdrive-use-evdev.patch | 4 ++++ .../xserver-kdrive-1.7.99.2/keyboard-resume-workaround.patch | 4 ++++ .../xorg-xserver/xserver-kdrive-1.7.99.2/no-serial-probing.patch | 4 ++++ .../xorg-xserver/xserver-kdrive-1.7.99.2/nodolt.patch | 4 ++++ .../xorg-xserver/xserver-kdrive-1.7.99.2/optional-xkb.patch | 4 ++++ 14 files changed, 57 insertions(+) (limited to 'meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2') diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/crosscompile.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/crosscompile.patch index 2341e40bca..87595d0a5a 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/crosscompile.patch +++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/crosscompile.patch @@ -1,3 +1,7 @@ +Upstream-Status: Inappropriate [cross compiling] + +Signed-off-by: Yu Ke + Index: xorg-server-1.7.99.2/configure.ac =================================================================== --- xorg-server-1.7.99.2.orig/configure.ac 2010-01-29 16:38:49.000000000 +0000 diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/disable-apm.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/disable-apm.patch index bd8842721b..c22b1c06e2 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/disable-apm.patch +++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/disable-apm.patch @@ -1,3 +1,7 @@ +Upstream-Status: Inappropriate [disable feature] + +Signed-off-by: Yu Ke + --- xserver/hw/kdrive/linux/linux.c.orig 2005-04-23 15:56:13.988849232 +0000 +++ xserver/hw/kdrive/linux/linux.c 2005-04-23 15:57:05.001094192 +0000 @@ -342,7 +342,7 @@ diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/enable-builtin-fonts.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/enable-builtin-fonts.patch index 13a6c2c954..98d5176b40 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/enable-builtin-fonts.patch +++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/enable-builtin-fonts.patch @@ -1,3 +1,7 @@ +Upstream-Status: Pending + +Signed-off-by: Yu Ke + --- xorg-server-X11R7.1-1.1.0/dix/dixfonts.c.orig 2006-06-08 14:49:12.158684250 +0200 +++ xorg-server-X11R7.1-1.1.0/dix/dixfonts.c 2006-06-08 14:49:52.493205000 +0200 @@ -52,8 +52,8 @@ diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/enable-xcalibrate.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/enable-xcalibrate.patch index 9794e98cb0..efac5ef67a 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/enable-xcalibrate.patch +++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/enable-xcalibrate.patch @@ -1,3 +1,7 @@ +Upstream-Status: Pending + +Signed-off-by: Yu Ke + --- Xext/Makefile.am | 6 ++++++ configure.ac | 11 +++++++++-- diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/extra-kmodes.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/extra-kmodes.patch index 14cf99055b..896c0332b1 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/extra-kmodes.patch +++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/extra-kmodes.patch @@ -1,5 +1,9 @@ Add some extra video modes and change the default to VGA. +Upstream-Status: Pending + +Signed-off-by: Yu Ke + --- hw/kdrive/src/kmode.c | 41 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/fbdev_xrandr_ioctl.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/fbdev_xrandr_ioctl.patch index a5c22a5efc..06761c9141 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/fbdev_xrandr_ioctl.patch +++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/fbdev_xrandr_ioctl.patch @@ -1,3 +1,7 @@ +Upstream-Status: Pending + +Signed-off-by: Yu Ke + Index: xorg-server-1.3.0.0/hw/kdrive/fbdev/fbdev.c =================================================================== --- xorg-server-1.3.0.0.orig/hw/kdrive/fbdev/fbdev.c 2008-09-25 21:55:12.000000000 +0100 diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/fix-newer-xorg-headers.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/fix-newer-xorg-headers.patch index eb98fb82c7..7aa487a141 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/fix-newer-xorg-headers.patch +++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/fix-newer-xorg-headers.patch @@ -1,3 +1,7 @@ +Upstream-Status: Pending + +Signed-off-by: Yu Ke + --- render/glyphstr.h | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/hide-cursor-and-ppm-root.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/hide-cursor-and-ppm-root.patch index 73f30ee716..b946bb5475 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/hide-cursor-and-ppm-root.patch +++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/hide-cursor-and-ppm-root.patch @@ -1,3 +1,7 @@ +Upstream-Status: Pending + +Signed-off-by: Yu Ke + Index: xorg-server-1.7.99.2/dix/window.c =================================================================== --- xorg-server-1.7.99.2.orig/dix/window.c 2009-11-04 16:25:50.000000000 +0000 diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/kdrive-evdev.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/kdrive-evdev.patch index 2dc22bf50e..5d876af9e3 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/kdrive-evdev.patch +++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/kdrive-evdev.patch @@ -1,5 +1,10 @@ # Kdrive evdev support patch, posted by Ander Conselvan de Oliveira at # http://lists.freedesktop.org/archives/xorg/2005-December/011635.html + +Upstream-Status: Pending + +Signed-off-by: Yu Ke + diff -u -r --exclude=CVS --exclude=Makefile --exclude='*.o' --exclude=ephyr --exclude='*.Po' xserver.original/hw/kdrive/linux/evdev.c xserver/hw/kdrive/linux/evdev.c --- xserver.original/hw/kdrive/linux/evdev.c 2005-12-16 10:36:05.000000000 -0200 +++ xserver/hw/kdrive/linux/evdev.c 2005-12-16 10:40:51.077410192 -0200 diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/kdrive-use-evdev.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/kdrive-use-evdev.patch index 28d7325601..8a480dc9d9 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/kdrive-use-evdev.patch +++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/kdrive-use-evdev.patch @@ -1,3 +1,7 @@ +Upstream-Status: Pending + +Signed-off-by: Yu Ke + --- xserver/hw/kdrive/fbdev/fbinit.c~ 2006-01-31 17:09:33.000000000 +0100 +++ xserver/hw/kdrive/fbdev/fbinit.c 2006-01-31 17:11:55.000000000 +0100 @@ -28,6 +28,8 @@ diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/keyboard-resume-workaround.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/keyboard-resume-workaround.patch index d614b547a8..00626611ad 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/keyboard-resume-workaround.patch +++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/keyboard-resume-workaround.patch @@ -1,3 +1,7 @@ +Upstream-Status: Pending + +Signed-off-by: Yu Ke + Index: xorg-server-1.4/hw/kdrive/linux/keyboard.c =================================================================== --- xorg-server-1.4.orig/hw/kdrive/linux/keyboard.c 2007-09-29 18:31:15.000000000 +0200 diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/no-serial-probing.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/no-serial-probing.patch index 35ccadaa8d..6acb83440c 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/no-serial-probing.patch +++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/no-serial-probing.patch @@ -1,3 +1,7 @@ +Upstream-Status: Pending + +Signed-off-by: Yu Ke + --- xserver/hw/kdrive/linux/mouse.c.orig 2004-05-13 14:25:51.000000000 -0700 +++ xserver/hw/kdrive/linux/mouse.c 2005-09-22 12:20:47.000000000 -0700 @@ -927,8 +927,10 @@ char *kdefaultMouse[] = { diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/nodolt.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/nodolt.patch index 6b34032a39..37811dbfd1 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/nodolt.patch +++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/nodolt.patch @@ -1,3 +1,7 @@ +Upstream-Status: Pending + +Signed-off-by: Yu Ke + Index: git/configure.ac =================================================================== --- git.orig/configure.ac 2009-01-15 20:35:31.000000000 +0000 diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/optional-xkb.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/optional-xkb.patch index a580b500b7..af3c16c058 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/optional-xkb.patch +++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/optional-xkb.patch @@ -1,3 +1,7 @@ +Upstream-Status: Pending + +Signed-off-by: Yu Ke + Index: xorg-server-1.2.0/Makefile.am =================================================================== --- xorg-server-1.2.0.orig/Makefile.am 2007-01-23 06:39:15.000000000 +0100 -- cgit v1.2.3-54-g00ecf