xorg-xserver: push a couple of patches upstream.

diff --git a/recipes/xorg-xserver/files/xorg-avr32-support.diff b/recipes/xorg-xserver/files/xorg-avr32-support.diff
index dd7d379010a6a71f1fd17448893a7df17d8349e5..68320482b951959d0972e791aef391b16383bda0 100644 (file)
--- a/recipes/xorg-xserver/files/xorg-avr32-support.diff
+++ b/recipes/xorg-xserver/files/xorg-avr32-support.diff
@@ -1,3 +1,5 @@
+upstream: https://bugs.freedesktop.org/show_bug.cgi?id=22129
+
 --- /tmp/servermd.h    2007-09-30 17:27:22.310911628 +0200
 +++ xorg-server-1.4/include/servermd.h 2007-09-30 17:28:25.297799199 +0200
 @@ -130,6 +130,16 @@

diff --git a/recipes/xorg-xserver/xserver-kdrive-1.5.3/drmfix.patch b/recipes/xorg-xserver/xserver-kdrive-1.5.3/drmfix.patch
index e0f633bc24b74c64c5fda83c0b6aa8deb908acac..3a010dd4a9198747f80c76e8114a1059ffb55fc3 100644 (file)
--- a/recipes/xorg-xserver/xserver-kdrive-1.5.3/drmfix.patch
+++ b/recipes/xorg-xserver/xserver-kdrive-1.5.3/drmfix.patch
@@ -1,3 +1,5 @@
+upstream: https://bugs.freedesktop.org/show_bug.cgi?id=22131
+
 Index: xorg-server-1.5.1/hw/xfree86/os-support/linux/Makefile.am
 ===================================================================
 --- xorg-server-1.5.1.orig/hw/xfree86/os-support/linux/Makefile.am     2008-09-23 19:24:59.000000000 +0100

diff --git a/recipes/xorg-xserver/xserver-xorg-1.3.0.0/drmfix.patch b/recipes/xorg-xserver/xserver-xorg-1.3.0.0/drmfix.patch
index 96924484af275c847fe23b4f7de0ddb0cf20b3d6..6fb92e255f67cbcaf2b6c05487af43604c4a8ca7 100644 (file)
--- a/recipes/xorg-xserver/xserver-xorg-1.3.0.0/drmfix.patch
+++ b/recipes/xorg-xserver/xserver-xorg-1.3.0.0/drmfix.patch
@@ -1,3 +1,5 @@
+upstream: https://bugs.freedesktop.org/show_bug.cgi?id=22131
+
 --- xorg-server-1.3.0.0.orig/hw/xfree86/os-support/linux/Makefile.am
 +++ xorg-server-1.3.0.0/hw/xfree86/os-support/linux/Makefile.am
 @@ -38,7 +38,7 @@

diff --git a/recipes/xorg-xserver/xserver-xorg-1.3.0.0/glyphstr.patch b/recipes/xorg-xserver/xserver-xorg-1.3.0.0/glyphstr.patch
index 69557274054624248cdf2b10b478011d72e427d9..ba7d26f7cd274a9332d0ea3d7cac1ef291870fb0 100644 (file)
--- a/recipes/xorg-xserver/xserver-xorg-1.3.0.0/glyphstr.patch
+++ b/recipes/xorg-xserver/xserver-xorg-1.3.0.0/glyphstr.patch
@@ -1,3 +1,5 @@
+upstream: https://bugs.freedesktop.org/show_bug.cgi?id=22133
+
 --- xorg-server-1.3.0.0/render/glyphstr.h~     2006-09-18 03:04:18.000000000 -0300
 +++ xorg-server-1.3.0.0/render/glyphstr.h      2008-02-03 22:14:23.187159732 -0200
 @@ -25,6 +25,7 @@

diff --git a/recipes/xorg-xserver/xserver-xorg-1.4.2/drmfix.patch b/recipes/xorg-xserver/xserver-xorg-1.4.2/drmfix.patch
index a62a767f23a2bb2a782444393e6e677fa7aeeea1..5dc896e98f4e1778d291d2cf8a055486e4bec4b0 100644 (file)
--- a/recipes/xorg-xserver/xserver-xorg-1.4.2/drmfix.patch
+++ b/recipes/xorg-xserver/xserver-xorg-1.4.2/drmfix.patch
@@ -1,3 +1,5 @@
+upstream: https://bugs.freedesktop.org/show_bug.cgi?id=22131
+
 Index: xorg-server-1.4/hw/xfree86/os-support/linux/Makefile.am
 ===================================================================
 --- xorg-server-1.4.orig/hw/xfree86/os-support/linux/Makefile.am       2007-08-23 21:04:53.000000000 +0200

