mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-21 21:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

xf86-video-omap: Upgrade to 0.4.3

Browse Source 
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>
This commit is contained in:
Jussi Kukkonen
2015-05-21 13:40:08 +03:00
committed by Richard Purdie
parent 81b0a09323
commit 01319863b6
2 changed files with 2 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
meta/recipes-graphics/xorg-driver/xf86-video-omap/configure.patch
View File

@@ -1,74 +0,0 @@
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

11
meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb → meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.3.bb
View File

@@ -24,15 +24,8 @@ LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=10ce5de3b111315ea652a5f74ec0c602"
DEPENDS += "virtual/libx11 libdrm xf86driproto"
SRCREV = "ae0394e687f1a77e966cf72f895da91840dffb8f"
PR = "${INC_PR}.3"
PV = "0.4.2+gitr${SRCPV}"
SRC_URI = "git://anongit.freedesktop.org/xorg/driver/xf86-video-omap \
file://configure.patch \
"
S = "${WORKDIR}/git"
SRC_URI[md5sum] = "be35daf6fa4b75092cc4a8978c437bc5"
SRC_URI[sha256sum] = "db1e0e69fd4c4c8fdca5ef2cb0447bccd7518a718495876a6904bef57b39986d"
CFLAGS += " -I${STAGING_INCDIR}/xorg "