summaryrefslogtreecommitdiff
path: root/recipes/xorg-xserver/xserver-xorg
diff options
context:
space:
mode:
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>2009-06-07 10:43:33 +0900
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>2009-06-07 10:43:33 +0900
commitead01d1ba1b934b89179a9c95a7613e48207429f (patch)
tree5bc680f59427ef55770c8209f2567579a4484ae6 /recipes/xorg-xserver/xserver-xorg
parent595a0174db40089ad992bb054c6e694957f35042 (diff)
xorg-xserver: push a couple of patches upstream.
Diffstat (limited to 'recipes/xorg-xserver/xserver-xorg')
-rw-r--r--recipes/xorg-xserver/xserver-xorg/dri.patch2
-rw-r--r--recipes/xorg-xserver/xserver-xorg/drmfix.patch2
-rw-r--r--recipes/xorg-xserver/xserver-xorg/miext_layer_shadow_h.patch2
-rw-r--r--recipes/xorg-xserver/xserver-xorg/no-screen-blanking.patch2
4 files changed, 8 insertions, 0 deletions
diff --git a/recipes/xorg-xserver/xserver-xorg/dri.patch b/recipes/xorg-xserver/xserver-xorg/dri.patch
index 37d0407fe4..337a1ddfbf 100644
--- a/recipes/xorg-xserver/xserver-xorg/dri.patch
+++ b/recipes/xorg-xserver/xserver-xorg/dri.patch
@@ -1,3 +1,5 @@
+upstream: https://bugs.freedesktop.org/show_bug.cgi?id=22130
+
--- xc/extras/drm/shared/drm.h.old 2004-09-14 21:42:45.000000000 +0100
+++ xc/extras/drm/shared/drm.h 2004-09-14 21:42:47.000000000 +0100
@@ -38,7 +38,6 @@
diff --git a/recipes/xorg-xserver/xserver-xorg/drmfix.patch b/recipes/xorg-xserver/xserver-xorg/drmfix.patch
index 04b0c1ae4f..a64778fb3a 100644
--- a/recipes/xorg-xserver/xserver-xorg/drmfix.patch
+++ b/recipes/xorg-xserver/xserver-xorg/drmfix.patch
@@ -1,3 +1,5 @@
+upstream: https://bugs.freedesktop.org/show_bug.cgi?id=22131
+
Index: xorg-server-X11R7.0-1.0.1/hw/xfree86/os-support/linux/Makefile.am
===================================================================
--- xorg-server-X11R7.0-1.0.1.orig/hw/xfree86/os-support/linux/Makefile.am
diff --git a/recipes/xorg-xserver/xserver-xorg/miext_layer_shadow_h.patch b/recipes/xorg-xserver/xserver-xorg/miext_layer_shadow_h.patch
index fbade4319a..7cd5f78073 100644
--- a/recipes/xorg-xserver/xserver-xorg/miext_layer_shadow_h.patch
+++ b/recipes/xorg-xserver/xserver-xorg/miext_layer_shadow_h.patch
@@ -1,3 +1,5 @@
+upstream: https://bugs.freedesktop.org/show_bug.cgi?id=22132
+
--- temp/xorg-server-X11R7.0-1.0.1/miext/layer/Makefile.am 2005-12-01 23:02:44.000000000 -0700
+++ xorg-server-X11R7.0-1.0.1/miext/layer/Makefile.am 2006-04-18 23:16:04.315823560 -0600
@@ -2,7 +2,7 @@
diff --git a/recipes/xorg-xserver/xserver-xorg/no-screen-blanking.patch b/recipes/xorg-xserver/xserver-xorg/no-screen-blanking.patch
index 021ba6cded..cd7cbe371c 100644
--- a/recipes/xorg-xserver/xserver-xorg/no-screen-blanking.patch
+++ b/recipes/xorg-xserver/xserver-xorg/no-screen-blanking.patch
@@ -1,3 +1,5 @@
+upstream: not applicable to upstream
+
--- xserver/include/site.h-orig 2006-11-02 10:37:14.000000000 +0000
+++ xserver/include/site.h 2006-11-02 10:37:14.000000000 +0000
@@ -117,8 +117,8 @@