diff --git a/recipes/xorg-xserver/xserver-xorg-1.4/drmfix.patch b/recipes/xorg-xserver/xserver-xorg-1.4/drmfix.patch
index a62a767f23a2bb2a782444393e6e677fa7aeeea1..5dc896e98f4e1778d291d2cf8a055486e4bec4b0 100644 (file)
--- a/recipes/xorg-xserver/xserver-xorg-1.4/drmfix.patch
+++ b/recipes/xorg-xserver/xserver-xorg-1.4/drmfix.patch
@@ -1,3 +1,5 @@
+upstream: https://bugs.freedesktop.org/show_bug.cgi?id=22131
+
 Index: xorg-server-1.4/hw/xfree86/os-support/linux/Makefile.am
 ===================================================================
 --- xorg-server-1.4.orig/hw/xfree86/os-support/linux/Makefile.am       2007-08-23 21:04:53.000000000 +0200

diff --git a/recipes/xorg-xserver/xserver-xorg-1.5.1/drmfix.patch b/recipes/xorg-xserver/xserver-xorg-1.5.1/drmfix.patch
index e0f633bc24b74c64c5fda83c0b6aa8deb908acac..3a010dd4a9198747f80c76e8114a1059ffb55fc3 100644 (file)
--- a/recipes/xorg-xserver/xserver-xorg-1.5.1/drmfix.patch
+++ b/recipes/xorg-xserver/xserver-xorg-1.5.1/drmfix.patch
@@ -1,3 +1,5 @@
+upstream: https://bugs.freedesktop.org/show_bug.cgi?id=22131
+
 Index: xorg-server-1.5.1/hw/xfree86/os-support/linux/Makefile.am
 ===================================================================
 --- xorg-server-1.5.1.orig/hw/xfree86/os-support/linux/Makefile.am     2008-09-23 19:24:59.000000000 +0100

diff --git a/recipes/xorg-xserver/xserver-xorg-1.5.3/drmfix.patch b/recipes/xorg-xserver/xserver-xorg-1.5.3/drmfix.patch
index e0f633bc24b74c64c5fda83c0b6aa8deb908acac..3a010dd4a9198747f80c76e8114a1059ffb55fc3 100644 (file)
--- a/recipes/xorg-xserver/xserver-xorg-1.5.3/drmfix.patch
+++ b/recipes/xorg-xserver/xserver-xorg-1.5.3/drmfix.patch
@@ -1,3 +1,5 @@
+upstream: https://bugs.freedesktop.org/show_bug.cgi?id=22131
+
 Index: xorg-server-1.5.1/hw/xfree86/os-support/linux/Makefile.am
 ===================================================================
 --- xorg-server-1.5.1.orig/hw/xfree86/os-support/linux/Makefile.am     2008-09-23 19:24:59.000000000 +0100

diff --git a/recipes/xorg-xserver/xserver-xorg-1.6.1/drmfix.patch b/recipes/xorg-xserver/xserver-xorg-1.6.1/drmfix.patch
index e0f633bc24b74c64c5fda83c0b6aa8deb908acac..3a010dd4a9198747f80c76e8114a1059ffb55fc3 100644 (file)
--- a/recipes/xorg-xserver/xserver-xorg-1.6.1/drmfix.patch
+++ b/recipes/xorg-xserver/xserver-xorg-1.6.1/drmfix.patch
@@ -1,3 +1,5 @@
+upstream: https://bugs.freedesktop.org/show_bug.cgi?id=22131
+
 Index: xorg-server-1.5.1/hw/xfree86/os-support/linux/Makefile.am
 ===================================================================
 --- xorg-server-1.5.1.orig/hw/xfree86/os-support/linux/Makefile.am     2008-09-23 19:24:59.000000000 +0100

diff --git a/recipes/xorg-xserver/xserver-xorg/dri.patch b/recipes/xorg-xserver/xserver-xorg/dri.patch
index 37d0407fe4a256b057b4c30623fe7102e112d629..337a1ddfbf930b9d8912f46b0785309b1746e795 100644 (file)
--- 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 04b0c1ae4ff3e954352b803b093d0a608bbc6742..a64778fb3a8ab5141295ff86bcc9e6e55a046b81 100644 (file)
--- 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 fbade4319a7067df3e675541dd1c5874da5c89e3..7cd5f780732426033990c9c537ee9a376dc338d9 100644 (file)
--- 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 021ba6cded1455f4610b1c7ea1150b5e2e3de0fd..cd7cbe371c468ae4545e6ae89bf2ab798374c469 100644 (file)
--- 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 @@