Compare commits

...

5 Commits

Author SHA1 Message Date
j1nx a019105f81 Have a dedicated pulse profile for sj-201 and load it by udev 2023-01-19 16:01:12 +01:00
j1nx 53bae2b9e0 Bump python-scipy 2023-01-19 15:30:03 +01:00
j1nx 083ccaae5d Bump Numpy and Cython 2023-01-19 15:28:41 +01:00
j1nx de3e5189c4 Enable ffmpeg binaries 2023-01-19 15:28:09 +01:00
j1nx da279eb2a0 Bump whisper-tflite 2023-01-19 12:12:17 +01:00
14 changed files with 203 additions and 32 deletions

View File

@ -64,8 +64,8 @@ load-module module-position-event-sounds
### OpenVoiceOS Audio Settings
load-module module-role-ducking
load-module module-combine-sink sink_name=OpenVoiceOS
load-module module-remap-source source_name=VF_ASR_L source_properties="device.description='VocalFusion ASR recording'" master=alsa_input.platform-asoc-simple-card.0.stereo-fallback remix=no master_channel_map=front-left channel_map=mono
load-module module-remap-source source_name=VF_Comms_R source_properties="device.description='VocalFusion Comms recording'" master=alsa_input.platform-asoc-simple-card.0.stereo-fallback remix=no master_channel_map=front-right channel_map=mono
load-module module-remap-source source_name=VF_ASR_L source_properties="device.description='VocalFusion ASR recording'" master=alsa_input.platform-asoc-simple-card.0.xvf3510-2mic remix=no master_channel_map=front-left channel_map=mono
load-module module-remap-source source_name=VF_Comms_R source_properties="device.description='VocalFusion Comms recording'" master=alsa_input.platform-asoc-simple-card.0.xvf3510-2mic remix=no master_channel_map=front-right channel_map=mono
set-default-source VF_ASR_L
set-default-sink OpenVoiceOS

View File

@ -0,0 +1,7 @@
SUBSYSTEM!="sound", GOTO="vocalfusion_end"
ACTION!="change", GOTO="vocalfusion_end"
KERNEL!="card*", GOTO="vocalfusion_end"
ATTR{id}=="sndxmosvocalfus",ENV{PULSE_PROFILE_SET}="xvf3510.conf"
LABEL="vocalfusion_end"

View File

@ -0,0 +1,38 @@
# /usr/share/pulseaudio/alsa-mixer/profile-sets/xvf3510.conf
[General]
auto-profiles = no
[Mapping xvf3510-2mic]
device-strings = hw:%f
channel-map = front-left,front-right
exact-channels = yes
fallback = yes
paths-input = xvf3510-2mic
priority = 3
direction = input
[Mapping xvf3510-stereo-output]
device-strings = hw:%f
channel-map = front-left,front-right
exact-channels = yes
fallback = yes
paths-output = xvf3510-stereo-output
direction = output
priority = 2
[Profile output:xvf3510-stereo-output+input:xvf3510-2mic]
output-mappings = xvf3510-stereo-output
input-mappings = xvf3510-2mic
priority = 100
skip-probe = yes
[Profile output:xvf3510-stereo-output]
output-mappings = xvf3510-stereo-output
priority = 4
skip-probe = yes
[Profile input:xvf3510-2mic]
input-mappings = xvf3510-2mic
priority = 5
skip-probe = yes

View File

@ -66,7 +66,8 @@ BR2_PACKAGE_ESPEAK=y
BR2_PACKAGE_ESPEAK_AUDIO_BACKEND_PULSEAUDIO=y
BR2_PACKAGE_FFMPEG_GPL=y
BR2_PACKAGE_FFMPEG_NONFREE=y
# BR2_PACKAGE_FFMPEG_FFMPEG is not set
BR2_PACKAGE_FFMPEG_FFPLAY=y
BR2_PACKAGE_FFMPEG_FFPROBE=y
BR2_PACKAGE_FFMPEG_AVRESAMPLE=y
BR2_PACKAGE_FFMPEG_POSTPROC=y
BR2_PACKAGE_FLUIDSYNTH_PULSEAUDIO=y
@ -285,7 +286,6 @@ BR2_PACKAGE_LIBERATION=y
BR2_PACKAGE_MESA3D=y
BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D=y
BR2_PACKAGE_MESA3D_OPENGL_ES=y
BR2_PACKAGE_SDL2=y
BR2_PACKAGE_QT5=y
BR2_PACKAGE_QT53D=y
BR2_PACKAGE_QT5BASE_CONCURRENT=y

