diff --git a/buildroot-external/Config.in b/buildroot-external/Config.in index 45529eb6..454ca897 100644 --- a/buildroot-external/Config.in +++ b/buildroot-external/Config.in @@ -147,7 +147,6 @@ menu "Additional external python modules" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-korean-lunar-calendar/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-lazy/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-levenshtein/Config.in" - source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-lingua-franca/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-lingua-nostra/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-memory-tempfile/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-mock-msm/Config.in" @@ -242,6 +241,7 @@ menu "Mycroft A.I. Personal Assistant" menu "Mycroft A.I. Plugins" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-audio-plugin-simple/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-config-assistant/Config.in" + source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-lingua-franca/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-local-backend/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-notifications-service/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/python-ovos-ocp-audio-plugin/Config.in" diff --git a/buildroot-external/configs/rpi3_64-gui_defconfig b/buildroot-external/configs/rpi3_64-gui_defconfig index fe9ac04a..5d20498c 100644 --- a/buildroot-external/configs/rpi3_64-gui_defconfig +++ b/buildroot-external/configs/rpi3_64-gui_defconfig @@ -642,8 +642,6 @@ BR2_PACKAGE_PYTHON_HUMANHASH3=y BR2_PACKAGE_PYTHON_KTHREAD=y BR2_PACKAGE_PYTHON_LAZY=y BR2_PACKAGE_PYTHON_LEVENSHTEIN=y -BR2_PACKAGE_PYTHON_LINGUA_FRANCA=y -BR2_PACKAGE_PYTHON_LINGUA_NOSTRA=y BR2_PACKAGE_PYTHON_MEMORY_TEMPFILE=y BR2_PACKAGE_PYTHON_MOCK_MSM=y BR2_PACKAGE_PYTHON_MSK=y @@ -704,6 +702,7 @@ BR2_PACKAGE_PYTHON_OVOS_CORE=y BR2_PACKAGE_MYCROFT_SERVICE=y BR2_PACKAGE_PYTHON_OVOS_AUDIO_PLUGIN_SIMPLE=y BR2_PACKAGE_PYTHON_OVOS_CONFIG_ASSISTANT=y +BR2_PACKAGE_PYTHON_OVOS_LINGUA_FRANCA=y BR2_PACKAGE_PYTHON_OVOS_LOCAL_BACKEND=y BR2_PACKAGE_PYTHON_OVOS_NOTIFICATIONS_SERVICE=y BR2_PACKAGE_PYTHON_OVOS_OCP_AUDIO_PLUGIN=y diff --git a/buildroot-external/configs/rpi4_64-gui_defconfig b/buildroot-external/configs/rpi4_64-gui_defconfig index b258a36e..73682402 100644 --- a/buildroot-external/configs/rpi4_64-gui_defconfig +++ b/buildroot-external/configs/rpi4_64-gui_defconfig @@ -644,8 +644,6 @@ BR2_PACKAGE_PYTHON_HUMANHASH3=y BR2_PACKAGE_PYTHON_KTHREAD=y BR2_PACKAGE_PYTHON_LAZY=y BR2_PACKAGE_PYTHON_LEVENSHTEIN=y -BR2_PACKAGE_PYTHON_LINGUA_FRANCA=y -BR2_PACKAGE_PYTHON_LINGUA_NOSTRA=y BR2_PACKAGE_PYTHON_MEMORY_TEMPFILE=y BR2_PACKAGE_PYTHON_MOCK_MSM=y BR2_PACKAGE_PYTHON_MSK=y @@ -706,6 +704,7 @@ BR2_PACKAGE_PYTHON_OVOS_CORE=y BR2_PACKAGE_MYCROFT_SERVICE=y BR2_PACKAGE_PYTHON_OVOS_AUDIO_PLUGIN_SIMPLE=y BR2_PACKAGE_PYTHON_OVOS_CONFIG_ASSISTANT=y +BR2_PACKAGE_PYTHON_OVOS_LINGUA_FRANCA=y BR2_PACKAGE_PYTHON_OVOS_LOCAL_BACKEND=y BR2_PACKAGE_PYTHON_OVOS_NOTIFICATIONS_SERVICE=y BR2_PACKAGE_PYTHON_OVOS_OCP_AUDIO_PLUGIN=y diff --git a/buildroot-external/package/python-lingua-franca/Config.in b/buildroot-external/package/python-lingua-franca/Config.in deleted file mode 100644 index 5b491745..00000000 --- a/buildroot-external/package/python-lingua-franca/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PYTHON_LINGUA_FRANCA - bool "python-lingua-franca" - select BR2_PACKAGE_PYTHON_DATEUTIL # runtime - help - Mycroft's multilingual text parsing and formatting library. - - https://github.com/MycroftAI/lingua-franca diff --git a/buildroot-external/package/python-lingua-franca/python-lingua-franca.hash b/buildroot-external/package/python-lingua-franca/python-lingua-franca.hash deleted file mode 100644 index 77ddf097..00000000 --- a/buildroot-external/package/python-lingua-franca/python-lingua-franca.hash +++ /dev/null @@ -1 +0,0 @@ -sha256 e7fe49250fdf1e01b1a53c8fb21381861557a906dce6092d3f20532417e06edd python-lingua-franca-0adc4314c96afd935975c82dde3d453e0713de41.tar.gz diff --git a/buildroot-external/package/python-lingua-franca/python-lingua-franca.mk b/buildroot-external/package/python-lingua-franca/python-lingua-franca.mk deleted file mode 100644 index f6e075df..00000000 --- a/buildroot-external/package/python-lingua-franca/python-lingua-franca.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# python-lingua-franca -# -################################################################################ - -PYTHON_LINGUA_FRANCA_VERSION = 0adc4314c96afd935975c82dde3d453e0713de41 -PYTHON_LINGUA_FRANCA_SITE = $(call github,MycroftAI,lingua-franca,$(PYTHON_LINGUA_FRANCA_VERSION)) -PYTHON_LINGUA_FRANCA_SETUP_TYPE = setuptools -PYTHON_LINGUA_FRANCA_LICENSE = Apache-2.0 -PYTHON_LINGUA_FRANCA_LICENSE_FILES = LICENSE - -$(eval $(python-package)) diff --git a/buildroot-external/package/python-ovos-lingua-franca/0001-No-LF-uninstall.patch b/buildroot-external/package/python-ovos-lingua-franca/0001-No-LF-uninstall.patch new file mode 100644 index 00000000..d1585db1 --- /dev/null +++ b/buildroot-external/package/python-ovos-lingua-franca/0001-No-LF-uninstall.patch @@ -0,0 +1,47 @@ +From 6b6955e4ea7e0dd160a39f7a42fdf5cde78e0692 Mon Sep 17 00:00:00 2001 +From: j1nx