summaryrefslogtreecommitdiff
path: root/meta/recipes-graphics/xorg-xserver
diff options
context:
space:
mode:
authorYu Ke <ke.yu@intel.com>2011-07-26 15:12:58 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-26 15:48:53 +0100
commit8afcc3551be8d608a2082ab7da7a6bfdba490f15 (patch)
tree4d48e64a779d7ef4f31520c6019109ff6c86b00e /meta/recipes-graphics/xorg-xserver
parent66ec3774f99229ca6c25c047372f45ccd834d77a (diff)
downloadopenembedded-core-8afcc3551be8d608a2082ab7da7a6bfdba490f15.tar.gz
openembedded-core-8afcc3551be8d608a2082ab7da7a6bfdba490f15.tar.bz2
openembedded-core-8afcc3551be8d608a2082ab7da7a6bfdba490f15.zip
upstream status: add for libsdl and xserver patches
Signed-off-by: Yu Ke <ke.yu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver')
-rw-r--r--meta/recipes-graphics/xorg-xserver/files/macro_tweak.patch2
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-kdrive/fbdev_xrandr_ioctl.patch2
2 files changed, 4 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/files/macro_tweak.patch b/meta/recipes-graphics/xorg-xserver/files/macro_tweak.patch
index 6998adffe9..c4af228afb 100644
--- a/meta/recipes-graphics/xorg-xserver/files/macro_tweak.patch
+++ b/meta/recipes-graphics/xorg-xserver/files/macro_tweak.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
Index: xorg-server-1.5.0/xorg-server.m4
===================================================================
--- xorg-server-1.5.0.orig/xorg-server.m4 2007-05-29 20:36:51.000000000 +0100
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive/fbdev_xrandr_ioctl.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive/fbdev_xrandr_ioctl.patch
index a5c22a5efc..07348dc512 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive/fbdev_xrandr_ioctl.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive/fbdev_xrandr_ioctl.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
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