summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--conf/include/maintainers.inc1
-rw-r--r--conf/machine/include/meta-intel.inc3
-rw-r--r--conf/machine/intel-corei7-64.conf1
-rw-r--r--recipes-graphics/xorg-driver/xf86-video-mga/checkfile.patch68
-rw-r--r--recipes-graphics/xorg-driver/xf86-video-mga_1.6.5.bb23
5 files changed, 0 insertions, 96 deletions
diff --git a/conf/include/maintainers.inc b/conf/include/maintainers.inc
index 1be4672..64896c3 100644
--- a/conf/include/maintainers.inc
+++ b/conf/include/maintainers.inc
@@ -20,4 +20,3 @@ RECIPE_MAINTAINER_pn-rmc-db = "Stephano Cetola <stephano.cetola@linux.intel.com>
20RECIPE_MAINTAINER_pn-thermald = "California Sullivan <california.l.sullivan@intel.com>" 20RECIPE_MAINTAINER_pn-thermald = "California Sullivan <california.l.sullivan@intel.com>"
21RECIPE_MAINTAINER_pn-va-intel = "Anuj Mittal <anuj.mittal@intel.com>" 21RECIPE_MAINTAINER_pn-va-intel = "Anuj Mittal <anuj.mittal@intel.com>"
22RECIPE_MAINTAINER_pn-xf86-video-ast = "Anuj Mittal <anuj.mittal@intel.com>" 22RECIPE_MAINTAINER_pn-xf86-video-ast = "Anuj Mittal <anuj.mittal@intel.com>"
23RECIPE_MAINTAINER_pn-xf86-video-mga = "Anuj Mittal <anuj.mittal@intel.com>"
diff --git a/conf/machine/include/meta-intel.inc b/conf/machine/include/meta-intel.inc
index ae57543..ed4fcf5 100644
--- a/conf/machine/include/meta-intel.inc
+++ b/conf/machine/include/meta-intel.inc
@@ -21,9 +21,6 @@ OLD_XSERVER_X86_EXT = "xserver-xorg-extension-dri \
21 xserver-xorg-extension-dbe \ 21 xserver-xorg-extension-dbe \
22 " 22 "
23 23
24XSERVER_X86_MATROX_MGA = "xf86-video-mga \
25 "
26
27XSERVER_X86_ASPEED_AST = "xf86-video-ast \ 24XSERVER_X86_ASPEED_AST = "xf86-video-ast \
28 " 25 "
29 26
diff --git a/conf/machine/intel-corei7-64.conf b/conf/machine/intel-corei7-64.conf
index 78a1f6e..8b36b36 100644
--- a/conf/machine/intel-corei7-64.conf
+++ b/conf/machine/intel-corei7-64.conf
@@ -31,7 +31,6 @@ XSERVER ?= "${XSERVER_X86_BASE} \
31 ${XSERVER_X86_FBDEV} \ 31 ${XSERVER_X86_FBDEV} \
32 ${XSERVER_X86_I915} \ 32 ${XSERVER_X86_I915} \
33 ${XSERVER_X86_I965} \ 33 ${XSERVER_X86_I965} \
34 ${XSERVER_X86_MATROX_MGA} \
35 ${XSERVER_X86_MODESETTING} \ 34 ${XSERVER_X86_MODESETTING} \
36 ${XSERVER_X86_VESA} \ 35 ${XSERVER_X86_VESA} \
37 ${XSERVER_X86_ASPEED_AST} \ 36 ${XSERVER_X86_ASPEED_AST} \
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 ceae6df..0000000
--- a/recipes-graphics/xorg-driver/xf86-video-mga/checkfile.patch
+++ /dev/null
@@ -1,68 +0,0 @@
1Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cgi?id=57606]
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From c9014a8f3c9b691b5aa7b1f3ec66cf7c84b8211b Mon Sep 17 00:00:00 2001
5From: Ross Burton <ross.burton@intel.com>
6Date: Thu, 29 Nov 2012 11:00:43 +0000
7Subject: [PATCH] build: dont use AC_CHECK_FILE when enabling DRI
8
9Automatically enabling or disabling a feature based on installed files isn't
10deterministic, and AC_CHECK_FILE returns an error when cross-compiling.
11
12Fix this by enabling DRI by default, and removing the explicit file checks as
13pkg-config is good enough.
14
15(#57606)
16
17Signed-off-by: Ross Burton <ross.burton@intel.com>
18---
19 configure.ac | 25 ++-----------------------
20 1 file changed, 2 insertions(+), 23 deletions(-)
21
22diff --git a/configure.ac b/configure.ac
23index 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--
671.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 d30936b..0000000
--- a/recipes-graphics/xorg-driver/xf86-video-mga_1.6.5.bb
+++ /dev/null
@@ -1,23 +0,0 @@
1require recipes-graphics/xorg-driver/xorg-driver-video.inc
2
3SUMMARY = "X.Org X server -- Matrox MGA display driver"
4
5DESCRIPTION = "mga is an Xorg driver for Matrox video cards"
6
7LIC_FILES_CHKSUM = "file://COPYING;md5=bc1395d2cd32dfc5d6c57d2d8f83d3fc"
8
9SRC_URI += "file://checkfile.patch"
10
11DEPENDS += "virtual/libx11 libpciaccess"
12
13PR = "r1"
14
15COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)'
16
17SRC_URI[md5sum] = "3ee2549247e01de3e7bce52c27483118"
18SRC_URI[sha256sum] = "b663cd8e6364f7c4e2637b9fcab9861d0e3971518c73b00d213f6545a1289422"
19
20PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri', '', d)}"
21PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,drm xf86driproto,xserver-xorg-extension-dri"
22
23RDEPENDS_${PN} = "xserver-xorg-module-exa"