View File

@ -67,7 +67,8 @@ BR2_PACKAGE_ESPEAK=y
BR2_PACKAGE_ESPEAK_AUDIO_BACKEND_PULSEAUDIO=y
BR2_PACKAGE_FFMPEG_GPL=y
BR2_PACKAGE_FFMPEG_NONFREE=y
# BR2_PACKAGE_FFMPEG_FFMPEG is not set
BR2_PACKAGE_FFMPEG_FFPLAY=y
BR2_PACKAGE_FFMPEG_FFPROBE=y
BR2_PACKAGE_FFMPEG_AVRESAMPLE=y
BR2_PACKAGE_FFMPEG_POSTPROC=y
BR2_PACKAGE_FLUIDSYNTH_PULSEAUDIO=y
@ -286,7 +287,6 @@ BR2_PACKAGE_LIBERATION=y
BR2_PACKAGE_MESA3D=y
BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D=y
BR2_PACKAGE_MESA3D_OPENGL_ES=y
BR2_PACKAGE_SDL2=y
BR2_PACKAGE_QT5=y
BR2_PACKAGE_QT53D=y
BR2_PACKAGE_QT5BASE_CONCURRENT=y

View File

@ -0,0 +1,36 @@
From aae8b63ddffe014e9353c3e8d2604628433eb7d7 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Sun, 4 Dec 2022 14:14:21 +0100
Subject: [PATCH] build sh4 FE
ensures FE_UPWARD and FE_DOWNWARD are defined for sh4 architecture.
Closes: #1007769.
[Retrieved from:
https://salsa.debian.org/python-team/packages/scipy/-/blob/master/debian/patches/build_sh4_FE.patch]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
scipy/special/_round.h | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/scipy/special/_round.h b/scipy/special/_round.h
index 013a25620..c321a1939 100644
--- a/scipy/special/_round.h
+++ b/scipy/special/_round.h
@@ -69,5 +69,12 @@ int fegetround()
#endif
+/* SH4 is not C99 compliant, see https://github.com/scipy/scipy/issues/15584 */
+#ifndef FE_UPWARD
+#define FE_UPWARD -1
+#endif
+#ifndef FE_DOWNWARD
+#define FE_DOWNWARD -1
+#endif
#endif /* _round.h */
--
2.38.1

View File

@ -1,15 +1,12 @@
config BR2_PACKAGE_PYTHON_SCIPY
bool "python-scipy"
depends on BR2_PACKAGE_OPENBLAS_ARCH_SUPPORTS # openblas
depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS # python-numpy
depends on BR2_PACKAGE_LAPACK_ARCH_SUPPORTS # lapack
depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy
depends on BR2_TOOLCHAIN_HAS_FORTRAN # lapack
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_PACKAGE_PYTHON3
select BR2_PACKAGE_LAPACK
select BR2_PACKAGE_OPENBLAS
select BR2_PACKAGE_ZLIB # runtime scipy::io
select BR2_PACKAGE_PYTHON3_ZLIB # runtime scipy::io
select BR2_PACKAGE_PYTHON_NUMPY # runtime
select BR2_PACKAGE_PYTHON_PYBIND
help
@ -21,10 +18,8 @@ config BR2_PACKAGE_PYTHON_SCIPY
https://www.scipy.org/scipylib/
comment "python-scipy needs toolchain w/ fortran and c++ and glibc or musl"
depends on BR2_PACKAGE_OPENBLAS_ARCH_SUPPORTS
depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS
depends on BR2_PACKAGE_LAPACK_ARCH_SUPPORTS
depends on BR2_PACKAGE_PYTHON3
depends on !BR2_TOOLCHAIN_HAS_FORTRAN || \
!BR2_INSTALL_LIBSTDCPP || \
(!BR2_TOOLCHAIN_USES_GLIBC && !BR2_TOOLCHAIN_USES_MUSL)

View File

@ -1,9 +1,9 @@
# Locally generated
sha256 4042211bed8e6c658b9e2a4ca829806f0b33437faa7878c8dc6d6f72845b1694 scipy-1.7.3.tar.xz
sha256 32b2f41fb8c1193a066c1686bb3237e79f918685bf545cb6dfcb68753ac35152 LICENSE.txt
sha256 26d28c468900e6d5fdb37d2812ab46db0ccd22c63baa095057871faa3a498bc9 scipy-1.9.1.tar.gz
sha256 96599f8ec69a2cc609265eed13fc75090aacb28742260e55ce623788a33da19c LICENSE.txt
sha256 37e64a498894ac7c3b070023e3689e954a8ecf8a23b90968d09a455f1b4f7b35 scipy/linalg/src/lapack_deprecations/LICENSE
sha256 606209a000716c5f66e33e180ce08434b96ed17db4975ab9723c6b5fbcc89609 scipy/ndimage/LICENSE.txt
sha256 3df9207af2fdb861af0ae3b22026f163b9bcfab4e525dc4943afe2ffa3f77624 scipy/optimize/tnc/LICENSE
sha256 f0cedf52503b2d42b83411a0a16e6fefac346dfad8fddc66f50050150123470c scipy/sparse/linalg/dsolve/SuperLU/License.txt
sha256 0926566f9f406178d1214f8cc796e166b1213dd7c05e0c5b461a8b8ac9e50bbe scipy/sparse/linalg/eigen/arpack/ARPACK/COPYING
sha256 f0cedf52503b2d42b83411a0a16e6fefac346dfad8fddc66f50050150123470c scipy/sparse/linalg/_dsolve/SuperLU/License.txt
sha256 0926566f9f406178d1214f8cc796e166b1213dd7c05e0c5b461a8b8ac9e50bbe scipy/sparse/linalg/_eigen/arpack/ARPACK/COPYING
sha256 34db0c0c4f931861d720555c9cd7a2e228d1290ba29af0f2ee80c41bb2038afb scipy/spatial/qhull_src/COPYING.txt

View File

@ -4,31 +4,31 @@
#
################################################################################
PYTHON_SCIPY_VERSION = 1.7.3
PYTHON_SCIPY_SOURCE = scipy-$(PYTHON_SCIPY_VERSION).tar.xz
PYTHON_SCIPY_VERSION = 1.9.1
PYTHON_SCIPY_SOURCE = scipy-$(PYTHON_SCIPY_VERSION).tar.gz
PYTHON_SCIPY_SITE = https://github.com/scipy/scipy/releases/download/v$(PYTHON_SCIPY_VERSION)
PYTHON_SCIPY_LICENSE = \
BSD-3-Clause, \
BSD-2-Clause, \
BSD, \
BSD-Style, \
Apache-2.0, \
MIT
MIT, \
Qhull
PYTHON_SCIPY_LICENSE_FILES = \
LICENSE.txt \
scipy/linalg/src/lapack_deprecations/LICENSE \
scipy/ndimage/LICENSE.txt \
scipy/optimize/tnc/LICENSE \
scipy/sparse/linalg/dsolve/SuperLU/License.txt \
scipy/sparse/linalg/eigen/arpack/ARPACK/COPYING \
scipy/sparse/linalg/_dsolve/SuperLU/License.txt \
scipy/sparse/linalg/_eigen/arpack/ARPACK/COPYING \
scipy/spatial/qhull_src/COPYING.txt
PYTHON_SCIPY_CPE_ID_VENDOR = scipy
PYTHON_SCIPY_CPE_ID_PRODUCT = scipy
PYTHON_SCIPY_DEPENDENCIES += \
host-meson \
host-python-numpy \
host-python-pythran \
zlib \
lapack \
openblas \
python-numpy \
python-pybind
PYTHON_SCIPY_INSTALL_STAGING = YES
@ -36,22 +36,26 @@ PYTHON_SCIPY_INSTALL_STAGING = YES
PYTHON_SCIPY_SETUP_TYPE = setuptools
PYTHON_SCIPY_BUILD_OPTS = config_fc --fcompiler=gnu95
# -lnpymath npymath.ini localization
PYTHON_SCIPY_NPY_PKG_CONFIG_PATH = \
$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/numpy/core/lib/npy-pkg-config
PYTHON_SCIPY_CFLAGS = \
-I$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR)
PYTHON_SCIPY_LDFLAGS = $(TARGET_LDFLAGS) -shared \
-L$(PYTHON3_PATH)/site-packages/numpy/core/lib
# -lnpyrandom localization
PYTHON_SCIPY_LDFLAGS += \
-L$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/numpy/random/lib
# scipy can use C++11 atomics when available, so we need to link with
# libatomic for the architectures that need libatomic.
ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
PYTHON_SCIPY_LDFLAGS += -latomic
endif
PYTHON_SCIPY_ENV = \
F90=$(TARGET_FC) \
NPY_PKG_CONFIG_PATH=$(PYTHON_SCIPY_NPY_PKG_CONFIG_PATH) \
CFLAGS="$(PYTHON_SCIPY_CFLAGS)" \
LDFLAGS="$(PYTHON_SCIPY_LDFLAGS)"
# Provide system configuration options to numpy distutils extenions, telling
# Provide system configuration options to numpy distutils extensions, telling
# to find all include files and libraries in staging directory.
define PYTHON_SCIPY_CONFIGURE_CMDS
-rm -f $(@D)/site.cfg

