diff options
Diffstat (limited to 'recipes/xorg-xserver')
17 files changed, 24 insertions, 23 deletions
diff --git a/recipes/xorg-xserver/files/xorg-avr32-support.diff b/recipes/xorg-xserver/files/xorg-avr32-support.diff index 68320482b9..583191e84f 100644 --- a/recipes/xorg-xserver/files/xorg-avr32-support.diff +++ b/recipes/xorg-xserver/files/xorg-avr32-support.diff @@ -1,4 +1,4 @@ -upstream: https://bugs.freedesktop.org/show_bug.cgi?id=22129 +upstream: applied in 82b37d35af13a9f402755e167493ab256b664b9c (2008-04-22) --- /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 diff --git a/recipes/xorg-xserver/xserver-kdrive-1.4.0.90/w100-autofoo.patch b/recipes/xorg-xserver/xserver-kdrive-1.4.0.90/w100-autofoo.patch index 0812a2e856..6102dadaa1 100644 --- a/recipes/xorg-xserver/xserver-kdrive-1.4.0.90/w100-autofoo.patch +++ b/recipes/xorg-xserver/xserver-kdrive-1.4.0.90/w100-autofoo.patch @@ -1,3 +1,5 @@ +upstream: http://bugs.freedesktop.org/show_bug.cgi?id=15882 + Index: xorg-server-1.4/hw/kdrive/Makefile.am =================================================================== --- xorg-server-1.4.orig/hw/kdrive/Makefile.am 2007-09-06 23:32:04.000000000 +0200 diff --git a/recipes/xorg-xserver/xserver-kdrive-1.4.2/w100-autofoo.patch b/recipes/xorg-xserver/xserver-kdrive-1.4.2/w100-autofoo.patch index 0812a2e856..6102dadaa1 100644 --- a/recipes/xorg-xserver/xserver-kdrive-1.4.2/w100-autofoo.patch +++ b/recipes/xorg-xserver/xserver-kdrive-1.4.2/w100-autofoo.patch @@ -1,3 +1,5 @@ +upstream: http://bugs.freedesktop.org/show_bug.cgi?id=15882 + Index: xorg-server-1.4/hw/kdrive/Makefile.am =================================================================== --- xorg-server-1.4.orig/hw/kdrive/Makefile.am 2007-09-06 23:32:04.000000000 +0200 diff --git a/recipes/xorg-xserver/xserver-kdrive-1.4.99.901/w100-autofoo.patch b/recipes/xorg-xserver/xserver-kdrive-1.4.99.901/w100-autofoo.patch index 0812a2e856..6102dadaa1 100644 --- a/recipes/xorg-xserver/xserver-kdrive-1.4.99.901/w100-autofoo.patch +++ b/recipes/xorg-xserver/xserver-kdrive-1.4.99.901/w100-autofoo.patch @@ -1,3 +1,5 @@ +upstream: http://bugs.freedesktop.org/show_bug.cgi?id=15882 + Index: xorg-server-1.4/hw/kdrive/Makefile.am =================================================================== --- xorg-server-1.4.orig/hw/kdrive/Makefile.am 2007-09-06 23:32:04.000000000 +0200 diff --git a/recipes/xorg-xserver/xserver-kdrive-1.4/w100-autofoo.patch b/recipes/xorg-xserver/xserver-kdrive-1.4/w100-autofoo.patch index 0812a2e856..6102dadaa1 100644 --- a/recipes/xorg-xserver/xserver-kdrive-1.4/w100-autofoo.patch +++ b/recipes/xorg-xserver/xserver-kdrive-1.4/w100-autofoo.patch @@ -1,3 +1,5 @@ +upstream: http://bugs.freedesktop.org/show_bug.cgi?id=15882 + Index: xorg-server-1.4/hw/kdrive/Makefile.am =================================================================== --- xorg-server-1.4.orig/hw/kdrive/Makefile.am 2007-09-06 23:32:04.000000000 +0200 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 3a010dd4a9..8ebda98975 100644 --- a/recipes/xorg-xserver/xserver-kdrive-1.5.3/drmfix.patch +++ b/recipes/xorg-xserver/xserver-kdrive-1.5.3/drmfix.patch @@ -1,4 +1,4 @@ -upstream: https://bugs.freedesktop.org/show_bug.cgi?id=22131 +upstream: applied in b3e981c9d4ff31263a43b47f83cf8db4c2b5aeff (2008-07-28) Index: xorg-server-1.5.1/hw/xfree86/os-support/linux/Makefile.am =================================================================== diff --git a/recipes/xorg-xserver/xserver-kdrive-1.5.3/w100-autofoo.patch b/recipes/xorg-xserver/xserver-kdrive-1.5.3/w100-autofoo.patch index 0812a2e856..6102dadaa1 100644 --- a/recipes/xorg-xserver/xserver-kdrive-1.5.3/w100-autofoo.patch +++ b/recipes/xorg-xserver/xserver-kdrive-1.5.3/w100-autofoo.patch @@ -1,3 +1,5 @@ +upstream: http://bugs.freedesktop.org/show_bug.cgi?id=15882 + Index: xorg-server-1.4/hw/kdrive/Makefile.am =================================================================== --- xorg-server-1.4.orig/hw/kdrive/Makefile.am 2007-09-06 23:32:04.000000000 +0200 diff --git a/recipes/xorg-xserver/xserver-kdrive/w100-autofoo.patch b/recipes/xorg-xserver/xserver-kdrive/w100-autofoo.patch index b53e327dae..61d0a971ac 100644 --- a/recipes/xorg-xserver/xserver-kdrive/w100-autofoo.patch +++ b/recipes/xorg-xserver/xserver-kdrive/w100-autofoo.patch @@ -1,3 +1,5 @@ +upstream: http://bugs.freedesktop.org/show_bug.cgi?id=15882 + Index: git/hw/kdrive/Makefile.am =================================================================== --- git.orig/hw/kdrive/Makefile.am 2006-09-02 12:12:13.000000000 +0200 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 6fb92e255f..72bdcda358 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,4 +1,4 @@ -upstream: https://bugs.freedesktop.org/show_bug.cgi?id=22131 +upstream: applied in b3e981c9d4ff31263a43b47f83cf8db4c2b5aeff (2008-07-28) --- 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 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 5dc896e98f..dde76376f3 100644 --- a/recipes/xorg-xserver/xserver-xorg-1.4.2/drmfix.patch +++ b/recipes/xorg-xserver/xserver-xorg-1.4.2/drmfix.patch @@ -1,4 +1,4 @@ -upstream: https://bugs.freedesktop.org/show_bug.cgi?id=22131 +upstream: applied in b3e981c9d4ff31263a43b47f83cf8db4c2b5aeff (2008-07-28) Index: xorg-server-1.4/hw/xfree86/os-support/linux/Makefile.am =================================================================== diff --git a/recipes/xorg-xserver/xserver-xorg-1.4/drmfix.patch b/recipes/xorg-xserver/xserver-xorg-1.4/drmfix.patch index 5dc896e98f..dde76376f3 100644 --- a/recipes/xorg-xserver/xserver-xorg-1.4/drmfix.patch +++ b/recipes/xorg-xserver/xserver-xorg-1.4/drmfix.patch @@ -1,4 +1,4 @@ -upstream: https://bugs.freedesktop.org/show_bug.cgi?id=22131 +upstream: applied in b3e981c9d4ff31263a43b47f83cf8db4c2b5aeff (2008-07-28) Index: xorg-server-1.4/hw/xfree86/os-support/linux/Makefile.am =================================================================== 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 3a010dd4a9..8ebda98975 100644 --- a/recipes/xorg-xserver/xserver-xorg-1.5.1/drmfix.patch +++ b/recipes/xorg-xserver/xserver-xorg-1.5.1/drmfix.patch @@ -1,4 +1,4 @@ -upstream: https://bugs.freedesktop.org/show_bug.cgi?id=22131 +upstream: applied in b3e981c9d4ff31263a43b47f83cf8db4c2b5aeff (2008-07-28) Index: xorg-server-1.5.1/hw/xfree86/os-support/linux/Makefile.am =================================================================== 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 3a010dd4a9..8ebda98975 100644 --- a/recipes/xorg-xserver/xserver-xorg-1.5.3/drmfix.patch +++ b/recipes/xorg-xserver/xserver-xorg-1.5.3/drmfix.patch @@ -1,4 +1,4 @@ -upstream: https://bugs.freedesktop.org/show_bug.cgi?id=22131 +upstream: applied in b3e981c9d4ff31263a43b47f83cf8db4c2b5aeff (2008-07-28) Index: xorg-server-1.5.1/hw/xfree86/os-support/linux/Makefile.am =================================================================== 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 3a010dd4a9..8ebda98975 100644 --- a/recipes/xorg-xserver/xserver-xorg-1.6.1/drmfix.patch +++ b/recipes/xorg-xserver/xserver-xorg-1.6.1/drmfix.patch @@ -1,4 +1,4 @@ -upstream: https://bugs.freedesktop.org/show_bug.cgi?id=22131 +upstream: applied in b3e981c9d4ff31263a43b47f83cf8db4c2b5aeff (2008-07-28) Index: xorg-server-1.5.1/hw/xfree86/os-support/linux/Makefile.am =================================================================== diff --git a/recipes/xorg-xserver/xserver-xorg/dri.patch b/recipes/xorg-xserver/xserver-xorg/dri.patch index 337a1ddfbf..dd94bdf6b2 100644 --- a/recipes/xorg-xserver/xserver-xorg/dri.patch +++ b/recipes/xorg-xserver/xserver-xorg/dri.patch @@ -1,4 +1,6 @@ -upstream: https://bugs.freedesktop.org/show_bug.cgi?id=22130 +upstream: not applicable upstream. The relevant code seems to have been dropped + within the last three years. the outdated cvs recipe is the only bb that uses + this patch. --- 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 diff --git a/recipes/xorg-xserver/xserver-xorg/drmfix.patch b/recipes/xorg-xserver/xserver-xorg/drmfix.patch index a64778fb3a..fcbeac097c 100644 --- a/recipes/xorg-xserver/xserver-xorg/drmfix.patch +++ b/recipes/xorg-xserver/xserver-xorg/drmfix.patch @@ -1,4 +1,4 @@ -upstream: https://bugs.freedesktop.org/show_bug.cgi?id=22131 +upstream: applied in b3e981c9d4ff31263a43b47f83cf8db4c2b5aeff (2008-07-28) Index: xorg-server-X11R7.0-1.0.1/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 deleted file mode 100644 index 7cd5f78073..0000000000 --- a/recipes/xorg-xserver/xserver-xorg/miext_layer_shadow_h.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 @@ - - AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ - --INCLUDES = -I$(top_srcdir)/hw/xfree86/os-support -+INCLUDES = -I$(top_srcdir)/miext/shadow -I$(top_srcdir)/hw/xfree86/os-support - - liblayer_la_SOURCES = \ - layer.h \ |