summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-11-21 23:50:59 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-11-22 07:53:02 +0000
commit8043f458f52f28c414472764a664c31e2a62facf (patch)
tree3c1591431ba4ec26c2cc8092f54403dccc566102
parent0d7d413d64bab8d3c758414c6c8c653ccc325653 (diff)
downloadpoky-8043f458f52f28c414472764a664c31e2a62facf.tar.gz
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>
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-omap/configure.patch74
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb3
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 @@
1Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cgi?id=57386]
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From fc7b6045aaec583c7e29021bd23c20a877b20546 Mon Sep 17 00:00:00 2001
5From: Ross Burton <ross.burton@intel.com>
6Date: Wed, 21 Nov 2012 23:39:18 +0000
7Subject: [PATCH] build: rationalise DRI checks
8
9The existing logic around DRI was complicated and defined a number of variables
10that were not used, when in reality DRI is required.
11
12Move the glproto check to the main pkg-config check, and remove everything else.
13
14Signed-off-by: Ross Burton <ross.burton@intel.com>
15---
16 configure.ac | 33 +--------------------------------
17 1 file changed, 1 insertion(+), 32 deletions(-)
18
19diff --git a/configure.ac b/configure.ac
20index 11238b1..c321b98 100644
21--- a/configure.ac
22+++ b/configure.ac
23@@ -44,47 +44,16 @@ XORG_DRIVER_CHECK_EXT(XV, videoproto)
24 XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
25
26 # Checks for pkg-config packages
27-PKG_CHECK_MODULES(XORG, [xorg-server >= 1.3] xproto fontsproto [libdrm >= 2.4.36] libdrm_omap xf86driproto $REQUIRED_MODULES)
28-sdkdir=$(pkg-config --variable=sdkdir xorg-server)
29+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.3] xproto fontsproto [libdrm >= 2.4.36] libdrm_omap xf86driproto glproto $REQUIRED_MODULES)
30
31 # Checks for header files.
32 AC_HEADER_STDC
33
34-save_CFLAGS="$CFLAGS"
35-CFLAGS="$XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS"
36-CPPFLAGS="$XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS"
37-AC_MSG_CHECKING([whether to include DRI support])
38-if test x$DRI != xno; then
39- AC_CHECK_FILE([${sdkdir}/dri.h],
40- [have_dri_h="yes"], [have_dri_h="no"])
41- AC_CHECK_FILE([${sdkdir}/dristruct.h],
42- [have_dristruct_h="yes"], [have_dristruct_h="no"])
43-fi
44-AC_MSG_CHECKING([whether to include DRI support])
45-if test x$DRI = xauto; then
46- if test "$have_dri_h" = yes -a \
47- "$have_dristruct_h" = yes; then
48- DRI="yes"
49- else
50- DRI="no"
51- fi
52-fi
53-AC_MSG_RESULT([$DRI])
54-CFLAGS="$save_CFLAGS $DEBUGFLAGS"
55-
56-AM_CONDITIONAL(DRI, test x$DRI = xyes)
57-if test "$DRI" = yes; then
58- PKG_CHECK_MODULES(DRI, [xf86driproto glproto])
59- AC_DEFINE(XF86DRI,1,[Enable DRI driver support])
60- AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support])
61-fi
62-
63 AM_CONDITIONAL(VIDEO_DEBUG, test x$VIDEO_DEBUG = xyes)
64 if test "$VIDEO_DEBUG" = yes; then
65 AC_DEFINE(VIDEO_DEBUG,1,[Enable debug support])
66 fi
67
68-AC_SUBST([DRI_CFLAGS])
69
70 DRIVER_NAME=omap
71 AC_SUBST([DRIVER_NAME])
72--
731.7.10.4
74
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"
14RREPLACES = "xf86-video-omapfb" 14RREPLACES = "xf86-video-omapfb"
15 15
16SRCREV = "ae0394e687f1a77e966cf72f895da91840dffb8f" 16SRCREV = "ae0394e687f1a77e966cf72f895da91840dffb8f"
17PR = "${INC_PR}.0" 17PR = "${INC_PR}.1"
18PV = "0.4.2+gitr${SRCPV}" 18PV = "0.4.2+gitr${SRCPV}"
19 19
20SRC_URI = "git://anongit.freedesktop.org/xorg/driver/xf86-video-omap;protocol=git \ 20SRC_URI = "git://anongit.freedesktop.org/xorg/driver/xf86-video-omap;protocol=git \
21 file://configure.patch \
21" 22"
22 23
23S = "${WORKDIR}/git" 24S = "${WORKDIR}/git"