summaryrefslogtreecommitdiff
path: root/recipes/xorg-xserver
diff options
context:
space:
mode:
Diffstat (limited to 'recipes/xorg-xserver')
-rw-r--r--recipes/xorg-xserver/files/xorg-avr32-support.diff2
-rw-r--r--recipes/xorg-xserver/xserver-kdrive-1.2.0/split_multiple_AC_SUBST.patch15
-rw-r--r--recipes/xorg-xserver/xserver-kdrive-1.4.0.90/split_multiple_AC_SUBST.patch15
-rw-r--r--recipes/xorg-xserver/xserver-kdrive-1.5.3/drmfix.patch2
-rw-r--r--recipes/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb5
-rw-r--r--recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb3
-rw-r--r--recipes/xorg-xserver/xserver-xorg-1.3.0.0/drmfix.patch2
-rw-r--r--recipes/xorg-xserver/xserver-xorg-1.3.0.0/glyphstr.patch2
-rw-r--r--recipes/xorg-xserver/xserver-xorg-1.4.2/drmfix.patch2
-rw-r--r--recipes/xorg-xserver/xserver-xorg-1.4/drmfix.patch2
-rw-r--r--recipes/xorg-xserver/xserver-xorg-1.5.1/drmfix.patch2
-rw-r--r--recipes/xorg-xserver/xserver-xorg-1.5.3/drmfix.patch2
-rw-r--r--recipes/xorg-xserver/xserver-xorg-1.6.1/drmfix.patch2
-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
17 files changed, 61 insertions, 3 deletions
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.2.0/split_multiple_AC_SUBST.patch b/recipes/xorg-xserver/xserver-kdrive-1.2.0/split_multiple_AC_SUBST.patch
new file mode 100644
index 0000000000..dfbe730613
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-kdrive-1.2.0/split_multiple_AC_SUBST.patch
@@ -0,0 +1,15 @@
+Index: xorg-server-1.2.0/configure.ac
+===================================================================
+--- xorg-server-1.2.0.orig/configure.ac 2007-12-12 20:57:37.000000000 +0100
++++ xorg-server-1.2.0/configure.ac 2009-06-06 23:47:54.000000000 +0200
+@@ -1667,7 +1667,9 @@
+ DIX_CFLAGS="-DHAVE_DIX_CONFIG_H"
+ AC_SUBST([DIX_CFLAGS])
+
+-AC_SUBST([libdir exec_prefix prefix])
++AC_SUBST([libdir])
++AC_SUBST([exec_prefix])
++AC_SUBST([prefix])
+
+ # Man page sections - used in config utils & generating man pages
+ XORG_MANPAGE_SECTIONS
diff --git a/recipes/xorg-xserver/xserver-kdrive-1.4.0.90/split_multiple_AC_SUBST.patch b/recipes/xorg-xserver/xserver-kdrive-1.4.0.90/split_multiple_AC_SUBST.patch
new file mode 100644
index 0000000000..110a2a5df1
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-kdrive-1.4.0.90/split_multiple_AC_SUBST.patch
@@ -0,0 +1,15 @@
+Index: xorg-server-1.4.0.90/configure.ac
+===================================================================
+--- xorg-server-1.4.0.90.orig/configure.ac 2007-12-12 20:57:37.000000000 +0100
++++ xorg-server-1.4.0.90/configure.ac 2009-06-06 23:47:54.000000000 +0200
+@@ -1962,7 +1962,9 @@
+
+ AC_SUBST([DIX_CFLAGS])
+
+-AC_SUBST([libdir exec_prefix prefix])
++AC_SUBST([libdir])
++AC_SUBST([exec_prefix])
++AC_SUBST([prefix])
+
+ # Man page sections - used in config utils & generating man pages
+ XORG_MANPAGE_SECTIONS
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-kdrive-imageon_1.2.0.bb b/recipes/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb
index 3a042db0d1..18b85fdcb0 100644
--- a/recipes/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb
+++ b/recipes/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb
@@ -7,7 +7,7 @@ DEPENDS += "libxkbfile libxcalibrate"
PROVIDES = "virtual/xserver"
PE = "1"
-PR = "r6"
+PR = "r7"
FILESPATH = "${FILE_DIRNAME}/xserver-kdrive-${PV}:${FILE_DIRNAME}/xserver-kdrive:${FILE_DIRNAME}/files"
SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
@@ -22,7 +22,8 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
file://xcalibrate_coords.patch;patch=1 \
file://enable-builtin-fonts.patch;patch=1 \
file://fix-picturestr-include-order.patch;patch=1 \
- "
+ file://split_multiple_AC_SUBST.patch;patch=1 \
+ "
S = "${WORKDIR}/xorg-server-${PV}"
diff --git a/recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb b/recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb
index fe0335d2cd..0b347aad7b 100644
--- a/recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb
+++ b/recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb
@@ -4,7 +4,7 @@ DEPENDS += "hal libxkbfile libxcalibrate pixman"
RDEPENDS += "hal"
PE = "1"
-PR = "r6"
+PR = "r7"
SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
${KDRIVE_COMMON_PATCHES} \
@@ -26,6 +26,7 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
file://pkgconfig_fix.patch;patch=1 \
file://no_xkb.patch;patch=1;pnum=0 \
file://xorg-1.4-kdrive-rotation.patch;patch=1 \
+ file://split_multiple_AC_SUBST.patch;patch=1 \
"
S = "${WORKDIR}/xorg-server-${PV}"
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 @@