* Re: [PR PATCH] [Updated] vosk-api: update to 0.3.45
2023-02-05 12:18 [PR PATCH] vosk-api: update to 0.3.45 JohnGebbie
@ 2023-02-05 12:28 ` JohnGebbie
2023-02-05 12:45 ` JohnGebbie
` (16 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: JohnGebbie @ 2023-02-05 12:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1269 bytes --]
There is an updated pull request by JohnGebbie against master on the void-packages repository
https://github.com/JohnGebbie/void-packages vosk-api
https://github.com/void-linux/void-packages/pull/42091
vosk-api: update to 0.3.45
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/42091.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vosk-api-42091.patch --]
[-- Type: text/x-diff, Size: 5910 bytes --]
From 1dfd79012b1f7b5c58ba20575948ab902d2c8f1f Mon Sep 17 00:00:00 2001
From: John Gebbie <me@johngebbie.com>
Date: Sun, 5 Feb 2023 12:10:37 +0000
Subject: [PATCH 1/2] vosk-api: update to 0.3.45.
---
common/shlibs | 2 +-
srcpkgs/vosk-api/template | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 59444164928b..bc77277ce8d1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4213,7 +4213,7 @@ libtracecmd.so.1 libtracecmd-3.1.2_1
libkshark.so.2 libkshark-2.1.1_1
libcpp-hocon.so.0.3.0 cpp-hocon-0.3.0_5
libfst.so.25 openfst-1.8.2_1
-libvosk.so vosk-api-0.3.43_1
+libvosk.so vosk-api-0.3.45_1
libdspy-1.so.1 d-spy-1.4.0_1
libpanel-1.so.1 libpanel-1.0.1_1
libqrtr.so.1 qrtr-ns-1.0_1
diff --git a/srcpkgs/vosk-api/template b/srcpkgs/vosk-api/template
index b86c74452b95..41d53e654042 100644
--- a/srcpkgs/vosk-api/template
+++ b/srcpkgs/vosk-api/template
@@ -1,12 +1,12 @@
# Template file for 'vosk-api'
pkgname=vosk-api
-version=0.3.43
+version=0.3.45
revision=1
create_wrksrc=yes
build_wrksrc="vosk-api-${version}/src"
# Vosk is built with their own vendored version of Kaldi which has no releases
# of its own, so the commit must be determined by the date of the vosk release.
-_kaldi_commit=ecb4b47159501ef0d67888633e65b8fc0c1f79d1
+_kaldi_commit=93ef0019b847272a239fbb485ef97f29feb1d587
build_style=gnu-makefile
make_use_env=yes
make_build_args="KALDI_ROOT=../../kaldi HAVE_OPENBLAS_NO_F2C=1 HAVE_OPENBLAS_CLAPACK=0"
@@ -18,8 +18,8 @@ homepage="https://alphacephei.com/vosk"
distfiles="https://github.com/alphacep/vosk-api/archive/v${version}/vosk-api-${version}.tar.gz
https://github.com/alphacep/kaldi/archive/${_kaldi_commit}.tar.gz
https://alphacephei.com/vosk/models/vosk-model-small-en-us-0.15.zip"
-checksum="50fa82bfbfe3fc5be868237c84ac180eb55da0b65b1803bf022899673afda024
- 39cadd5a351a5513e3e4e1f71ac4b4f018a592a856a55f1d32c159e22e799f64
+checksum="930fb9cfa6c1b3035d3730feee7d670fb893caa0c71bd2159ee7623102674c26
+ f47a996af546884a8e1cb961323b796c5c238c1bbeabaf657bb300b760e431b2
30f26242c4eb449f948e42cb302dd7a686cb29a3423a8367f99ff41780942498"
shlib_provides="libvosk.so"
patch_args="-Np1 -d ${pkgname}-${version}"
From 5a0f5dbc0adb94409cda7a2f9592cd05b4fec51f Mon Sep 17 00:00:00 2001
From: John Gebbie <me@johngebbie.com>
Date: Sun, 5 Feb 2023 12:28:21 +0000
Subject: [PATCH 2/2] openfst: unrestrict archs
---
srcpkgs/openfst/patches/32bit.patch | 37 +++++++++++++++++++++
srcpkgs/openfst/patches/cross-compile.patch | 23 -------------
srcpkgs/openfst/template | 5 +--
3 files changed, 38 insertions(+), 27 deletions(-)
create mode 100644 srcpkgs/openfst/patches/32bit.patch
delete mode 100644 srcpkgs/openfst/patches/cross-compile.patch
diff --git a/srcpkgs/openfst/patches/32bit.patch b/srcpkgs/openfst/patches/32bit.patch
new file mode 100644
index 000000000000..7102e455ca15
--- /dev/null
+++ b/srcpkgs/openfst/patches/32bit.patch
@@ -0,0 +1,37 @@
+This removes a test which stops at least i686 natively compiling:
+https://github.com/kaldi-asr/kaldi/issues/4808
+
+152,184d151
+< # Flags may be changed after configuring, so this is checked again by
+< # weight_test.cc. The check here is to save time in the common case,
+< # or when someone does not run `make check`.
+< AC_RUN_IFELSE([AC_LANG_PROGRAM([
+< #include <cstdio>
+<
+< template <typename T>
+< bool FloatEqIsReflexive(T m) {
+< volatile T x = 1.111;
+< x *= m;
+<
+< T y = 1.111;
+< y *= m;
+<
+< return x == y;
+< }
+< ], [
+< volatile double test_value = 1.1;
+< if (!FloatEqIsReflexive(static_cast<float>(test_value))) {
+< printf("float FAIL\n");
+< return 1;
+< }
+< if (!FloatEqIsReflexive(test_value)) {
+< printf("double FAIL\n");
+< return 1;
+< }
+< ])],
+< [echo "Float equality is good"],
+< [AC_MSG_FAILURE(m4_normalize([
+< Test float equality failed!
+< Compile with -msse -mfpmath=sse if using g++.
+< ]))])
+<
diff --git a/srcpkgs/openfst/patches/cross-compile.patch b/srcpkgs/openfst/patches/cross-compile.patch
deleted file mode 100644
index 4014f51dba38..000000000000
--- a/srcpkgs/openfst/patches/cross-compile.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 256f83e52112a5cd37e37a34beff2c4f0eae4660 Mon Sep 17 00:00:00 2001
-From: Nickolay Shmyrev <nshmyrev@gmail.com>
-Date: Tue, 16 Jun 2020 15:22:19 +0200
-Subject: [PATCH] Don't fail on cross-compile
-
----
- configure.ac | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index d52ed02..0f53b4d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -180,7 +180,8 @@ AC_RUN_IFELSE([AC_LANG_PROGRAM([
- [AC_MSG_FAILURE(m4_normalize([
- Test float equality failed!
- Compile with -msse -mfpmath=sse if using g++.
-- ]))])
-+ ]))],
-+ [echo "Ignoring test for cross-compilation"])
-
- AC_CHECK_LIB([dl], dlopen, [DL_LIBS=-ldl])
- AC_SUBST([DL_LIBS])
diff --git a/srcpkgs/openfst/template b/srcpkgs/openfst/template
index 1e62d249f83c..aa5385d2187f 100644
--- a/srcpkgs/openfst/template
+++ b/srcpkgs/openfst/template
@@ -1,10 +1,7 @@
# Template file for 'openfst'
pkgname=openfst
version=1.8.2
-revision=1
-# Limiting archs until resolved why a test fails when natively compiling i686:
-# https://github.com/kaldi-asr/kaldi/issues/4808
-archs="x86_64* aarch64*"
+revision=2
build_style=gnu-configure
configure_args="
--disable-bin
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PR PATCH] [Updated] vosk-api: update to 0.3.45
2023-02-05 12:18 [PR PATCH] vosk-api: update to 0.3.45 JohnGebbie
2023-02-05 12:28 ` [PR PATCH] [Updated] " JohnGebbie
@ 2023-02-05 12:45 ` JohnGebbie
2023-02-05 12:59 ` JohnGebbie
` (15 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: JohnGebbie @ 2023-02-05 12:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1269 bytes --]
There is an updated pull request by JohnGebbie against master on the void-packages repository
https://github.com/JohnGebbie/void-packages vosk-api
https://github.com/void-linux/void-packages/pull/42091
vosk-api: update to 0.3.45
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/42091.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vosk-api-42091.patch --]
[-- Type: text/x-diff, Size: 6066 bytes --]
From 1dfd79012b1f7b5c58ba20575948ab902d2c8f1f Mon Sep 17 00:00:00 2001
From: John Gebbie <me@johngebbie.com>
Date: Sun, 5 Feb 2023 12:10:37 +0000
Subject: [PATCH 1/2] vosk-api: update to 0.3.45.
---
common/shlibs | 2 +-
srcpkgs/vosk-api/template | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 59444164928b..bc77277ce8d1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4213,7 +4213,7 @@ libtracecmd.so.1 libtracecmd-3.1.2_1
libkshark.so.2 libkshark-2.1.1_1
libcpp-hocon.so.0.3.0 cpp-hocon-0.3.0_5
libfst.so.25 openfst-1.8.2_1
-libvosk.so vosk-api-0.3.43_1
+libvosk.so vosk-api-0.3.45_1
libdspy-1.so.1 d-spy-1.4.0_1
libpanel-1.so.1 libpanel-1.0.1_1
libqrtr.so.1 qrtr-ns-1.0_1
diff --git a/srcpkgs/vosk-api/template b/srcpkgs/vosk-api/template
index b86c74452b95..41d53e654042 100644
--- a/srcpkgs/vosk-api/template
+++ b/srcpkgs/vosk-api/template
@@ -1,12 +1,12 @@
# Template file for 'vosk-api'
pkgname=vosk-api
-version=0.3.43
+version=0.3.45
revision=1
create_wrksrc=yes
build_wrksrc="vosk-api-${version}/src"
# Vosk is built with their own vendored version of Kaldi which has no releases
# of its own, so the commit must be determined by the date of the vosk release.
-_kaldi_commit=ecb4b47159501ef0d67888633e65b8fc0c1f79d1
+_kaldi_commit=93ef0019b847272a239fbb485ef97f29feb1d587
build_style=gnu-makefile
make_use_env=yes
make_build_args="KALDI_ROOT=../../kaldi HAVE_OPENBLAS_NO_F2C=1 HAVE_OPENBLAS_CLAPACK=0"
@@ -18,8 +18,8 @@ homepage="https://alphacephei.com/vosk"
distfiles="https://github.com/alphacep/vosk-api/archive/v${version}/vosk-api-${version}.tar.gz
https://github.com/alphacep/kaldi/archive/${_kaldi_commit}.tar.gz
https://alphacephei.com/vosk/models/vosk-model-small-en-us-0.15.zip"
-checksum="50fa82bfbfe3fc5be868237c84ac180eb55da0b65b1803bf022899673afda024
- 39cadd5a351a5513e3e4e1f71ac4b4f018a592a856a55f1d32c159e22e799f64
+checksum="930fb9cfa6c1b3035d3730feee7d670fb893caa0c71bd2159ee7623102674c26
+ f47a996af546884a8e1cb961323b796c5c238c1bbeabaf657bb300b760e431b2
30f26242c4eb449f948e42cb302dd7a686cb29a3423a8367f99ff41780942498"
shlib_provides="libvosk.so"
patch_args="-Np1 -d ${pkgname}-${version}"
From 5d169c5e64593f1dae39e9fbc796263563d94f4c Mon Sep 17 00:00:00 2001
From: John Gebbie <me@johngebbie.com>
Date: Sun, 5 Feb 2023 12:28:21 +0000
Subject: [PATCH 2/2] openfst: unrestrict archs
---
srcpkgs/openfst/patches/32bit.patch | 45 +++++++++++++++++++++
srcpkgs/openfst/patches/cross-compile.patch | 23 -----------
srcpkgs/openfst/template | 5 +--
3 files changed, 46 insertions(+), 27 deletions(-)
create mode 100644 srcpkgs/openfst/patches/32bit.patch
delete mode 100644 srcpkgs/openfst/patches/cross-compile.patch
diff --git a/srcpkgs/openfst/patches/32bit.patch b/srcpkgs/openfst/patches/32bit.patch
new file mode 100644
index 000000000000..b1a254ae9dfc
--- /dev/null
+++ b/srcpkgs/openfst/patches/32bit.patch
@@ -0,0 +1,45 @@
+This removes a test which stops at least i686 natively compiling:
+https://github.com/kaldi-asr/kaldi/issues/4808
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -149,39 +149,6 @@ AC_ARG_WITH([libfstdir],
+
+ AC_SUBST([libfstdir], $with_libfstdir)
+
+-# Flags may be changed after configuring, so this is checked again by
+-# weight_test.cc. The check here is to save time in the common case,
+-# or when someone does not run `make check`.
+-AC_RUN_IFELSE([AC_LANG_PROGRAM([
+- #include <cstdio>
+-
+- template <typename T>
+- bool FloatEqIsReflexive(T m) {
+- volatile T x = 1.111;
+- x *= m;
+-
+- T y = 1.111;
+- y *= m;
+-
+- return x == y;
+- }
+- ], [
+- volatile double test_value = 1.1;
+- if (!FloatEqIsReflexive(static_cast<float>(test_value))) {
+- printf("float FAIL\n");
+- return 1;
+- }
+- if (!FloatEqIsReflexive(test_value)) {
+- printf("double FAIL\n");
+- return 1;
+- }
+- ])],
+- [echo "Float equality is good"],
+- [AC_MSG_FAILURE(m4_normalize([
+- Test float equality failed!
+- Compile with -msse -mfpmath=sse if using g++.
+- ]))])
+-
+ AC_CHECK_LIB([dl], dlopen, [DL_LIBS=-ldl])
+ AC_SUBST([DL_LIBS])
+
diff --git a/srcpkgs/openfst/patches/cross-compile.patch b/srcpkgs/openfst/patches/cross-compile.patch
deleted file mode 100644
index 4014f51dba38..000000000000
--- a/srcpkgs/openfst/patches/cross-compile.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 256f83e52112a5cd37e37a34beff2c4f0eae4660 Mon Sep 17 00:00:00 2001
-From: Nickolay Shmyrev <nshmyrev@gmail.com>
-Date: Tue, 16 Jun 2020 15:22:19 +0200
-Subject: [PATCH] Don't fail on cross-compile
-
----
- configure.ac | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index d52ed02..0f53b4d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -180,7 +180,8 @@ AC_RUN_IFELSE([AC_LANG_PROGRAM([
- [AC_MSG_FAILURE(m4_normalize([
- Test float equality failed!
- Compile with -msse -mfpmath=sse if using g++.
-- ]))])
-+ ]))],
-+ [echo "Ignoring test for cross-compilation"])
-
- AC_CHECK_LIB([dl], dlopen, [DL_LIBS=-ldl])
- AC_SUBST([DL_LIBS])
diff --git a/srcpkgs/openfst/template b/srcpkgs/openfst/template
index 1e62d249f83c..aa5385d2187f 100644
--- a/srcpkgs/openfst/template
+++ b/srcpkgs/openfst/template
@@ -1,10 +1,7 @@
# Template file for 'openfst'
pkgname=openfst
version=1.8.2
-revision=1
-# Limiting archs until resolved why a test fails when natively compiling i686:
-# https://github.com/kaldi-asr/kaldi/issues/4808
-archs="x86_64* aarch64*"
+revision=2
build_style=gnu-configure
configure_args="
--disable-bin
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PR PATCH] [Updated] vosk-api: update to 0.3.45
2023-02-05 12:18 [PR PATCH] vosk-api: update to 0.3.45 JohnGebbie
2023-02-05 12:28 ` [PR PATCH] [Updated] " JohnGebbie
2023-02-05 12:45 ` JohnGebbie
@ 2023-02-05 12:59 ` JohnGebbie
2023-02-05 13:08 ` JohnGebbie
` (14 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: JohnGebbie @ 2023-02-05 12:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1269 bytes --]
There is an updated pull request by JohnGebbie against master on the void-packages repository
https://github.com/JohnGebbie/void-packages vosk-api
https://github.com/void-linux/void-packages/pull/42091
vosk-api: update to 0.3.45
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/42091.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vosk-api-42091.patch --]
[-- Type: text/x-diff, Size: 7230 bytes --]
From 1dfd79012b1f7b5c58ba20575948ab902d2c8f1f Mon Sep 17 00:00:00 2001
From: John Gebbie <me@johngebbie.com>
Date: Sun, 5 Feb 2023 12:10:37 +0000
Subject: [PATCH 1/2] vosk-api: update to 0.3.45.
---
common/shlibs | 2 +-
srcpkgs/vosk-api/template | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 59444164928b..bc77277ce8d1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4213,7 +4213,7 @@ libtracecmd.so.1 libtracecmd-3.1.2_1
libkshark.so.2 libkshark-2.1.1_1
libcpp-hocon.so.0.3.0 cpp-hocon-0.3.0_5
libfst.so.25 openfst-1.8.2_1
-libvosk.so vosk-api-0.3.43_1
+libvosk.so vosk-api-0.3.45_1
libdspy-1.so.1 d-spy-1.4.0_1
libpanel-1.so.1 libpanel-1.0.1_1
libqrtr.so.1 qrtr-ns-1.0_1
diff --git a/srcpkgs/vosk-api/template b/srcpkgs/vosk-api/template
index b86c74452b95..41d53e654042 100644
--- a/srcpkgs/vosk-api/template
+++ b/srcpkgs/vosk-api/template
@@ -1,12 +1,12 @@
# Template file for 'vosk-api'
pkgname=vosk-api
-version=0.3.43
+version=0.3.45
revision=1
create_wrksrc=yes
build_wrksrc="vosk-api-${version}/src"
# Vosk is built with their own vendored version of Kaldi which has no releases
# of its own, so the commit must be determined by the date of the vosk release.
-_kaldi_commit=ecb4b47159501ef0d67888633e65b8fc0c1f79d1
+_kaldi_commit=93ef0019b847272a239fbb485ef97f29feb1d587
build_style=gnu-makefile
make_use_env=yes
make_build_args="KALDI_ROOT=../../kaldi HAVE_OPENBLAS_NO_F2C=1 HAVE_OPENBLAS_CLAPACK=0"
@@ -18,8 +18,8 @@ homepage="https://alphacephei.com/vosk"
distfiles="https://github.com/alphacep/vosk-api/archive/v${version}/vosk-api-${version}.tar.gz
https://github.com/alphacep/kaldi/archive/${_kaldi_commit}.tar.gz
https://alphacephei.com/vosk/models/vosk-model-small-en-us-0.15.zip"
-checksum="50fa82bfbfe3fc5be868237c84ac180eb55da0b65b1803bf022899673afda024
- 39cadd5a351a5513e3e4e1f71ac4b4f018a592a856a55f1d32c159e22e799f64
+checksum="930fb9cfa6c1b3035d3730feee7d670fb893caa0c71bd2159ee7623102674c26
+ f47a996af546884a8e1cb961323b796c5c238c1bbeabaf657bb300b760e431b2
30f26242c4eb449f948e42cb302dd7a686cb29a3423a8367f99ff41780942498"
shlib_provides="libvosk.so"
patch_args="-Np1 -d ${pkgname}-${version}"
From 3714c762f47b91a303def8e9c8608f99c935f9aa Mon Sep 17 00:00:00 2001
From: John Gebbie <me@johngebbie.com>
Date: Sun, 5 Feb 2023 12:59:28 +0000
Subject: [PATCH 2/2] openfst: unrestrict archs
---
srcpkgs/openfst/patches/32bit.patch | 71 +++++++++++++++++++++
srcpkgs/openfst/patches/cross-compile.patch | 23 -------
srcpkgs/openfst/template | 5 +-
3 files changed, 72 insertions(+), 27 deletions(-)
create mode 100644 srcpkgs/openfst/patches/32bit.patch
delete mode 100644 srcpkgs/openfst/patches/cross-compile.patch
diff --git a/srcpkgs/openfst/patches/32bit.patch b/srcpkgs/openfst/patches/32bit.patch
new file mode 100644
index 000000000000..78953f3afb21
--- /dev/null
+++ b/srcpkgs/openfst/patches/32bit.patch
@@ -0,0 +1,71 @@
+This removes checks which stops at least i686 natively compiling:
+https://github.com/kaldi-asr/kaldi/issues/4808
+
+diff --git a/configure.ac b/configure.ac
+index a2328ff..ddacaae 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -149,39 +149,6 @@ AC_ARG_WITH([libfstdir],
+
+ AC_SUBST([libfstdir], $with_libfstdir)
+
+-# Flags may be changed after configuring, so this is checked again by
+-# weight_test.cc. The check here is to save time in the common case,
+-# or when someone does not run `make check`.
+-AC_RUN_IFELSE([AC_LANG_PROGRAM([
+- #include <cstdio>
+-
+- template <typename T>
+- bool FloatEqIsReflexive(T m) {
+- volatile T x = 1.111;
+- x *= m;
+-
+- T y = 1.111;
+- y *= m;
+-
+- return x == y;
+- }
+- ], [
+- volatile double test_value = 1.1;
+- if (!FloatEqIsReflexive(static_cast<float>(test_value))) {
+- printf("float FAIL\n");
+- return 1;
+- }
+- if (!FloatEqIsReflexive(test_value)) {
+- printf("double FAIL\n");
+- return 1;
+- }
+- ])],
+- [echo "Float equality is good"],
+- [AC_MSG_FAILURE(m4_normalize([
+- Test float equality failed!
+- Compile with -msse -mfpmath=sse if using g++.
+- ]))])
+-
+ AC_CHECK_LIB([dl], dlopen, [DL_LIBS=-ldl])
+ AC_SUBST([DL_LIBS])
+
+diff --git a/src/include/fst/float-weight.h b/src/include/fst/float-weight.h
+index 5cf4386..38b7d48 100644
+--- a/src/include/fst/float-weight.h
++++ b/src/include/fst/float-weight.h
+@@ -109,6 +109,19 @@ class FloatWeightTpl {
+ // Single-precision float weight.
+ using FloatWeight = FloatWeightTpl<float>;
+
++template <class T>
++constexpr bool operator==(const FloatWeightTpl<T> &w1,
++ const FloatWeightTpl<T> &w2) {
++#if (defined(__i386__) || defined(__x86_64__)) && !defined(__SSE2_MATH__)
++// With i387 instructions, excess precision on a weight in an 80-bit
++// register may cause it to compare unequal to that same weight when
++// stored to memory. This breaks =='s reflexivity, in turn breaking
++// NaturalLess.
++#error "Please compile with -msse -mfpmath=sse, or equivalent."
++#endif
++ return w1.Value() == w2.Value();
++}
++
+ // These seemingly unnecessary overloads are actually needed to make
+ // comparisons like FloatWeightTpl<float> == float compile. If only the
+ // templated version exists, the FloatWeightTpl<float>(float) conversion
diff --git a/srcpkgs/openfst/patches/cross-compile.patch b/srcpkgs/openfst/patches/cross-compile.patch
deleted file mode 100644
index 4014f51dba38..000000000000
--- a/srcpkgs/openfst/patches/cross-compile.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 256f83e52112a5cd37e37a34beff2c4f0eae4660 Mon Sep 17 00:00:00 2001
-From: Nickolay Shmyrev <nshmyrev@gmail.com>
-Date: Tue, 16 Jun 2020 15:22:19 +0200
-Subject: [PATCH] Don't fail on cross-compile
-
----
- configure.ac | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index d52ed02..0f53b4d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -180,7 +180,8 @@ AC_RUN_IFELSE([AC_LANG_PROGRAM([
- [AC_MSG_FAILURE(m4_normalize([
- Test float equality failed!
- Compile with -msse -mfpmath=sse if using g++.
-- ]))])
-+ ]))],
-+ [echo "Ignoring test for cross-compilation"])
-
- AC_CHECK_LIB([dl], dlopen, [DL_LIBS=-ldl])
- AC_SUBST([DL_LIBS])
diff --git a/srcpkgs/openfst/template b/srcpkgs/openfst/template
index 1e62d249f83c..aa5385d2187f 100644
--- a/srcpkgs/openfst/template
+++ b/srcpkgs/openfst/template
@@ -1,10 +1,7 @@
# Template file for 'openfst'
pkgname=openfst
version=1.8.2
-revision=1
-# Limiting archs until resolved why a test fails when natively compiling i686:
-# https://github.com/kaldi-asr/kaldi/issues/4808
-archs="x86_64* aarch64*"
+revision=2
build_style=gnu-configure
configure_args="
--disable-bin
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PR PATCH] [Updated] vosk-api: update to 0.3.45
2023-02-05 12:18 [PR PATCH] vosk-api: update to 0.3.45 JohnGebbie
` (2 preceding siblings ...)
2023-02-05 12:59 ` JohnGebbie
@ 2023-02-05 13:08 ` JohnGebbie
2023-02-05 13:20 ` JohnGebbie
` (13 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: JohnGebbie @ 2023-02-05 13:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1269 bytes --]
There is an updated pull request by JohnGebbie against master on the void-packages repository
https://github.com/JohnGebbie/void-packages vosk-api
https://github.com/void-linux/void-packages/pull/42091
vosk-api: update to 0.3.45
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/42091.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vosk-api-42091.patch --]
[-- Type: text/x-diff, Size: 7230 bytes --]
From 1dfd79012b1f7b5c58ba20575948ab902d2c8f1f Mon Sep 17 00:00:00 2001
From: John Gebbie <me@johngebbie.com>
Date: Sun, 5 Feb 2023 12:10:37 +0000
Subject: [PATCH 1/2] vosk-api: update to 0.3.45.
---
common/shlibs | 2 +-
srcpkgs/vosk-api/template | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 59444164928b..bc77277ce8d1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4213,7 +4213,7 @@ libtracecmd.so.1 libtracecmd-3.1.2_1
libkshark.so.2 libkshark-2.1.1_1
libcpp-hocon.so.0.3.0 cpp-hocon-0.3.0_5
libfst.so.25 openfst-1.8.2_1
-libvosk.so vosk-api-0.3.43_1
+libvosk.so vosk-api-0.3.45_1
libdspy-1.so.1 d-spy-1.4.0_1
libpanel-1.so.1 libpanel-1.0.1_1
libqrtr.so.1 qrtr-ns-1.0_1
diff --git a/srcpkgs/vosk-api/template b/srcpkgs/vosk-api/template
index b86c74452b95..41d53e654042 100644
--- a/srcpkgs/vosk-api/template
+++ b/srcpkgs/vosk-api/template
@@ -1,12 +1,12 @@
# Template file for 'vosk-api'
pkgname=vosk-api
-version=0.3.43
+version=0.3.45
revision=1
create_wrksrc=yes
build_wrksrc="vosk-api-${version}/src"
# Vosk is built with their own vendored version of Kaldi which has no releases
# of its own, so the commit must be determined by the date of the vosk release.
-_kaldi_commit=ecb4b47159501ef0d67888633e65b8fc0c1f79d1
+_kaldi_commit=93ef0019b847272a239fbb485ef97f29feb1d587
build_style=gnu-makefile
make_use_env=yes
make_build_args="KALDI_ROOT=../../kaldi HAVE_OPENBLAS_NO_F2C=1 HAVE_OPENBLAS_CLAPACK=0"
@@ -18,8 +18,8 @@ homepage="https://alphacephei.com/vosk"
distfiles="https://github.com/alphacep/vosk-api/archive/v${version}/vosk-api-${version}.tar.gz
https://github.com/alphacep/kaldi/archive/${_kaldi_commit}.tar.gz
https://alphacephei.com/vosk/models/vosk-model-small-en-us-0.15.zip"
-checksum="50fa82bfbfe3fc5be868237c84ac180eb55da0b65b1803bf022899673afda024
- 39cadd5a351a5513e3e4e1f71ac4b4f018a592a856a55f1d32c159e22e799f64
+checksum="930fb9cfa6c1b3035d3730feee7d670fb893caa0c71bd2159ee7623102674c26
+ f47a996af546884a8e1cb961323b796c5c238c1bbeabaf657bb300b760e431b2
30f26242c4eb449f948e42cb302dd7a686cb29a3423a8367f99ff41780942498"
shlib_provides="libvosk.so"
patch_args="-Np1 -d ${pkgname}-${version}"
From 35b1ad1c81c429d2442640883d4dc6ea38144d5d Mon Sep 17 00:00:00 2001
From: John Gebbie <me@johngebbie.com>
Date: Sun, 5 Feb 2023 13:08:18 +0000
Subject: [PATCH 2/2] openfst: unrestrict archs
---
srcpkgs/openfst/patches/32bit.patch | 71 +++++++++++++++++++++
srcpkgs/openfst/patches/cross-compile.patch | 23 -------
srcpkgs/openfst/template | 5 +-
3 files changed, 72 insertions(+), 27 deletions(-)
create mode 100644 srcpkgs/openfst/patches/32bit.patch
delete mode 100644 srcpkgs/openfst/patches/cross-compile.patch
diff --git a/srcpkgs/openfst/patches/32bit.patch b/srcpkgs/openfst/patches/32bit.patch
new file mode 100644
index 000000000000..4b0cfce02ede
--- /dev/null
+++ b/srcpkgs/openfst/patches/32bit.patch
@@ -0,0 +1,71 @@
+This removes checks which stops at least i686 natively compiling:
+https://github.com/kaldi-asr/kaldi/issues/4808
+
+diff --git a/configure.ac b/configure.ac
+index a2328ff..ddacaae 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -149,39 +149,6 @@ AC_ARG_WITH([libfstdir],
+
+ AC_SUBST([libfstdir], $with_libfstdir)
+
+-# Flags may be changed after configuring, so this is checked again by
+-# weight_test.cc. The check here is to save time in the common case,
+-# or when someone does not run `make check`.
+-AC_RUN_IFELSE([AC_LANG_PROGRAM([
+- #include <cstdio>
+-
+- template <typename T>
+- bool FloatEqIsReflexive(T m) {
+- volatile T x = 1.111;
+- x *= m;
+-
+- T y = 1.111;
+- y *= m;
+-
+- return x == y;
+- }
+- ], [
+- volatile double test_value = 1.1;
+- if (!FloatEqIsReflexive(static_cast<float>(test_value))) {
+- printf("float FAIL\n");
+- return 1;
+- }
+- if (!FloatEqIsReflexive(test_value)) {
+- printf("double FAIL\n");
+- return 1;
+- }
+- ])],
+- [echo "Float equality is good"],
+- [AC_MSG_FAILURE(m4_normalize([
+- Test float equality failed!
+- Compile with -msse -mfpmath=sse if using g++.
+- ]))])
+-
+ AC_CHECK_LIB([dl], dlopen, [DL_LIBS=-ldl])
+ AC_SUBST([DL_LIBS])
+
+diff --git a/src/include/fst/float-weight.h b/src/include/fst/float-weight.h
+index 5cf4386..38b7d48 100644
+--- a/src/include/fst/float-weight.h
++++ b/src/include/fst/float-weight.h
+@@ -109,6 +109,19 @@ class FloatWeightTpl {
+ // Single-precision float weight.
+ using FloatWeight = FloatWeightTpl<float>;
+
+-template <class T>
+-constexpr bool operator==(const FloatWeightTpl<T> &w1,
+- const FloatWeightTpl<T> &w2) {
+-#if (defined(__i386__) || defined(__x86_64__)) && !defined(__SSE2_MATH__)
+-// With i387 instructions, excess precision on a weight in an 80-bit
+-// register may cause it to compare unequal to that same weight when
+-// stored to memory. This breaks =='s reflexivity, in turn breaking
+-// NaturalLess.
+-#error "Please compile with -msse -mfpmath=sse, or equivalent."
+-#endif
+- return w1.Value() == w2.Value();
+-}
+-
+ // These seemingly unnecessary overloads are actually needed to make
+ // comparisons like FloatWeightTpl<float> == float compile. If only the
+ // templated version exists, the FloatWeightTpl<float>(float) conversion
diff --git a/srcpkgs/openfst/patches/cross-compile.patch b/srcpkgs/openfst/patches/cross-compile.patch
deleted file mode 100644
index 4014f51dba38..000000000000
--- a/srcpkgs/openfst/patches/cross-compile.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 256f83e52112a5cd37e37a34beff2c4f0eae4660 Mon Sep 17 00:00:00 2001
-From: Nickolay Shmyrev <nshmyrev@gmail.com>
-Date: Tue, 16 Jun 2020 15:22:19 +0200
-Subject: [PATCH] Don't fail on cross-compile
-
----
- configure.ac | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index d52ed02..0f53b4d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -180,7 +180,8 @@ AC_RUN_IFELSE([AC_LANG_PROGRAM([
- [AC_MSG_FAILURE(m4_normalize([
- Test float equality failed!
- Compile with -msse -mfpmath=sse if using g++.
-- ]))])
-+ ]))],
-+ [echo "Ignoring test for cross-compilation"])
-
- AC_CHECK_LIB([dl], dlopen, [DL_LIBS=-ldl])
- AC_SUBST([DL_LIBS])
diff --git a/srcpkgs/openfst/template b/srcpkgs/openfst/template
index 1e62d249f83c..aa5385d2187f 100644
--- a/srcpkgs/openfst/template
+++ b/srcpkgs/openfst/template
@@ -1,10 +1,7 @@
# Template file for 'openfst'
pkgname=openfst
version=1.8.2
-revision=1
-# Limiting archs until resolved why a test fails when natively compiling i686:
-# https://github.com/kaldi-asr/kaldi/issues/4808
-archs="x86_64* aarch64*"
+revision=2
build_style=gnu-configure
configure_args="
--disable-bin
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PR PATCH] [Updated] vosk-api: update to 0.3.45
2023-02-05 12:18 [PR PATCH] vosk-api: update to 0.3.45 JohnGebbie
` (3 preceding siblings ...)
2023-02-05 13:08 ` JohnGebbie
@ 2023-02-05 13:20 ` JohnGebbie
2023-02-05 13:26 ` JohnGebbie
` (12 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: JohnGebbie @ 2023-02-05 13:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1269 bytes --]
There is an updated pull request by JohnGebbie against master on the void-packages repository
https://github.com/JohnGebbie/void-packages vosk-api
https://github.com/void-linux/void-packages/pull/42091
vosk-api: update to 0.3.45
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/42091.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vosk-api-42091.patch --]
[-- Type: text/x-diff, Size: 7230 bytes --]
From 1dfd79012b1f7b5c58ba20575948ab902d2c8f1f Mon Sep 17 00:00:00 2001
From: John Gebbie <me@johngebbie.com>
Date: Sun, 5 Feb 2023 12:10:37 +0000
Subject: [PATCH 1/2] vosk-api: update to 0.3.45.
---
common/shlibs | 2 +-
srcpkgs/vosk-api/template | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 59444164928b..bc77277ce8d1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4213,7 +4213,7 @@ libtracecmd.so.1 libtracecmd-3.1.2_1
libkshark.so.2 libkshark-2.1.1_1
libcpp-hocon.so.0.3.0 cpp-hocon-0.3.0_5
libfst.so.25 openfst-1.8.2_1
-libvosk.so vosk-api-0.3.43_1
+libvosk.so vosk-api-0.3.45_1
libdspy-1.so.1 d-spy-1.4.0_1
libpanel-1.so.1 libpanel-1.0.1_1
libqrtr.so.1 qrtr-ns-1.0_1
diff --git a/srcpkgs/vosk-api/template b/srcpkgs/vosk-api/template
index b86c74452b95..41d53e654042 100644
--- a/srcpkgs/vosk-api/template
+++ b/srcpkgs/vosk-api/template
@@ -1,12 +1,12 @@
# Template file for 'vosk-api'
pkgname=vosk-api
-version=0.3.43
+version=0.3.45
revision=1
create_wrksrc=yes
build_wrksrc="vosk-api-${version}/src"
# Vosk is built with their own vendored version of Kaldi which has no releases
# of its own, so the commit must be determined by the date of the vosk release.
-_kaldi_commit=ecb4b47159501ef0d67888633e65b8fc0c1f79d1
+_kaldi_commit=93ef0019b847272a239fbb485ef97f29feb1d587
build_style=gnu-makefile
make_use_env=yes
make_build_args="KALDI_ROOT=../../kaldi HAVE_OPENBLAS_NO_F2C=1 HAVE_OPENBLAS_CLAPACK=0"
@@ -18,8 +18,8 @@ homepage="https://alphacephei.com/vosk"
distfiles="https://github.com/alphacep/vosk-api/archive/v${version}/vosk-api-${version}.tar.gz
https://github.com/alphacep/kaldi/archive/${_kaldi_commit}.tar.gz
https://alphacephei.com/vosk/models/vosk-model-small-en-us-0.15.zip"
-checksum="50fa82bfbfe3fc5be868237c84ac180eb55da0b65b1803bf022899673afda024
- 39cadd5a351a5513e3e4e1f71ac4b4f018a592a856a55f1d32c159e22e799f64
+checksum="930fb9cfa6c1b3035d3730feee7d670fb893caa0c71bd2159ee7623102674c26
+ f47a996af546884a8e1cb961323b796c5c238c1bbeabaf657bb300b760e431b2
30f26242c4eb449f948e42cb302dd7a686cb29a3423a8367f99ff41780942498"
shlib_provides="libvosk.so"
patch_args="-Np1 -d ${pkgname}-${version}"
From 050d1979f2e4d8b1e2ab08c42b5cf86955e50c27 Mon Sep 17 00:00:00 2001
From: John Gebbie <me@johngebbie.com>
Date: Sun, 5 Feb 2023 13:20:02 +0000
Subject: [PATCH 2/2] openfst: unrestrict archs
---
srcpkgs/openfst/patches/32bit.patch | 71 +++++++++++++++++++++
srcpkgs/openfst/patches/cross-compile.patch | 23 -------
srcpkgs/openfst/template | 5 +-
3 files changed, 72 insertions(+), 27 deletions(-)
create mode 100644 srcpkgs/openfst/patches/32bit.patch
delete mode 100644 srcpkgs/openfst/patches/cross-compile.patch
diff --git a/srcpkgs/openfst/patches/32bit.patch b/srcpkgs/openfst/patches/32bit.patch
new file mode 100644
index 000000000000..6a3672efde77
--- /dev/null
+++ b/srcpkgs/openfst/patches/32bit.patch
@@ -0,0 +1,71 @@
+This removes checks which stops at least i686 natively compiling:
+https://github.com/kaldi-asr/kaldi/issues/4808
+
+diff --git a/configure.ac b/configure.ac
+index a2328ff..ddacaae 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -149,39 +149,6 @@ AC_ARG_WITH([libfstdir],
+
+ AC_SUBST([libfstdir], $with_libfstdir)
+
+-# Flags may be changed after configuring, so this is checked again by
+-# weight_test.cc. The check here is to save time in the common case,
+-# or when someone does not run `make check`.
+-AC_RUN_IFELSE([AC_LANG_PROGRAM([
+- #include <cstdio>
+-
+- template <typename T>
+- bool FloatEqIsReflexive(T m) {
+- volatile T x = 1.111;
+- x *= m;
+-
+- T y = 1.111;
+- y *= m;
+-
+- return x == y;
+- }
+- ], [
+- volatile double test_value = 1.1;
+- if (!FloatEqIsReflexive(static_cast<float>(test_value))) {
+- printf("float FAIL\n");
+- return 1;
+- }
+- if (!FloatEqIsReflexive(test_value)) {
+- printf("double FAIL\n");
+- return 1;
+- }
+- ])],
+- [echo "Float equality is good"],
+- [AC_MSG_FAILURE(m4_normalize([
+- Test float equality failed!
+- Compile with -msse -mfpmath=sse if using g++.
+- ]))])
+-
+ AC_CHECK_LIB([dl], dlopen, [DL_LIBS=-ldl])
+ AC_SUBST([DL_LIBS])
+
+diff --git a/src/include/fst/float-weight.h b/src/include/fst/float-weight.h
+index 38b7d48..5cf4386 100644
+--- a/src/include/fst/float-weight.h
++++ b/src/include/fst/float-weight.h
+@@ -109,19 +109,6 @@ class FloatWeightTpl {
+ // Single-precision float weight.
+ using FloatWeight = FloatWeightTpl<float>;
+
+-template <class T>
+-constexpr bool operator==(const FloatWeightTpl<T> &w1,
+- const FloatWeightTpl<T> &w2) {
+-#if (defined(__i386__) || defined(__x86_64__)) && !defined(__SSE2_MATH__)
+-// With i387 instructions, excess precision on a weight in an 80-bit
+-// register may cause it to compare unequal to that same weight when
+-// stored to memory. This breaks =='s reflexivity, in turn breaking
+-// NaturalLess.
+-#error "Please compile with -msse -mfpmath=sse, or equivalent."
+-#endif
+- return w1.Value() == w2.Value();
+-}
+-
+ // These seemingly unnecessary overloads are actually needed to make
+ // comparisons like FloatWeightTpl<float> == float compile. If only the
+ // templated version exists, the FloatWeightTpl<float>(float) conversion
diff --git a/srcpkgs/openfst/patches/cross-compile.patch b/srcpkgs/openfst/patches/cross-compile.patch
deleted file mode 100644
index 4014f51dba38..000000000000
--- a/srcpkgs/openfst/patches/cross-compile.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 256f83e52112a5cd37e37a34beff2c4f0eae4660 Mon Sep 17 00:00:00 2001
-From: Nickolay Shmyrev <nshmyrev@gmail.com>
-Date: Tue, 16 Jun 2020 15:22:19 +0200
-Subject: [PATCH] Don't fail on cross-compile
-
----
- configure.ac | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index d52ed02..0f53b4d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -180,7 +180,8 @@ AC_RUN_IFELSE([AC_LANG_PROGRAM([
- [AC_MSG_FAILURE(m4_normalize([
- Test float equality failed!
- Compile with -msse -mfpmath=sse if using g++.
-- ]))])
-+ ]))],
-+ [echo "Ignoring test for cross-compilation"])
-
- AC_CHECK_LIB([dl], dlopen, [DL_LIBS=-ldl])
- AC_SUBST([DL_LIBS])
diff --git a/srcpkgs/openfst/template b/srcpkgs/openfst/template
index 1e62d249f83c..aa5385d2187f 100644
--- a/srcpkgs/openfst/template
+++ b/srcpkgs/openfst/template
@@ -1,10 +1,7 @@
# Template file for 'openfst'
pkgname=openfst
version=1.8.2
-revision=1
-# Limiting archs until resolved why a test fails when natively compiling i686:
-# https://github.com/kaldi-asr/kaldi/issues/4808
-archs="x86_64* aarch64*"
+revision=2
build_style=gnu-configure
configure_args="
--disable-bin
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PR PATCH] [Updated] vosk-api: update to 0.3.45
2023-02-05 12:18 [PR PATCH] vosk-api: update to 0.3.45 JohnGebbie
` (4 preceding siblings ...)
2023-02-05 13:20 ` JohnGebbie
@ 2023-02-05 13:26 ` JohnGebbie
2023-02-05 14:30 ` JohnGebbie
` (11 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: JohnGebbie @ 2023-02-05 13:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1269 bytes --]
There is an updated pull request by JohnGebbie against master on the void-packages repository
https://github.com/JohnGebbie/void-packages vosk-api
https://github.com/void-linux/void-packages/pull/42091
vosk-api: update to 0.3.45
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/42091.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vosk-api-42091.patch --]
[-- Type: text/x-diff, Size: 6947 bytes --]
From 1dfd79012b1f7b5c58ba20575948ab902d2c8f1f Mon Sep 17 00:00:00 2001
From: John Gebbie <me@johngebbie.com>
Date: Sun, 5 Feb 2023 12:10:37 +0000
Subject: [PATCH 1/2] vosk-api: update to 0.3.45.
---
common/shlibs | 2 +-
srcpkgs/vosk-api/template | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 59444164928b..bc77277ce8d1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4213,7 +4213,7 @@ libtracecmd.so.1 libtracecmd-3.1.2_1
libkshark.so.2 libkshark-2.1.1_1
libcpp-hocon.so.0.3.0 cpp-hocon-0.3.0_5
libfst.so.25 openfst-1.8.2_1
-libvosk.so vosk-api-0.3.43_1
+libvosk.so vosk-api-0.3.45_1
libdspy-1.so.1 d-spy-1.4.0_1
libpanel-1.so.1 libpanel-1.0.1_1
libqrtr.so.1 qrtr-ns-1.0_1
diff --git a/srcpkgs/vosk-api/template b/srcpkgs/vosk-api/template
index b86c74452b95..41d53e654042 100644
--- a/srcpkgs/vosk-api/template
+++ b/srcpkgs/vosk-api/template
@@ -1,12 +1,12 @@
# Template file for 'vosk-api'
pkgname=vosk-api
-version=0.3.43
+version=0.3.45
revision=1
create_wrksrc=yes
build_wrksrc="vosk-api-${version}/src"
# Vosk is built with their own vendored version of Kaldi which has no releases
# of its own, so the commit must be determined by the date of the vosk release.
-_kaldi_commit=ecb4b47159501ef0d67888633e65b8fc0c1f79d1
+_kaldi_commit=93ef0019b847272a239fbb485ef97f29feb1d587
build_style=gnu-makefile
make_use_env=yes
make_build_args="KALDI_ROOT=../../kaldi HAVE_OPENBLAS_NO_F2C=1 HAVE_OPENBLAS_CLAPACK=0"
@@ -18,8 +18,8 @@ homepage="https://alphacephei.com/vosk"
distfiles="https://github.com/alphacep/vosk-api/archive/v${version}/vosk-api-${version}.tar.gz
https://github.com/alphacep/kaldi/archive/${_kaldi_commit}.tar.gz
https://alphacephei.com/vosk/models/vosk-model-small-en-us-0.15.zip"
-checksum="50fa82bfbfe3fc5be868237c84ac180eb55da0b65b1803bf022899673afda024
- 39cadd5a351a5513e3e4e1f71ac4b4f018a592a856a55f1d32c159e22e799f64
+checksum="930fb9cfa6c1b3035d3730feee7d670fb893caa0c71bd2159ee7623102674c26
+ f47a996af546884a8e1cb961323b796c5c238c1bbeabaf657bb300b760e431b2
30f26242c4eb449f948e42cb302dd7a686cb29a3423a8367f99ff41780942498"
shlib_provides="libvosk.so"
patch_args="-Np1 -d ${pkgname}-${version}"
From e08ec1467c6d1f36cbbfec077a872a3303b59349 Mon Sep 17 00:00:00 2001
From: John Gebbie <me@johngebbie.com>
Date: Sun, 5 Feb 2023 13:26:25 +0000
Subject: [PATCH 2/2] openfst: unrestrict archs
---
srcpkgs/openfst/patches/32bit.patch | 65 +++++++++++++++++++++
srcpkgs/openfst/patches/cross-compile.patch | 23 --------
srcpkgs/openfst/template | 5 +-
3 files changed, 66 insertions(+), 27 deletions(-)
create mode 100644 srcpkgs/openfst/patches/32bit.patch
delete mode 100644 srcpkgs/openfst/patches/cross-compile.patch
diff --git a/srcpkgs/openfst/patches/32bit.patch b/srcpkgs/openfst/patches/32bit.patch
new file mode 100644
index 000000000000..0d01bb1c76b8
--- /dev/null
+++ b/srcpkgs/openfst/patches/32bit.patch
@@ -0,0 +1,65 @@
+This removes checks which stops at least i686 natively compiling:
+https://github.com/kaldi-asr/kaldi/issues/4808
+
+diff --git a/configure.ac b/configure.ac
+index a2328ff..ddacaae 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -149,39 +149,6 @@ AC_ARG_WITH([libfstdir],
+
+ AC_SUBST([libfstdir], $with_libfstdir)
+
+-# Flags may be changed after configuring, so this is checked again by
+-# weight_test.cc. The check here is to save time in the common case,
+-# or when someone does not run `make check`.
+-AC_RUN_IFELSE([AC_LANG_PROGRAM([
+- #include <cstdio>
+-
+- template <typename T>
+- bool FloatEqIsReflexive(T m) {
+- volatile T x = 1.111;
+- x *= m;
+-
+- T y = 1.111;
+- y *= m;
+-
+- return x == y;
+- }
+- ], [
+- volatile double test_value = 1.1;
+- if (!FloatEqIsReflexive(static_cast<float>(test_value))) {
+- printf("float FAIL\n");
+- return 1;
+- }
+- if (!FloatEqIsReflexive(test_value)) {
+- printf("double FAIL\n");
+- return 1;
+- }
+- ])],
+- [echo "Float equality is good"],
+- [AC_MSG_FAILURE(m4_normalize([
+- Test float equality failed!
+- Compile with -msse -mfpmath=sse if using g++.
+- ]))])
+-
+ AC_CHECK_LIB([dl], dlopen, [DL_LIBS=-ldl])
+ AC_SUBST([DL_LIBS])
+
+diff --git a/src/include/fst/float-weight.h b/src/include/fst/float-weight.h
+index 38b7d48..88b9a50 100644
+--- a/src/include/fst/float-weight.h
++++ b/src/include/fst/float-weight.h
+@@ -112,13 +112,6 @@ using FloatWeight = FloatWeightTpl<float>;
+ template <class T>
+ constexpr bool operator==(const FloatWeightTpl<T> &w1,
+ const FloatWeightTpl<T> &w2) {
+-#if (defined(__i386__) || defined(__x86_64__)) && !defined(__SSE2_MATH__)
+-// With i387 instructions, excess precision on a weight in an 80-bit
+-// register may cause it to compare unequal to that same weight when
+-// stored to memory. This breaks =='s reflexivity, in turn breaking
+-// NaturalLess.
+-#error "Please compile with -msse -mfpmath=sse, or equivalent."
+-#endif
+ return w1.Value() == w2.Value();
+ }
+
diff --git a/srcpkgs/openfst/patches/cross-compile.patch b/srcpkgs/openfst/patches/cross-compile.patch
deleted file mode 100644
index 4014f51dba38..000000000000
--- a/srcpkgs/openfst/patches/cross-compile.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 256f83e52112a5cd37e37a34beff2c4f0eae4660 Mon Sep 17 00:00:00 2001
-From: Nickolay Shmyrev <nshmyrev@gmail.com>
-Date: Tue, 16 Jun 2020 15:22:19 +0200
-Subject: [PATCH] Don't fail on cross-compile
-
----
- configure.ac | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index d52ed02..0f53b4d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -180,7 +180,8 @@ AC_RUN_IFELSE([AC_LANG_PROGRAM([
- [AC_MSG_FAILURE(m4_normalize([
- Test float equality failed!
- Compile with -msse -mfpmath=sse if using g++.
-- ]))])
-+ ]))],
-+ [echo "Ignoring test for cross-compilation"])
-
- AC_CHECK_LIB([dl], dlopen, [DL_LIBS=-ldl])
- AC_SUBST([DL_LIBS])
diff --git a/srcpkgs/openfst/template b/srcpkgs/openfst/template
index 1e62d249f83c..aa5385d2187f 100644
--- a/srcpkgs/openfst/template
+++ b/srcpkgs/openfst/template
@@ -1,10 +1,7 @@
# Template file for 'openfst'
pkgname=openfst
version=1.8.2
-revision=1
-# Limiting archs until resolved why a test fails when natively compiling i686:
-# https://github.com/kaldi-asr/kaldi/issues/4808
-archs="x86_64* aarch64*"
+revision=2
build_style=gnu-configure
configure_args="
--disable-bin
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PR PATCH] [Updated] vosk-api: update to 0.3.45
2023-02-05 12:18 [PR PATCH] vosk-api: update to 0.3.45 JohnGebbie
` (5 preceding siblings ...)
2023-02-05 13:26 ` JohnGebbie
@ 2023-02-05 14:30 ` JohnGebbie
2023-02-05 16:59 ` JohnGebbie
` (10 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: JohnGebbie @ 2023-02-05 14:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1269 bytes --]
There is an updated pull request by JohnGebbie against master on the void-packages repository
https://github.com/JohnGebbie/void-packages vosk-api
https://github.com/void-linux/void-packages/pull/42091
vosk-api: update to 0.3.45
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/42091.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vosk-api-42091.patch --]
[-- Type: text/x-diff, Size: 7291 bytes --]
From 1dfd79012b1f7b5c58ba20575948ab902d2c8f1f Mon Sep 17 00:00:00 2001
From: John Gebbie <me@johngebbie.com>
Date: Sun, 5 Feb 2023 12:10:37 +0000
Subject: [PATCH 1/2] vosk-api: update to 0.3.45.
---
common/shlibs | 2 +-
srcpkgs/vosk-api/template | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 59444164928b..bc77277ce8d1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4213,7 +4213,7 @@ libtracecmd.so.1 libtracecmd-3.1.2_1
libkshark.so.2 libkshark-2.1.1_1
libcpp-hocon.so.0.3.0 cpp-hocon-0.3.0_5
libfst.so.25 openfst-1.8.2_1
-libvosk.so vosk-api-0.3.43_1
+libvosk.so vosk-api-0.3.45_1
libdspy-1.so.1 d-spy-1.4.0_1
libpanel-1.so.1 libpanel-1.0.1_1
libqrtr.so.1 qrtr-ns-1.0_1
diff --git a/srcpkgs/vosk-api/template b/srcpkgs/vosk-api/template
index b86c74452b95..41d53e654042 100644
--- a/srcpkgs/vosk-api/template
+++ b/srcpkgs/vosk-api/template
@@ -1,12 +1,12 @@
# Template file for 'vosk-api'
pkgname=vosk-api
-version=0.3.43
+version=0.3.45
revision=1
create_wrksrc=yes
build_wrksrc="vosk-api-${version}/src"
# Vosk is built with their own vendored version of Kaldi which has no releases
# of its own, so the commit must be determined by the date of the vosk release.
-_kaldi_commit=ecb4b47159501ef0d67888633e65b8fc0c1f79d1
+_kaldi_commit=93ef0019b847272a239fbb485ef97f29feb1d587
build_style=gnu-makefile
make_use_env=yes
make_build_args="KALDI_ROOT=../../kaldi HAVE_OPENBLAS_NO_F2C=1 HAVE_OPENBLAS_CLAPACK=0"
@@ -18,8 +18,8 @@ homepage="https://alphacephei.com/vosk"
distfiles="https://github.com/alphacep/vosk-api/archive/v${version}/vosk-api-${version}.tar.gz
https://github.com/alphacep/kaldi/archive/${_kaldi_commit}.tar.gz
https://alphacephei.com/vosk/models/vosk-model-small-en-us-0.15.zip"
-checksum="50fa82bfbfe3fc5be868237c84ac180eb55da0b65b1803bf022899673afda024
- 39cadd5a351a5513e3e4e1f71ac4b4f018a592a856a55f1d32c159e22e799f64
+checksum="930fb9cfa6c1b3035d3730feee7d670fb893caa0c71bd2159ee7623102674c26
+ f47a996af546884a8e1cb961323b796c5c238c1bbeabaf657bb300b760e431b2
30f26242c4eb449f948e42cb302dd7a686cb29a3423a8367f99ff41780942498"
shlib_provides="libvosk.so"
patch_args="-Np1 -d ${pkgname}-${version}"
From 225b0f0cddcac513348b1d90cec4dd54b24c3d20 Mon Sep 17 00:00:00 2001
From: John Gebbie <me@johngebbie.com>
Date: Sun, 5 Feb 2023 14:30:18 +0000
Subject: [PATCH 2/2] openfst: unrestrict archs
---
srcpkgs/openfst/patches/32bit.patch | 77 +++++++++++++++++++++
srcpkgs/openfst/patches/cross-compile.patch | 23 ------
srcpkgs/openfst/template | 5 +-
3 files changed, 78 insertions(+), 27 deletions(-)
create mode 100644 srcpkgs/openfst/patches/32bit.patch
delete mode 100644 srcpkgs/openfst/patches/cross-compile.patch
diff --git a/srcpkgs/openfst/patches/32bit.patch b/srcpkgs/openfst/patches/32bit.patch
new file mode 100644
index 000000000000..56c6df0bfcac
--- /dev/null
+++ b/srcpkgs/openfst/patches/32bit.patch
@@ -0,0 +1,77 @@
+This removes checks which stops at least i686 natively compiling:
+https://github.com/kaldi-asr/kaldi/issues/4808
+
+diff --git a/configure.ac b/configure.ac
+index a2328ff..ddacaae 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -149,39 +149,6 @@ AC_ARG_WITH([libfstdir],
+
+ AC_SUBST([libfstdir], $with_libfstdir)
+
+-# Flags may be changed after configuring, so this is checked again by
+-# weight_test.cc. The check here is to save time in the common case,
+-# or when someone does not run `make check`.
+-AC_RUN_IFELSE([AC_LANG_PROGRAM([
+- #include <cstdio>
+-
+- template <typename T>
+- bool FloatEqIsReflexive(T m) {
+- volatile T x = 1.111;
+- x *= m;
+-
+- T y = 1.111;
+- y *= m;
+-
+- return x == y;
+- }
+- ], [
+- volatile double test_value = 1.1;
+- if (!FloatEqIsReflexive(static_cast<float>(test_value))) {
+- printf("float FAIL\n");
+- return 1;
+- }
+- if (!FloatEqIsReflexive(test_value)) {
+- printf("double FAIL\n");
+- return 1;
+- }
+- ])],
+- [echo "Float equality is good"],
+- [AC_MSG_FAILURE(m4_normalize([
+- Test float equality failed!
+- Compile with -msse -mfpmath=sse if using g++.
+- ]))])
+-
+ AC_CHECK_LIB([dl], dlopen, [DL_LIBS=-ldl])
+ AC_SUBST([DL_LIBS])
+
+diff --git a/src/include/fst/float-weight.h b/src/include/fst/float-weight.h
+index 38b7d48..88b9a50 100644
+--- a/src/include/fst/float-weight.h
++++ b/src/include/fst/float-weight.h
+@@ -112,13 +112,6 @@ using FloatWeight = FloatWeightTpl<float>;
+ template <class T>
+ constexpr bool operator==(const FloatWeightTpl<T> &w1,
+ const FloatWeightTpl<T> &w2) {
+-#if (defined(__i386__) || defined(__x86_64__)) && !defined(__SSE2_MATH__)
+-// With i387 instructions, excess precision on a weight in an 80-bit
+-// register may cause it to compare unequal to that same weight when
+-// stored to memory. This breaks =='s reflexivity, in turn breaking
+-// NaturalLess.
+-#error "Please compile with -msse -mfpmath=sse, or equivalent."
+-#endif
+ return w1.Value() == w2.Value();
+ }
+
+diff --git a/src/test/weight_test.cc b/src/test/weight_test.cc
+index ff77402..11fc984 100644
+--- a/src/test/weight_test.cc
++++ b/src/test/weight_test.cc
+@@ -516,7 +516,5 @@ int main(int argc, char **argv) {
+ TestPowerWeightGetSetValue();
+ TestSparsePowerWeightGetSetValue();
+
+- TestFloatEqualityIsReflexive();
+-
+ return 0;
+ }
diff --git a/srcpkgs/openfst/patches/cross-compile.patch b/srcpkgs/openfst/patches/cross-compile.patch
deleted file mode 100644
index 4014f51dba38..000000000000
--- a/srcpkgs/openfst/patches/cross-compile.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 256f83e52112a5cd37e37a34beff2c4f0eae4660 Mon Sep 17 00:00:00 2001
-From: Nickolay Shmyrev <nshmyrev@gmail.com>
-Date: Tue, 16 Jun 2020 15:22:19 +0200
-Subject: [PATCH] Don't fail on cross-compile
-
----
- configure.ac | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index d52ed02..0f53b4d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -180,7 +180,8 @@ AC_RUN_IFELSE([AC_LANG_PROGRAM([
- [AC_MSG_FAILURE(m4_normalize([
- Test float equality failed!
- Compile with -msse -mfpmath=sse if using g++.
-- ]))])
-+ ]))],
-+ [echo "Ignoring test for cross-compilation"])
-
- AC_CHECK_LIB([dl], dlopen, [DL_LIBS=-ldl])
- AC_SUBST([DL_LIBS])
diff --git a/srcpkgs/openfst/template b/srcpkgs/openfst/template
index 1e62d249f83c..aa5385d2187f 100644
--- a/srcpkgs/openfst/template
+++ b/srcpkgs/openfst/template
@@ -1,10 +1,7 @@
# Template file for 'openfst'
pkgname=openfst
version=1.8.2
-revision=1
-# Limiting archs until resolved why a test fails when natively compiling i686:
-# https://github.com/kaldi-asr/kaldi/issues/4808
-archs="x86_64* aarch64*"
+revision=2
build_style=gnu-configure
configure_args="
--disable-bin
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PR PATCH] [Updated] vosk-api: update to 0.3.45
2023-02-05 12:18 [PR PATCH] vosk-api: update to 0.3.45 JohnGebbie
` (6 preceding siblings ...)
2023-02-05 14:30 ` JohnGebbie
@ 2023-02-05 16:59 ` JohnGebbie
2023-02-05 19:42 ` JohnGebbie
` (9 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: JohnGebbie @ 2023-02-05 16:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1269 bytes --]
There is an updated pull request by JohnGebbie against master on the void-packages repository
https://github.com/JohnGebbie/void-packages vosk-api
https://github.com/void-linux/void-packages/pull/42091
vosk-api: update to 0.3.45
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/42091.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vosk-api-42091.patch --]
[-- Type: text/x-diff, Size: 8721 bytes --]
From 1dfd79012b1f7b5c58ba20575948ab902d2c8f1f Mon Sep 17 00:00:00 2001
From: John Gebbie <me@johngebbie.com>
Date: Sun, 5 Feb 2023 12:10:37 +0000
Subject: [PATCH 1/3] vosk-api: update to 0.3.45.
---
common/shlibs | 2 +-
srcpkgs/vosk-api/template | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 59444164928b..bc77277ce8d1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4213,7 +4213,7 @@ libtracecmd.so.1 libtracecmd-3.1.2_1
libkshark.so.2 libkshark-2.1.1_1
libcpp-hocon.so.0.3.0 cpp-hocon-0.3.0_5
libfst.so.25 openfst-1.8.2_1
-libvosk.so vosk-api-0.3.43_1
+libvosk.so vosk-api-0.3.45_1
libdspy-1.so.1 d-spy-1.4.0_1
libpanel-1.so.1 libpanel-1.0.1_1
libqrtr.so.1 qrtr-ns-1.0_1
diff --git a/srcpkgs/vosk-api/template b/srcpkgs/vosk-api/template
index b86c74452b95..41d53e654042 100644
--- a/srcpkgs/vosk-api/template
+++ b/srcpkgs/vosk-api/template
@@ -1,12 +1,12 @@
# Template file for 'vosk-api'
pkgname=vosk-api
-version=0.3.43
+version=0.3.45
revision=1
create_wrksrc=yes
build_wrksrc="vosk-api-${version}/src"
# Vosk is built with their own vendored version of Kaldi which has no releases
# of its own, so the commit must be determined by the date of the vosk release.
-_kaldi_commit=ecb4b47159501ef0d67888633e65b8fc0c1f79d1
+_kaldi_commit=93ef0019b847272a239fbb485ef97f29feb1d587
build_style=gnu-makefile
make_use_env=yes
make_build_args="KALDI_ROOT=../../kaldi HAVE_OPENBLAS_NO_F2C=1 HAVE_OPENBLAS_CLAPACK=0"
@@ -18,8 +18,8 @@ homepage="https://alphacephei.com/vosk"
distfiles="https://github.com/alphacep/vosk-api/archive/v${version}/vosk-api-${version}.tar.gz
https://github.com/alphacep/kaldi/archive/${_kaldi_commit}.tar.gz
https://alphacephei.com/vosk/models/vosk-model-small-en-us-0.15.zip"
-checksum="50fa82bfbfe3fc5be868237c84ac180eb55da0b65b1803bf022899673afda024
- 39cadd5a351a5513e3e4e1f71ac4b4f018a592a856a55f1d32c159e22e799f64
+checksum="930fb9cfa6c1b3035d3730feee7d670fb893caa0c71bd2159ee7623102674c26
+ f47a996af546884a8e1cb961323b796c5c238c1bbeabaf657bb300b760e431b2
30f26242c4eb449f948e42cb302dd7a686cb29a3423a8367f99ff41780942498"
shlib_provides="libvosk.so"
patch_args="-Np1 -d ${pkgname}-${version}"
From 225b0f0cddcac513348b1d90cec4dd54b24c3d20 Mon Sep 17 00:00:00 2001
From: John Gebbie <me@johngebbie.com>
Date: Sun, 5 Feb 2023 14:30:18 +0000
Subject: [PATCH 2/3] openfst: unrestrict archs
---
srcpkgs/openfst/patches/32bit.patch | 77 +++++++++++++++++++++
srcpkgs/openfst/patches/cross-compile.patch | 23 ------
srcpkgs/openfst/template | 5 +-
3 files changed, 78 insertions(+), 27 deletions(-)
create mode 100644 srcpkgs/openfst/patches/32bit.patch
delete mode 100644 srcpkgs/openfst/patches/cross-compile.patch
diff --git a/srcpkgs/openfst/patches/32bit.patch b/srcpkgs/openfst/patches/32bit.patch
new file mode 100644
index 000000000000..56c6df0bfcac
--- /dev/null
+++ b/srcpkgs/openfst/patches/32bit.patch
@@ -0,0 +1,77 @@
+This removes checks which stops at least i686 natively compiling:
+https://github.com/kaldi-asr/kaldi/issues/4808
+
+diff --git a/configure.ac b/configure.ac
+index a2328ff..ddacaae 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -149,39 +149,6 @@ AC_ARG_WITH([libfstdir],
+
+ AC_SUBST([libfstdir], $with_libfstdir)
+
+-# Flags may be changed after configuring, so this is checked again by
+-# weight_test.cc. The check here is to save time in the common case,
+-# or when someone does not run `make check`.
+-AC_RUN_IFELSE([AC_LANG_PROGRAM([
+- #include <cstdio>
+-
+- template <typename T>
+- bool FloatEqIsReflexive(T m) {
+- volatile T x = 1.111;
+- x *= m;
+-
+- T y = 1.111;
+- y *= m;
+-
+- return x == y;
+- }
+- ], [
+- volatile double test_value = 1.1;
+- if (!FloatEqIsReflexive(static_cast<float>(test_value))) {
+- printf("float FAIL\n");
+- return 1;
+- }
+- if (!FloatEqIsReflexive(test_value)) {
+- printf("double FAIL\n");
+- return 1;
+- }
+- ])],
+- [echo "Float equality is good"],
+- [AC_MSG_FAILURE(m4_normalize([
+- Test float equality failed!
+- Compile with -msse -mfpmath=sse if using g++.
+- ]))])
+-
+ AC_CHECK_LIB([dl], dlopen, [DL_LIBS=-ldl])
+ AC_SUBST([DL_LIBS])
+
+diff --git a/src/include/fst/float-weight.h b/src/include/fst/float-weight.h
+index 38b7d48..88b9a50 100644
+--- a/src/include/fst/float-weight.h
++++ b/src/include/fst/float-weight.h
+@@ -112,13 +112,6 @@ using FloatWeight = FloatWeightTpl<float>;
+ template <class T>
+ constexpr bool operator==(const FloatWeightTpl<T> &w1,
+ const FloatWeightTpl<T> &w2) {
+-#if (defined(__i386__) || defined(__x86_64__)) && !defined(__SSE2_MATH__)
+-// With i387 instructions, excess precision on a weight in an 80-bit
+-// register may cause it to compare unequal to that same weight when
+-// stored to memory. This breaks =='s reflexivity, in turn breaking
+-// NaturalLess.
+-#error "Please compile with -msse -mfpmath=sse, or equivalent."
+-#endif
+ return w1.Value() == w2.Value();
+ }
+
+diff --git a/src/test/weight_test.cc b/src/test/weight_test.cc
+index ff77402..11fc984 100644
+--- a/src/test/weight_test.cc
++++ b/src/test/weight_test.cc
+@@ -516,7 +516,5 @@ int main(int argc, char **argv) {
+ TestPowerWeightGetSetValue();
+ TestSparsePowerWeightGetSetValue();
+
+- TestFloatEqualityIsReflexive();
+-
+ return 0;
+ }
diff --git a/srcpkgs/openfst/patches/cross-compile.patch b/srcpkgs/openfst/patches/cross-compile.patch
deleted file mode 100644
index 4014f51dba38..000000000000
--- a/srcpkgs/openfst/patches/cross-compile.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 256f83e52112a5cd37e37a34beff2c4f0eae4660 Mon Sep 17 00:00:00 2001
-From: Nickolay Shmyrev <nshmyrev@gmail.com>
-Date: Tue, 16 Jun 2020 15:22:19 +0200
-Subject: [PATCH] Don't fail on cross-compile
-
----
- configure.ac | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index d52ed02..0f53b4d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -180,7 +180,8 @@ AC_RUN_IFELSE([AC_LANG_PROGRAM([
- [AC_MSG_FAILURE(m4_normalize([
- Test float equality failed!
- Compile with -msse -mfpmath=sse if using g++.
-- ]))])
-+ ]))],
-+ [echo "Ignoring test for cross-compilation"])
-
- AC_CHECK_LIB([dl], dlopen, [DL_LIBS=-ldl])
- AC_SUBST([DL_LIBS])
diff --git a/srcpkgs/openfst/template b/srcpkgs/openfst/template
index 1e62d249f83c..aa5385d2187f 100644
--- a/srcpkgs/openfst/template
+++ b/srcpkgs/openfst/template
@@ -1,10 +1,7 @@
# Template file for 'openfst'
pkgname=openfst
version=1.8.2
-revision=1
-# Limiting archs until resolved why a test fails when natively compiling i686:
-# https://github.com/kaldi-asr/kaldi/issues/4808
-archs="x86_64* aarch64*"
+revision=2
build_style=gnu-configure
configure_args="
--disable-bin
From 56248d0c62019a7e933aeee1c79633a837b0d032 Mon Sep 17 00:00:00 2001
From: John Gebbie <me@johngebbie.com>
Date: Sun, 5 Feb 2023 16:59:37 +0000
Subject: [PATCH 3/3] fixup
---
srcpkgs/openfst/patches/32bit.patch | 26 ++++++++++++++++----------
1 file changed, 16 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/openfst/patches/32bit.patch b/srcpkgs/openfst/patches/32bit.patch
index 56c6df0bfcac..2610f1456ced 100644
--- a/srcpkgs/openfst/patches/32bit.patch
+++ b/srcpkgs/openfst/patches/32bit.patch
@@ -63,15 +63,21 @@ index 38b7d48..88b9a50 100644
return w1.Value() == w2.Value();
}
-diff --git a/src/test/weight_test.cc b/src/test/weight_test.cc
-index ff77402..11fc984 100644
---- a/src/test/weight_test.cc
-+++ b/src/test/weight_test.cc
-@@ -516,7 +516,5 @@ int main(int argc, char **argv) {
- TestPowerWeightGetSetValue();
- TestSparsePowerWeightGetSetValue();
+diff --git a/src/test/Makefile.am b/src/test/Makefile.am
+index a2754e5..ec84297 100644
+--- a/src/test/Makefile.am
++++ b/src/test/Makefile.am
+@@ -1,12 +1,10 @@
+ AM_CPPFLAGS = -I$(srcdir)/../include $(ICU_CPPFLAGS)
+ LDADD = ../lib/libfst.la -lm $(DL_LIBS)
-- TestFloatEqualityIsReflexive();
+-check_PROGRAMS = fst_test weight_test
++check_PROGRAMS = fst_test
+
+ fst_test_SOURCES = fst_test.cc
+
+-weight_test_SOURCES = weight_test.cc
-
- return 0;
- }
+ algo_test_SOURCES = algo_test.cc
+
+ check_PROGRAMS += algo_test_log
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PR PATCH] [Updated] vosk-api: update to 0.3.45
2023-02-05 12:18 [PR PATCH] vosk-api: update to 0.3.45 JohnGebbie
` (7 preceding siblings ...)
2023-02-05 16:59 ` JohnGebbie
@ 2023-02-05 19:42 ` JohnGebbie
2023-02-09 14:39 ` JohnGebbie
` (8 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: JohnGebbie @ 2023-02-05 19:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1269 bytes --]
There is an updated pull request by JohnGebbie against master on the void-packages repository
https://github.com/JohnGebbie/void-packages vosk-api
https://github.com/void-linux/void-packages/pull/42091
vosk-api: update to 0.3.45
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/42091.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vosk-api-42091.patch --]
[-- Type: text/x-diff, Size: 7430 bytes --]
From 024a3e8f9fc543f4b65db278af8952e2d65754c4 Mon Sep 17 00:00:00 2001
From: John Gebbie <me@johngebbie.com>
Date: Sun, 5 Feb 2023 12:10:37 +0000
Subject: [PATCH 1/2] vosk-api: update to 0.3.45.
---
common/shlibs | 2 +-
srcpkgs/vosk-api/template | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 59444164928b..bc77277ce8d1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4213,7 +4213,7 @@ libtracecmd.so.1 libtracecmd-3.1.2_1
libkshark.so.2 libkshark-2.1.1_1
libcpp-hocon.so.0.3.0 cpp-hocon-0.3.0_5
libfst.so.25 openfst-1.8.2_1
-libvosk.so vosk-api-0.3.43_1
+libvosk.so vosk-api-0.3.45_1
libdspy-1.so.1 d-spy-1.4.0_1
libpanel-1.so.1 libpanel-1.0.1_1
libqrtr.so.1 qrtr-ns-1.0_1
diff --git a/srcpkgs/vosk-api/template b/srcpkgs/vosk-api/template
index b86c74452b95..41d53e654042 100644
--- a/srcpkgs/vosk-api/template
+++ b/srcpkgs/vosk-api/template
@@ -1,12 +1,12 @@
# Template file for 'vosk-api'
pkgname=vosk-api
-version=0.3.43
+version=0.3.45
revision=1
create_wrksrc=yes
build_wrksrc="vosk-api-${version}/src"
# Vosk is built with their own vendored version of Kaldi which has no releases
# of its own, so the commit must be determined by the date of the vosk release.
-_kaldi_commit=ecb4b47159501ef0d67888633e65b8fc0c1f79d1
+_kaldi_commit=93ef0019b847272a239fbb485ef97f29feb1d587
build_style=gnu-makefile
make_use_env=yes
make_build_args="KALDI_ROOT=../../kaldi HAVE_OPENBLAS_NO_F2C=1 HAVE_OPENBLAS_CLAPACK=0"
@@ -18,8 +18,8 @@ homepage="https://alphacephei.com/vosk"
distfiles="https://github.com/alphacep/vosk-api/archive/v${version}/vosk-api-${version}.tar.gz
https://github.com/alphacep/kaldi/archive/${_kaldi_commit}.tar.gz
https://alphacephei.com/vosk/models/vosk-model-small-en-us-0.15.zip"
-checksum="50fa82bfbfe3fc5be868237c84ac180eb55da0b65b1803bf022899673afda024
- 39cadd5a351a5513e3e4e1f71ac4b4f018a592a856a55f1d32c159e22e799f64
+checksum="930fb9cfa6c1b3035d3730feee7d670fb893caa0c71bd2159ee7623102674c26
+ f47a996af546884a8e1cb961323b796c5c238c1bbeabaf657bb300b760e431b2
30f26242c4eb449f948e42cb302dd7a686cb29a3423a8367f99ff41780942498"
shlib_provides="libvosk.so"
patch_args="-Np1 -d ${pkgname}-${version}"
From 5b868c106c06f103d3e0f063405335c0672b1413 Mon Sep 17 00:00:00 2001
From: John Gebbie <me@johngebbie.com>
Date: Sun, 5 Feb 2023 14:30:18 +0000
Subject: [PATCH 2/2] openfst: unrestrict archs
---
srcpkgs/openfst/patches/32bit.patch | 83 +++++++++++++++++++++
srcpkgs/openfst/patches/cross-compile.patch | 23 ------
srcpkgs/openfst/template | 5 +-
3 files changed, 84 insertions(+), 27 deletions(-)
create mode 100644 srcpkgs/openfst/patches/32bit.patch
delete mode 100644 srcpkgs/openfst/patches/cross-compile.patch
diff --git a/srcpkgs/openfst/patches/32bit.patch b/srcpkgs/openfst/patches/32bit.patch
new file mode 100644
index 000000000000..2610f1456ced
--- /dev/null
+++ b/srcpkgs/openfst/patches/32bit.patch
@@ -0,0 +1,83 @@
+This removes checks which stops at least i686 natively compiling:
+https://github.com/kaldi-asr/kaldi/issues/4808
+
+diff --git a/configure.ac b/configure.ac
+index a2328ff..ddacaae 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -149,39 +149,6 @@ AC_ARG_WITH([libfstdir],
+
+ AC_SUBST([libfstdir], $with_libfstdir)
+
+-# Flags may be changed after configuring, so this is checked again by
+-# weight_test.cc. The check here is to save time in the common case,
+-# or when someone does not run `make check`.
+-AC_RUN_IFELSE([AC_LANG_PROGRAM([
+- #include <cstdio>
+-
+- template <typename T>
+- bool FloatEqIsReflexive(T m) {
+- volatile T x = 1.111;
+- x *= m;
+-
+- T y = 1.111;
+- y *= m;
+-
+- return x == y;
+- }
+- ], [
+- volatile double test_value = 1.1;
+- if (!FloatEqIsReflexive(static_cast<float>(test_value))) {
+- printf("float FAIL\n");
+- return 1;
+- }
+- if (!FloatEqIsReflexive(test_value)) {
+- printf("double FAIL\n");
+- return 1;
+- }
+- ])],
+- [echo "Float equality is good"],
+- [AC_MSG_FAILURE(m4_normalize([
+- Test float equality failed!
+- Compile with -msse -mfpmath=sse if using g++.
+- ]))])
+-
+ AC_CHECK_LIB([dl], dlopen, [DL_LIBS=-ldl])
+ AC_SUBST([DL_LIBS])
+
+diff --git a/src/include/fst/float-weight.h b/src/include/fst/float-weight.h
+index 38b7d48..88b9a50 100644
+--- a/src/include/fst/float-weight.h
++++ b/src/include/fst/float-weight.h
+@@ -112,13 +112,6 @@ using FloatWeight = FloatWeightTpl<float>;
+ template <class T>
+ constexpr bool operator==(const FloatWeightTpl<T> &w1,
+ const FloatWeightTpl<T> &w2) {
+-#if (defined(__i386__) || defined(__x86_64__)) && !defined(__SSE2_MATH__)
+-// With i387 instructions, excess precision on a weight in an 80-bit
+-// register may cause it to compare unequal to that same weight when
+-// stored to memory. This breaks =='s reflexivity, in turn breaking
+-// NaturalLess.
+-#error "Please compile with -msse -mfpmath=sse, or equivalent."
+-#endif
+ return w1.Value() == w2.Value();
+ }
+
+diff --git a/src/test/Makefile.am b/src/test/Makefile.am
+index a2754e5..ec84297 100644
+--- a/src/test/Makefile.am
++++ b/src/test/Makefile.am
+@@ -1,12 +1,10 @@
+ AM_CPPFLAGS = -I$(srcdir)/../include $(ICU_CPPFLAGS)
+ LDADD = ../lib/libfst.la -lm $(DL_LIBS)
+
+-check_PROGRAMS = fst_test weight_test
++check_PROGRAMS = fst_test
+
+ fst_test_SOURCES = fst_test.cc
+
+-weight_test_SOURCES = weight_test.cc
+-
+ algo_test_SOURCES = algo_test.cc
+
+ check_PROGRAMS += algo_test_log
diff --git a/srcpkgs/openfst/patches/cross-compile.patch b/srcpkgs/openfst/patches/cross-compile.patch
deleted file mode 100644
index 4014f51dba38..000000000000
--- a/srcpkgs/openfst/patches/cross-compile.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 256f83e52112a5cd37e37a34beff2c4f0eae4660 Mon Sep 17 00:00:00 2001
-From: Nickolay Shmyrev <nshmyrev@gmail.com>
-Date: Tue, 16 Jun 2020 15:22:19 +0200
-Subject: [PATCH] Don't fail on cross-compile
-
----
- configure.ac | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index d52ed02..0f53b4d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -180,7 +180,8 @@ AC_RUN_IFELSE([AC_LANG_PROGRAM([
- [AC_MSG_FAILURE(m4_normalize([
- Test float equality failed!
- Compile with -msse -mfpmath=sse if using g++.
-- ]))])
-+ ]))],
-+ [echo "Ignoring test for cross-compilation"])
-
- AC_CHECK_LIB([dl], dlopen, [DL_LIBS=-ldl])
- AC_SUBST([DL_LIBS])
diff --git a/srcpkgs/openfst/template b/srcpkgs/openfst/template
index 1e62d249f83c..aa5385d2187f 100644
--- a/srcpkgs/openfst/template
+++ b/srcpkgs/openfst/template
@@ -1,10 +1,7 @@
# Template file for 'openfst'
pkgname=openfst
version=1.8.2
-revision=1
-# Limiting archs until resolved why a test fails when natively compiling i686:
-# https://github.com/kaldi-asr/kaldi/issues/4808
-archs="x86_64* aarch64*"
+revision=2
build_style=gnu-configure
configure_args="
--disable-bin
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: vosk-api: update to 0.3.45
2023-02-05 12:18 [PR PATCH] vosk-api: update to 0.3.45 JohnGebbie
` (8 preceding siblings ...)
2023-02-05 19:42 ` JohnGebbie
@ 2023-02-09 14:39 ` JohnGebbie
2023-02-10 14:13 ` [PR PATCH] [Updated] " JohnGebbie
` (7 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: JohnGebbie @ 2023-02-09 14:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 193 bytes --]
New comment by JohnGebbie on void-packages repository
https://github.com/void-linux/void-packages/pull/42091#issuecomment-1424295492
Comment:
I want to test i686 (with numen) before merging.
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PR PATCH] [Updated] vosk-api: update to 0.3.45
2023-02-05 12:18 [PR PATCH] vosk-api: update to 0.3.45 JohnGebbie
` (9 preceding siblings ...)
2023-02-09 14:39 ` JohnGebbie
@ 2023-02-10 14:13 ` JohnGebbie
2023-02-10 14:44 ` JohnGebbie
` (6 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: JohnGebbie @ 2023-02-10 14:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1250 bytes --]
There is an updated pull request by JohnGebbie against master on the void-packages repository
https://github.com/JohnGebbie/void-packages vosk-api
https://github.com/void-linux/void-packages/pull/42091
vosk-api: update to 0.3.45
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/42091.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vosk-api-42091.patch --]
[-- Type: text/x-diff, Size: 7077 bytes --]
From 8fb3e9ca918ef335f78e2516441953915145c4a1 Mon Sep 17 00:00:00 2001
From: John Gebbie <me@johngebbie.com>
Date: Sun, 5 Feb 2023 12:10:37 +0000
Subject: [PATCH 1/2] vosk-api: update to 0.3.45.
---
common/shlibs | 2 +-
srcpkgs/vosk-api/template | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 59444164928b..bc77277ce8d1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4213,7 +4213,7 @@ libtracecmd.so.1 libtracecmd-3.1.2_1
libkshark.so.2 libkshark-2.1.1_1
libcpp-hocon.so.0.3.0 cpp-hocon-0.3.0_5
libfst.so.25 openfst-1.8.2_1
-libvosk.so vosk-api-0.3.43_1
+libvosk.so vosk-api-0.3.45_1
libdspy-1.so.1 d-spy-1.4.0_1
libpanel-1.so.1 libpanel-1.0.1_1
libqrtr.so.1 qrtr-ns-1.0_1
diff --git a/srcpkgs/vosk-api/template b/srcpkgs/vosk-api/template
index b86c74452b95..41d53e654042 100644
--- a/srcpkgs/vosk-api/template
+++ b/srcpkgs/vosk-api/template
@@ -1,12 +1,12 @@
# Template file for 'vosk-api'
pkgname=vosk-api
-version=0.3.43
+version=0.3.45
revision=1
create_wrksrc=yes
build_wrksrc="vosk-api-${version}/src"
# Vosk is built with their own vendored version of Kaldi which has no releases
# of its own, so the commit must be determined by the date of the vosk release.
-_kaldi_commit=ecb4b47159501ef0d67888633e65b8fc0c1f79d1
+_kaldi_commit=93ef0019b847272a239fbb485ef97f29feb1d587
build_style=gnu-makefile
make_use_env=yes
make_build_args="KALDI_ROOT=../../kaldi HAVE_OPENBLAS_NO_F2C=1 HAVE_OPENBLAS_CLAPACK=0"
@@ -18,8 +18,8 @@ homepage="https://alphacephei.com/vosk"
distfiles="https://github.com/alphacep/vosk-api/archive/v${version}/vosk-api-${version}.tar.gz
https://github.com/alphacep/kaldi/archive/${_kaldi_commit}.tar.gz
https://alphacephei.com/vosk/models/vosk-model-small-en-us-0.15.zip"
-checksum="50fa82bfbfe3fc5be868237c84ac180eb55da0b65b1803bf022899673afda024
- 39cadd5a351a5513e3e4e1f71ac4b4f018a592a856a55f1d32c159e22e799f64
+checksum="930fb9cfa6c1b3035d3730feee7d670fb893caa0c71bd2159ee7623102674c26
+ f47a996af546884a8e1cb961323b796c5c238c1bbeabaf657bb300b760e431b2
30f26242c4eb449f948e42cb302dd7a686cb29a3423a8367f99ff41780942498"
shlib_provides="libvosk.so"
patch_args="-Np1 -d ${pkgname}-${version}"
From e94c889204e5be75bbda82e642bfc5a9d2db6a52 Mon Sep 17 00:00:00 2001
From: John Gebbie <me@johngebbie.com>
Date: Fri, 10 Feb 2023 14:04:45 +0000
Subject: [PATCH 2/2] vosk-api: use dynamic openblas lib
---
srcpkgs/vosk-api/patches/vosk-lapack.patch | 41 --------------------
srcpkgs/vosk-api/patches/vosk-openblas.patch | 41 ++++++++++++++++++++
srcpkgs/vosk-api/template | 6 +--
3 files changed, 44 insertions(+), 44 deletions(-)
delete mode 100644 srcpkgs/vosk-api/patches/vosk-lapack.patch
create mode 100644 srcpkgs/vosk-api/patches/vosk-openblas.patch
diff --git a/srcpkgs/vosk-api/patches/vosk-lapack.patch b/srcpkgs/vosk-api/patches/vosk-lapack.patch
deleted file mode 100644
index 1b2fd6bd6c1d..000000000000
--- a/srcpkgs/vosk-api/patches/vosk-lapack.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-https://github.com/alphacep/vosk-api/pull/1215
-From 6c28207334bb1281d98a94f799757fdfa8f6b336 Mon Sep 17 00:00:00 2001
-From: John Gebbie <me@johngebbie.com>
-Date: Sat, 3 Dec 2022 17:53:21 +0000
-Subject: [PATCH] Add OPENBLAS_NO_F2C math library option
-
----
- src/Makefile | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff --git a/src/Makefile b/src/Makefile
-index cd697b15..97654883 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -7,6 +7,7 @@ CUDA_ROOT?=/usr/local/cuda
- USE_SHARED?=0
- # Math libraries
- HAVE_OPENBLAS_CLAPACK?=1
-+HAVE_OPENBLAS_NO_F2C?=0
- HAVE_MKL?=0
- HAVE_ACCELERATE=0
- HAVE_CUDA?=0
-@@ -80,6 +81,18 @@ ifeq ($(HAVE_OPENBLAS_CLAPACK), 1)
- endif
- endif
-
-+ifeq ($(HAVE_OPENBLAS_NO_F2C), 1)
-+ CFLAGS += -I$(OPENBLAS_ROOT)/include
-+ ifeq ($(USE_SHARED), 0)
-+ LIBS += \
-+ $(OPENBLAS_ROOT)/lib/libopenblas.a \
-+ $(OPENBLAS_ROOT)/lib/liblapack.a \
-+ $(OPENBLAS_ROOT)/lib/libblas.a
-+ else
-+ LDFLAGS += -lopenblas -llapack -lblas
-+ endif
-+endif
-+
- ifeq ($(HAVE_MKL), 1)
- CFLAGS += -DHAVE_MKL=1 -I$(MKL_ROOT)/include
- LDFLAGS += -L$(MKL_ROOT)/lib/intel64 -Wl,-rpath=$(MKL_ROOT)/lib/intel64 -lmkl_rt -lmkl_intel_lp64 -lmkl_core -lmkl_sequential
diff --git a/srcpkgs/vosk-api/patches/vosk-openblas.patch b/srcpkgs/vosk-api/patches/vosk-openblas.patch
new file mode 100644
index 000000000000..2e3e473534a4
--- /dev/null
+++ b/srcpkgs/vosk-api/patches/vosk-openblas.patch
@@ -0,0 +1,41 @@
+https://github.com/alphacep/vosk-api/pull/1268
+From fd7a05c279d8a221afb7cf48df5a5dd9baf0c9d4 Mon Sep 17 00:00:00 2001
+From: John Gebbie <me@johngebbie.com>
+Date: Thu, 9 Feb 2023 18:45:53 +0000
+Subject: [PATCH] Add OPENBLAS math library option
+
+---
+ src/Makefile | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/src/Makefile b/src/Makefile
+index cd697b1..d821022 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -7,6 +7,7 @@ CUDA_ROOT?=/usr/local/cuda
+ USE_SHARED?=0
+ # Math libraries
+ HAVE_OPENBLAS_CLAPACK?=1
++HAVE_OPENBLAS?=0
+ HAVE_MKL?=0
+ HAVE_ACCELERATE=0
+ HAVE_CUDA?=0
+@@ -80,6 +81,15 @@ ifeq ($(HAVE_OPENBLAS_CLAPACK), 1)
+ endif
+ endif
+
++ifeq ($(HAVE_OPENBLAS), 1)
++ CFLAGS += -I$(OPENBLAS_ROOT)/include
++ ifeq ($(USE_SHARED), 0)
++ LIBS += $(OPENBLAS_ROOT)/lib/libopenblas.a
++ else
++ LDFLAGS += -lopenblas -lgfortan
++ endif
++endif
++
+ ifeq ($(HAVE_MKL), 1)
+ CFLAGS += -DHAVE_MKL=1 -I$(MKL_ROOT)/include
+ LDFLAGS += -L$(MKL_ROOT)/lib/intel64 -Wl,-rpath=$(MKL_ROOT)/lib/intel64 -lmkl_rt -lmkl_intel_lp64 -lmkl_core -lmkl_sequential
+--
+2.38.3
+
diff --git a/srcpkgs/vosk-api/template b/srcpkgs/vosk-api/template
index 41d53e654042..6082a6de0b5e 100644
--- a/srcpkgs/vosk-api/template
+++ b/srcpkgs/vosk-api/template
@@ -10,7 +10,7 @@ _kaldi_commit=93ef0019b847272a239fbb485ef97f29feb1d587
build_style=gnu-makefile
make_use_env=yes
make_build_args="KALDI_ROOT=../../kaldi HAVE_OPENBLAS_NO_F2C=1 HAVE_OPENBLAS_CLAPACK=0"
-makedepends="blas-devel lapack-devel openblas-devel libgomp-devel openfst-devel"
+makedepends="libgfortran openblas-devel libgomp-devel openfst-devel"
short_desc="Offline speech recognition toolkit"
maintainer="John Gebbie <me@johngebbie.com>"
license="Apache-2.0"
@@ -41,7 +41,7 @@ post_extract() {
pre_build() {
cd "${wrksrc}/kaldi/src"
- ./configure ${CROSS_BUILD:+--host="${XBPS_CROSS_TRIPLET}"} --mathlib=OPENBLAS_NO_F2C --shared --use-cuda=no
+ ./configure ${CROSS_BUILD:+--host="${XBPS_CROSS_TRIPLET}"} --mathlib=OPENBLAS --shared --use-cuda=no
make online2 lm rnnlm
}
@@ -57,7 +57,7 @@ do_check() {
cd "${wrksrc}/vosk-api-${version}/c"
ln -sf "${wrksrc}/vosk-model-small-en-us-0.15" model
ln -sf ../python/example/test.wav .
- ldflags="-fopenmp -L../src -lvosk -ldl -lpthread -Wl,-rpath,../src"
+ ldflags="-fopenmp -L../src -lvosk -ldl -lpthread -lopenblas -lgfortran -Wl,-rpath,../src"
if [ "$XBPS_TARGET_LIBC" = musl ]; then
ldflags+=" -lexecinfo"
fi
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PR PATCH] [Updated] vosk-api: update to 0.3.45
2023-02-05 12:18 [PR PATCH] vosk-api: update to 0.3.45 JohnGebbie
` (10 preceding siblings ...)
2023-02-10 14:13 ` [PR PATCH] [Updated] " JohnGebbie
@ 2023-02-10 14:44 ` JohnGebbie
2023-02-11 11:26 ` JohnGebbie
` (5 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: JohnGebbie @ 2023-02-10 14:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1250 bytes --]
There is an updated pull request by JohnGebbie against master on the void-packages repository
https://github.com/JohnGebbie/void-packages vosk-api
https://github.com/void-linux/void-packages/pull/42091
vosk-api: update to 0.3.45
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/42091.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vosk-api-42091.patch --]
[-- Type: text/x-diff, Size: 7218 bytes --]
From 8fb3e9ca918ef335f78e2516441953915145c4a1 Mon Sep 17 00:00:00 2001
From: John Gebbie <me@johngebbie.com>
Date: Sun, 5 Feb 2023 12:10:37 +0000
Subject: [PATCH 1/2] vosk-api: update to 0.3.45.
---
common/shlibs | 2 +-
srcpkgs/vosk-api/template | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 59444164928b..bc77277ce8d1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4213,7 +4213,7 @@ libtracecmd.so.1 libtracecmd-3.1.2_1
libkshark.so.2 libkshark-2.1.1_1
libcpp-hocon.so.0.3.0 cpp-hocon-0.3.0_5
libfst.so.25 openfst-1.8.2_1
-libvosk.so vosk-api-0.3.43_1
+libvosk.so vosk-api-0.3.45_1
libdspy-1.so.1 d-spy-1.4.0_1
libpanel-1.so.1 libpanel-1.0.1_1
libqrtr.so.1 qrtr-ns-1.0_1
diff --git a/srcpkgs/vosk-api/template b/srcpkgs/vosk-api/template
index b86c74452b95..41d53e654042 100644
--- a/srcpkgs/vosk-api/template
+++ b/srcpkgs/vosk-api/template
@@ -1,12 +1,12 @@
# Template file for 'vosk-api'
pkgname=vosk-api
-version=0.3.43
+version=0.3.45
revision=1
create_wrksrc=yes
build_wrksrc="vosk-api-${version}/src"
# Vosk is built with their own vendored version of Kaldi which has no releases
# of its own, so the commit must be determined by the date of the vosk release.
-_kaldi_commit=ecb4b47159501ef0d67888633e65b8fc0c1f79d1
+_kaldi_commit=93ef0019b847272a239fbb485ef97f29feb1d587
build_style=gnu-makefile
make_use_env=yes
make_build_args="KALDI_ROOT=../../kaldi HAVE_OPENBLAS_NO_F2C=1 HAVE_OPENBLAS_CLAPACK=0"
@@ -18,8 +18,8 @@ homepage="https://alphacephei.com/vosk"
distfiles="https://github.com/alphacep/vosk-api/archive/v${version}/vosk-api-${version}.tar.gz
https://github.com/alphacep/kaldi/archive/${_kaldi_commit}.tar.gz
https://alphacephei.com/vosk/models/vosk-model-small-en-us-0.15.zip"
-checksum="50fa82bfbfe3fc5be868237c84ac180eb55da0b65b1803bf022899673afda024
- 39cadd5a351a5513e3e4e1f71ac4b4f018a592a856a55f1d32c159e22e799f64
+checksum="930fb9cfa6c1b3035d3730feee7d670fb893caa0c71bd2159ee7623102674c26
+ f47a996af546884a8e1cb961323b796c5c238c1bbeabaf657bb300b760e431b2
30f26242c4eb449f948e42cb302dd7a686cb29a3423a8367f99ff41780942498"
shlib_provides="libvosk.so"
patch_args="-Np1 -d ${pkgname}-${version}"
From d52ac57dd1409ad2049fdfc4c9531efdb1afef7a Mon Sep 17 00:00:00 2001
From: John Gebbie <me@johngebbie.com>
Date: Fri, 10 Feb 2023 14:04:45 +0000
Subject: [PATCH 2/2] vosk-api: use dynamic openblas lib
---
srcpkgs/vosk-api/patches/vosk-lapack.patch | 41 --------------------
srcpkgs/vosk-api/patches/vosk-openblas.patch | 41 ++++++++++++++++++++
srcpkgs/vosk-api/template | 8 ++--
3 files changed, 45 insertions(+), 45 deletions(-)
delete mode 100644 srcpkgs/vosk-api/patches/vosk-lapack.patch
create mode 100644 srcpkgs/vosk-api/patches/vosk-openblas.patch
diff --git a/srcpkgs/vosk-api/patches/vosk-lapack.patch b/srcpkgs/vosk-api/patches/vosk-lapack.patch
deleted file mode 100644
index 1b2fd6bd6c1d..000000000000
--- a/srcpkgs/vosk-api/patches/vosk-lapack.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-https://github.com/alphacep/vosk-api/pull/1215
-From 6c28207334bb1281d98a94f799757fdfa8f6b336 Mon Sep 17 00:00:00 2001
-From: John Gebbie <me@johngebbie.com>
-Date: Sat, 3 Dec 2022 17:53:21 +0000
-Subject: [PATCH] Add OPENBLAS_NO_F2C math library option
-
----
- src/Makefile | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff --git a/src/Makefile b/src/Makefile
-index cd697b15..97654883 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -7,6 +7,7 @@ CUDA_ROOT?=/usr/local/cuda
- USE_SHARED?=0
- # Math libraries
- HAVE_OPENBLAS_CLAPACK?=1
-+HAVE_OPENBLAS_NO_F2C?=0
- HAVE_MKL?=0
- HAVE_ACCELERATE=0
- HAVE_CUDA?=0
-@@ -80,6 +81,18 @@ ifeq ($(HAVE_OPENBLAS_CLAPACK), 1)
- endif
- endif
-
-+ifeq ($(HAVE_OPENBLAS_NO_F2C), 1)
-+ CFLAGS += -I$(OPENBLAS_ROOT)/include
-+ ifeq ($(USE_SHARED), 0)
-+ LIBS += \
-+ $(OPENBLAS_ROOT)/lib/libopenblas.a \
-+ $(OPENBLAS_ROOT)/lib/liblapack.a \
-+ $(OPENBLAS_ROOT)/lib/libblas.a
-+ else
-+ LDFLAGS += -lopenblas -llapack -lblas
-+ endif
-+endif
-+
- ifeq ($(HAVE_MKL), 1)
- CFLAGS += -DHAVE_MKL=1 -I$(MKL_ROOT)/include
- LDFLAGS += -L$(MKL_ROOT)/lib/intel64 -Wl,-rpath=$(MKL_ROOT)/lib/intel64 -lmkl_rt -lmkl_intel_lp64 -lmkl_core -lmkl_sequential
diff --git a/srcpkgs/vosk-api/patches/vosk-openblas.patch b/srcpkgs/vosk-api/patches/vosk-openblas.patch
new file mode 100644
index 000000000000..2e3e473534a4
--- /dev/null
+++ b/srcpkgs/vosk-api/patches/vosk-openblas.patch
@@ -0,0 +1,41 @@
+https://github.com/alphacep/vosk-api/pull/1268
+From fd7a05c279d8a221afb7cf48df5a5dd9baf0c9d4 Mon Sep 17 00:00:00 2001
+From: John Gebbie <me@johngebbie.com>
+Date: Thu, 9 Feb 2023 18:45:53 +0000
+Subject: [PATCH] Add OPENBLAS math library option
+
+---
+ src/Makefile | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/src/Makefile b/src/Makefile
+index cd697b1..d821022 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -7,6 +7,7 @@ CUDA_ROOT?=/usr/local/cuda
+ USE_SHARED?=0
+ # Math libraries
+ HAVE_OPENBLAS_CLAPACK?=1
++HAVE_OPENBLAS?=0
+ HAVE_MKL?=0
+ HAVE_ACCELERATE=0
+ HAVE_CUDA?=0
+@@ -80,6 +81,15 @@ ifeq ($(HAVE_OPENBLAS_CLAPACK), 1)
+ endif
+ endif
+
++ifeq ($(HAVE_OPENBLAS), 1)
++ CFLAGS += -I$(OPENBLAS_ROOT)/include
++ ifeq ($(USE_SHARED), 0)
++ LIBS += $(OPENBLAS_ROOT)/lib/libopenblas.a
++ else
++ LDFLAGS += -lopenblas -lgfortan
++ endif
++endif
++
+ ifeq ($(HAVE_MKL), 1)
+ CFLAGS += -DHAVE_MKL=1 -I$(MKL_ROOT)/include
+ LDFLAGS += -L$(MKL_ROOT)/lib/intel64 -Wl,-rpath=$(MKL_ROOT)/lib/intel64 -lmkl_rt -lmkl_intel_lp64 -lmkl_core -lmkl_sequential
+--
+2.38.3
+
diff --git a/srcpkgs/vosk-api/template b/srcpkgs/vosk-api/template
index 41d53e654042..72146431b138 100644
--- a/srcpkgs/vosk-api/template
+++ b/srcpkgs/vosk-api/template
@@ -9,8 +9,8 @@ build_wrksrc="vosk-api-${version}/src"
_kaldi_commit=93ef0019b847272a239fbb485ef97f29feb1d587
build_style=gnu-makefile
make_use_env=yes
-make_build_args="KALDI_ROOT=../../kaldi HAVE_OPENBLAS_NO_F2C=1 HAVE_OPENBLAS_CLAPACK=0"
-makedepends="blas-devel lapack-devel openblas-devel libgomp-devel openfst-devel"
+make_build_args="KALDI_ROOT=../../kaldi USE_SHARED=1 HAVE_OPENBLAS_NO_F2C=1 HAVE_OPENBLAS_CLAPACK=0"
+makedepends="libgfortran openblas-devel libgomp-devel openfst-devel"
short_desc="Offline speech recognition toolkit"
maintainer="John Gebbie <me@johngebbie.com>"
license="Apache-2.0"
@@ -41,7 +41,7 @@ post_extract() {
pre_build() {
cd "${wrksrc}/kaldi/src"
- ./configure ${CROSS_BUILD:+--host="${XBPS_CROSS_TRIPLET}"} --mathlib=OPENBLAS_NO_F2C --shared --use-cuda=no
+ ./configure ${CROSS_BUILD:+--host="${XBPS_CROSS_TRIPLET}"} --mathlib=OPENBLAS --shared --use-cuda=no
make online2 lm rnnlm
}
@@ -57,7 +57,7 @@ do_check() {
cd "${wrksrc}/vosk-api-${version}/c"
ln -sf "${wrksrc}/vosk-model-small-en-us-0.15" model
ln -sf ../python/example/test.wav .
- ldflags="-fopenmp -L../src -lvosk -ldl -lpthread -Wl,-rpath,../src"
+ ldflags="-fopenmp -L../src -lvosk -ldl -lpthread -lopenblas -lgfortran -Wl,-rpath,../src"
if [ "$XBPS_TARGET_LIBC" = musl ]; then
ldflags+=" -lexecinfo"
fi
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PR PATCH] [Updated] vosk-api: update to 0.3.45
2023-02-05 12:18 [PR PATCH] vosk-api: update to 0.3.45 JohnGebbie
` (11 preceding siblings ...)
2023-02-10 14:44 ` JohnGebbie
@ 2023-02-11 11:26 ` JohnGebbie
2023-02-11 13:51 ` JohnGebbie
` (4 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: JohnGebbie @ 2023-02-11 11:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1250 bytes --]
There is an updated pull request by JohnGebbie against master on the void-packages repository
https://github.com/JohnGebbie/void-packages vosk-api
https://github.com/void-linux/void-packages/pull/42091
vosk-api: update to 0.3.45
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/42091.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vosk-api-42091.patch --]
[-- Type: text/x-diff, Size: 10892 bytes --]
From 8fb3e9ca918ef335f78e2516441953915145c4a1 Mon Sep 17 00:00:00 2001
From: John Gebbie <me@johngebbie.com>
Date: Sun, 5 Feb 2023 12:10:37 +0000
Subject: [PATCH 1/2] vosk-api: update to 0.3.45.
---
common/shlibs | 2 +-
srcpkgs/vosk-api/template | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 59444164928b..bc77277ce8d1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4213,7 +4213,7 @@ libtracecmd.so.1 libtracecmd-3.1.2_1
libkshark.so.2 libkshark-2.1.1_1
libcpp-hocon.so.0.3.0 cpp-hocon-0.3.0_5
libfst.so.25 openfst-1.8.2_1
-libvosk.so vosk-api-0.3.43_1
+libvosk.so vosk-api-0.3.45_1
libdspy-1.so.1 d-spy-1.4.0_1
libpanel-1.so.1 libpanel-1.0.1_1
libqrtr.so.1 qrtr-ns-1.0_1
diff --git a/srcpkgs/vosk-api/template b/srcpkgs/vosk-api/template
index b86c74452b95..41d53e654042 100644
--- a/srcpkgs/vosk-api/template
+++ b/srcpkgs/vosk-api/template
@@ -1,12 +1,12 @@
# Template file for 'vosk-api'
pkgname=vosk-api
-version=0.3.43
+version=0.3.45
revision=1
create_wrksrc=yes
build_wrksrc="vosk-api-${version}/src"
# Vosk is built with their own vendored version of Kaldi which has no releases
# of its own, so the commit must be determined by the date of the vosk release.
-_kaldi_commit=ecb4b47159501ef0d67888633e65b8fc0c1f79d1
+_kaldi_commit=93ef0019b847272a239fbb485ef97f29feb1d587
build_style=gnu-makefile
make_use_env=yes
make_build_args="KALDI_ROOT=../../kaldi HAVE_OPENBLAS_NO_F2C=1 HAVE_OPENBLAS_CLAPACK=0"
@@ -18,8 +18,8 @@ homepage="https://alphacephei.com/vosk"
distfiles="https://github.com/alphacep/vosk-api/archive/v${version}/vosk-api-${version}.tar.gz
https://github.com/alphacep/kaldi/archive/${_kaldi_commit}.tar.gz
https://alphacephei.com/vosk/models/vosk-model-small-en-us-0.15.zip"
-checksum="50fa82bfbfe3fc5be868237c84ac180eb55da0b65b1803bf022899673afda024
- 39cadd5a351a5513e3e4e1f71ac4b4f018a592a856a55f1d32c159e22e799f64
+checksum="930fb9cfa6c1b3035d3730feee7d670fb893caa0c71bd2159ee7623102674c26
+ f47a996af546884a8e1cb961323b796c5c238c1bbeabaf657bb300b760e431b2
30f26242c4eb449f948e42cb302dd7a686cb29a3423a8367f99ff41780942498"
shlib_provides="libvosk.so"
patch_args="-Np1 -d ${pkgname}-${version}"
From 4f21e371b6065e429b9bf2be765b879bc7edd710 Mon Sep 17 00:00:00 2001
From: John Gebbie <me@johngebbie.com>
Date: Sat, 11 Feb 2023 11:25:46 +0000
Subject: [PATCH 2/2] vosk-api: use shared libs
---
srcpkgs/vosk-api/patches/kaldi-lapack.patch | 45 -------------
.../vosk-api/patches/kaldi-lapack.patch.args | 1 -
srcpkgs/vosk-api/patches/vosk-lapack.patch | 41 ------------
srcpkgs/vosk-api/patches/vosk-openblas.patch | 64 +++++++++++++++++++
srcpkgs/vosk-api/template | 8 +--
5 files changed, 68 insertions(+), 91 deletions(-)
delete mode 100644 srcpkgs/vosk-api/patches/kaldi-lapack.patch
delete mode 100644 srcpkgs/vosk-api/patches/kaldi-lapack.patch.args
delete mode 100644 srcpkgs/vosk-api/patches/vosk-lapack.patch
create mode 100644 srcpkgs/vosk-api/patches/vosk-openblas.patch
diff --git a/srcpkgs/vosk-api/patches/kaldi-lapack.patch b/srcpkgs/vosk-api/patches/kaldi-lapack.patch
deleted file mode 100644
index 9fdd3a11eb65..000000000000
--- a/srcpkgs/vosk-api/patches/kaldi-lapack.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-https://github.com/alphacep/kaldi/pull/5
-From 5f70761ecdf497cf55ca730187ab6ab38589ef0f Mon Sep 17 00:00:00 2001
-From: John Gebbie <me@johngebbie.com>
-Date: Sat, 3 Dec 2022 17:59:32 +0000
-Subject: [PATCH] Add OPENBLAS_NO_F2C math library option
-
----
- src/configure | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/src/configure b/src/configure
-index ed62daa5017..1d78489d55e 100755
---- a/src/configure
-+++ b/src/configure
-@@ -834,7 +834,7 @@ auto_lib= # Deduced lib name, used when $MATHLIB is not set.
-
- # Validate the (optionally) provided MATHLIB value.
- case $MATHLIB in
-- ''|ATLAS|CLAPACK|MKL|OPENBLAS|OPENBLAS_CLAPACK) : ;;
-+ ''|ATLAS|CLAPACK|MKL|OPENBLAS|OPENBLAS_CLAPACK|OPENBLAS_NO_F2C) : ;;
- *) failure "Unknown --mathlib='${MATHLIB}'. Supported libs: ATLAS CLAPACK MKL OPENBLAS" ;;
- esac
-
-@@ -1301,7 +1301,7 @@ or try another math library, e.g. --mathlib=OPENBLAS (Kaldi may be slower)."
- esac >> kaldi.mk
-
- echo "Successfully configured for Linux with OpenBLAS from $OPENBLASROOT"
-- elif [ "$MATHLIB" == "OPENBLAS_CLAPACK" ]; then
-+ elif [ "$MATHLIB" == "OPENBLAS_CLAPACK" ] || [ "$MATHLIB" == "OPENBLAS_NO_F2C" ]; then
- if [[ ! $OPENBLASROOT ]]; then
- # Either the user specified --mathlib=OPENBLAS or we've autodetected the
- # system where OpenBLAS is the preferred option (the parser for
-@@ -1345,7 +1345,11 @@ or try another math library, e.g. --mathlib=OPENBLAS (Kaldi may be slower)."
- OPENBLASINCDIR="/usr/include"
- fi
- echo "Your math library seems to be OpenBLAS from $OPENBLASROOT. Configuring appropriately."
-- OPENBLASLIBS="-L$OPENBLASLIBDIR -l:libopenblas.a -l:libblas.a -l:liblapack.a -l:libf2c.a"
-+ if [ "$MATHLIB" == "OPENBLAS_CLAPACK" ]; then
-+ OPENBLASLIBS="-L$OPENBLASLIBDIR -l:libopenblas.a -l:libblas.a -l:liblapack.a -l:libf2c.a"
-+ else
-+ OPENBLASLIBS="-L$OPENBLASLIBDIR -l:libopenblas.a -l:libblas.a -l:liblapack.a"
-+ fi
- echo "OPENBLASINC = $OPENBLASINCDIR" >> kaldi.mk
- echo "OPENBLASLIBS = $OPENBLASLIBS" >> kaldi.mk
- echo >> kaldi.mk
diff --git a/srcpkgs/vosk-api/patches/kaldi-lapack.patch.args b/srcpkgs/vosk-api/patches/kaldi-lapack.patch.args
deleted file mode 100644
index b5c52a09e494..000000000000
--- a/srcpkgs/vosk-api/patches/kaldi-lapack.patch.args
+++ /dev/null
@@ -1 +0,0 @@
--Np1 -d kaldi
diff --git a/srcpkgs/vosk-api/patches/vosk-lapack.patch b/srcpkgs/vosk-api/patches/vosk-lapack.patch
deleted file mode 100644
index 1b2fd6bd6c1d..000000000000
--- a/srcpkgs/vosk-api/patches/vosk-lapack.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-https://github.com/alphacep/vosk-api/pull/1215
-From 6c28207334bb1281d98a94f799757fdfa8f6b336 Mon Sep 17 00:00:00 2001
-From: John Gebbie <me@johngebbie.com>
-Date: Sat, 3 Dec 2022 17:53:21 +0000
-Subject: [PATCH] Add OPENBLAS_NO_F2C math library option
-
----
- src/Makefile | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff --git a/src/Makefile b/src/Makefile
-index cd697b15..97654883 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -7,6 +7,7 @@ CUDA_ROOT?=/usr/local/cuda
- USE_SHARED?=0
- # Math libraries
- HAVE_OPENBLAS_CLAPACK?=1
-+HAVE_OPENBLAS_NO_F2C?=0
- HAVE_MKL?=0
- HAVE_ACCELERATE=0
- HAVE_CUDA?=0
-@@ -80,6 +81,18 @@ ifeq ($(HAVE_OPENBLAS_CLAPACK), 1)
- endif
- endif
-
-+ifeq ($(HAVE_OPENBLAS_NO_F2C), 1)
-+ CFLAGS += -I$(OPENBLAS_ROOT)/include
-+ ifeq ($(USE_SHARED), 0)
-+ LIBS += \
-+ $(OPENBLAS_ROOT)/lib/libopenblas.a \
-+ $(OPENBLAS_ROOT)/lib/liblapack.a \
-+ $(OPENBLAS_ROOT)/lib/libblas.a
-+ else
-+ LDFLAGS += -lopenblas -llapack -lblas
-+ endif
-+endif
-+
- ifeq ($(HAVE_MKL), 1)
- CFLAGS += -DHAVE_MKL=1 -I$(MKL_ROOT)/include
- LDFLAGS += -L$(MKL_ROOT)/lib/intel64 -Wl,-rpath=$(MKL_ROOT)/lib/intel64 -lmkl_rt -lmkl_intel_lp64 -lmkl_core -lmkl_sequential
diff --git a/srcpkgs/vosk-api/patches/vosk-openblas.patch b/srcpkgs/vosk-api/patches/vosk-openblas.patch
new file mode 100644
index 000000000000..1755119444fd
--- /dev/null
+++ b/srcpkgs/vosk-api/patches/vosk-openblas.patch
@@ -0,0 +1,64 @@
+https://github.com/alphacep/vosk-api/pull/1268
+From 461e869b29df58b824292c5564b743619770e5fd Mon Sep 17 00:00:00 2001
+From: John Gebbie <me@johngebbie.com>
+Date: Thu, 9 Feb 2023 18:45:53 +0000
+Subject: [PATCH] Add OPENBLAS and USE_SHARED_MATH
+
+---
+ src/Makefile | 17 ++++++++++++++---
+ 1 file changed, 14 insertions(+), 3 deletions(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index cd697b1..56cb306 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -4,9 +4,11 @@ OPENFST_ROOT?=$(KALDI_ROOT)/tools/openfst
+ OPENBLAS_ROOT?=$(KALDI_ROOT)/tools/OpenBLAS/install
+ MKL_ROOT?=/opt/intel/mkl
+ CUDA_ROOT?=/usr/local/cuda
+-USE_SHARED?=0
++USE_SHARED_KALDI?=0
++USE_SHARED_MATH?=0
+ # Math libraries
+ HAVE_OPENBLAS_CLAPACK?=1
++HAVE_OPENBLAS?=0
+ HAVE_MKL?=0
+ HAVE_ACCELERATE=0
+ HAVE_CUDA?=0
+@@ -37,7 +39,7 @@ CFLAGS=-g -O3 -std=c++17 -Wno-deprecated-declarations -fPIC -DFST_NO_DYNAMIC_LIN
+
+ LDFLAGS=
+
+-ifeq ($(USE_SHARED), 0)
++ifeq ($(USE_SHARED_KALDI), 0)
+ LIBS = \
+ $(KALDI_ROOT)/src/online2/kaldi-online2.a \
+ $(KALDI_ROOT)/src/decoder/kaldi-decoder.a \
+@@ -69,7 +71,7 @@ endif
+
+ ifeq ($(HAVE_OPENBLAS_CLAPACK), 1)
+ CFLAGS += -I$(OPENBLAS_ROOT)/include
+- ifeq ($(USE_SHARED), 0)
++ ifeq ($(USE_SHARED_MATH), 0)
+ LIBS += \
+ $(OPENBLAS_ROOT)/lib/libopenblas.a \
+ $(OPENBLAS_ROOT)/lib/liblapack.a \
+@@ -80,6 +82,15 @@ ifeq ($(HAVE_OPENBLAS_CLAPACK), 1)
+ endif
+ endif
+
++ifeq ($(HAVE_OPENBLAS), 1)
++ CFLAGS += -I$(OPENBLAS_ROOT)/include
++ ifeq ($(USE_SHARED_MATH), 0)
++ LIBS += $(OPENBLAS_ROOT)/lib/libopenblas.a
++ else
++ LDFLAGS += -lopenblas -lgfortran
++ endif
++endif
++
+ ifeq ($(HAVE_MKL), 1)
+ CFLAGS += -DHAVE_MKL=1 -I$(MKL_ROOT)/include
+ LDFLAGS += -L$(MKL_ROOT)/lib/intel64 -Wl,-rpath=$(MKL_ROOT)/lib/intel64 -lmkl_rt -lmkl_intel_lp64 -lmkl_core -lmkl_sequential
+--
+2.38.3
+
diff --git a/srcpkgs/vosk-api/template b/srcpkgs/vosk-api/template
index 41d53e654042..9f1cc0ce0403 100644
--- a/srcpkgs/vosk-api/template
+++ b/srcpkgs/vosk-api/template
@@ -9,8 +9,8 @@ build_wrksrc="vosk-api-${version}/src"
_kaldi_commit=93ef0019b847272a239fbb485ef97f29feb1d587
build_style=gnu-makefile
make_use_env=yes
-make_build_args="KALDI_ROOT=../../kaldi HAVE_OPENBLAS_NO_F2C=1 HAVE_OPENBLAS_CLAPACK=0"
-makedepends="blas-devel lapack-devel openblas-devel libgomp-devel openfst-devel"
+make_build_args="KALDI_ROOT=../../kaldi USE_SHARED_MATH=1 HAVE_OPENBLAS=1 HAVE_OPENBLAS_CLAPACK=0"
+makedepends="libgfortran openblas-devel libgomp-devel openfst"
short_desc="Offline speech recognition toolkit"
maintainer="John Gebbie <me@johngebbie.com>"
license="Apache-2.0"
@@ -41,7 +41,7 @@ post_extract() {
pre_build() {
cd "${wrksrc}/kaldi/src"
- ./configure ${CROSS_BUILD:+--host="${XBPS_CROSS_TRIPLET}"} --mathlib=OPENBLAS_NO_F2C --shared --use-cuda=no
+ ./configure ${CROSS_BUILD:+--host="${XBPS_CROSS_TRIPLET}"} --mathlib=OPENBLAS --shared --use-cuda=no
make online2 lm rnnlm
}
@@ -57,7 +57,7 @@ do_check() {
cd "${wrksrc}/vosk-api-${version}/c"
ln -sf "${wrksrc}/vosk-model-small-en-us-0.15" model
ln -sf ../python/example/test.wav .
- ldflags="-fopenmp -L../src -lvosk -ldl -lpthread -Wl,-rpath,../src"
+ ldflags="-fopenmp -L../src -lvosk -ldl -lpthread -lopenblas -lgfortran -Wl,-rpath,../src"
if [ "$XBPS_TARGET_LIBC" = musl ]; then
ldflags+=" -lexecinfo"
fi
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PR PATCH] [Updated] vosk-api: update to 0.3.45
2023-02-05 12:18 [PR PATCH] vosk-api: update to 0.3.45 JohnGebbie
` (12 preceding siblings ...)
2023-02-11 11:26 ` JohnGebbie
@ 2023-02-11 13:51 ` JohnGebbie
2023-02-11 15:02 ` JohnGebbie
` (3 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: JohnGebbie @ 2023-02-11 13:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1250 bytes --]
There is an updated pull request by JohnGebbie against master on the void-packages repository
https://github.com/JohnGebbie/void-packages vosk-api
https://github.com/void-linux/void-packages/pull/42091
vosk-api: update to 0.3.45
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/42091.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vosk-api-42091.patch --]
[-- Type: text/x-diff, Size: 11878 bytes --]
From 8fb3e9ca918ef335f78e2516441953915145c4a1 Mon Sep 17 00:00:00 2001
From: John Gebbie <me@johngebbie.com>
Date: Sun, 5 Feb 2023 12:10:37 +0000
Subject: [PATCH 1/2] vosk-api: update to 0.3.45.
---
common/shlibs | 2 +-
srcpkgs/vosk-api/template | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 59444164928b..bc77277ce8d1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4213,7 +4213,7 @@ libtracecmd.so.1 libtracecmd-3.1.2_1
libkshark.so.2 libkshark-2.1.1_1
libcpp-hocon.so.0.3.0 cpp-hocon-0.3.0_5
libfst.so.25 openfst-1.8.2_1
-libvosk.so vosk-api-0.3.43_1
+libvosk.so vosk-api-0.3.45_1
libdspy-1.so.1 d-spy-1.4.0_1
libpanel-1.so.1 libpanel-1.0.1_1
libqrtr.so.1 qrtr-ns-1.0_1
diff --git a/srcpkgs/vosk-api/template b/srcpkgs/vosk-api/template
index b86c74452b95..41d53e654042 100644
--- a/srcpkgs/vosk-api/template
+++ b/srcpkgs/vosk-api/template
@@ -1,12 +1,12 @@
# Template file for 'vosk-api'
pkgname=vosk-api
-version=0.3.43
+version=0.3.45
revision=1
create_wrksrc=yes
build_wrksrc="vosk-api-${version}/src"
# Vosk is built with their own vendored version of Kaldi which has no releases
# of its own, so the commit must be determined by the date of the vosk release.
-_kaldi_commit=ecb4b47159501ef0d67888633e65b8fc0c1f79d1
+_kaldi_commit=93ef0019b847272a239fbb485ef97f29feb1d587
build_style=gnu-makefile
make_use_env=yes
make_build_args="KALDI_ROOT=../../kaldi HAVE_OPENBLAS_NO_F2C=1 HAVE_OPENBLAS_CLAPACK=0"
@@ -18,8 +18,8 @@ homepage="https://alphacephei.com/vosk"
distfiles="https://github.com/alphacep/vosk-api/archive/v${version}/vosk-api-${version}.tar.gz
https://github.com/alphacep/kaldi/archive/${_kaldi_commit}.tar.gz
https://alphacephei.com/vosk/models/vosk-model-small-en-us-0.15.zip"
-checksum="50fa82bfbfe3fc5be868237c84ac180eb55da0b65b1803bf022899673afda024
- 39cadd5a351a5513e3e4e1f71ac4b4f018a592a856a55f1d32c159e22e799f64
+checksum="930fb9cfa6c1b3035d3730feee7d670fb893caa0c71bd2159ee7623102674c26
+ f47a996af546884a8e1cb961323b796c5c238c1bbeabaf657bb300b760e431b2
30f26242c4eb449f948e42cb302dd7a686cb29a3423a8367f99ff41780942498"
shlib_provides="libvosk.so"
patch_args="-Np1 -d ${pkgname}-${version}"
From 5b268ee7074586c084b9fd390f29af52c2a874d5 Mon Sep 17 00:00:00 2001
From: John Gebbie <me@johngebbie.com>
Date: Sat, 11 Feb 2023 13:51:30 +0000
Subject: [PATCH 2/2] vosk-api: use shared libs
---
srcpkgs/vosk-api/patches/kaldi-lapack.patch | 45 -------------
.../vosk-api/patches/kaldi-lapack.patch.args | 1 -
srcpkgs/vosk-api/patches/vosk-lapack.patch | 41 ------------
srcpkgs/vosk-api/patches/vosk-openblas.patch | 64 +++++++++++++++++++
.../patches/vosk-shared-openfst.patch | 17 +++++
srcpkgs/vosk-api/template | 8 +--
6 files changed, 85 insertions(+), 91 deletions(-)
delete mode 100644 srcpkgs/vosk-api/patches/kaldi-lapack.patch
delete mode 100644 srcpkgs/vosk-api/patches/kaldi-lapack.patch.args
delete mode 100644 srcpkgs/vosk-api/patches/vosk-lapack.patch
create mode 100644 srcpkgs/vosk-api/patches/vosk-openblas.patch
create mode 100644 srcpkgs/vosk-api/patches/vosk-shared-openfst.patch
diff --git a/srcpkgs/vosk-api/patches/kaldi-lapack.patch b/srcpkgs/vosk-api/patches/kaldi-lapack.patch
deleted file mode 100644
index 9fdd3a11eb65..000000000000
--- a/srcpkgs/vosk-api/patches/kaldi-lapack.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-https://github.com/alphacep/kaldi/pull/5
-From 5f70761ecdf497cf55ca730187ab6ab38589ef0f Mon Sep 17 00:00:00 2001
-From: John Gebbie <me@johngebbie.com>
-Date: Sat, 3 Dec 2022 17:59:32 +0000
-Subject: [PATCH] Add OPENBLAS_NO_F2C math library option
-
----
- src/configure | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/src/configure b/src/configure
-index ed62daa5017..1d78489d55e 100755
---- a/src/configure
-+++ b/src/configure
-@@ -834,7 +834,7 @@ auto_lib= # Deduced lib name, used when $MATHLIB is not set.
-
- # Validate the (optionally) provided MATHLIB value.
- case $MATHLIB in
-- ''|ATLAS|CLAPACK|MKL|OPENBLAS|OPENBLAS_CLAPACK) : ;;
-+ ''|ATLAS|CLAPACK|MKL|OPENBLAS|OPENBLAS_CLAPACK|OPENBLAS_NO_F2C) : ;;
- *) failure "Unknown --mathlib='${MATHLIB}'. Supported libs: ATLAS CLAPACK MKL OPENBLAS" ;;
- esac
-
-@@ -1301,7 +1301,7 @@ or try another math library, e.g. --mathlib=OPENBLAS (Kaldi may be slower)."
- esac >> kaldi.mk
-
- echo "Successfully configured for Linux with OpenBLAS from $OPENBLASROOT"
-- elif [ "$MATHLIB" == "OPENBLAS_CLAPACK" ]; then
-+ elif [ "$MATHLIB" == "OPENBLAS_CLAPACK" ] || [ "$MATHLIB" == "OPENBLAS_NO_F2C" ]; then
- if [[ ! $OPENBLASROOT ]]; then
- # Either the user specified --mathlib=OPENBLAS or we've autodetected the
- # system where OpenBLAS is the preferred option (the parser for
-@@ -1345,7 +1345,11 @@ or try another math library, e.g. --mathlib=OPENBLAS (Kaldi may be slower)."
- OPENBLASINCDIR="/usr/include"
- fi
- echo "Your math library seems to be OpenBLAS from $OPENBLASROOT. Configuring appropriately."
-- OPENBLASLIBS="-L$OPENBLASLIBDIR -l:libopenblas.a -l:libblas.a -l:liblapack.a -l:libf2c.a"
-+ if [ "$MATHLIB" == "OPENBLAS_CLAPACK" ]; then
-+ OPENBLASLIBS="-L$OPENBLASLIBDIR -l:libopenblas.a -l:libblas.a -l:liblapack.a -l:libf2c.a"
-+ else
-+ OPENBLASLIBS="-L$OPENBLASLIBDIR -l:libopenblas.a -l:libblas.a -l:liblapack.a"
-+ fi
- echo "OPENBLASINC = $OPENBLASINCDIR" >> kaldi.mk
- echo "OPENBLASLIBS = $OPENBLASLIBS" >> kaldi.mk
- echo >> kaldi.mk
diff --git a/srcpkgs/vosk-api/patches/kaldi-lapack.patch.args b/srcpkgs/vosk-api/patches/kaldi-lapack.patch.args
deleted file mode 100644
index b5c52a09e494..000000000000
--- a/srcpkgs/vosk-api/patches/kaldi-lapack.patch.args
+++ /dev/null
@@ -1 +0,0 @@
--Np1 -d kaldi
diff --git a/srcpkgs/vosk-api/patches/vosk-lapack.patch b/srcpkgs/vosk-api/patches/vosk-lapack.patch
deleted file mode 100644
index 1b2fd6bd6c1d..000000000000
--- a/srcpkgs/vosk-api/patches/vosk-lapack.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-https://github.com/alphacep/vosk-api/pull/1215
-From 6c28207334bb1281d98a94f799757fdfa8f6b336 Mon Sep 17 00:00:00 2001
-From: John Gebbie <me@johngebbie.com>
-Date: Sat, 3 Dec 2022 17:53:21 +0000
-Subject: [PATCH] Add OPENBLAS_NO_F2C math library option
-
----
- src/Makefile | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff --git a/src/Makefile b/src/Makefile
-index cd697b15..97654883 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -7,6 +7,7 @@ CUDA_ROOT?=/usr/local/cuda
- USE_SHARED?=0
- # Math libraries
- HAVE_OPENBLAS_CLAPACK?=1
-+HAVE_OPENBLAS_NO_F2C?=0
- HAVE_MKL?=0
- HAVE_ACCELERATE=0
- HAVE_CUDA?=0
-@@ -80,6 +81,18 @@ ifeq ($(HAVE_OPENBLAS_CLAPACK), 1)
- endif
- endif
-
-+ifeq ($(HAVE_OPENBLAS_NO_F2C), 1)
-+ CFLAGS += -I$(OPENBLAS_ROOT)/include
-+ ifeq ($(USE_SHARED), 0)
-+ LIBS += \
-+ $(OPENBLAS_ROOT)/lib/libopenblas.a \
-+ $(OPENBLAS_ROOT)/lib/liblapack.a \
-+ $(OPENBLAS_ROOT)/lib/libblas.a
-+ else
-+ LDFLAGS += -lopenblas -llapack -lblas
-+ endif
-+endif
-+
- ifeq ($(HAVE_MKL), 1)
- CFLAGS += -DHAVE_MKL=1 -I$(MKL_ROOT)/include
- LDFLAGS += -L$(MKL_ROOT)/lib/intel64 -Wl,-rpath=$(MKL_ROOT)/lib/intel64 -lmkl_rt -lmkl_intel_lp64 -lmkl_core -lmkl_sequential
diff --git a/srcpkgs/vosk-api/patches/vosk-openblas.patch b/srcpkgs/vosk-api/patches/vosk-openblas.patch
new file mode 100644
index 000000000000..1755119444fd
--- /dev/null
+++ b/srcpkgs/vosk-api/patches/vosk-openblas.patch
@@ -0,0 +1,64 @@
+https://github.com/alphacep/vosk-api/pull/1268
+From 461e869b29df58b824292c5564b743619770e5fd Mon Sep 17 00:00:00 2001
+From: John Gebbie <me@johngebbie.com>
+Date: Thu, 9 Feb 2023 18:45:53 +0000
+Subject: [PATCH] Add OPENBLAS and USE_SHARED_MATH
+
+---
+ src/Makefile | 17 ++++++++++++++---
+ 1 file changed, 14 insertions(+), 3 deletions(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index cd697b1..56cb306 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -4,9 +4,11 @@ OPENFST_ROOT?=$(KALDI_ROOT)/tools/openfst
+ OPENBLAS_ROOT?=$(KALDI_ROOT)/tools/OpenBLAS/install
+ MKL_ROOT?=/opt/intel/mkl
+ CUDA_ROOT?=/usr/local/cuda
+-USE_SHARED?=0
++USE_SHARED_KALDI?=0
++USE_SHARED_MATH?=0
+ # Math libraries
+ HAVE_OPENBLAS_CLAPACK?=1
++HAVE_OPENBLAS?=0
+ HAVE_MKL?=0
+ HAVE_ACCELERATE=0
+ HAVE_CUDA?=0
+@@ -37,7 +39,7 @@ CFLAGS=-g -O3 -std=c++17 -Wno-deprecated-declarations -fPIC -DFST_NO_DYNAMIC_LIN
+
+ LDFLAGS=
+
+-ifeq ($(USE_SHARED), 0)
++ifeq ($(USE_SHARED_KALDI), 0)
+ LIBS = \
+ $(KALDI_ROOT)/src/online2/kaldi-online2.a \
+ $(KALDI_ROOT)/src/decoder/kaldi-decoder.a \
+@@ -69,7 +71,7 @@ endif
+
+ ifeq ($(HAVE_OPENBLAS_CLAPACK), 1)
+ CFLAGS += -I$(OPENBLAS_ROOT)/include
+- ifeq ($(USE_SHARED), 0)
++ ifeq ($(USE_SHARED_MATH), 0)
+ LIBS += \
+ $(OPENBLAS_ROOT)/lib/libopenblas.a \
+ $(OPENBLAS_ROOT)/lib/liblapack.a \
+@@ -80,6 +82,15 @@ ifeq ($(HAVE_OPENBLAS_CLAPACK), 1)
+ endif
+ endif
+
++ifeq ($(HAVE_OPENBLAS), 1)
++ CFLAGS += -I$(OPENBLAS_ROOT)/include
++ ifeq ($(USE_SHARED_MATH), 0)
++ LIBS += $(OPENBLAS_ROOT)/lib/libopenblas.a
++ else
++ LDFLAGS += -lopenblas -lgfortran
++ endif
++endif
++
+ ifeq ($(HAVE_MKL), 1)
+ CFLAGS += -DHAVE_MKL=1 -I$(MKL_ROOT)/include
+ LDFLAGS += -L$(MKL_ROOT)/lib/intel64 -Wl,-rpath=$(MKL_ROOT)/lib/intel64 -lmkl_rt -lmkl_intel_lp64 -lmkl_core -lmkl_sequential
+--
+2.38.3
+
diff --git a/srcpkgs/vosk-api/patches/vosk-shared-openfst.patch b/srcpkgs/vosk-api/patches/vosk-shared-openfst.patch
new file mode 100644
index 000000000000..3af12f84062a
--- /dev/null
+++ b/srcpkgs/vosk-api/patches/vosk-shared-openfst.patch
@@ -0,0 +1,17 @@
+diff --git a/src/Makefile b/src/Makefile
+index cd697b1..cfa9714 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -55,9 +55,9 @@ ifeq ($(USE_SHARED), 0)
+ $(KALDI_ROOT)/src/matrix/kaldi-matrix.a \
+ $(KALDI_ROOT)/src/fstext/kaldi-fstext.a \
+ $(KALDI_ROOT)/src/util/kaldi-util.a \
+- $(KALDI_ROOT)/src/base/kaldi-base.a \
+- $(OPENFST_ROOT)/lib/libfst.a \
+- $(OPENFST_ROOT)/lib/libfstngram.a
++ $(KALDI_ROOT)/src/base/kaldi-base.a
++ LDFLAGS += \
++ -lfst -lfstngram
+ else
+ LDFLAGS += \
+ -L$(KALDI_ROOT)/libs \
diff --git a/srcpkgs/vosk-api/template b/srcpkgs/vosk-api/template
index 41d53e654042..428235a09ebb 100644
--- a/srcpkgs/vosk-api/template
+++ b/srcpkgs/vosk-api/template
@@ -9,8 +9,8 @@ build_wrksrc="vosk-api-${version}/src"
_kaldi_commit=93ef0019b847272a239fbb485ef97f29feb1d587
build_style=gnu-makefile
make_use_env=yes
-make_build_args="KALDI_ROOT=../../kaldi HAVE_OPENBLAS_NO_F2C=1 HAVE_OPENBLAS_CLAPACK=0"
-makedepends="blas-devel lapack-devel openblas-devel libgomp-devel openfst-devel"
+make_build_args="KALDI_ROOT=../../kaldi USE_SHARED_MATH=1 HAVE_OPENBLAS=1 HAVE_OPENBLAS_CLAPACK=0"
+makedepends="libgfortran openblas-devel libgomp-devel openfst-devel"
short_desc="Offline speech recognition toolkit"
maintainer="John Gebbie <me@johngebbie.com>"
license="Apache-2.0"
@@ -41,7 +41,7 @@ post_extract() {
pre_build() {
cd "${wrksrc}/kaldi/src"
- ./configure ${CROSS_BUILD:+--host="${XBPS_CROSS_TRIPLET}"} --mathlib=OPENBLAS_NO_F2C --shared --use-cuda=no
+ ./configure ${CROSS_BUILD:+--host="${XBPS_CROSS_TRIPLET}"} --mathlib=OPENBLAS --shared --use-cuda=no
make online2 lm rnnlm
}
@@ -57,7 +57,7 @@ do_check() {
cd "${wrksrc}/vosk-api-${version}/c"
ln -sf "${wrksrc}/vosk-model-small-en-us-0.15" model
ln -sf ../python/example/test.wav .
- ldflags="-fopenmp -L../src -lvosk -ldl -lpthread -Wl,-rpath,../src"
+ ldflags="-fopenmp -L../src -lvosk -ldl -lpthread -lopenblas -lgfortran -Wl,-rpath,../src"
if [ "$XBPS_TARGET_LIBC" = musl ]; then
ldflags+=" -lexecinfo"
fi
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PR PATCH] [Updated] vosk-api: update to 0.3.45
2023-02-05 12:18 [PR PATCH] vosk-api: update to 0.3.45 JohnGebbie
` (13 preceding siblings ...)
2023-02-11 13:51 ` JohnGebbie
@ 2023-02-11 15:02 ` JohnGebbie
2023-02-11 16:05 ` JohnGebbie
` (2 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: JohnGebbie @ 2023-02-11 15:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1250 bytes --]
There is an updated pull request by JohnGebbie against master on the void-packages repository
https://github.com/JohnGebbie/void-packages vosk-api
https://github.com/void-linux/void-packages/pull/42091
vosk-api: update to 0.3.45
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/42091.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vosk-api-42091.patch --]
[-- Type: text/x-diff, Size: 10898 bytes --]
From 8fb3e9ca918ef335f78e2516441953915145c4a1 Mon Sep 17 00:00:00 2001
From: John Gebbie <me@johngebbie.com>
Date: Sun, 5 Feb 2023 12:10:37 +0000
Subject: [PATCH 1/2] vosk-api: update to 0.3.45.
---
common/shlibs | 2 +-
srcpkgs/vosk-api/template | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 59444164928b..bc77277ce8d1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4213,7 +4213,7 @@ libtracecmd.so.1 libtracecmd-3.1.2_1
libkshark.so.2 libkshark-2.1.1_1
libcpp-hocon.so.0.3.0 cpp-hocon-0.3.0_5
libfst.so.25 openfst-1.8.2_1
-libvosk.so vosk-api-0.3.43_1
+libvosk.so vosk-api-0.3.45_1
libdspy-1.so.1 d-spy-1.4.0_1
libpanel-1.so.1 libpanel-1.0.1_1
libqrtr.so.1 qrtr-ns-1.0_1
diff --git a/srcpkgs/vosk-api/template b/srcpkgs/vosk-api/template
index b86c74452b95..41d53e654042 100644
--- a/srcpkgs/vosk-api/template
+++ b/srcpkgs/vosk-api/template
@@ -1,12 +1,12 @@
# Template file for 'vosk-api'
pkgname=vosk-api
-version=0.3.43
+version=0.3.45
revision=1
create_wrksrc=yes
build_wrksrc="vosk-api-${version}/src"
# Vosk is built with their own vendored version of Kaldi which has no releases
# of its own, so the commit must be determined by the date of the vosk release.
-_kaldi_commit=ecb4b47159501ef0d67888633e65b8fc0c1f79d1
+_kaldi_commit=93ef0019b847272a239fbb485ef97f29feb1d587
build_style=gnu-makefile
make_use_env=yes
make_build_args="KALDI_ROOT=../../kaldi HAVE_OPENBLAS_NO_F2C=1 HAVE_OPENBLAS_CLAPACK=0"
@@ -18,8 +18,8 @@ homepage="https://alphacephei.com/vosk"
distfiles="https://github.com/alphacep/vosk-api/archive/v${version}/vosk-api-${version}.tar.gz
https://github.com/alphacep/kaldi/archive/${_kaldi_commit}.tar.gz
https://alphacephei.com/vosk/models/vosk-model-small-en-us-0.15.zip"
-checksum="50fa82bfbfe3fc5be868237c84ac180eb55da0b65b1803bf022899673afda024
- 39cadd5a351a5513e3e4e1f71ac4b4f018a592a856a55f1d32c159e22e799f64
+checksum="930fb9cfa6c1b3035d3730feee7d670fb893caa0c71bd2159ee7623102674c26
+ f47a996af546884a8e1cb961323b796c5c238c1bbeabaf657bb300b760e431b2
30f26242c4eb449f948e42cb302dd7a686cb29a3423a8367f99ff41780942498"
shlib_provides="libvosk.so"
patch_args="-Np1 -d ${pkgname}-${version}"
From ad4bd55fa4d9152d97a2e38f29e5a581366d90bf Mon Sep 17 00:00:00 2001
From: John Gebbie <me@johngebbie.com>
Date: Sat, 11 Feb 2023 15:02:39 +0000
Subject: [PATCH 2/2] vosk-api: use shared libs
---
srcpkgs/vosk-api/patches/kaldi-lapack.patch | 45 -------------
.../vosk-api/patches/kaldi-lapack.patch.args | 1 -
srcpkgs/vosk-api/patches/vosk-lapack.patch | 41 ------------
srcpkgs/vosk-api/patches/vosk-openblas.patch | 64 +++++++++++++++++++
srcpkgs/vosk-api/template | 8 +--
5 files changed, 68 insertions(+), 91 deletions(-)
delete mode 100644 srcpkgs/vosk-api/patches/kaldi-lapack.patch
delete mode 100644 srcpkgs/vosk-api/patches/kaldi-lapack.patch.args
delete mode 100644 srcpkgs/vosk-api/patches/vosk-lapack.patch
create mode 100644 srcpkgs/vosk-api/patches/vosk-openblas.patch
diff --git a/srcpkgs/vosk-api/patches/kaldi-lapack.patch b/srcpkgs/vosk-api/patches/kaldi-lapack.patch
deleted file mode 100644
index 9fdd3a11eb65..000000000000
--- a/srcpkgs/vosk-api/patches/kaldi-lapack.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-https://github.com/alphacep/kaldi/pull/5
-From 5f70761ecdf497cf55ca730187ab6ab38589ef0f Mon Sep 17 00:00:00 2001
-From: John Gebbie <me@johngebbie.com>
-Date: Sat, 3 Dec 2022 17:59:32 +0000
-Subject: [PATCH] Add OPENBLAS_NO_F2C math library option
-
----
- src/configure | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/src/configure b/src/configure
-index ed62daa5017..1d78489d55e 100755
---- a/src/configure
-+++ b/src/configure
-@@ -834,7 +834,7 @@ auto_lib= # Deduced lib name, used when $MATHLIB is not set.
-
- # Validate the (optionally) provided MATHLIB value.
- case $MATHLIB in
-- ''|ATLAS|CLAPACK|MKL|OPENBLAS|OPENBLAS_CLAPACK) : ;;
-+ ''|ATLAS|CLAPACK|MKL|OPENBLAS|OPENBLAS_CLAPACK|OPENBLAS_NO_F2C) : ;;
- *) failure "Unknown --mathlib='${MATHLIB}'. Supported libs: ATLAS CLAPACK MKL OPENBLAS" ;;
- esac
-
-@@ -1301,7 +1301,7 @@ or try another math library, e.g. --mathlib=OPENBLAS (Kaldi may be slower)."
- esac >> kaldi.mk
-
- echo "Successfully configured for Linux with OpenBLAS from $OPENBLASROOT"
-- elif [ "$MATHLIB" == "OPENBLAS_CLAPACK" ]; then
-+ elif [ "$MATHLIB" == "OPENBLAS_CLAPACK" ] || [ "$MATHLIB" == "OPENBLAS_NO_F2C" ]; then
- if [[ ! $OPENBLASROOT ]]; then
- # Either the user specified --mathlib=OPENBLAS or we've autodetected the
- # system where OpenBLAS is the preferred option (the parser for
-@@ -1345,7 +1345,11 @@ or try another math library, e.g. --mathlib=OPENBLAS (Kaldi may be slower)."
- OPENBLASINCDIR="/usr/include"
- fi
- echo "Your math library seems to be OpenBLAS from $OPENBLASROOT. Configuring appropriately."
-- OPENBLASLIBS="-L$OPENBLASLIBDIR -l:libopenblas.a -l:libblas.a -l:liblapack.a -l:libf2c.a"
-+ if [ "$MATHLIB" == "OPENBLAS_CLAPACK" ]; then
-+ OPENBLASLIBS="-L$OPENBLASLIBDIR -l:libopenblas.a -l:libblas.a -l:liblapack.a -l:libf2c.a"
-+ else
-+ OPENBLASLIBS="-L$OPENBLASLIBDIR -l:libopenblas.a -l:libblas.a -l:liblapack.a"
-+ fi
- echo "OPENBLASINC = $OPENBLASINCDIR" >> kaldi.mk
- echo "OPENBLASLIBS = $OPENBLASLIBS" >> kaldi.mk
- echo >> kaldi.mk
diff --git a/srcpkgs/vosk-api/patches/kaldi-lapack.patch.args b/srcpkgs/vosk-api/patches/kaldi-lapack.patch.args
deleted file mode 100644
index b5c52a09e494..000000000000
--- a/srcpkgs/vosk-api/patches/kaldi-lapack.patch.args
+++ /dev/null
@@ -1 +0,0 @@
--Np1 -d kaldi
diff --git a/srcpkgs/vosk-api/patches/vosk-lapack.patch b/srcpkgs/vosk-api/patches/vosk-lapack.patch
deleted file mode 100644
index 1b2fd6bd6c1d..000000000000
--- a/srcpkgs/vosk-api/patches/vosk-lapack.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-https://github.com/alphacep/vosk-api/pull/1215
-From 6c28207334bb1281d98a94f799757fdfa8f6b336 Mon Sep 17 00:00:00 2001
-From: John Gebbie <me@johngebbie.com>
-Date: Sat, 3 Dec 2022 17:53:21 +0000
-Subject: [PATCH] Add OPENBLAS_NO_F2C math library option
-
----
- src/Makefile | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff --git a/src/Makefile b/src/Makefile
-index cd697b15..97654883 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -7,6 +7,7 @@ CUDA_ROOT?=/usr/local/cuda
- USE_SHARED?=0
- # Math libraries
- HAVE_OPENBLAS_CLAPACK?=1
-+HAVE_OPENBLAS_NO_F2C?=0
- HAVE_MKL?=0
- HAVE_ACCELERATE=0
- HAVE_CUDA?=0
-@@ -80,6 +81,18 @@ ifeq ($(HAVE_OPENBLAS_CLAPACK), 1)
- endif
- endif
-
-+ifeq ($(HAVE_OPENBLAS_NO_F2C), 1)
-+ CFLAGS += -I$(OPENBLAS_ROOT)/include
-+ ifeq ($(USE_SHARED), 0)
-+ LIBS += \
-+ $(OPENBLAS_ROOT)/lib/libopenblas.a \
-+ $(OPENBLAS_ROOT)/lib/liblapack.a \
-+ $(OPENBLAS_ROOT)/lib/libblas.a
-+ else
-+ LDFLAGS += -lopenblas -llapack -lblas
-+ endif
-+endif
-+
- ifeq ($(HAVE_MKL), 1)
- CFLAGS += -DHAVE_MKL=1 -I$(MKL_ROOT)/include
- LDFLAGS += -L$(MKL_ROOT)/lib/intel64 -Wl,-rpath=$(MKL_ROOT)/lib/intel64 -lmkl_rt -lmkl_intel_lp64 -lmkl_core -lmkl_sequential
diff --git a/srcpkgs/vosk-api/patches/vosk-openblas.patch b/srcpkgs/vosk-api/patches/vosk-openblas.patch
new file mode 100644
index 000000000000..1755119444fd
--- /dev/null
+++ b/srcpkgs/vosk-api/patches/vosk-openblas.patch
@@ -0,0 +1,64 @@
+https://github.com/alphacep/vosk-api/pull/1268
+From 461e869b29df58b824292c5564b743619770e5fd Mon Sep 17 00:00:00 2001
+From: John Gebbie <me@johngebbie.com>
+Date: Thu, 9 Feb 2023 18:45:53 +0000
+Subject: [PATCH] Add OPENBLAS and USE_SHARED_MATH
+
+---
+ src/Makefile | 17 ++++++++++++++---
+ 1 file changed, 14 insertions(+), 3 deletions(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index cd697b1..56cb306 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -4,9 +4,11 @@ OPENFST_ROOT?=$(KALDI_ROOT)/tools/openfst
+ OPENBLAS_ROOT?=$(KALDI_ROOT)/tools/OpenBLAS/install
+ MKL_ROOT?=/opt/intel/mkl
+ CUDA_ROOT?=/usr/local/cuda
+-USE_SHARED?=0
++USE_SHARED_KALDI?=0
++USE_SHARED_MATH?=0
+ # Math libraries
+ HAVE_OPENBLAS_CLAPACK?=1
++HAVE_OPENBLAS?=0
+ HAVE_MKL?=0
+ HAVE_ACCELERATE=0
+ HAVE_CUDA?=0
+@@ -37,7 +39,7 @@ CFLAGS=-g -O3 -std=c++17 -Wno-deprecated-declarations -fPIC -DFST_NO_DYNAMIC_LIN
+
+ LDFLAGS=
+
+-ifeq ($(USE_SHARED), 0)
++ifeq ($(USE_SHARED_KALDI), 0)
+ LIBS = \
+ $(KALDI_ROOT)/src/online2/kaldi-online2.a \
+ $(KALDI_ROOT)/src/decoder/kaldi-decoder.a \
+@@ -69,7 +71,7 @@ endif
+
+ ifeq ($(HAVE_OPENBLAS_CLAPACK), 1)
+ CFLAGS += -I$(OPENBLAS_ROOT)/include
+- ifeq ($(USE_SHARED), 0)
++ ifeq ($(USE_SHARED_MATH), 0)
+ LIBS += \
+ $(OPENBLAS_ROOT)/lib/libopenblas.a \
+ $(OPENBLAS_ROOT)/lib/liblapack.a \
+@@ -80,6 +82,15 @@ ifeq ($(HAVE_OPENBLAS_CLAPACK), 1)
+ endif
+ endif
+
++ifeq ($(HAVE_OPENBLAS), 1)
++ CFLAGS += -I$(OPENBLAS_ROOT)/include
++ ifeq ($(USE_SHARED_MATH), 0)
++ LIBS += $(OPENBLAS_ROOT)/lib/libopenblas.a
++ else
++ LDFLAGS += -lopenblas -lgfortran
++ endif
++endif
++
+ ifeq ($(HAVE_MKL), 1)
+ CFLAGS += -DHAVE_MKL=1 -I$(MKL_ROOT)/include
+ LDFLAGS += -L$(MKL_ROOT)/lib/intel64 -Wl,-rpath=$(MKL_ROOT)/lib/intel64 -lmkl_rt -lmkl_intel_lp64 -lmkl_core -lmkl_sequential
+--
+2.38.3
+
diff --git a/srcpkgs/vosk-api/template b/srcpkgs/vosk-api/template
index 41d53e654042..428235a09ebb 100644
--- a/srcpkgs/vosk-api/template
+++ b/srcpkgs/vosk-api/template
@@ -9,8 +9,8 @@ build_wrksrc="vosk-api-${version}/src"
_kaldi_commit=93ef0019b847272a239fbb485ef97f29feb1d587
build_style=gnu-makefile
make_use_env=yes
-make_build_args="KALDI_ROOT=../../kaldi HAVE_OPENBLAS_NO_F2C=1 HAVE_OPENBLAS_CLAPACK=0"
-makedepends="blas-devel lapack-devel openblas-devel libgomp-devel openfst-devel"
+make_build_args="KALDI_ROOT=../../kaldi USE_SHARED_MATH=1 HAVE_OPENBLAS=1 HAVE_OPENBLAS_CLAPACK=0"
+makedepends="libgfortran openblas-devel libgomp-devel openfst-devel"
short_desc="Offline speech recognition toolkit"
maintainer="John Gebbie <me@johngebbie.com>"
license="Apache-2.0"
@@ -41,7 +41,7 @@ post_extract() {
pre_build() {
cd "${wrksrc}/kaldi/src"
- ./configure ${CROSS_BUILD:+--host="${XBPS_CROSS_TRIPLET}"} --mathlib=OPENBLAS_NO_F2C --shared --use-cuda=no
+ ./configure ${CROSS_BUILD:+--host="${XBPS_CROSS_TRIPLET}"} --mathlib=OPENBLAS --shared --use-cuda=no
make online2 lm rnnlm
}
@@ -57,7 +57,7 @@ do_check() {
cd "${wrksrc}/vosk-api-${version}/c"
ln -sf "${wrksrc}/vosk-model-small-en-us-0.15" model
ln -sf ../python/example/test.wav .
- ldflags="-fopenmp -L../src -lvosk -ldl -lpthread -Wl,-rpath,../src"
+ ldflags="-fopenmp -L../src -lvosk -ldl -lpthread -lopenblas -lgfortran -Wl,-rpath,../src"
if [ "$XBPS_TARGET_LIBC" = musl ]; then
ldflags+=" -lexecinfo"
fi
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PR PATCH] [Updated] vosk-api: update to 0.3.45
2023-02-05 12:18 [PR PATCH] vosk-api: update to 0.3.45 JohnGebbie
` (14 preceding siblings ...)
2023-02-11 15:02 ` JohnGebbie
@ 2023-02-11 16:05 ` JohnGebbie
2023-02-11 16:06 ` JohnGebbie
2023-02-14 20:29 ` [PR PATCH] [Merged]: " paper42
17 siblings, 0 replies; 19+ messages in thread
From: JohnGebbie @ 2023-02-11 16:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1250 bytes --]
There is an updated pull request by JohnGebbie against master on the void-packages repository
https://github.com/JohnGebbie/void-packages vosk-api
https://github.com/void-linux/void-packages/pull/42091
vosk-api: update to 0.3.45
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/42091.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vosk-api-42091.patch --]
[-- Type: text/x-diff, Size: 2228 bytes --]
From 8fb3e9ca918ef335f78e2516441953915145c4a1 Mon Sep 17 00:00:00 2001
From: John Gebbie <me@johngebbie.com>
Date: Sun, 5 Feb 2023 12:10:37 +0000
Subject: [PATCH] vosk-api: update to 0.3.45.
---
common/shlibs | 2 +-
srcpkgs/vosk-api/template | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 59444164928b..bc77277ce8d1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4213,7 +4213,7 @@ libtracecmd.so.1 libtracecmd-3.1.2_1
libkshark.so.2 libkshark-2.1.1_1
libcpp-hocon.so.0.3.0 cpp-hocon-0.3.0_5
libfst.so.25 openfst-1.8.2_1
-libvosk.so vosk-api-0.3.43_1
+libvosk.so vosk-api-0.3.45_1
libdspy-1.so.1 d-spy-1.4.0_1
libpanel-1.so.1 libpanel-1.0.1_1
libqrtr.so.1 qrtr-ns-1.0_1
diff --git a/srcpkgs/vosk-api/template b/srcpkgs/vosk-api/template
index b86c74452b95..41d53e654042 100644
--- a/srcpkgs/vosk-api/template
+++ b/srcpkgs/vosk-api/template
@@ -1,12 +1,12 @@
# Template file for 'vosk-api'
pkgname=vosk-api
-version=0.3.43
+version=0.3.45
revision=1
create_wrksrc=yes
build_wrksrc="vosk-api-${version}/src"
# Vosk is built with their own vendored version of Kaldi which has no releases
# of its own, so the commit must be determined by the date of the vosk release.
-_kaldi_commit=ecb4b47159501ef0d67888633e65b8fc0c1f79d1
+_kaldi_commit=93ef0019b847272a239fbb485ef97f29feb1d587
build_style=gnu-makefile
make_use_env=yes
make_build_args="KALDI_ROOT=../../kaldi HAVE_OPENBLAS_NO_F2C=1 HAVE_OPENBLAS_CLAPACK=0"
@@ -18,8 +18,8 @@ homepage="https://alphacephei.com/vosk"
distfiles="https://github.com/alphacep/vosk-api/archive/v${version}/vosk-api-${version}.tar.gz
https://github.com/alphacep/kaldi/archive/${_kaldi_commit}.tar.gz
https://alphacephei.com/vosk/models/vosk-model-small-en-us-0.15.zip"
-checksum="50fa82bfbfe3fc5be868237c84ac180eb55da0b65b1803bf022899673afda024
- 39cadd5a351a5513e3e4e1f71ac4b4f018a592a856a55f1d32c159e22e799f64
+checksum="930fb9cfa6c1b3035d3730feee7d670fb893caa0c71bd2159ee7623102674c26
+ f47a996af546884a8e1cb961323b796c5c238c1bbeabaf657bb300b760e431b2
30f26242c4eb449f948e42cb302dd7a686cb29a3423a8367f99ff41780942498"
shlib_provides="libvosk.so"
patch_args="-Np1 -d ${pkgname}-${version}"
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: vosk-api: update to 0.3.45
2023-02-05 12:18 [PR PATCH] vosk-api: update to 0.3.45 JohnGebbie
` (15 preceding siblings ...)
2023-02-11 16:05 ` JohnGebbie
@ 2023-02-11 16:06 ` JohnGebbie
2023-02-14 20:29 ` [PR PATCH] [Merged]: " paper42
17 siblings, 0 replies; 19+ messages in thread
From: JohnGebbie @ 2023-02-11 16:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 193 bytes --]
New comment by JohnGebbie on void-packages repository
https://github.com/void-linux/void-packages/pull/42091#issuecomment-1424295492
Comment:
I want to test i686 (with numen) before merging.
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PR PATCH] [Merged]: vosk-api: update to 0.3.45
2023-02-05 12:18 [PR PATCH] vosk-api: update to 0.3.45 JohnGebbie
` (16 preceding siblings ...)
2023-02-11 16:06 ` JohnGebbie
@ 2023-02-14 20:29 ` paper42
17 siblings, 0 replies; 19+ messages in thread
From: paper42 @ 2023-02-14 20:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1087 bytes --]
There's a merged pull request on the void-packages repository
vosk-api: update to 0.3.45
https://github.com/void-linux/void-packages/pull/42091
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 19+ messages in thread