summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2015-05-21 13:40:08 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-08 17:34:04 +0100
commit01319863b649277b74e72ad39e0f63c74ed2a3fa (patch)
tree8f18a5442487518e7eedc79907d6ca6304f0a489 /meta/recipes-graphics
parent81b0a093234367d2b6a48c5063dbd90de2b24568 (diff)
downloadpoky-01319863b649277b74e72ad39e0f63c74ed2a3fa.tar.gz
xf86-video-omap: Upgrade to 0.4.3
Use last release instead of slightly older git revision, drop the upstreamed patch. (From OE-Core rev: b1b566375c7b4d4621bd16d17573ad11040e5b8c) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-omap/configure.patch74
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.3.bb (renamed from meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb)11
2 files changed, 2 insertions, 83 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
deleted file mode 100644
index d298d5d71e..0000000000
--- a/meta/recipes-graphics/xorg-driver/xf86-video-omap/configure.patch
+++ /dev/null
@@ -1,74 +0,0 @@
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_0.4.3.bb
index 454d0a1fb2..5f3a5323a1 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.3.bb
@@ -24,15 +24,8 @@ LICENSE = "GPLv2+"
24LIC_FILES_CHKSUM = "file://COPYING;md5=10ce5de3b111315ea652a5f74ec0c602" 24LIC_FILES_CHKSUM = "file://COPYING;md5=10ce5de3b111315ea652a5f74ec0c602"
25DEPENDS += "virtual/libx11 libdrm xf86driproto" 25DEPENDS += "virtual/libx11 libdrm xf86driproto"
26 26
27SRCREV = "ae0394e687f1a77e966cf72f895da91840dffb8f" 27SRC_URI[md5sum] = "be35daf6fa4b75092cc4a8978c437bc5"
28PR = "${INC_PR}.3" 28SRC_URI[sha256sum] = "db1e0e69fd4c4c8fdca5ef2cb0447bccd7518a718495876a6904bef57b39986d"
29PV = "0.4.2+gitr${SRCPV}"
30
31SRC_URI = "git://anongit.freedesktop.org/xorg/driver/xf86-video-omap \
32 file://configure.patch \
33"
34
35S = "${WORKDIR}/git"
36 29
37CFLAGS += " -I${STAGING_INCDIR}/xorg " 30CFLAGS += " -I${STAGING_INCDIR}/xorg "
38 31