X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-agl-core%2Frecipes-graphics%2Fwayland%2Fweston-ini-conf.bb;h=f7b281e7b1d5f14d23f060739c7cc714e8f94865;hb=refs%2Fchanges%2F38%2F28738%2F2;hp=04907c671874f697defd910c123303f7fadfb8c7;hpb=2f40613cbf42fd378feea57ccefbb3215ecc1355;p=AGL%2Fmeta-agl.git

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 04907c671..f7b281e7b 100644
--- a/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bb
+++ b/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bb
@@ -9,12 +9,13 @@ SRC_URI = " \
 	file://hdmi-a-1-90.cfg \
 	file://hdmi-a-1-180.cfg \
 	file://hdmi-a-1-270.cfg \
-	file://remote-output.cfg \
+	file://remote-output.cfg.in \
 	file://transmitter-output.cfg.in \
 	file://virtual-0.cfg \
 	file://virtual-90.cfg \
 	file://virtual-180.cfg \
 	file://virtual-270.cfg \
+	file://grpc-proxy.cfg \
 "
 
 S = "${WORKDIR}"
@@ -43,6 +44,9 @@ do_configure() {
         -e "s#host=.*#host=${TRANSMITTER_OUTPUT_HOST}#" \
         -e "s#port=.*#port=${TRANSMITTER_OUTPUT_PORT}#" \
         ${WORKDIR}/transmitter-output.cfg.in  > ${WORKDIR}/transmitter-output.cfg
+    sed -e "s#host=.*#host=${TRANSMITTER_OUTPUT_HOST}#" \
+        -e "s#port=.*#port=${TRANSMITTER_OUTPUT_PORT}#" \
+        ${WORKDIR}/remote-output.cfg.in  > ${WORKDIR}/remote-output.cfg
 }
 
 do_compile() {
@@ -55,15 +59,15 @@ do_compile() {
     done
     sed -i -e '$ d' ${WORKDIR}/weston.ini.default
 
-    echo "[shell-client-ext]\ncommand=/usr/lib/agl-compositor/agl-shell-grpc-server\n" >> ${WORKDIR}/weston.ini.default
-
     cat ${WORKDIR}/weston.ini.default > ${WORKDIR}/weston.ini.default-no-activate
     sed -i -e 's#\[core\]#[core]\nactivate-by-default=false#' ${WORKDIR}/weston.ini.default-no-activate
+    cat ${WORKDIR}/grpc-proxy.cfg >> ${WORKDIR}/weston.ini.default-no-activate
 
     # 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
+    rm -f ${WORKDIR}/weston.ini.landscape-inverted
     for F in ${WESTON_FRAGMENTS}; do
         INVF=$F
         if echo $F | grep '^hdmi-a-1-\(90\|270\)$'; then
@@ -80,12 +84,17 @@ do_compile() {
     done
     sed -i -e '$ d' ${WORKDIR}/weston.ini.landscape
     sed -i -e '$ d' ${WORKDIR}/weston.ini.landscape-inverted
+
+    cat ${WORKDIR}/weston.ini.landscape > ${WORKDIR}/weston.ini.landscape-no-activate
+    sed -i -e 's#\[core\]#[core]\nactivate-by-default=false#' ${WORKDIR}/weston.ini.landscape-no-activate
+    cat ${WORKDIR}/grpc-proxy.cfg >> ${WORKDIR}/weston.ini.landscape-no-activate
 }
 
 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.default-no-activate ${D}${weston_ini_dir}/
+    install -m 0644 ${WORKDIR}/weston.ini.landscape-no-activate ${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}/
 }
@@ -138,6 +147,18 @@ RCONFLICTS:${PN}-no-activate = "${PN}"
 ALTERNATIVE:${PN}-no-activate = "weston.ini"
 ALTERNATIVE_TARGET_${PN}-no-activate = "${weston_ini_dir}/weston.ini.default-no-activate"
 
+# landscape, no activation by default
+PACKAGE_BEFORE_PN += "${PN}-landscape-no-activate"
+
+FILES:${PN}-landscape-no-activate = "${weston_ini_dir}/weston.ini.landscape-no-activate"
+
+RDEPENDS:${PN}-landscape-no-activate = "weston-init"
+RPROVIDES:${PN}-landscape-no-activate = "weston-ini"
+RCONFLICTS:${PN}-landscape-no-activate = "${PN}"
+ALTERNATIVE:${PN}-landscape-no-activate = "weston.ini"
+ALTERNATIVE_TARGET_${PN}-landscape-no-activate = "${weston_ini_dir}/weston.ini.landscape-no-activate"
+
+
 # This is a settings-only package, we do not need a development package
 # (and its fixed dependency to ${PN} being installed)
 PACKAGES:remove = "${PN}-dev ${PN}-staticdev"