X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-agl-core%2Frecipes-graphics%2Fwayland%2Fweston-ini-conf.bb;h=c04ff6568a01e9b8527e4fc7dc01f139d4887702;hb=00691c280303d633f638b7a8141cc59f9ade4813;hp=b3a5a4712dbdf75b2362cb2c7d40720a0baa761f;hpb=ce21cba7432a434c359235be901fa0efb9c7b784;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 b3a5a4712..c04ff6568 100644
--- a/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bb
+++ b/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bb
@@ -10,8 +10,9 @@ SRC_URI = " \
 	file://hdmi-a-1-180.cfg \
 	file://hdmi-a-1-270.cfg \
 	file://remote-output.cfg \
-	file://transmitter-output.cfg \
+	file://transmitter-output.cfg.in \
 	file://virtual-0.cfg \
+	file://virtual-90.cfg \
 	file://virtual-180.cfg \
 	file://virtual-270.cfg \
 "
@@ -21,7 +22,7 @@ S = "${WORKDIR}"
 inherit update-alternatives
 
 # Default primary display/orientation fragment
-WESTON_DISPLAYS ?= "hdmi-a-1-270"
+WESTON_DISPLAYS ?= "hdmi-a-1-90"
 
 # Configuration fragments to use in weston.ini.*
 # Note that some may be replaced/removed when building the landscape
@@ -31,6 +32,19 @@ WESTON_FRAGMENTS = "core shell ${WESTON_DISPLAYS}"
 # On-target weston.ini directory
 weston_ini_dir = "${sysconfdir}/xdg/weston"
 
+# Options for the user to change in local.conf
+# e.g. TRANSMITTER_OUTPUT_MODE = "1080x1488"
+TRANSMITTER_OUTPUT_MODE ??= "640x720@30"
+TRANSMITTER_OUTPUT_HOST ??= "192.168.20.99"
+TRANSMITTER_OUTPUT_PORT ??= "5005"
+
+do_configure() {
+    sed -e "s#mode=.*#mode=${TRANSMITTER_OUTPUT_MODE}#" \
+        -e "s#host=.*#host=${TRANSMITTER_OUTPUT_HOST}#" \
+        -e "s#port=.*#port=${TRANSMITTER_OUTPUT_PORT}#" \
+        ${WORKDIR}/transmitter-output.cfg.in  > ${WORKDIR}/transmitter-output.cfg
+}
+
 do_compile() {
     # Put all of our cfg files together for a default portrait
     # orientation configuration
@@ -50,7 +64,7 @@ do_compile() {
         if echo $F | grep '^hdmi-a-1-\(90\|270\)$'; then
             F="hdmi-a-1-0"
             INVF="hdmi-a-1-180"
-        elif echo $F | grep '^virtual-270$'; then
+        elif echo $F | grep '^virtual-90$'; then
             F="virtual-0"
             INVF="virtual-180"
         fi
@@ -63,7 +77,7 @@ do_compile() {
     sed -i -e '$ d' ${WORKDIR}/weston.ini.landscape-inverted
 }
 
-do_install_append() {
+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}/
@@ -81,28 +95,28 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 ALTERNATIVE_LINK_NAME[weston.ini] = "${weston_ini_dir}/weston.ini"
 
-RDEPENDS_${PN} = "weston-init"
-RPROVIDES_${PN} = "weston-ini"
-RCONFLICTS_${PN} = "${PN}-landscape"
-ALTERNATIVE_${PN} = "weston.ini"
+RDEPENDS:${PN} = "weston-init"
+RPROVIDES:${PN} = "weston-ini"
+RCONFLICTS:${PN} = "${PN}-landscape"
+ALTERNATIVE:${PN} = "weston.ini"
 ALTERNATIVE_TARGET_${PN} = "${weston_ini_dir}/weston.ini.default"
 
 PACKAGE_BEFORE_PN += "${PN}-landscape"
 
-FILES_${PN}-landscape = "${weston_ini_dir}/weston.ini.landscape"
+FILES:${PN}-landscape = "${weston_ini_dir}/weston.ini.landscape"
 
-RDEPENDS_${PN}-landscape = "weston-init"
-RPROVIDES_${PN}-landscape = "weston-ini"
-RCONFLICTS_${PN}-landscape = "${PN}"
-ALTERNATIVE_${PN}-landscape = "weston.ini"
+RDEPENDS:${PN}-landscape = "weston-init"
+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"
+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"
+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"