View File

@ -1,2 +1,2 @@
# Locally computed
sha256 9cefee3ef2e2ea3d556c98922cc522e22af527bb76aaccf68fa02cc1d9e8b322 whisper-tflite-b3649ffba57bc226492522c736b1a127e50cdc26.tar.gz
sha256 92007085500b98abd9dd62d9cdecf50b267111910ccfbade45d27309cacd3262 whisper-tflite-f11d55e440c9f8d51782ef8badf2270583486000.tar.gz

View File

@ -4,7 +4,7 @@
#
################################################################################
WHISPER_TFLITE_VERSION = b3649ffba57bc226492522c736b1a127e50cdc26
WHISPER_TFLITE_VERSION = f11d55e440c9f8d51782ef8badf2270583486000
WHISPER_TFLITE_SITE = $(call github,usefulsensors,openai-whisper,$(WHISPER_TFLITE_VERSION))
WHISPER_TFLITE_LICENSE = Apache License 2.0
WHISPER_TFLITE_SUBDIR = tflite_minimal
@ -13,4 +13,10 @@ WHISPER_TFLITE_INSTALL_STAGING = YES
WHISPER_TFLITE_DEPENDENCIES = host-pkgconf
WHISPER_TFLITE_SUPPORTS_IN_SOURCE_BUILD = NO
WHISPER_TFLITE_PRE_CONFIGURE_HOOKS = WHISPER_TFLITE_MEDIUM_MODEL
define WHISPER_TFLITE_MEDIUM_MODEL
cp $(@D)/models/filters_vocab_multilingual.bin $(@D)/$(WHISPER_TFLITE_SUBDIR)/filters_vocab_gen.bin
endef
$(eval $(cmake-package))

