aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarius Vlad <marius.vlad@collabora.com>2020-10-16 17:37:35 +0300
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2021-01-22 14:54:00 +0000
commit2c0f2f6dbfab6df3c9ac34857811f052ec437c63 (patch)
treec86a1b4b46475c4ba6263ed3f59dab630e4948b6
parentb449d8c95d62925fbf9d7b929dfbbaecf8697d87 (diff)
wayland/weston-ini-conf: Add transmitter-output ini section
And with it, build remoting plug-in when weston-waltham-remoting AGL feature is set. agl-compositor will use the remoting plug-in to create a remote output so we need the remoting plug-in built as well as weston-remoting distro feature. v8 (mvlad): plain rebase to new folder structure, use AGL_FEATURES instead of DISTRO_FEATURES v7 (mvlad): plain rebase to new folder structure v6 (jsmoeller): plain rebase to new folder structure Bug-AGL: SPEC-3601 Signed-off-by: Marius Vlad <marius.vlad@collabora.com> Change-Id: Idf591e3f6954bdaafe917e5ceb93fde134dde8db Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/25454 Tested-by: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> ci-image-build: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> ci-image-boot-test: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
-rw-r--r--meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bbappend1
-rw-r--r--meta-agl-core/recipes-graphics/wayland/weston-ini-conf/transmitter-output.cfg5
-rw-r--r--meta-agl-core/recipes-graphics/wayland/weston_8.0_aglcore.inc1
3 files changed, 7 insertions, 0 deletions
diff --git a/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bbappend b/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bbappend
index 0f51d5971..88590c602 100644
--- a/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bbappend
+++ b/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bbappend
@@ -3,6 +3,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PACKAGE_ARCH = "${MACHINE_ARCH}"
WESTON_DISPLAYS_append = "${@bb.utils.contains("DISTRO_FEATURES", "weston-remoting", " remote-output", "", d)}"
+WESTON_DISPLAYS_append = "${@bb.utils.contains("AGL_FEATURES", "waltham-remoting", " transmitter-output", "", d)}"
# For virtual machines and intel-corei7-64 we want to support both the HDMI-A-1
# and Virtual-1 outputs. This allows us to run virtual images on real hardware
diff --git a/meta-agl-core/recipes-graphics/wayland/weston-ini-conf/transmitter-output.cfg b/meta-agl-core/recipes-graphics/wayland/weston-ini-conf/transmitter-output.cfg
new file mode 100644
index 000000000..e77f74ec0
--- /dev/null
+++ b/meta-agl-core/recipes-graphics/wayland/weston-ini-conf/transmitter-output.cfg
@@ -0,0 +1,5 @@
+[transmitter-output]
+name=transmitter-1
+mode=640x720@30
+host=192.168.20.99
+port=5005
diff --git a/meta-agl-core/recipes-graphics/wayland/weston_8.0_aglcore.inc b/meta-agl-core/recipes-graphics/wayland/weston_8.0_aglcore.inc
index c2495465b..ec4165c71 100644
--- a/meta-agl-core/recipes-graphics/wayland/weston_8.0_aglcore.inc
+++ b/meta-agl-core/recipes-graphics/wayland/weston_8.0_aglcore.inc
@@ -9,3 +9,4 @@ SRC_URI_append = "\
# Workaround for incorrect upstream definition
PACKAGECONFIG[remoting] = "-Dremoting=true,-Dremoting=false,gstreamer1.0 gstreamer1.0-plugins-base"
PACKAGECONFIG_append = "${@bb.utils.contains('DISTRO_FEATURES', 'weston-remoting', ' remoting', '', d)}"
+PACKAGECONFIG_append = "${@bb.utils.contains('AGL_FEATURES', 'waltham-remoting', ' remoting', '', d)}"