From cf9971fa8bc218f9818412781e4e1bc57133779e Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 30 Apr 2018 10:44:19 -0700 Subject: xserver-xf86-config: Disable glamor for vc4 in general We need this fix across 32bit and 64bit with vc4/mesa Signed-off-by: Khem Raj --- .../xorg-xserver/xserver-xf86-config_0.1.bbappend | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend b/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend index 7902f20..919e95e 100644 --- a/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend +++ b/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend @@ -3,20 +3,19 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI_append_rpi = " \ file://xorg.conf.d/98-pitft.conf \ file://xorg.conf.d/99-calibration.conf \ -" -SRC_URI_append_libc-musl_raspberrypi3-64 = " \ file://xorg.conf.d/10-noglamor.conf \ " do_install_append_rpi () { PITFT="${@bb.utils.contains("MACHINE_FEATURES", "pitft", "1", "0", d)}" + VC4="${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "1", "0", d)}" if [ "${PITFT}" = "1" ]; then install -d ${D}/${sysconfdir}/X11/xorg.conf.d/ install -m 0644 ${WORKDIR}/xorg.conf.d/98-pitft.conf ${D}/${sysconfdir}/X11/xorg.conf.d/ install -m 0644 ${WORKDIR}/xorg.conf.d/99-calibration.conf ${D}/${sysconfdir}/X11/xorg.conf.d/ fi + if [ "${VC4}" = "1" ]; then + install -Dm 0644 ${WORKDIR}/xorg.conf.d/10-noglamor.conf ${D}/${sysconfdir}/X11/xorg.conf.d/10-noglamor.conf + fi } -do_install_append_libc-musl_raspberrypi3-64 () { - install -d ${D}/${sysconfdir}/X11/xorg.conf.d/ - install -m 0644 ${WORKDIR}/xorg.conf.d/10-noglamor.conf ${D}/${sysconfdir}/X11/xorg.conf.d/ -} + FILES_${PN}_rpi += "${sysconfdir}/X11/xorg.conf ${sysconfdir}/X11/xorg.conf.d/*" -- cgit v1.2.3-54-g00ecf