View File

@ -0,0 +1,43 @@
From df38dc70991fb0952348e27212ca3d5ec9365270 Mon Sep 17 00:00:00 2001
From: j1nx <p.steenbergen@j1nx.nl>
Date: Thu, 19 Jan 2023 13:14:51 +0100
Subject: [PATCH 1/1] Bump python-numpy to v1.23.5
---
package/python-numpy/python-numpy.hash | 8 ++++----
package/python-numpy/python-numpy.mk | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/package/python-numpy/python-numpy.hash b/package/python-numpy/python-numpy.hash
index c0dcc5d27f..9ac9280c78 100644
--- a/package/python-numpy/python-numpy.hash
+++ b/package/python-numpy/python-numpy.hash
@@ -1,8 +1,8 @@
-# Copied from https://github.com/numpy/numpy/releases/tag/v1.21.2
-sha256 76af194fbc117934ec5bbe2ff15177adbd05aeed23f18ee209ed88edcd777e05 numpy-1.21.2.tar.gz
+# Copied from https://github.com/numpy/numpy/releases/tag/v1.23.5
+sha256 1b1766d6f397c18153d40015ddfc79ddb715cabadc04d2d228d4e5a8bc4ded1a numpy-1.23.5.tar.gz
# License files, locally calculated
-sha256 bc1b0af15cdc9415ea26c5f1df352c226ac86425ec0fb9ab38d111018bf1c6f2 LICENSE.txt
-sha256 2be6947e0432ecf7950ee8fe38681316749dd06d1de17c9ec4de6d2f55adb3a1 numpy/core/src/multiarray/dragon4.c
+sha256 0f88787955e7131224f53a8c3f3e859dc502408e3a539a4dcf61fb7888b5b984 LICENSE.txt
+sha256 c27d0a8026bdb8876562b720ab24d1688e3827a89f6083cd6e7e8caa9584aba3 numpy/core/src/multiarray/dragon4.c
sha256 fbc539f47d0cf83bc61378080fb873d5c14630126cacbfe754035c3926daa5ec numpy/core/include/numpy/libdivide/LICENSE.txt
sha256 a14cc25e10d40a3aa705b7de2fb764a6535d8ee9b2db4e1724900585457dfd55 numpy/linalg/lapack_lite/LICENSE.txt
sha256 badf51c7e3e7de9c7630bd069780f5c197b846ef7660b342a1e58d5553592d8e tools/npy_tempita/license.txt
diff --git a/package/python-numpy/python-numpy.mk b/package/python-numpy/python-numpy.mk
index 417fe81f57..812bfdae4a 100644
--- a/package/python-numpy/python-numpy.mk
+++ b/package/python-numpy/python-numpy.mk
@@ -4,7 +4,7 @@
#
################################################################################
-PYTHON_NUMPY_VERSION = 1.21.2
+PYTHON_NUMPY_VERSION = 1.23.5
PYTHON_NUMPY_SOURCE = numpy-$(PYTHON_NUMPY_VERSION).tar.gz
PYTHON_NUMPY_SITE = https://github.com/numpy/numpy/releases/download/v$(PYTHON_NUMPY_VERSION)
PYTHON_NUMPY_LICENSE = BSD-3-Clause, MIT, Zlib
--
2.34.1

