xf86-video-omap: don't use AC_CHECK_FILE

Upstream uses AC_CHECK_FILE to find dri.h, but that errors out when
cross-compiling.  Until oe-core 1b0d9cb1801a8eb68c82dfcda5a1da420ac8dd83 this
wasn't a problem because we patched AC_CHECK_FILE to always pass, which was a
nasty hack.

Patch configure.ac to use pkg-config like it should, and not AC_CHECK_FILE.

(From OE-Core rev: a7fe0d17c50d9b38ce33fe39e677da349d1d358c)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

2 files changed, 76 insertions, 1 deletions

diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omap/configure.patch b/meta/recipes-graphics/xorg-driver/xf86-video-omap/configure.patch
new file mode 100644
index 0000000000..d298d5d71e
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-omap/configure.patch
@@ -0,0 +1,74 @@
+Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cgi?id=57386]
+Signed-off-by: Ross Burton <ross.burton@intel.com>
+
+From fc7b6045aaec583c7e29021bd23c20a877b20546 Mon Sep 17 00:00:00 2001
+From: Ross Burton <ross.burton@intel.com>
+Date: Wed, 21 Nov 2012 23:39:18 +0000
+Subject: [PATCH] build: rationalise DRI checks
+
+The existing logic around DRI was complicated and defined a number of variables
+that were not used, when in reality DRI is required.
+
+Move the glproto check to the main pkg-config check, and remove everything else.
+
+Signed-off-by: Ross Burton <ross.burton@intel.com>
+---
+ configure.ac |   33 +--------------------------------
+ 1 file changed, 1 insertion(+), 32 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 11238b1..c321b98 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -44,47 +44,16 @@ XORG_DRIVER_CHECK_EXT(XV, videoproto)
+ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
+ 
+ # Checks for pkg-config packages
+-PKG_CHECK_MODULES(XORG, [xorg-server >= 1.3] xproto fontsproto [libdrm >= 2.4.36] libdrm_omap xf86driproto $REQUIRED_MODULES)
+-sdkdir=$(pkg-config --variable=sdkdir xorg-server)
++PKG_CHECK_MODULES(XORG, [xorg-server >= 1.3] xproto fontsproto [libdrm >= 2.4.36] libdrm_omap xf86driproto glproto $REQUIRED_MODULES)
+ 
+ # Checks for header files.
+ AC_HEADER_STDC
+ 
+-save_CFLAGS="$CFLAGS"
+-CFLAGS="$XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS"
+-CPPFLAGS="$XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS"
+-AC_MSG_CHECKING([whether to include DRI support])
+-if test x$DRI != xno; then
+-        AC_CHECK_FILE([${sdkdir}/dri.h],
+-                      [have_dri_h="yes"], [have_dri_h="no"])
+-        AC_CHECK_FILE([${sdkdir}/dristruct.h],
+-                      [have_dristruct_h="yes"], [have_dristruct_h="no"])
+-fi
+-AC_MSG_CHECKING([whether to include DRI support])
+-if test x$DRI = xauto; then
+-        if test "$have_dri_h" = yes -a \
+-                "$have_dristruct_h" = yes; then
+-                DRI="yes"
+-        else
+-                DRI="no"
+-        fi
+-fi
+-AC_MSG_RESULT([$DRI])
+-CFLAGS="$save_CFLAGS $DEBUGFLAGS"
+-
+-AM_CONDITIONAL(DRI, test x$DRI = xyes)
+-if test "$DRI" = yes; then
+-        PKG_CHECK_MODULES(DRI, [xf86driproto glproto])
+-        AC_DEFINE(XF86DRI,1,[Enable DRI driver support])
+-        AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support])
+-fi
+-
+ AM_CONDITIONAL(VIDEO_DEBUG, test x$VIDEO_DEBUG = xyes)
+ if test "$VIDEO_DEBUG" = yes; then
+        AC_DEFINE(VIDEO_DEBUG,1,[Enable debug support])
+ fi
+ 
+-AC_SUBST([DRI_CFLAGS])
+ 
+ DRIVER_NAME=omap
+ AC_SUBST([DRIVER_NAME])
+-- 
+1.7.10.4
+
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb b/meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb
index b3177ebb4d..2371f963de 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb
@@ -14,10 +14,11 @@ RCONFLICTS = "xf86-video-omapfb"
 RREPLACES = "xf86-video-omapfb"
 
 SRCREV = "ae0394e687f1a77e966cf72f895da91840dffb8f"
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 PV = "0.4.2+gitr${SRCPV}"
 
 SRC_URI = "git://anongit.freedesktop.org/xorg/driver/xf86-video-omap;protocol=git \
+           file://configure.patch \
 "
 
 S = "${WORKDIR}/git"