From 02ce57eaf0cbc7c659e78a5591cf503f9b286791 Mon Sep 17 00:00:00 2001
From: Phil Blundell <philb@gnu.org>
Date: Sat, 6 Jun 2009 10:11:23 +0100
Subject: micro: eliminate some bloat Acked-by: Chris Larson

---
 conf/distro/micro.conf | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/conf/distro/micro.conf b/conf/distro/micro.conf
index bf4e5e1a82..a6fb64e4d8 100644
--- a/conf/distro/micro.conf
+++ b/conf/distro/micro.conf
@@ -98,3 +98,12 @@ USE_NLS_gcc-cross = "no"
 # Disable binary locale generation
 ENABLE_BINARY_LOCALE_GENERATION = "0"
 
+# Don't install useless symlinks to libraries
+PACKAGE_SNAP_LIB_SYMLINKS = "1"
+
+# Collapse /usr into /
+layout_prefix = ""
+layout_exec_prefix = ""
+
+# Don't install ldconfig and associated gubbins
+USE_LDCONFIG = "0"
-- 
cgit v1.2.3


From ef47aa19f38d0a17d7c8e1e19b168097e94c2588 Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Sat, 6 Jun 2009 14:28:08 +0900
Subject: zaurus-installer: add collie support.  properly unbreaks collie image
 build. * this effectively reverts d4dae3f91c9e0e5391ea5e83751ae0d56cbaabe6  
 which was not the proper way to do it.  Zaurus machine config probably  
 still needs some more TLC.

---
 conf/machine/include/zaurus-2.6.inc        |  3 ---
 recipes/zaurus-updater/zaurus-installer.bb | 10 ++++++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index cdad690545..ba923f9515 100644
--- a/conf/machine/include/zaurus-2.6.inc
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -14,9 +14,6 @@ EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=${ERASEBLOCKSIZE} --pad --f
 
 EXTRA_IMAGEDEPENDS += "zaurus-installer"
 
-# collie is flashed by pressing C+D on power-on
-EXTRA_IMAGEDEPENDS_collie += ""
-
 SERIAL_CONSOLE = "115200 ttyS0"
 SERIAL_CONSOLE_collie = "115200 ttySA0"
 
diff --git a/recipes/zaurus-updater/zaurus-installer.bb b/recipes/zaurus-updater/zaurus-installer.bb
index 098110b969..70dca30031 100644
--- a/recipes/zaurus-updater/zaurus-installer.bb
+++ b/recipes/zaurus-updater/zaurus-installer.bb
@@ -1,10 +1,10 @@
 DESCRIPTION = "Installkit for kexecboot-kernel"
-DEPENDS = "zaurus-updater linux-kexecboot"
-PR = "r0"
+DEPENDS = "${@base_conditional('MACHINE', 'collie', 'linux-kexecboot', 'zaurus-updater linux-kexecboot', d)}"
+PR = "r1"
 
 PACKAGES = ""
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = '(poodle|c7x0|spitz|akita|tosa)'
+COMPATIBLE_MACHINE = '(collie|poodle|c7x0|spitz|akita|tosa)'
 
 S = "${WORKDIR}"
 