View File

@ -0,0 +1,42 @@
From 2ef5c18a93d39563f56f4010f46902049cbdee35 Mon Sep 17 00:00:00 2001
From: j1nx <p.steenbergen@j1nx.nl>
Date: Thu, 19 Jan 2023 13:33:18 +0100
Subject: [PATCH 1/1] Bump python-cython to 0.29.33
---
package/python-cython/python-cython.hash | 4 ++--
package/python-cython/python-cython.mk | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/package/python-cython/python-cython.hash b/package/python-cython/python-cython.hash
index 9c5f1225cf..e7e86264d2 100644
--- a/package/python-cython/python-cython.hash
+++ b/package/python-cython/python-cython.hash
@@ -1,6 +1,6 @@
# md5, sha256 from https://pypi.org/pypi/cython/json
-md5 2b2ba86abcf823985935d37f5e43b19a Cython-0.29.27.tar.gz
-sha256 c6a442504db906dfc13a480e96850cced994ecdc076bcf492c43515b78f70da2 Cython-0.29.27.tar.gz
+md5 bd42c555cb2298b8a94fa8de7ee679ba Cython-0.29.33.tar.gz
+sha256 5040764c4a4d2ce964a395da24f0d1ae58144995dab92c6b96f44c3f4d72286a Cython-0.29.33.tar.gz
# Locally computed sha256 checksums
sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 LICENSE.txt
sha256 e1eb1c49a8508e8173dac30157e4a6439a44ad8846194746c424fbc3fc2b95d7 COPYING.txt
diff --git a/package/python-cython/python-cython.mk b/package/python-cython/python-cython.mk
index b9fbf7b11a..b11d75b33d 100644
--- a/package/python-cython/python-cython.mk
+++ b/package/python-cython/python-cython.mk
@@ -4,9 +4,9 @@
#
################################################################################
-PYTHON_CYTHON_VERSION = 0.29.27
+PYTHON_CYTHON_VERSION = 0.29.33
PYTHON_CYTHON_SOURCE = Cython-$(PYTHON_CYTHON_VERSION).tar.gz
-PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/eb/46/80dd9e5ad67ebc766ff3229901bde4a7bc82907efe93cd7007c4df458dd5
+PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/dc/f6/e8e302f9942cbebede88b1a0c33d0be3a738c3ac37abae87254d58ffc51c
PYTHON_CYTHON_SETUP_TYPE = setuptools
PYTHON_CYTHON_LICENSE = Apache-2.0
PYTHON_CYTHON_LICENSE_FILES = COPYING.txt LICENSE.txt
--
2.34.1