diff options
| author | Anuj Mittal <anuj.mittal@intel.com> | 2018-01-17 15:45:40 +0800 |
|---|---|---|
| committer | California Sullivan <california.l.sullivan@intel.com> | 2018-01-17 11:36:26 -0800 |
| commit | 7bf03f7612834142355189c46ccdb4b309acc58a (patch) | |
| tree | 08d5b4a006dba12eb2b751eda56b5947af25fb56 /recipes-graphics | |
| parent | 3845413cfb3f91a5b2c30e6ce82274c66ce8eebd (diff) | |
| download | meta-intel-7bf03f7612834142355189c46ccdb4b309acc58a.tar.gz | |
xf86-video-mga: remove recipe from meta-intel
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>
Diffstat (limited to 'recipes-graphics')
| -rw-r--r-- | recipes-graphics/xorg-driver/xf86-video-mga/checkfile.patch | 68 | ||||
| -rw-r--r-- | recipes-graphics/xorg-driver/xf86-video-mga_1.6.5.bb | 23 |
2 files changed, 0 insertions, 91 deletions
diff --git a/recipes-graphics/xorg-driver/xf86-video-mga/checkfile.patch b/recipes-graphics/xorg-driver/xf86-video-mga/checkfile.patch deleted file mode 100644 index ceae6dfb..00000000 --- a/recipes-graphics/xorg-driver/xf86-video-mga/checkfile.patch +++ /dev/null | |||
| @@ -1,68 +0,0 @@ | |||
| 1 | Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cgi?id=57606] | ||
| 2 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
| 3 | |||
| 4 | From c9014a8f3c9b691b5aa7b1f3ec66cf7c84b8211b Mon Sep 17 00:00:00 2001 | ||
| 5 | From: Ross Burton <ross.burton@intel.com> | ||
| 6 | Date: Thu, 29 Nov 2012 11:00:43 +0000 | ||
| 7 | Subject: [PATCH] build: dont use AC_CHECK_FILE when enabling DRI | ||
| 8 | |||
| 9 | Automatically enabling or disabling a feature based on installed files isn't | ||
| 10 | deterministic, and AC_CHECK_FILE returns an error when cross-compiling. | ||
| 11 | |||
| 12 | Fix this by enabling DRI by default, and removing the explicit file checks as | ||
| 13 | pkg-config is good enough. | ||
| 14 | |||
| 15 | (#57606) | ||
| 16 | |||
| 17 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
| 18 | --- | ||
| 19 | configure.ac | 25 ++----------------------- | ||
| 20 | 1 file changed, 2 insertions(+), 23 deletions(-) | ||
| 21 | |||
| 22 | diff --git a/configure.ac b/configure.ac | ||
| 23 | index fca1a9c..d2aa2ed 100644 | ||
| 24 | --- a/configure.ac | ||
| 25 | +++ b/configure.ac | ||
| 26 | @@ -55,9 +55,9 @@ AC_ARG_WITH(xorg-module-dir, | ||
| 27 | [moduledir="$libdir/xorg/modules"]) | ||
| 28 | |||
| 29 | AC_ARG_ENABLE(dri, AS_HELP_STRING([--disable-dri], | ||
| 30 | - [Disable DRI support [[default=auto]]]), | ||
| 31 | + [Disable DRI support [[default=enabled]]]), | ||
| 32 | [DRI="$enableval"], | ||
| 33 | - [DRI=auto]) | ||
| 34 | + [DRI=yes]) | ||
| 35 | AC_ARG_ENABLE(exa, | ||
| 36 | AS_HELP_STRING([--disable-exa], | ||
| 37 | [Disable EXA support [[default=enabled]]]), | ||
| 38 | @@ -76,27 +76,6 @@ sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server` | ||
| 39 | |||
| 40 | # Checks for libraries. | ||
| 41 | |||
| 42 | -if test "x$DRI" != xno; then | ||
| 43 | - AC_CHECK_FILE([${sdkdir}/dri.h], | ||
| 44 | - [have_dri_h="yes"], [have_dri_h="no"]) | ||
| 45 | - AC_CHECK_FILE([${sdkdir}/sarea.h], | ||
| 46 | - [have_sarea_h="yes"], [have_sarea_h="no"]) | ||
| 47 | - AC_CHECK_FILE([${sdkdir}/dristruct.h], | ||
| 48 | - [have_dristruct_h="yes"], [have_dristruct_h="no"]) | ||
| 49 | -fi | ||
| 50 | - | ||
| 51 | -AC_MSG_CHECKING([whether to include DRI support]) | ||
| 52 | -if test "x$DRI" = xauto; then | ||
| 53 | - if test "x$have_dri_h" = xyes && \ | ||
| 54 | - test "x$have_sarea_h" = xyes && \ | ||
| 55 | - test "x$have_dristruct_h" = xyes; then | ||
| 56 | - DRI="yes" | ||
| 57 | - else | ||
| 58 | - DRI="no" | ||
| 59 | - fi | ||
| 60 | -fi | ||
| 61 | -AC_MSG_RESULT([$DRI]) | ||
| 62 | - | ||
| 63 | AM_CONDITIONAL(DRI, test "x$DRI" = xyes) | ||
| 64 | if test "x$DRI" = xyes; then | ||
| 65 | PKG_CHECK_MODULES(DRI, [libdrm >= 2.0 xf86driproto]) | ||
| 66 | -- | ||
| 67 | 1.7.10.4 | ||
| 68 | |||
diff --git a/recipes-graphics/xorg-driver/xf86-video-mga_1.6.5.bb b/recipes-graphics/xorg-driver/xf86-video-mga_1.6.5.bb deleted file mode 100644 index d30936b6..00000000 --- a/recipes-graphics/xorg-driver/xf86-video-mga_1.6.5.bb +++ /dev/null | |||
| @@ -1,23 +0,0 @@ | |||
| 1 | require recipes-graphics/xorg-driver/xorg-driver-video.inc | ||
| 2 | |||
| 3 | SUMMARY = "X.Org X server -- Matrox MGA display driver" | ||
| 4 | |||
| 5 | DESCRIPTION = "mga is an Xorg driver for Matrox video cards" | ||
| 6 | |||
| 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=bc1395d2cd32dfc5d6c57d2d8f83d3fc" | ||
| 8 | |||
| 9 | SRC_URI += "file://checkfile.patch" | ||
| 10 | |||
| 11 | DEPENDS += "virtual/libx11 libpciaccess" | ||
| 12 | |||
| 13 | PR = "r1" | ||
| 14 | |||
| 15 | COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)' | ||
| 16 | |||
| 17 | SRC_URI[md5sum] = "3ee2549247e01de3e7bce52c27483118" | ||
| 18 | SRC_URI[sha256sum] = "b663cd8e6364f7c4e2637b9fcab9861d0e3971518c73b00d213f6545a1289422" | ||
| 19 | |||
| 20 | PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri', '', d)}" | ||
| 21 | PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,drm xf86driproto,xserver-xorg-extension-dri" | ||
| 22 | |||
| 23 | RDEPENDS_${PN} = "xserver-xorg-module-exa" | ||
