diff options
author | Scott Murray <scott.murray@konsulko.com> | 2019-07-30 08:56:24 -0400 |
---|---|---|
committer | Scott Murray <scott.murray@konsulko.com> | 2019-07-30 08:56:24 -0400 |
commit | f1a340c17c6979a3f19f6a1eea5c7bc2f98bfcbf (patch) | |
tree | badaa33ca2f2954c44650ec8bdf170356217acb7 /recipes-demo-hmi/navigation | |
parent | 6f3f6139089e2f283b785bb31a222e1290d12eb0 (diff) |
ondemandnavi: Remove now unused patches
Remove now unused patches that were missed in previous commit to switch
to AGL Gerrit repository.
Bug-AGL: SPEC-2667
Change-Id: I156627c430fbd86f5743837f11245264b4ac1a73
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Diffstat (limited to 'recipes-demo-hmi/navigation')
-rw-r--r-- | recipes-demo-hmi/navigation/ondemandnavi/0001-switch-to-alsa-output.patch | 34 | ||||
-rw-r--r-- | recipes-demo-hmi/navigation/ondemandnavi/0002-update-permissions.patch | 22 |
2 files changed, 0 insertions, 56 deletions
diff --git a/recipes-demo-hmi/navigation/ondemandnavi/0001-switch-to-alsa-output.patch b/recipes-demo-hmi/navigation/ondemandnavi/0001-switch-to-alsa-output.patch deleted file mode 100644 index a93e8f987..000000000 --- a/recipes-demo-hmi/navigation/ondemandnavi/0001-switch-to-alsa-output.patch +++ /dev/null @@ -1,34 +0,0 @@ -ondemandnavi: Switch to ALSA output - -Update the talk scripts to use ALSA output via gst-launch-1.0 instead -of 4A's 4a-play. gstreamer is used since it is likely that a further -revision will change to a pipewire output sink and add back setting a -role property. - -Upstream-Status: pending - -Signed-off-by: Scott Murray <scott.murray@konsulko.com> - -diff --git a/package/flite b/package/flite -index 4c17b80..c837149 100755 ---- a/package/flite -+++ b/package/flite -@@ -1,5 +1,4 @@ - #!/bin/sh - TMP=/tmp/navi.wav - echo "$1" | flite_hts_engine -m /usr/share/Voice/us/cmu_us_arctic_slt.htsvoice -o $TMP --4a-play $TMP hw:0,0,3 navigation -- -+gst-launch-1.0 filesrc location=$TMP ! decodebin ! audioconvert ! audioresample ! alsasink -diff --git a/package/jtalk b/package/jtalk -index ed82281..c075317 100755 ---- a/package/jtalk -+++ b/package/jtalk -@@ -1,6 +1,4 @@ - #!/bin/sh - TMP=/tmp/navi.wav - echo "$1" | open_jtalk -ow $TMP -m /usr/share/Voice/mei/mei_normal.htsvoice -x /usr/share/dic/ --4a-play $TMP hw:0,0,3 navigation -- -- -+gst-launch-1.0 filesrc location=$TMP ! decodebin ! audioconvert ! audioresample ! alsasink diff --git a/recipes-demo-hmi/navigation/ondemandnavi/0002-update-permissions.patch b/recipes-demo-hmi/navigation/ondemandnavi/0002-update-permissions.patch deleted file mode 100644 index cff5fa952..000000000 --- a/recipes-demo-hmi/navigation/ondemandnavi/0002-update-permissions.patch +++ /dev/null @@ -1,22 +0,0 @@ -ondemandnavi: Update permissions - -Add the new display and audio permissions required with the change to -running as non-root. - -Upstream-Status: pending - -Signed-off-by: Scott Murray <scott.murray@konsulko.com> - -diff --git a/package/config.xml b/package/config.xml -index ae5c1f6..10b2d99 100755 ---- a/package/config.xml -+++ b/package/config.xml -@@ -13,6 +13,8 @@ - <feature name="urn:AGL:widget:required-permission"> - <param name="urn:AGL:permission::public:no-htdocs" value="required"/> - <param name="http://tizen.org/privilege/internal/dbus" value="required"/> -+ <param name="urn:AGL:permission::public:display" value="required" /> -+ <param name="urn:AGL:permission::public:audio" value="required" /> - </feature> - </widget> - |