@@ -22,7 +22,9 @@ do_deploy() {
 
 	[ -f "${KERNEL_IMAGETYPE}-kexecboot-${MACHINE}.bin" ] && cp ${KERNEL_IMAGETYPE}-kexecboot-${MACHINE}.bin installkit-${MACHINE}/${KERNEL_IMAGETYPE}
 
-	cp updater.sh.${MACHINE} installkit-${MACHINE}/updater.sh
+	if [ ! "${MACHINE}" = "collie" ]; then
+		cp updater.sh.${MACHINE} installkit-${MACHINE}/updater.sh
+	fi
  
 	tar czf ${DEPLOY_DIR_IMAGE}/installkit-${MACHINE}.tar.gz installkit-${MACHINE}/
 	md5sum ${DEPLOY_DIR_IMAGE}/installkit-${MACHINE}.tar.gz > ${DEPLOY_DIR_IMAGE}/installkit-${MACHINE}.tar.gz.md5
-- 
cgit v1.2.3


From 9ff15b96b31106c4a315106801fe6534905b5948 Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Sat, 6 Jun 2009 20:04:01 +0900
Subject: util-linux-ng: add e2fsprogs-libs to DEPENDS.

---
 recipes/util-linux-ng/util-linux-ng.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes/util-linux-ng/util-linux-ng.inc b/recipes/util-linux-ng/util-linux-ng.inc
index 39100b0a75..7e949d1615 100644
--- a/recipes/util-linux-ng/util-linux-ng.inc
+++ b/recipes/util-linux-ng/util-linux-ng.inc
@@ -1,7 +1,7 @@
 DESCRIPTION = "Util-linux-ng is a suite of essential utilities for any Linux system."
 SECTION = "base"
 LICENSE = "GPL"
-DEPENDS = "udev zlib ncurses virtual/libintl"
+DEPENDS = "udev zlib ncurses virtual/libintl e2fsprogs-libs"
 
 inherit autotools_stage
 AUTOTOOLS_STAGE_PKGCONFIG = "1"
-- 
cgit v1.2.3


From 3d0356a80bd04d073e212412fe4f54b487714879 Mon Sep 17 00:00:00 2001
From: Stefan Schmidt <stefan@datenfreihafen.org>
Date: Fri, 5 Jun 2009 23:46:47 +0200
Subject: libefso: Sync package version

---
 recipes/efl1/libefso_svn.bb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/recipes/efl1/libefso_svn.bb b/recipes/efl1/libefso_svn.bb
index 20d520cba5..276cd100ef 100644
--- a/recipes/efl1/libefso_svn.bb
+++ b/recipes/efl1/libefso_svn.bb
@@ -2,8 +2,7 @@ DESCRIPTION = "EFL FSO wrapper library"
 SECTION = "e/libs"
 LICENSE = "GPLv2"
 DEPENDS = "ecore edbus"
-PV = "0.0.0+svnr${SRCREV}"
-PR = "r2"
+PV = "0.0.1+svnr${SRCREV}"
 
 SRC_URI = "svn://svn.om.vptt.ch/trunk/;proto=http;module=libefso"
 S = "${WORKDIR}/libefso"
-- 
cgit v1.2.3


From 9828546472d9dd95cea089e481a765c7e9a353d2 Mon Sep 17 00:00:00 2001
From: Stefan Schmidt <stefan@datenfreihafen.org>
Date: Fri, 5 Jun 2009 23:47:07 +0200
Subject: essential-dialer: Sync package version

---
 recipes/e17/essential-dialer_svn.bb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/recipes/e17/essential-dialer_svn.bb b/recipes/e17/essential-dialer_svn.bb
index e0c81293e9..bd16282b41 100644
--- a/recipes/e17/essential-dialer_svn.bb
+++ b/recipes/e17/essential-dialer_svn.bb
@@ -2,8 +2,7 @@ DESCRIPTION = "Simple Dialer based on Elementary and FSO"
 SECTION = "x11"
 LICENSE = "GPLv2"
 DEPENDS = "ecore edbus elementary libefso"
-PV = "0.0.0+svnr${SRCREV}"
-PR = "r2"
+PV = "0.1.0.0+svnr${SRCREV}"
 
 SRC_URI = "svn://svn.om.vptt.ch/trunk/;proto=http;module=essential-dialer"
 S = "${WORKDIR}/essential-dialer"
-- 
cgit v1.2.3


From d920917b6ab36583c634160a5faee057abd87a6a Mon Sep 17 00:00:00 2001
From: Stefan Schmidt <stefan@datenfreihafen.org>
Date: Sat, 6 Jun 2009 23:50:16 +0200
Subject: sane-srcrevs: Update and add more swisscom revisions

---
 conf/distro/include/sane-srcrevs.inc | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 7b5a93a8c8..08d33869e6 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -19,6 +19,7 @@ SRCREV_pn-assassin ?= "268"
 SRCREV_pn-assassin-thumbnail ?= "4690"
 SRCREV_pn-bfin-uclibc ?= "1857"
 SRCREV_pn-bootchart-lite ?= "4"
+SRCREV_pn-bubble-keyboard ?= "194"
 SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c"
 SRCREV_pn-clutter-box2d ?= "3197"
 SRCREV_pn-clutter-cairo ?= "3210"
@@ -42,7 +43,7 @@ SRCREV_pn-eds-dbus ?= "736"
 SRCREV_pn-eglibc ?= "8139"
 SRCREV_pn-eglibc-initial ?= "8139"
 SRCREV_pn-enlazar ?= "37"
-SRCREV_pn-essential-dialer ?= "111"
+SRCREV_pn-essential-dialer ?= "194"
 SRCREV_pn-exalt ?= "79"
 SRCREV_pn-exalt-daemon ?= "78"
 SRCREV_pn-exalt-module ?= "78"
@@ -81,17 +82,19 @@ SRCREV_pn-gpe-contacts ?= "9312"
 SRCREV_pn-gpe-gallery ?= "9376"
 SRCREV_pn-gpe-mini-browser2 ?= "9900"
 SRCREV_pn-gpe-sketchbook ?= "9547"
+SRCREV_pn-gridpad ?= "194"
 SRCREV_pn-gsmd2 ?= "963f34df8fa3ff4b301079dcf86e9acea6b6fe0f"
 SRCREV_pn-gtkhtml2 ?= "1158"
 SRCREV_pn-gypsy ?= "134"
 SRCREV_pn-hildon-1 ?= "14429"
 SRCREV_pn-illume-theme-asu ?= "4881"
 SRCREV_pn-illume-theme-freesmartphone ?= "b1b0f6adc59e6f72a3929771058e3750bf181bc5"
+SRCREV_pn-intuition ?= "194"
 SRCREV_pn-kismet ?= "2285"
 SRCREV_pn-kismet-newcore ?= "2285"
 SRCREV_pn-libcalenabler2 ?= "1410"
 SRCREV_pn-libeflvala ?= "676c901eb57f653231fb4c9eeabc2ed3d1b0c072"
-SRCREV_pn-libefso ?= "111"
+SRCREV_pn-libefso ?= "194"
 SRCREV_pn-libexalt ?= "78"
 SRCREV_pn-libexalt-dbus ?= "76"
 SRCREV_pn-libfakekey ?= "1455"
-- 
cgit v1.2.3


From 5519930151de423b3474dc4418bd350d91cc0f49 Mon Sep 17 00:00:00 2001
From: Stefan Schmidt <stefan@datenfreihafen.org>
Date: Fri, 5 Jun 2009 23:49:39 +0200
Subject: bubble-keyboard: Add swisscoms bubble-keyboard prototyp

---
 recipes/e17/bubble-keyboard_svn.bb | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 recipes/e17/bubble-keyboard_svn.bb

diff --git a/recipes/e17/bubble-keyboard_svn.bb b/recipes/e17/bubble-keyboard_svn.bb
new file mode 100644
index 0000000000..c47c8fb12d
--- /dev/null
+++ b/recipes/e17/bubble-keyboard_svn.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "Simple dialpad keyboard"
+SECTION = "x11"
+LICENSE = "GPLv2"
+DEPENDS = "ecore evas edje libfakekey"
+PV = "0.1.4+svnr${SRCREV}"
+PR = "r0"
+
+SRC_URI = "svn://svn.om.vptt.ch/trunk/;proto=http;module=bubble-keyboard"
+S = "${WORKDIR}/bubble-keyboard"
+
+inherit autotools pkgconfig
-- 
cgit v1.2.3


From a12c43de7e2f67c46110449e33596d5eacf2ea89 Mon Sep 17 00:00:00 2001
From: Stefan Schmidt <stefan@datenfreihafen.org>
Date: Fri, 5 Jun 2009 23:49:57 +0200
Subject: gridpad: Add swisscoms gridpad.

---
 recipes/e17/gridpad_svn.bb | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 recipes/e17/gridpad_svn.bb

diff --git a/recipes/e17/gridpad_svn.bb b/recipes/e17/gridpad_svn.bb
new file mode 100644
index 0000000000..40dfa11da5
--- /dev/null
+++ b/recipes/e17/gridpad_svn.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "Gridpad handstroke recognition"
+SECTION = "x11"
+LICENSE = "GPLv2"
+DEPENDS = "ecore evas edje libfakekey"
+PV = "2.0+svnr${SRCREV}"
+PR = "r0"
+
+SRC_URI = "svn://svn.om.vptt.ch/trunk/;proto=http;module=GridPad"
+S = "${WORKDIR}/GridPad"
+
+inherit autotools pkgconfig
-- 
cgit v1.2.3


From e31843297cc4301e3d3ca01d7ae7d389f8be4560 Mon Sep 17 00:00:00 2001
From: Stefan Schmidt <stefan@datenfreihafen.org>
Date: Fri, 5 Jun 2009 23:50:15 +0200
Subject: intuition: Add swisscoms intuition prototype.

---
 recipes/e17/intuition_svn.bb | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 recipes/e17/intuition_svn.bb

diff --git a/recipes/e17/intuition_svn.bb b/recipes/e17/intuition_svn.bb
new file mode 100644
index 0000000000..d40dae9f43
--- /dev/null
+++ b/recipes/e17/intuition_svn.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "Intuition a prototype context dependent mobile search engine"
+SECTION = "x11"
+LICENSE = "GPLv2"
+DEPENDS = "elementary sqlite"
+PV = "0.2.0+svnr${SRCREV}"
+PR = "r0"
+
+SRC_URI = "svn://svn.om.vptt.ch/trunk/;proto=http;module=intuition"
+S = "${WORKDIR}/intuition"
+
+inherit autotools pkgconfig
-- 
cgit v1.2.3


From f999f6777d4dcbd5a65a96e7cd04a72dff5d2ef1 Mon Sep 17 00:00:00 2001
From: Andrea Adami <andrea.adami@gmail.com>
Date: Sun, 7 Jun 2009 00:27:40 +0200
Subject: xserver-kdrive_1.4.0.90: fix AC_SUBST in configure.ac  - AC_SUBST is
 documented to only take one variable  - was breaking with autotools_2.63  -
 bump PR

---
 .../xserver-kdrive-1.4.0.90/split_multiple_AC_SUBST.patch | 15 +++++++++++++++
 recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb           |  3 ++-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 recipes/xorg-xserver/xserver-kdrive-1.4.0.90/split_multiple_AC_SUBST.patch

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.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}"
-- 
cgit v1.2.3


From 595a0174db40089ad992bb054c6e694957f35042 Mon Sep 17 00:00:00 2001
From: Andrea Adami <andrea.adami@gmail.com>
Date: Sun, 7 Jun 2009 00:37:02 +0200
Subject: xserver-kdrive-imageon_1.2.0: fix AC_SUBST in configure.ac  -
 AC_SUBST is documented to only take one variable  - was breaking with
 autotools_2.63  - bump PR

---
 .../xserver-kdrive-1.2.0/split_multiple_AC_SUBST.patch    | 15 +++++++++++++++
 recipes/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb      |  5 +++--
 2 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 recipes/xorg-xserver/xserver-kdrive-1.2.0/split_multiple_AC_SUBST.patch

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-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}"
 
-- 
cgit v1.2.3


From ead01d1ba1b934b89179a9c95a7613e48207429f Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
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(+)

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