Commit 839ebeb1ac814271d8bda892360f9c2b3ec206a7
1 parent
50449683a3
Exists in
8mm_4.19.35_1.0.0_warrior
Fall back weston to the GL backend
Showing 2 changed files with 46 additions and 1 deletions Side-by-side Diff
recipes-bsp/u-boot/u-boot-smarcimx8mm_2019.04.bb
| ... | ... | @@ -15,7 +15,7 @@ |
| 15 | 15 | UBOOT_SRC ?= "${EMB_UBOOT_MIRROR};protocol=ssh" |
| 16 | 16 | SRCBRANCH = "smarc_8mm-imx_v2019.04_4.19.35_1.1.0" |
| 17 | 17 | SRC_URI = "${UBOOT_SRC};branch=${SRCBRANCH}" |
| 18 | -SRCREV = "5999439f6bef2790462bb0ec936f3a783e3ce4b7" | |
| 18 | +SRCREV = "731c0fd70c338cf30512557588398efc6362f560" | |
| 19 | 19 | |
| 20 | 20 | S = "${WORKDIR}/git" |
| 21 | 21 |
recipes-graphics/wayland/weston_6.0.1.imx.bbappend
| 1 | +/*Weston falls back to use the GL backend*/ | |
| 2 | +do_install_append() { | |
| 3 | + # Weston doesn't need the .la files to load modules, so wipe them | |
| 4 | + rm -f ${D}/${libdir}/libweston-${WESTON_MAJOR_VERSION}/*.la | |
| 5 | + | |
| 6 | + # If X11, ship a desktop file to launch it | |
| 7 | + if [ "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" ]; then | |
| 8 | + install -d ${D}${datadir}/applications | |
| 9 | + install ${WORKDIR}/weston.desktop ${D}${datadir}/applications | |
| 10 | + | |
| 11 | + install -d ${D}${datadir}/icons/hicolor/48x48/apps | |
| 12 | + install ${WORKDIR}/weston.png ${D}${datadir}/icons/hicolor/48x48/apps | |
| 13 | + fi | |
| 14 | + | |
| 15 | + if [ "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', 'yes', 'no', d)}" = "yes" ]; then | |
| 16 | + install -Dm 644 ${WORKDIR}/xwayland.weston-start ${D}${datadir}/weston-start/xwayland | |
| 17 | + fi | |
| 18 | + | |
| 19 | + if [ -z "${@bb.utils.filter('BBFILE_COLLECTIONS', 'aglprofilegraphical', d)}" ]; then | |
| 20 | + if [ "${@bb.utils.filter('BBFILE_COLLECTIONS', 'ivi', d)}" ]; then | |
| 21 | + WESTON_INI_SRC=${B}/ivi-shell/weston.ini | |
| 22 | + else | |
| 23 | + WESTON_INI_SRC=${B}/weston.ini | |
| 24 | + fi | |
| 25 | + WESTON_INI_DEST_DIR=${D}${sysconfdir}/xdg/weston | |
| 26 | + install -d ${WESTON_INI_DEST_DIR} | |
| 27 | + install -m 0644 ${WESTON_INI_SRC} ${WESTON_INI_DEST_DIR} | |
| 28 | + cd ${WESTON_INI_DEST_DIR} | |
| 29 | + case ${SOCNAME} in | |
| 30 | + 8mq) | |
| 31 | + uncomment "gbm-format=argb8888" weston.ini | |
| 32 | + uncomment "\\[shell\\]" weston.ini | |
| 33 | + uncomment "size=1920x1080" weston.ini | |
| 34 | + ;; | |
| 35 | + esac | |
| 36 | + if "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', 'true', 'false', d)}"; then | |
| 37 | + uncomment "xwayland=true" weston.ini | |
| 38 | + fi | |
| 39 | + cd - | |
| 40 | + fi | |
| 41 | + | |
| 42 | + if [ -f ${WORKDIR}/weston.config ]; then | |
| 43 | + install -Dm0755 ${WORKDIR}/weston.config ${D}${sysconfdir}/default/weston | |
| 44 | + fi | |
| 45 | +} |