diff options
| author |   Scott Murray <scott.murray@konsulko.com> | 2021-02-04 10:05:23 -0500 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2021-02-05 11:54:02 +0000 |
| commit | 48fd4407babad2df5dba0aeb57c832a9ab531c0d (patch) | |
| tree | a6ec61225ab834b8ea6dd2006c5ce1b1d5661d63 /meta-agl-core/recipes-graphics | |
| parent | 275045b7acf6dc19dacd30e2254620b24feca993 (diff) | |
meta-agl-core: Update weston-ini-conf landscape support
Rework to change the weston-ini-conf-landscape configuration to be
no rotation, and add a new weston-ini-conf-landscape-inverted
configuration with the 180 degree rotation that was being used as
landscape before for the cluster demo (which has an inverted screen
installation).
Bug-AGL: SPEC-3791
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: Ia5179b26b30b484157e4d911ee07fe08f02415d8
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/25993
Tested-by: Jenkins Job builder account
ci-image-build: Jenkins Job builder account
ci-image-boot-test: Jenkins Job builder account
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'meta-agl-core/recipes-graphics')
3 files changed, 30 insertions, 2 deletions
diff --git a/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bb b/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bb index 70130f74a..f4c5c72f9 100644 --- a/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bb +++ b/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bb @@ -5,12 +5,14 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda SRC_URI = " \ file://core.cfg \ file://shell.cfg \ + file://hdmi-a-1-0.cfg \ file://hdmi-a-1-90.cfg \ file://hdmi-a-1-180.cfg \ file://hdmi-a-1-270.cfg \ file://remote-output.cfg \ - file://virtual-270.cfg \ file://virtual-0.cfg \ + file://virtual-180.cfg \ + file://virtual-270.cfg \ " S = "${WORKDIR}" @@ -39,23 +41,32 @@ do_compile() { sed -i -e '$ d' ${WORKDIR}/weston.ini.default # Do it again, but filter fragments to configure for landscape + # and a corresponding landscape-inverted that is 180 degrees + # rotated. rm -f ${WORKDIR}/weston.ini.landscape for F in ${WESTON_FRAGMENTS}; do + INVF=$F if echo $F | grep '^hdmi-a-1-\(90\|270\)$'; then - F="hdmi-a-1-180" + F="hdmi-a-1-0" + INVF="hdmi-a-1-180" elif echo $F | grep '^virtual-270$'; then F="virtual-0" + INVF="virtual-180" fi cat ${WORKDIR}/${F}.cfg >> ${WORKDIR}/weston.ini.landscape + cat ${WORKDIR}/${INVF}.cfg >> ${WORKDIR}/weston.ini.landscape-inverted echo >> ${WORKDIR}/weston.ini.landscape + echo >> ${WORKDIR}/weston.ini.landscape-inverted done sed -i -e '$ d' ${WORKDIR}/weston.ini.landscape + sed -i -e '$ d' ${WORKDIR}/weston.ini.landscape-inverted } do_install_append() { install -d ${D}${weston_ini_dir} install -m 0644 ${WORKDIR}/weston.ini.default ${D}${weston_ini_dir}/ install -m 0644 ${WORKDIR}/weston.ini.landscape ${D}${weston_ini_dir}/ + install -m 0644 ${WORKDIR}/weston.ini.landscape-inverted ${D}${weston_ini_dir}/ } PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -84,3 +95,13 @@ RPROVIDES_${PN}-landscape = "weston-ini" RCONFLICTS_${PN}-landscape = "${PN}" ALTERNATIVE_${PN}-landscape = "weston.ini" ALTERNATIVE_TARGET_${PN}-landscape = "${weston_ini_dir}/weston.ini.landscape" + +PACKAGE_BEFORE_PN += "${PN}-landscape-inverted" + +FILES_${PN}-landscape-inverted = "${weston_ini_dir}/weston.ini.landscape-inverted" + +RDEPENDS_${PN}-landscape-inverted = "weston-init" +RPROVIDES_${PN}-landscape-inverted = "weston-ini" +RCONFLICTS_${PN}-landscape-inverted = "${PN}" +ALTERNATIVE_${PN}-landscape-inverted = "weston.ini" +ALTERNATIVE_TARGET_${PN}-landscape-inverted = "${weston_ini_dir}/weston.ini.landscape-inverted" diff --git a/meta-agl-core/recipes-graphics/wayland/weston-ini-conf/hdmi-a-1-0.cfg b/meta-agl-core/recipes-graphics/wayland/weston-ini-conf/hdmi-a-1-0.cfg new file mode 100644 index 000000000..f82570790 --- /dev/null +++ b/meta-agl-core/recipes-graphics/wayland/weston-ini-conf/hdmi-a-1-0.cfg @@ -0,0 +1,3 @@ +# A display is connected to HDMI-A-1 +[output] +name=HDMI-A-1 diff --git a/meta-agl-core/recipes-graphics/wayland/weston-ini-conf/virtual-180.cfg b/meta-agl-core/recipes-graphics/wayland/weston-ini-conf/virtual-180.cfg new file mode 100644 index 000000000..34a741d40 --- /dev/null +++ b/meta-agl-core/recipes-graphics/wayland/weston-ini-conf/virtual-180.cfg @@ -0,0 +1,4 @@ +[output] +name=Virtual-1 +mode=1920x1080 +transform=180 |