xserver-xf86-dri: Fix for recent autoconf+automake

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite/doublefix.patch b/meta/packages/xorg-xserver/xserver-xf86-dri-lite/doublefix.patch
new file mode 100644 (file)
index 0000000..092a712
--- /dev/null
+++ b/meta/packages/xorg-xserver/xserver-xf86-dri-lite/doublefix.patch
@@ -0,0 +1,13 @@
+Index: xorg-server-1.6.0/hw/xfree86/common/Makefile.am
+===================================================================
+--- xorg-server-1.6.0.orig/hw/xfree86/common/Makefile.am       2010-02-01 14:04:53.247789918 +0000
++++ xorg-server-1.6.0/hw/xfree86/common/Makefile.am    2010-02-01 14:05:27.787817002 +0000
+@@ -46,7 +46,7 @@
+ sdk_HEADERS = compiler.h fourcc.h xf86.h xf86Module.h xf86Opt.h \
+               xf86PciInfo.h xf86Priv.h xf86Privstr.h xf86Resources.h \
+               xf86cmap.h xf86fbman.h xf86str.h xf86RAC.h xf86Xinput.h xisb.h \
+-              $(XVSDKINCS) xorgVersion.h \
++              xorgVersion.h \
+               xf86sbusBus.h xf86xv.h xf86xvmc.h xf86xvpriv.h
+ 
+ DISTCLEANFILES = xf86Build.h

diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite_1.6.0.bb b/meta/packages/xorg-xserver/xserver-xf86-dri-lite_1.6.0.bb
index 6a959ba5a29b7cb412505dd3050a06d62828b71d..76868719d16d8000472cfdec196a3ef88a571dc7 100644 (file)
--- a/meta/packages/xorg-xserver/xserver-xf86-dri-lite_1.6.0.bb
+++ b/meta/packages/xorg-xserver/xserver-xf86-dri-lite_1.6.0.bb
@@ -1,13 +1,14 @@
 require xserver-xf86-dri-lite.inc
 
 PE = "1"
-PR = "r3"
+PR = "r4"
 
 PROTO_DEPS += "xf86driproto dri2proto"
 
 SRC_URI += "file://nodolt.patch;patch=1 \
            file://libdri-xinerama-symbol.patch;patch=1 \
-           file://xserver-boottime.patch;patch=1"
+           file://xserver-boottime.patch;patch=1 \
+           file://doublefix.patch;patch=1"
 
 # Misc build failure for master HEAD
 SRC_URI += "file://fix_open_max_preprocessor_error.patch;patch=1"