summaryrefslogtreecommitdiff
path: root/meta-openembedded/meta-multimedia
diff options
context:
space:
mode:
authorBrad Bishop <bradleyb@fuzziesquirrel.com>2019-10-28 15:33:36 +0300
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2019-10-28 15:34:01 +0300
commit2d39a06105c717cc742ee37700441975ddd5f81e (patch)
tree37936399c7297c4557ab2f126fd3fa267e25bbf3 /meta-openembedded/meta-multimedia
parent47ca1972705ab5691c7774a426139ed01af20c55 (diff)
downloadopenbmc-2d39a06105c717cc742ee37700441975ddd5f81e.tar.xz
meta-openembedded: subtree update:64224b92e5..18506b797b
Alistair Francis (3): python3-pako: Initial commit of version 0.2.3 python3-msm: Initial commit of version 0.8.3 mycroft: Fixup remaining issues Andreas Müller (11): gtkmm3: upgrade 3.24.1 -> 3.24.2 geany: upgrade 1.34.1 -> 1.36 geany-plugins: upgrade 1.34 -> 1.36 libstemmer: initial add 2.0.0 appstream-glib: initial add 0.7.16 yelp-xsl: initial add 3.34.0 yelp-tools: initial add 3.32.2 yelp: initial add 3.34.0 glibmm: upgrade 2.60.0 -> 2.62.0 libsigc++-3: initial add 3.0.0 libgusb: initial add 0.3.0+ Ankit Navik (1): glfw: Initial recipe for glfw Armin Kuster (1): renderdoc: package need opengl Christophe PRIOUZEAU (91): spawn-fcgi: Clarify BSD license variant webmin: Clarify BSD license variant cyrus-sasl: Clarify BSD license variant libnet: Clarify BSD license variant openhpi: Clarify BSD license variant ptpd: Clarify BSD license variant pure-ftpd: Clarify BSD license variant corosync: Clarify BSD license variant netkit-ftp: Clarify BSD license variant netkit-rusers: Clarify BSD license variant netkit-rwho: Clarify BSD license variant netkit-telnet: Clarify BSD license variant freediameter: Clarify BSD license variant radiusclient: Clarify BSD license variant celt051: Clarify BSD license variant libmemcached: Clarify BSD license variant spice-protocol: Clarify BSD license variant tcpdump: Clarify BSD license variant libnet: Clarify BSD license variant iperf3: Clarify BSD license variant rfkill: Clarify BSD license variant postgresql: Clarify BSD license variant cscope: Clarify BSD license variant mcpp: Clarify BSD license variant yasm: Clarify BSD license variant cmpi binding: Clarify BSD license variant hwloc: Clarify BSD license variant liblogging: Clarify BSD license variant pmdk: Clarify BSD license variant openwsman: Clarify BSD license variant redis: Clarify BSD license variant scsirastools: Clarify BSD license variant libopus: Clarify BSD license variant opus-tools: Clarify BSD license variant wavpack: Clarify BSD license variant libvpx: Clarify BSD license variant passwdqc: Clarify BSD license variant testfloat: Clarify BSD license variant Python: flask-sqlalchemy: Clarify BSD license variant Python: meld3: Clarify BSD license variant Python: ply: Clarify BSD license variant Python: prompt toolkit: Clarify BSD license variant Python: pocket sphinx: Clarify BSD license variant Python: pysmi: Clarify BSD license variant Python: speaklater: Clarify BSD license variant Python: wrapt: Clarify BSD license variant Python: h5py: Clarify BSD license variant Python: xlrd: Clarify BSD license variant Python: alembic: Clarify BSD license variant Python: feed formatter: Clarify BSD license variant Python: decorator: Clarify BSD license variant Python: flask babel: Clarify BSD license variant Python: falsk mail: Clarify BSD license variant Python: isodate: Clarify BSD license variant Python: passlib: Clarify BSD license variant Python: pynetlinux: Clarify BSD license variant Python: webcolors: Clarify BSD license variant Python: werkzeug: Clarify BSD license variant Python: evdev: Clarify BSD license variant Python: netaddr: Clarify BSD license variant Python: pretend: Clarify BSD license variant Python: prettytable: Clarify BSD license variant Python: pysocks: Clarify BSD license variant Python: rdflib: Clarify BSD license variant Python: wtforms: Clarify BSD license variant Python: supervisor: Clarify BSD license variant Python: pysnmp: Clarify BSD license variant Python: flask pymongo: Clarify BSD license variant Python: flask xstatic: Clarify BSD license variant Python: lazy object proxy: Clarify BSD license variant Python: whoosh: Clarify BSD license variant Python: pyserial: Clarify BSD license variant Python: pika: Clarify BSD license variant Python: flask: Clarify BSD license variant Python: flask wtf: Clarify BSD license variant Python: click: Clarify BSD license variant Python: babel: Clarify BSD license variant Python: flask user: Clarify BSD license variant Python: jsonpointer: Clarify BSD license variant Python: xxhash: Clarify BSD license variant Python: markdown: Clarify BSD license variant Python: dnspython: Clarify BSD license variant Python: flask bcrypt: Clarify BSD license variant Python: jsonpatch: Clarify BSD license variant Python: ndg httpsclient: Clarify BSD license variant Python: flask scrypt: Clarify BSD license variant Python: oauthlib: Clarify BSD license variant Python: psutil: Clarify BSD license variant Python: pyhamcrest: Clarify BSD license variant Python: pyusb: Clarify BSD license variant Python: ujson: Clarify BSD license variant David Roman (1): nlohmann-json: upgrade 3.3.0 -> 3.7.0 Diego Rondini (1): ttf-roboto: add recipe Hongxu Jia (2): postfix: split /etc from ${PN} to ${PN}-cfg for ostree postfix.inc: make deterministic build Kai Kang (1): blueman: fix fail to enable bluetooth issue Khem Raj (8): open-vm-tools: Upgrade to 11.0.1 libftdi: Add target deps for python bindings mraa: Define PYTHON_LIBRARY and PYTHON_INCLUDE_DIR upm: Define PYTHON_INCLUDE_DIR and PYTHON_LIBRARY for cmake python3-astor: Upgrade to 0.8 python3-astor: Fix build with setuptools>=41.4 libiio: Inherit distutils3-base for packaging python files open-vm-tools: Fix build by removing deprecated G_INLINE_FUNC Michal Lower (1): update python setuptools-scm from 2.1.0 to 3.3.3 Paolo Valente (1): s-suite: push SRCREV to version 3.6 Richard Purdie (1): dconf: Fix build with meson 0.52 Tanu Kaskinen (1): pavucontrol: polish the recipe Trevor Gamblin (1): freeradius: fix PIDFile path in radiusd.service file Zang Ruochen (18): ltrace:Bug fix for data type length judgment python-ipaddress: upgrade 1.0.22 -> 1.0.23 python-cryptography: upgrade 2.7 -> 2.8 python-cryptography-vectors: upgrade 2.7 -> 2.8 python-automat: upgrade 0.7.0 -> 0.8.0 python-asn1crypto: upgrade 1.0.1 -> 1.2.0 python-attrs: upgrade 19.2.0 -> 19.3.0 python-cffi: upgrade 1.13.0 -> 1.13.1 python-cmd2: upgrade 0.9.18 -> 0.9.19 python-pip: upgrade 19.3 -> 19.3.1 python-pyro4: upgrade 4.73 -> 4.77 python-pytun: upgrade 2.2.1 -> 2.3.0 python-astroid: upgrade 1.6.5 -> 2.3.2 python-aws-iot-device-sdk-python: upgrade 1.4.0 -> 1.4.7 python-backports-ssl: upgrade 3.5.0.1 -> 3.7.0.1 python-bcrypt: upgrade 3.1.4 -> 3.1.7 snort: upgrade 2.9.14.1 -> 2.9.15 wolfssl: upgrade 4.1.0 -> 4.2.0 Zheng Ruoqin (9): byacc: upgrade 20180510 -> 20190617 drbd-utils: upgrade 9.10.0 -> 9.11.0 hwdata: upgrade 327 -> 328 multipath-tools: upgrade 0.8.2 -> 0.8.3 owfs: upgrade 3.2p2 -> 3.2p3 simple-mtpfs: upgrade to 0.3.0. fuse3: upgrade 3.6.2 -> 3.7.0 f2fs-tools: upgrade 1.11.0 -> 1.13.0 xorriso: upgrade 1.4.0 -> 1.5.0 nick83ola (2): python3-pyconnman: fix import issues with python3 python3-dbus-next: first commit of dbus-next 0.1.2 Change-Id: I6d500f726de3c5369b19c73e6ca7dc92aaf192d8 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-multimedia')
-rw-r--r--meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0001-Remove-python-venv.patch2
-rw-r--r--meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0002-dev_setup.sh-Remove-the-git-dependency.patch2
-rw-r--r--meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0003-dev_setup.sh-Remove-the-TERM-dependency.patch3
-rw-r--r--meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0004-dev_setup.sh-Ignore-missing-package-manager.patch31
-rw-r--r--meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0005-pip-requirements-Don-t-install-requirements-with-pip.patch (renamed from meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0004-pip-requirements-Don-t-install-requirements-with-pip.patch)10
-rw-r--r--meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0006-Use-python3-and-pip3-instead-of-python-and-pip.patch (renamed from meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0005-Use-python3-and-pip3-instead-of-python-and-pip.patch)8
-rw-r--r--meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0007-mycroft.conf-Use-pocketsphinx-by-default.patch30
-rw-r--r--meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/mycroft_19.8.1.bb6
8 files changed, 78 insertions, 14 deletions
diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0001-Remove-python-venv.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0001-Remove-python-venv.patch
index 43994e0ca..245785c82 100644
--- a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0001-Remove-python-venv.patch
+++ b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0001-Remove-python-venv.patch
@@ -1,7 +1,7 @@
From 07fce2101d83b5334de78e661ba0361c2874ebdf Mon Sep 17 00:00:00 2001
From: Alistair Francis <alistair.francis@wdc.com>
Date: Mon, 18 Mar 2019 16:30:45 -0700
-Subject: [PATCH 1/5] Remove python venv
+Subject: [PATCH 1/7] Remove python venv
Remove the python venv requirements and instead just use the native
python and pip pacakges.
diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0002-dev_setup.sh-Remove-the-git-dependency.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0002-dev_setup.sh-Remove-the-git-dependency.patch
index dd2431fdf..637854fdf 100644
--- a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0002-dev_setup.sh-Remove-the-git-dependency.patch
+++ b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0002-dev_setup.sh-Remove-the-git-dependency.patch
@@ -1,7 +1,7 @@
From 88696037af52d6a7f57bc0fb82598de1a25365cc Mon Sep 17 00:00:00 2001
From: Alistair Francis <alistair.francis@wdc.com>
Date: Fri, 29 Mar 2019 16:09:57 -0700
-Subject: [PATCH 2/5] dev_setup.sh: Remove the git dependency
+Subject: [PATCH 2/7] dev_setup.sh: Remove the git dependency
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Upstream-Status: Inappropriate [embedded specific]
diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0003-dev_setup.sh-Remove-the-TERM-dependency.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0003-dev_setup.sh-Remove-the-TERM-dependency.patch
index a4290d1cd..d803f526d 100644
--- a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0003-dev_setup.sh-Remove-the-TERM-dependency.patch
+++ b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0003-dev_setup.sh-Remove-the-TERM-dependency.patch
@@ -1,9 +1,10 @@
From 5ef52cdea278a1dff966a912549cb6708f2cb699 Mon Sep 17 00:00:00 2001
From: Alistair Francis <alistair.francis@wdc.com>
Date: Tue, 17 Sep 2019 11:31:47 -0700
-Subject: [PATCH 3/5] dev_setup.sh: Remove the TERM dependency
+Subject: [PATCH 3/7] dev_setup.sh: Remove the TERM dependency
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
+Upstream-Status: Inappropriate [embedded specific]
---
dev_setup.sh | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0004-dev_setup.sh-Ignore-missing-package-manager.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0004-dev_setup.sh-Ignore-missing-package-manager.patch
new file mode 100644
index 000000000..d2dc179ca
--- /dev/null
+++ b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0004-dev_setup.sh-Ignore-missing-package-manager.patch
@@ -0,0 +1,31 @@
+From e3b6ca995caca22e65d012a54bc2aeb08eb7e9d4 Mon Sep 17 00:00:00 2001
+From: Alistair Francis <alistair.francis@wdc.com>
+Date: Tue, 15 Oct 2019 17:09:06 -0700
+Subject: [PATCH 4/7] dev_setup.sh: Ignore missing package manager
+
+Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
+Upstream-Status: Inappropriate [embedded specific]
+---
+ dev_setup.sh | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/dev_setup.sh b/dev_setup.sh
+index 72f734f36bf..0c8e11b8170 100755
+--- a/dev_setup.sh
++++ b/dev_setup.sh
+@@ -317,12 +317,6 @@ Please review the following package changes carefully."
+ echo -e "${YELLOW}Could not find package manager
+ ${YELLOW}Make sure to manually install:$BLUE git python3 python-setuptools python-venv pygobject libtool libffi libjpg openssl autoconf bison swig glib2.0 portaudio19 mpg123 flac curl fann g++ jq\n$RESET"
+
+- echo 'Warning: Failed to install all dependencies. Continue? y/N'
+- read -n1 continue
+- if [[ $continue != 'y' ]] ; then
+- exit 1
+- fi
+-
+ fi
+ }
+
+--
+2.23.0
+
diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0004-pip-requirements-Don-t-install-requirements-with-pip.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0005-pip-requirements-Don-t-install-requirements-with-pip.patch
index 3063e7f8d..7f63ea13d 100644
--- a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0004-pip-requirements-Don-t-install-requirements-with-pip.patch
+++ b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0005-pip-requirements-Don-t-install-requirements-with-pip.patch
@@ -1,7 +1,7 @@
-From ac749f2512e8d121e8a64a8d5e6f226f16735dda Mon Sep 17 00:00:00 2001
+From 04b14c4569309f1a433d955773aeb8a3607a1360 Mon Sep 17 00:00:00 2001
From: Alistair Francis <alistair.francis@wdc.com>
Date: Tue, 19 Mar 2019 13:32:54 -0700
-Subject: [PATCH 4/5] pip requirements: Don't install requirements with pip
+Subject: [PATCH 5/7] pip requirements: Don't install requirements with pip
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Upstream-Status: Inappropriate [embedded specific]
@@ -14,10 +14,10 @@ Upstream-Status: Inappropriate [embedded specific]
delete mode 100644 test-requirements.txt
diff --git a/dev_setup.sh b/dev_setup.sh
-index 72f734f36bf..b5ca6851631 100755
+index 0c8e11b8170..be4a19de0c3 100755
--- a/dev_setup.sh
+++ b/dev_setup.sh
-@@ -357,19 +357,6 @@ fi
+@@ -351,19 +351,6 @@ fi
PYTHON=$(python -c "import sys;print('python{}.{}'.format(sys.version_info[0], sys.version_info[1]))")
@@ -37,7 +37,7 @@ index 72f734f36bf..b5ca6851631 100755
SYSMEM=$(free | awk '/^Mem:/ { print $2 }')
MAXCORES=$(($SYSMEM / 512000))
MINCORES=1
-@@ -426,4 +413,4 @@ if [[ ! -w /var/log/mycroft/ ]] ; then
+@@ -420,4 +407,4 @@ if [[ ! -w /var/log/mycroft/ ]] ; then
fi
#Store a fingerprint of setup
diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0005-Use-python3-and-pip3-instead-of-python-and-pip.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0006-Use-python3-and-pip3-instead-of-python-and-pip.patch
index 189b686c9..6f1f6f78d 100644
--- a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0005-Use-python3-and-pip3-instead-of-python-and-pip.patch
+++ b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0006-Use-python3-and-pip3-instead-of-python-and-pip.patch
@@ -1,7 +1,7 @@
-From 9a0bd09706da3949db17ea7272d6647a487bb6ad Mon Sep 17 00:00:00 2001
+From 86a1d18d96f827baa0c1029c85a53fc89d436e17 Mon Sep 17 00:00:00 2001
From: Alistair Francis <alistair.francis@wdc.com>
Date: Tue, 19 Mar 2019 13:38:44 -0700
-Subject: [PATCH 5/5] Use python3 and pip3 instead of python and pip
+Subject: [PATCH 6/7] Use python3 and pip3 instead of python and pip
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Upstream-Status: Inappropriate [embedded specific]
@@ -73,7 +73,7 @@ index d80f0e75b13..9448ea3400f 100755
-output=$(python -m mycroft.messagebus.send "speak" "{\"utterance\": \"$data\"}")
+output=$(python3 -m mycroft.messagebus.send "speak" "{\"utterance\": \"$data\"}")
diff --git a/dev_setup.sh b/dev_setup.sh
-index b5ca6851631..fcd0834669f 100755
+index be4a19de0c3..2d9e17ddfd6 100755
--- a/dev_setup.sh
+++ b/dev_setup.sh
@@ -48,7 +48,7 @@ param=''
@@ -94,7 +94,7 @@ index b5ca6851631..fcd0834669f 100755
fi
done
-@@ -355,7 +355,7 @@ else
+@@ -349,7 +349,7 @@ else
fi
fi
diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0007-mycroft.conf-Use-pocketsphinx-by-default.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0007-mycroft.conf-Use-pocketsphinx-by-default.patch
new file mode 100644
index 000000000..574bda144
--- /dev/null
+++ b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/files/0007-mycroft.conf-Use-pocketsphinx-by-default.patch
@@ -0,0 +1,30 @@
+From b48b3d240cb0fa5e76aa5daf578e51bb8126431d Mon Sep 17 00:00:00 2001
+From: Alistair Francis <alistair.francis@wdc.com>
+Date: Wed, 16 Oct 2019 09:18:39 -0700
+Subject: [PATCH 7/7] mycroft.conf: Use pocketsphinx by default
+
+precise only works on certain architectures, to make Mycroft more
+versitle use pocketsphinx as it is architecture independent.
+
+Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
+Upstream-Status: Inappropriate [embedded specific]
+---
+ mycroft/configuration/mycroft.conf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mycroft/configuration/mycroft.conf b/mycroft/configuration/mycroft.conf
+index 1d0be0dcd2b..d2dc75dac44 100644
+--- a/mycroft/configuration/mycroft.conf
++++ b/mycroft/configuration/mycroft.conf
+@@ -196,7 +196,7 @@
+ // Hotword configurations
+ "hotwords": {
+ "hey mycroft": {
+- "module": "precise",
++ "module": "pocketsphinx",
+ "phonemes": "HH EY . M AY K R AO F T",
+ "threshold": 1e-90,
+ "lang": "en-us"
+--
+2.23.0
+
diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/mycroft_19.8.1.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/mycroft_19.8.1.bb
index d4ac4096b..3c7bd8963 100644
--- a/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/mycroft_19.8.1.bb
+++ b/meta-openembedded/meta-multimedia/recipes-multimedia/mycroft/mycroft_19.8.1.bb
@@ -11,8 +11,10 @@ SRC_URI = "git://github.com/MycroftAI/mycroft-core.git;branch=master \
file://0001-Remove-python-venv.patch \
file://0002-dev_setup.sh-Remove-the-git-dependency.patch \
file://0003-dev_setup.sh-Remove-the-TERM-dependency.patch \
- file://0004-pip-requirements-Don-t-install-requirements-with-pip.patch \
- file://0005-Use-python3-and-pip3-instead-of-python-and-pip.patch \
+ file://0004-dev_setup.sh-Ignore-missing-package-manager.patch \
+ file://0005-pip-requirements-Don-t-install-requirements-with-pip.patch \
+ file://0006-Use-python3-and-pip3-instead-of-python-and-pip.patch \
+ file://0007-mycroft.conf-Use-pocketsphinx-by-default.patch \
file://dev_opts.json \
file://mycroft-setup.service \
file://mycroft.service \