xserver-xf86-dri-lite: Add patch to disable dolt and fix build breakage

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 (file)
index 0000000..6b34032
--- /dev/null
+++ b/meta/packages/xorg-xserver/xserver-xf86-dri-lite/nodolt.patch
@@ -0,0 +1,12 @@
+Index: git/configure.ac
+===================================================================
+--- git.orig/configure.ac      2009-01-15 20:35:31.000000000 +0000
++++ git/configure.ac   2009-01-15 20:35:38.000000000 +0000
+@@ -62,7 +62,6 @@
+ AC_LIBTOOL_WIN32_DLL
+ AC_DISABLE_STATIC
+ AC_PROG_LIBTOOL
+-DOLT
+ AC_PROG_MAKE_SET
+ PKG_PROG_PKG_CONFIG
+ 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 dabd8711b7c006ced20368b1359cf48c113df07d..76b4a75a4a5b1f3379de76ed7ff078a698fd0bf9 100644 (file)
--- 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"
 
 SRC_URI = "git://anongit.freedesktop.org/git/xorg/xserver;protocol=git;branch=server-1.6-branch \
            file://xorg.conf \
+          file://nodolt.patch;patch=1 \
            file://libdri-xinerama-symbol.patch;patch=1 \
            file://xserver-boottime.patch;patch=1"
 

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 029efa3835f211dfc0610a6e6b6ed6bfe03648a5..ecdcb3936a93d9f01a8c758e3ebda53adc5a15d7 100644 (file)
--- 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"
 
 SRC_URI = "git://anongit.freedesktop.org/git/xorg/xserver;protocol=git \
            file://xorg.conf \
+          file://nodolt.patch;patch=1 \
            file://libdri-xinerama-symbol.patch;patch=1"
 
 # Copied from OBS