On Fri, Jul 28, 2017 at 8:05 AM, Saul Wold <[email protected]> wrote: > On Thu, 2017-07-27 at 23:46 +0000, Khem Raj wrote: >> >> On Thu, Jul 27, 2017 at 3:50 PM Saul Wold <[email protected]> >> wrote: >> > On Tue, 2017-05-23 at 15:01 +0800, [email protected] >> > wrote: >> > > >> > > From: Jackie Huang <[email protected]> >> > > >> > > mga is an Xorg driver for Matrox video cards >> > > >> > I missed the inclusion of this driver into meta-oe, we have been >> > maintaining this driver in meta-intel and have been for a while >> > (it's >> > listed in layers.openembedded.org. >> > >> > If there are multiple layers using this Xorg driver, we should >> > consider >> > moving into oe-core proper. >> >> I think it falls into bsp area and unless we can >> Excercise it with qemu it just doesn't seem right to move to core I >> would even not put it in meta-oe >> > So your suggesting just update the meta-intel BSP with the newer > version and remove it from meta-oe?
right. May be between intel and amd, there should be a common layer too, since there are lot of x86 specific packages which are shared at architecture level. I am doing llvm right now and its only useful for x86 based systems there is no single place to put it and oe-core seems a bit of overkill. > > Sau! >> > >> > >> > There are multiple x86* HW platforms that use the Matrox hardware >> > still. I would prefer not to have meta-intel depending on meta-oe >> > for >> > one Xorg driver. >> > >> > Thoughts of moving it? >> > >> > Sau! >> > >> > >> > > >> > > Signed-off-by: Jackie Huang <[email protected]> >> > > --- >> > > .../xorg-driver/xf86-video-mga/checkfile.patch | 68 >> > > ++++++++++++++++++++++ >> > > .../xorg-driver/xf86-video-mga_1.6.5.bb | 21 +++++++ >> > > 2 files changed, 89 insertions(+) >> > > create mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86- >> > video- >> > > mga/checkfile.patch >> > > create mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86- >> > video- >> > > mga_1.6.5.bb >> > > >> > > diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video- >> > > mga/checkfile.patch b/meta-oe/recipes-graphics/xorg-driver/xf86- >> > > video-mga/checkfile.patch >> > > new file mode 100644 >> > > index 000000000..ceae6dfba >> > > --- /dev/null >> > > +++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video- >> > > mga/checkfile.patch >> > > @@ -0,0 +1,68 @@ >> > > +Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bu >> > g.cg >> > > i?id=57606] >> > > +Signed-off-by: Ross Burton <[email protected]> >> > > + >> > > +From c9014a8f3c9b691b5aa7b1f3ec66cf7c84b8211b Mon Sep 17 >> > 00:00:00 >> > > 2001 >> > > +From: Ross Burton <[email protected]> >> > > +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 <[email protected]> >> > > +--- >> > > + 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 >> > > + >> > > diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video- >> > > mga_1.6.5.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video- >> > > mga_1.6.5.bb >> > > new file mode 100644 >> > > index 000000000..cd680597c >> > > --- /dev/null >> > > +++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video- >> > mga_1.6.5.bb >> > > @@ -0,0 +1,21 @@ >> > > +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" >> > > + >> > > +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" >> > > -- >> > > 2.11.0 >> > -- >> > _______________________________________________ >> > Openembedded-devel mailing list >> > [email protected] >> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel >> > -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
