[gnome-ostree] manifest: Pull in XOrg modesetting driver

[Colin Walters <walters src gnome org>]

commit 575961ad929c8cd2e7b28d290041ea511368285b
Author: Colin Walters <walters verbum org>
Date:   Fri Mar 15 16:08:08 2013 -0400

    manifest: Pull in XOrg modesetting driver
    
    So cirrus might work.

 manifest.json                     |    3 +++
 patches/xorg-autogen-merged.patch |   27 +++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 0 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index cf730b4..122037a 100644
--- a/manifest.json
+++ b/manifest.json
@@ -339,6 +339,9 @@
 
                {"src": "fd:xorg/driver/xf86-video-intel"},
 
+               {"src": "fd:xorg/driver/xf86-video-modesetting",
+                "patches": ["xorg-autogen-merged.patch"]},
+
                {"src": "fd:xorg/driver/xf86-video-ati"},
 
                {"src": "fd:xorg/driver/xf86-video-vesa"},
diff --git a/patches/xorg-autogen-merged.patch b/patches/xorg-autogen-merged.patch
new file mode 100644
index 0000000..8ec768a
--- /dev/null
+++ b/patches/xorg-autogen-merged.patch
@@ -0,0 +1,27 @@
+From 97e004cc3623f3e2b8a8ed22c1cd6b7787571efe Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters verbum org>
+Date: Wed, 4 Jan 2012 17:37:06 -0500
+Subject: [PATCH] autogen.sh: Implement GNOME Build API
+
+http://people.gnome.org/~walters/docs/build-api.txt
+
+Signed-off-by: Adam Jackson <ajax redhat com>
+---
+ autogen.sh |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/autogen.sh b/autogen.sh
+index f83ed27..7415c05 100755
+--- a/autogen.sh
++++ b/autogen.sh
+@@ -10,4 +10,6 @@ test -d m4 || mkdir m4
+ autoreconf -v --install || exit 1
+ cd $ORIGDIR || exit $?
+ 
+-$srcdir/configure --enable-maintainer-mode "$@"
++if test -z "$NOCONFIGURE"; then
++    $srcdir/configure "$@"
++fi
+-- 
+1.7.1
+