From 11044cbd741cc2ff17d0224752ecb3180c88f486 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 2 Feb 2010 16:22:41 +0000 Subject: xserver-xf86-dri: Fix for recent autoconf+automake Signed-off-by: Richard Purdie --- .../xorg-xserver/xserver-xf86-dri-lite/doublefix.patch | 13 +++++++++++++ meta/packages/xorg-xserver/xserver-xf86-dri-lite_1.6.0.bb | 5 +++-- 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 meta/packages/xorg-xserver/xserver-xf86-dri-lite/doublefix.patch (limited to 'meta') 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 index 0000000000..092a712903 --- /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 6a959ba5a2..76868719d1 100644 --- 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" -- cgit v1.2.3