X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=recipes-demo-hmi%2Fmixer%2Fmixer_git.bb;h=e2b588e6d9c0500dc5a7e11020a830b1f08e458e;hb=refs%2Ftags%2Feel%2F5.1.0;hp=c7f30a16469ebdcad841bb7683b42814a0da2b1e;hpb=5123685a5069f5f8e190c1e688958b86ece181c2;p=AGL%2Fmeta-agl-demo.git

diff --git a/recipes-demo-hmi/mixer/mixer_git.bb b/recipes-demo-hmi/mixer/mixer_git.bb
index c7f30a164..e2b588e6d 100644
--- a/recipes-demo-hmi/mixer/mixer_git.bb
+++ b/recipes-demo-hmi/mixer/mixer_git.bb
@@ -1,34 +1,26 @@
 SUMMARY     = "Mixer for CES2017 AGL Demonstration"
 DESCRIPTION = "AGL HMI application for control of PulseAudio mixer elements"
 HOMEPAGE    = "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/mixer"
-LICENSE     = "Apache-2.0"
 SECTION     = "apps"
 
-PV = "1.0+git${SRCPV}"
-S  = "${WORKDIR}/git"
-
-inherit qmake5
+LICENSE     = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984"
 
-DEPENDS += "qtquickcontrols2"
-# 'wgtpkg-pack' in af-main-native is required.
-DEPENDS += "af-main-native"
-DEPENDS += "pulseaudio"
+SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/mixer;protocol=https;branch=${AGL_BRANCH}"
 
-LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984"
+# 'legacy' version (eel_5.0.3) when 4A is not enabled
+SRCREV  = "eel_5.0.3"
 
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/mixer;protocol=http"
-SRCREV  = "${AUTOREV}"
+PV = "1.0+git${SRCPV}"
+S  = "${WORKDIR}/git"
 
-RDEPENDS_${PN} += " \
-    qtmultimedia-qmlplugins \
-    qtquickcontrols2-qmlplugins \
-    "
+# build-time dependencies
+DEPENDS += "qtquickcontrols2 \
+            pulseaudio \
+            virtual/libhomescreen \
+            qlibwindowmanager \
+"
 
-do_install() {
-    install -d ${D}/usr/AGL/apps
-    install -m 0644 ${B}/package/${PN}.wgt ${D}/usr/AGL/apps/
-}
+RPROVIDES_${PN} += "virtual/mixer"
 
-FILES_${PN} += "/usr/AGL/apps/ \
-    /usr/AGL/apps/${PN} \
-    "
+inherit qmake5 aglwgt