From 01b3ceea72ebdf0f87785cb39a22162b950ce9d8 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 24 Feb 2023 22:07:00 +0100 Subject: [PATCH] Update pocketsphinx to 5.0.0 * Remove no longer required base package * Do not include Python module anymore; it is not built by default by the upsteam build script anymore (only if CMake variable SKBUILD is set) and thus supposedly designed to be distributed in a separate package; this makes also sense at it avoids rebuilding the C library on every minor Python release * Rebuild subtitlecomposer; however, at this point this means its speech plugin will not be available anymore as even the detection of the library does not work: ``` -- Could NOT find PocketSphinx (missing: POCKETSPHINX_INCLUDE_DIR) (found suitable version "5.0.0", minimum required is "5") -- Have NOT Found PocketSphinx - Speech plugin will not be built ``` --- pocketsphinx/default/PKGBUILD | 33 ++-- sphinxbase/default/PKGBUILD | 46 ------ .../default/avoid-python3.10-warning.patch | 141 ------------------ .../sphinxbase-5prealpha-fix-doxy2swig.patch | 16 -- subtitlecomposer/default/PKGBUILD | 17 ++- 5 files changed, 24 insertions(+), 229 deletions(-) delete mode 100644 sphinxbase/default/PKGBUILD delete mode 100644 sphinxbase/default/avoid-python3.10-warning.patch delete mode 100644 sphinxbase/default/sphinxbase-5prealpha-fix-doxy2swig.patch diff --git a/pocketsphinx/default/PKGBUILD b/pocketsphinx/default/PKGBUILD index 4414aa2e..0333f16f 100644 --- a/pocketsphinx/default/PKGBUILD +++ b/pocketsphinx/default/PKGBUILD @@ -3,37 +3,28 @@ # Contributor: Ben Duffield pkgname=pocketsphinx -pkgver=5prealpha -pkgrel=13 -pkgdesc='Lightweight speech recognition engine' +pkgver=5.0.0 +pkgrel=1 +pkgdesc='A small speech recognizer' arch=('i686' 'x86_64') -url='http://cmusphinx.sourceforge.net' -license=('BSD') -makedepends=('swig' 'python') -depends=('sphinxbase=5prealpha' 'gst-plugins-base-libs') -source=("https://downloads.sourceforge.net/cmusphinx/$pkgname-$pkgver.tar.gz") -sha256sums=('ef5bb5547e2712bdf571f256490ef42a47962033892efd9d7df8eed7fe573ed9') -options=('!libtool') - -prepare() { - cd "$pkgname-$pkgver" - - echo "Reconfiguring project for current version of Automake" - autoreconf -ivf > /dev/null -} +url='https://cmusphinx.github.io' +license=('custom') +makedepends=('cmake' 'ninja' 'gst-plugins-base-libs') +optdepends=('gst-plugins-base-libs: GStreamer plugin') +source=("https://github.com/cmusphinx/pocketsphinx/archive/refs/tags/v$pkgver.tar.gz") +sha256sums=('78ffe5b60b6981b08667435dd26c5a179b612b8ca372bd9c23c896a8b2239a20') build() { cd "$pkgname-$pkgver" - export PYTHON=/usr/bin/python PYTHONWARNINGS=ignore - ./configure --prefix=/usr - make + cmake -S . -B build -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_SHARED_LIBS=ON -DBUILD_GSTREAMER=ON + cmake --build build } package() { cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir" install + DESTDIR=${pkgdir} cmake --build build --target install install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" install -D -m644 "${srcdir}/${pkgname}-${pkgver}/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" diff --git a/sphinxbase/default/PKGBUILD b/sphinxbase/default/PKGBUILD deleted file mode 100644 index 821fff8c..00000000 --- a/sphinxbase/default/PKGBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# Maintainer: Martchus -# Contributor: Marco Pompili -# Contributor: Giorgio Gilestro crocowhile@gmail.com -# Contributor: Mladen Milinkovic - -pkgname=sphinxbase -pkgver=5prealpha -pkgrel=13 -pkgdesc='Common library for sphinx speech recognition' -url='https://cmusphinx.sourceforge.net/' -arch=('i686' 'x86_64') -license=('BSD') -makedepends=('bison' 'swig') -depends=('python' 'lapack' 'libpulse') # not sure if libsamplerate is needed 'libsamplerate' -source=("http://downloads.sourceforge.net/project/cmusphinx/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz" - "sphinxbase-5prealpha-fix-doxy2swig.patch") - -sha256sums=('f72bdb59e50b558bed47cc2105777200d2b246a0f328e913de16a9b22f9a246f' - '1cb485202f83dc517872f5ab41f59d18884af1b85799166d80e08860f7729919') -options=('!libtool') - -prepare() { - cd "${pkgname}-${pkgver}" - - patch -p1 -b -i ../sphinxbase-5prealpha-fix-doxy2swig.patch - - echo "Reconfiguring project for current version of Automake" - autoreconf -ivf > /dev/null -} - -build() { - cd "${pkgname}-${pkgver}" - - export PYTHON=/usr/bin/python PYTHONWARNINGS=ignore - ./configure --prefix=/usr - make -} - -package() { - cd "${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}/" install - - install -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 "${srcdir}/${pkgname}-${pkgver}/LICENSE" \ - "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/sphinxbase/default/avoid-python3.10-warning.patch b/sphinxbase/default/avoid-python3.10-warning.patch deleted file mode 100644 index 0891f246..00000000 --- a/sphinxbase/default/avoid-python3.10-warning.patch +++ /dev/null @@ -1,141 +0,0 @@ -From e0221880ccdd79ed9bf42937a56a4c319b013576 Mon Sep 17 00:00:00 2001 -From: Samuel Thibault -Date: Thu, 11 Nov 2021 21:06:59 +0100 -Subject: [PATCH] Update ax_python_devel.m4 - -Notably python3.10's distutils emits a warning when getting imported. -This was making the old ax_python_devel.m4 fail. ---- - m4/ax_python_devel.m4 | 37 ++++++++++++++++++++----------------- - 1 file changed, 20 insertions(+), 17 deletions(-) - -diff --git a/m4/ax_python_devel.m4 b/m4/ax_python_devel.m4 -index 59a2ff09..44dbd83e 100644 ---- a/m4/ax_python_devel.m4 -+++ b/m4/ax_python_devel.m4 -@@ -1,5 +1,5 @@ - # =========================================================================== --# http://www.gnu.org/software/autoconf-archive/ax_python_devel.html -+# https://www.gnu.org/software/autoconf-archive/ax_python_devel.html - # =========================================================================== - # - # SYNOPSIS -@@ -12,8 +12,8 @@ - # in your configure.ac. - # - # This macro checks for Python and tries to get the include path to --# 'Python.h'. It provides the $(PYTHON_CPPFLAGS) and $(PYTHON_LDFLAGS) --# output variables. It also exports $(PYTHON_EXTRA_LIBS) and -+# 'Python.h'. It provides the $(PYTHON_CPPFLAGS) and $(PYTHON_LIBS) output -+# variables. It also exports $(PYTHON_EXTRA_LIBS) and - # $(PYTHON_EXTRA_LDFLAGS) for embedding Python in your code. - # - # You can search for some particular version of Python by passing a -@@ -52,7 +52,7 @@ - # Public License for more details. - # - # You should have received a copy of the GNU General Public License along --# with this program. If not, see . -+# with this program. If not, see . - # - # As a special exception, the respective Autoconf Macro's copyright owner - # gives unlimited permission to copy, distribute and modify the configure -@@ -67,7 +67,7 @@ - # modified version of the Autoconf Macro, you may extend this special - # exception to the GPL to apply to your modified version as well. - --#serial 17 -+#serial 21 - - AU_ALIAS([AC_PYTHON_DEVEL], [AX_PYTHON_DEVEL]) - AC_DEFUN([AX_PYTHON_DEVEL],[ -@@ -99,7 +99,7 @@ AC_DEFUN([AX_PYTHON_DEVEL],[ - This version of the AC@&t@_PYTHON_DEVEL macro - doesn't work properly with versions of Python before - 2.1.0. You may need to re-run configure, setting the --variables PYTHON_CPPFLAGS, PYTHON_LDFLAGS, PYTHON_SITE_PKG, -+variables PYTHON_CPPFLAGS, PYTHON_LIBS, PYTHON_SITE_PKG, - PYTHON_EXTRA_LIBS and PYTHON_EXTRA_LDFLAGS by hand. - Moreover, to disable this check, set PYTHON_NOVERSIONCHECK - to something else than an empty string. -@@ -137,7 +137,7 @@ variable to configure. See ``configure --help'' for reference. - # - AC_MSG_CHECKING([for the distutils Python package]) - ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` -- if test -z "$ac_distutils_result"; then -+ if test $? -eq 0; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) -@@ -172,7 +172,7 @@ $ac_distutils_result]) - # Check for Python library path - # - AC_MSG_CHECKING([for Python library path]) -- if test -z "$PYTHON_LDFLAGS"; then -+ if test -z "$PYTHON_LIBS"; then - # (makes two attempts to ensure we've got a version number - # from the interpreter) - ac_python_version=`cat<