summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-01-17 18:24:27 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2009-01-17 18:24:27 +0000
commite9ee1e5ceffd9b553a3892b88ae466a71abe5a74 (patch)
tree5d6cf3f8552891cc65d4e7d36a9f2ce6f071fa78
parentb010c24c22bb53b07a82f76df6ebf01af7ac5cb3 (diff)
downloadpoky-e9ee1e5ceffd9b553a3892b88ae466a71abe5a74.tar.gz
xserver-xf86-dri-lite: Add patch to disable dolt and fix build breakage
-rw-r--r--meta/packages/xorg-xserver/xserver-xf86-dri-lite/nodolt.patch12
-rw-r--r--meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb1
-rw-r--r--meta/packages/xorg-xserver/xserver-xf86-dri2-lite_git.bb1
3 files changed, 14 insertions, 0 deletions
diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite/nodolt.patch b/meta/packages/xorg-xserver/xserver-xf86-dri-lite/nodolt.patch
new file mode 100644
index 0000000000..6b34032a39
--- /dev/null
+++ b/meta/packages/xorg-xserver/xserver-xf86-dri-lite/nodolt.patch
@@ -0,0 +1,12 @@
1Index: git/configure.ac
2===================================================================
3--- git.orig/configure.ac 2009-01-15 20:35:31.000000000 +0000
4+++ git/configure.ac 2009-01-15 20:35:38.000000000 +0000
5@@ -62,7 +62,6 @@
6 AC_LIBTOOL_WIN32_DLL
7 AC_DISABLE_STATIC
8 AC_PROG_LIBTOOL
9-DOLT
10 AC_PROG_MAKE_SET
11 PKG_PROG_PKG_CONFIG
12 AC_PROG_LEX
diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb b/meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb
index dabd8711b7..76b4a75a4a 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb
+++ b/meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb
@@ -10,6 +10,7 @@ DEFAULT_PREFERENCE = "-1"
10 10
11SRC_URI = "git://anongit.freedesktop.org/git/xorg/xserver;protocol=git;branch=server-1.6-branch \ 11SRC_URI = "git://anongit.freedesktop.org/git/xorg/xserver;protocol=git;branch=server-1.6-branch \
12 file://xorg.conf \ 12 file://xorg.conf \
13 file://nodolt.patch;patch=1 \
13 file://libdri-xinerama-symbol.patch;patch=1 \ 14 file://libdri-xinerama-symbol.patch;patch=1 \
14 file://xserver-boottime.patch;patch=1" 15 file://xserver-boottime.patch;patch=1"
15 16
diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri2-lite_git.bb b/meta/packages/xorg-xserver/xserver-xf86-dri2-lite_git.bb
index 029efa3835..ecdcb3936a 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-dri2-lite_git.bb
+++ b/meta/packages/xorg-xserver/xserver-xf86-dri2-lite_git.bb
@@ -9,6 +9,7 @@ DEFAULT_PREFERENCE = "-1"
9 9
10SRC_URI = "git://anongit.freedesktop.org/git/xorg/xserver;protocol=git \ 10SRC_URI = "git://anongit.freedesktop.org/git/xorg/xserver;protocol=git \
11 file://xorg.conf \ 11 file://xorg.conf \
12 file://nodolt.patch;patch=1 \
12 file://libdri-xinerama-symbol.patch;patch=1" 13 file://libdri-xinerama-symbol.patch;patch=1"
13 14
14# Copied from OBS 15# Copied from OBS