From ead01d1ba1b934b89179a9c95a7613e48207429f Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Sun, 7 Jun 2009 10:43:33 +0900 Subject: xorg-xserver: push a couple of patches upstream. --- recipes/xorg-xserver/files/xorg-avr32-support.diff | 2 ++ recipes/xorg-xserver/xserver-kdrive-1.5.3/drmfix.patch | 2 ++ recipes/xorg-xserver/xserver-xorg-1.3.0.0/drmfix.patch | 2 ++ recipes/xorg-xserver/xserver-xorg-1.3.0.0/glyphstr.patch | 2 ++ recipes/xorg-xserver/xserver-xorg-1.4.2/drmfix.patch | 2 ++ recipes/xorg-xserver/xserver-xorg-1.4/drmfix.patch | 2 ++ recipes/xorg-xserver/xserver-xorg-1.5.1/drmfix.patch | 2 ++ recipes/xorg-xserver/xserver-xorg-1.5.3/drmfix.patch | 2 ++ recipes/xorg-xserver/xserver-xorg-1.6.1/drmfix.patch | 2 ++ recipes/xorg-xserver/xserver-xorg/dri.patch | 2 ++ recipes/xorg-xserver/xserver-xorg/drmfix.patch | 2 ++ recipes/xorg-xserver/xserver-xorg/miext_layer_shadow_h.patch | 2 ++ recipes/xorg-xserver/xserver-xorg/no-screen-blanking.patch | 2 ++ 13 files changed, 26 insertions(+) (limited to 'recipes/xorg-xserver') diff --git a/recipes/xorg-xserver/files/xorg-avr32-support.diff b/recipes/xorg-xserver/files/xorg-avr32-support.diff index dd7d379010..68320482b9 100644 --- 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 e0f633bc24..3a010dd4a9 100644 --- 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 96924484af..6fb92e255f 100644 --- 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 6955727405..ba7d26f7cd 100644 --- 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 a62a767f23..5dc896e98f 100644 --- 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 a62a767f23..5dc896e98f 100644 --- 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 e0f633bc24..3a010dd4a9 100644 --- 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 e0f633bc24..3a010dd4a9 100644 --- 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 e0f633bc24..3a010dd4a9 100644 --- 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 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 @@ -- cgit v1.2.3