summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--strata/genivi-smartdevicelink.morph1
-rw-r--r--strata/genivi-smartdevicelink/smartdevicelink-qt.morph4
-rw-r--r--strata/genivi-smartdevicelink/smartdevicelink-web.morph5
-rw-r--r--systems/genivi-plusplus-system-x86_64-generic.morph4
4 files changed, 9 insertions, 5 deletions
diff --git a/strata/genivi-smartdevicelink.morph b/strata/genivi-smartdevicelink.morph
index 455149b..475c1fd 100644
--- a/strata/genivi-smartdevicelink.morph
+++ b/strata/genivi-smartdevicelink.morph
@@ -5,6 +5,7 @@ build-depends:
- morph: strata/genivi-foundation.morph
- morph: strata/genivi.morph
- morph: strata/audio-bluetooth.morph
+- morph: strata/multimedia.morph
- morph: strata/qt5-tools-new.morph
chunks:
- name: libapr-tarball
diff --git a/strata/genivi-smartdevicelink/smartdevicelink-qt.morph b/strata/genivi-smartdevicelink/smartdevicelink-qt.morph
index 9a7169e..0247be5 100644
--- a/strata/genivi-smartdevicelink/smartdevicelink-qt.morph
+++ b/strata/genivi-smartdevicelink/smartdevicelink-qt.morph
@@ -1,8 +1,8 @@
-name: smartdevicelink
+name: smartdevicelink-qt
kind: chunk
configure-commands:
- - cmake -D HMI2=ON -DCMAKE_INSTALL_PREFIX="$PREFIX/smartdevicelink-qt" .
+ - cmake -D HMI2=ON -DCMAKE_INSTALL_PREFIX="$PREFIX/smartdevicelink-qt" -DEXTENDED_MEDIA_MODE=ON --debug-output .
build-commands:
- make
install-commands:
diff --git a/strata/genivi-smartdevicelink/smartdevicelink-web.morph b/strata/genivi-smartdevicelink/smartdevicelink-web.morph
index 736f9ff..99f0cad 100644
--- a/strata/genivi-smartdevicelink/smartdevicelink-web.morph
+++ b/strata/genivi-smartdevicelink/smartdevicelink-web.morph
@@ -1,10 +1,11 @@
-name: smartdevicelink
+name: smartdevicelink-web
kind: chunk
configure-commands:
- - cmake -DCMAKE_INSTALL_PREFIX="$PREFIX/smartdevicelink-web" .
+ - cmake -DCMAKE_INSTALL_PREFIX="$PREFIX/smartdevicelink-web" -DEXTENDED_MEDIA_MODE=ON .
build-commands:
- make
install-commands:
- make install DESTDIR="$DESTDIR"
- rm -rf "$DESTDIR/$(pwd)"
+ - cp -a src/components/HMI "$DESTDIR/$PREFIX/smartdevicelink-web/"
diff --git a/systems/genivi-plusplus-system-x86_64-generic.morph b/systems/genivi-plusplus-system-x86_64-generic.morph
index 561ecb4..2768feb 100644
--- a/systems/genivi-plusplus-system-x86_64-generic.morph
+++ b/systems/genivi-plusplus-system-x86_64-generic.morph
@@ -19,8 +19,10 @@ strata:
morph: strata/audio-bluetooth.morph
- name: x-common
morph: strata/x-common.morph
-- name: multimedia-gstreamer-0.10
+- name: multimedia
morph: strata/multimedia.morph
+- name: multimedia-gstreamer-0.10
+ morph: strata/multimedia-gstreamer-0.10.morph
- name: genivi
morph: strata/genivi.morph
- name: wayland-generic