MIRRORS/meta-intel
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-intel.git synced 2025-07-19 21:09:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

xf86-video-mga: remove recipe from meta-intel

Browse Source 
This driver was added for a platform that is no longer supported.

This recipe is also maintained in meta-oe in case it's required outside
of meta-intel.

Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
This commit is contained in:
Anuj Mittal 2018-01-17 15:45:40 +08:00 committed by California Sullivan
parent 3845413cfb
commit 7bf03f7612
5 changed files with 0 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
conf/include/maintainers.inc
View File

@ -20,4 +20,3 @@ RECIPE_MAINTAINER_pn-rmc-db = "Stephano Cetola <stephano.cetola@linux.intel.com>
RECIPE_MAINTAINER_pn-thermald = "California Sullivan <california.l.sullivan@intel.com>"
RECIPE_MAINTAINER_pn-va-intel = "Anuj Mittal <anuj.mittal@intel.com>"
RECIPE_MAINTAINER_pn-xf86-video-ast = "Anuj Mittal <anuj.mittal@intel.com>"
RECIPE_MAINTAINER_pn-xf86-video-mga = "Anuj Mittal <anuj.mittal@intel.com>"

3
conf/machine/include/meta-intel.inc
View File

@ -21,9 +21,6 @@ OLD_XSERVER_X86_EXT = "xserver-xorg-extension-dri \
xserver-xorg-extension-dbe \
"
XSERVER_X86_MATROX_MGA = "xf86-video-mga \
"
XSERVER_X86_ASPEED_AST = "xf86-video-ast \
"

1
conf/machine/intel-corei7-64.conf
View File

@ -31,7 +31,6 @@ XSERVER ?= "${XSERVER_X86_BASE} \
${XSERVER_X86_FBDEV} \
${XSERVER_X86_I915} \
${XSERVER_X86_I965} \
${XSERVER_X86_MATROX_MGA} \
${XSERVER_X86_MODESETTING} \
${XSERVER_X86_VESA} \
${XSERVER_X86_ASPEED_AST} \

68
recipes-graphics/xorg-driver/xf86-video-mga/checkfile.patch
View File

@ -1,68 +0,0 @@
Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cgi?id=57606]
Signed-off-by: Ross Burton <ross.burton@intel.com>
From c9014a8f3c9b691b5aa7b1f3ec66cf7c84b8211b Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@intel.com>
Date: Thu, 29 Nov 2012 11:00:43 +0000
Subject: [PATCH] build: dont use AC_CHECK_FILE when enabling DRI
Automatically enabling or disabling a feature based on installed files isn't
deterministic, and AC_CHECK_FILE returns an error when cross-compiling.
Fix this by enabling DRI by default, and removing the explicit file checks as
pkg-config is good enough.
(#57606)
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
configure.ac | 25 ++-----------------------
1 file changed, 2 insertions(+), 23 deletions(-)
diff --git a/configure.ac b/configure.ac
index fca1a9c..d2aa2ed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,9 +55,9 @@ AC_ARG_WITH(xorg-module-dir,
[moduledir="$libdir/xorg/modules"])
AC_ARG_ENABLE(dri, AS_HELP_STRING([--disable-dri],
- [Disable DRI support [[default=auto]]]),
+ [Disable DRI support [[default=enabled]]]),
[DRI="$enableval"],
- [DRI=auto])
+ [DRI=yes])
AC_ARG_ENABLE(exa,
AS_HELP_STRING([--disable-exa],
[Disable EXA support [[default=enabled]]]),
@@ -76,27 +76,6 @@ sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`
# Checks for libraries.
-if test "x$DRI" != xno; then
- AC_CHECK_FILE([${sdkdir}/dri.h],
- [have_dri_h="yes"], [have_dri_h="no"])
- AC_CHECK_FILE([${sdkdir}/sarea.h],
- [have_sarea_h="yes"], [have_sarea_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 "x$have_dri_h" = xyes && \
- test "x$have_sarea_h" = xyes && \
- test "x$have_dristruct_h" = xyes; then
- DRI="yes"
- else
- DRI="no"
- fi
-fi
-AC_MSG_RESULT([$DRI])
-
AM_CONDITIONAL(DRI, test "x$DRI" = xyes)
if test "x$DRI" = xyes; then
PKG_CHECK_MODULES(DRI, [libdrm >= 2.0 xf86driproto])
--
1.7.10.4

23
recipes-graphics/xorg-driver/xf86-video-mga_1.6.5.bb
View File

@ -1,23 +0,0 @@
require recipes-graphics/xorg-driver/xorg-driver-video.inc
SUMMARY = "X.Org X server -- Matrox MGA display driver"
DESCRIPTION = "mga is an Xorg driver for Matrox video cards"
LIC_FILES_CHKSUM = "file://COPYING;md5=bc1395d2cd32dfc5d6c57d2d8f83d3fc"
SRC_URI += "file://checkfile.patch"
DEPENDS += "virtual/libx11 libpciaccess"
PR = "r1"
COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)'
SRC_URI[md5sum] = "3ee2549247e01de3e7bce52c27483118"
SRC_URI[sha256sum] = "b663cd8e6364f7c4e2637b9fcab9861d0e3971518c73b00d213f6545a1289422"
PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri', '', d)}"
PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,drm xf86driproto,xserver-xorg-extension-dri"
RDEPENDS_${PN} = "xserver-xorg-module-exa"