-
Notifications
You must be signed in to change notification settings - Fork 7.5k
Libspeechd: init at 0.12.1 #51127
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Libspeechd: init at 0.12.1 #51127
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
3d7fc9b
Add libspeechd port
ethindp c97baeb
Update sha512
ethindp b79fffd
Update patch so it works
ethindp 180d6fb
Fix autoconf patch error
ethindp ff345d6
Fix patch
ethindp 089d28c
libspeechd: init at 0.12.1
ethindp 53af59c
Fix patch for arm64 builds
ethindp d1809a6
Restricts supports field to where libspeechd is actually practical
ethindp 95708ad
Switch to using vcpkg-make
ethindp File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| diff --git a/Makefile.am b/Makefile.am | ||
| index 480eb50e..3dbf458b 100644 | ||
| --- a/Makefile.am | ||
| +++ b/Makefile.am | ||
| @@ -22,7 +22,11 @@ pkgconfig_DATA = speech-dispatcher.pc | ||
|
|
||
| BUILT_SOURCES = $(top_srcdir)/.version | ||
|
|
||
| +if LIBS_ONLY | ||
| +SUBDIRS= include src | ||
| +else | ||
| SUBDIRS= include locale src config po | ||
| +endif | ||
|
|
||
| if ENABLE_DOC | ||
| SUBDIRS += doc | ||
| diff --git a/configure.ac b/configure.ac | ||
| index bd18fdbe..ef4da8e6 100644 | ||
| --- a/configure.ac | ||
| +++ b/configure.ac | ||
| @@ -43,11 +43,16 @@ LT_PREREQ([2.2]) | ||
| LT_INIT([dlopen]) | ||
| AC_CONFIG_SRCDIR([src/server/speechd.c]) | ||
| AC_CONFIG_HEADERS([config.h]) | ||
| -AM_GNU_GETTEXT_VERSION([0.19.8]) | ||
| -AM_GNU_GETTEXT([external]) | ||
| -if test "$ac_cv_path_MSGFMT" = ":" | ||
| -then | ||
| - AC_MSG_FAILURE([msgfmt missing from the gettext package]) | ||
| +AC_ARG_ENABLE([libs-only], [AS_HELP_STRING([--enable-libs-only], [build only the client library])], [], [enable_libs_only=no]) | ||
| +AM_CONDITIONAL([LIBS_ONLY], [test "$enable_libs_only" = "yes"]) | ||
| +if test "$enable_libs_only" = "yes"; then | ||
| + with_espeak=no with_espeak_ng=no with_flite=no with_ibmtts=no | ||
| + with_voxin=no with_ivona=no with_pico=no with_baratinoo=no | ||
| + with_kali=no with_piper=no | ||
| + with_pulse=no with_alsa=no with_oss=no with_nas=no | ||
| + with_libao=no with_pipewire=no | ||
| + enable_python=no enable_doc=no | ||
| + with_systemdsystemunitdir=no with_systemduserunitdir=no | ||
| fi | ||
|
|
||
| # Split version number | ||
| @@ -75,6 +80,7 @@ AC_SEARCH_LIBS([sqrt], [m], [], | ||
| [AC_MSG_FAILURE([Math library missing])]) | ||
| AC_SEARCH_LIBS([pthread_create], [pthread], [], | ||
| [AC_MSG_FAILURE([Threads library missing])]) | ||
| +if test "$enable_libs_only" != "yes"; then | ||
| AC_ARG_ENABLE([ltdl], | ||
| [AS_HELP_STRING([--disable-ltdl], [do not use ltdl for modules])], | ||
| [], | ||
| @@ -99,6 +105,7 @@ then | ||
| AC_SEARCH_LIBS([dlopen], [dl], [], | ||
| [AC_MSG_FAILURE([dlopen missing])]) | ||
| fi | ||
| +fi | ||
|
|
||
| if test x$enable_shared = xyes; | ||
| then | ||
| @@ -119,7 +126,7 @@ AM_CONDITIONAL(DARWIN_HOST, test "$darwin_host" = yes) | ||
| PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.36]) | ||
| AC_SUBST([GLIB_CFLAGS]) | ||
| AC_SUBST([GLIB_LIBS]) | ||
| - | ||
| +if test "$enable_libs_only" != "yes"; then | ||
| PKG_CHECK_MODULES([GTHREAD], [gthread-2.0]) | ||
| AC_SUBST([GTHREAD_CFLAGS]) | ||
| AC_SUBST([GTHREAD_LIBS]) | ||
| @@ -135,6 +142,7 @@ AC_SUBST([DOTCONF_LIBS]) | ||
| PKG_CHECK_MODULES([SNDFILE], [sndfile >= 1.0.2]) | ||
| AC_SUBST([SNDFILE_CFLAGS]) | ||
| AC_SUBST([SNDFILE_LIBS]) | ||
| +fi | ||
|
|
||
| PKG_CHECK_MODULES([LIBSYSTEMD], [libsystemd], [have_libsystemd=yes], [:]) | ||
|
|
||
| diff --git a/src/Makefile.am b/src/Makefile.am | ||
| index 2a9659c0..20f61525 100644 | ||
| --- a/src/Makefile.am | ||
| +++ b/src/Makefile.am | ||
| @@ -17,7 +17,11 @@ | ||
|
|
||
| ## Process this file with automake to produce Makefile.in | ||
|
|
||
| +if LIBS_ONLY | ||
| +SUBDIRS=api | ||
| +else | ||
| SUBDIRS=common server audio modules api clients tests | ||
| +endif | ||
|
|
||
|
|
||
| -include $(top_srcdir)/git.mk |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| vcpkg_from_github( | ||
| OUT_SOURCE_PATH SOURCE_PATH | ||
| REPO brailcom/speechd | ||
| REF "${VERSION}" | ||
| SHA512 8747c2cd09e378533a8c756126623b659a5adce8991602f2c8a8e4318f24dee6fd518472095bfab31911d683c4624ad9909e1f2f5c3ab5412e574b067f50068d | ||
| HEAD_REF master | ||
| PATCHES | ||
| libs-only.patch | ||
| ) | ||
| set(ENV{AUTOPOINT} true) | ||
| vcpkg_configure_make( | ||
| SOURCE_PATH "${SOURCE_PATH}" | ||
| AUTOCONFIG | ||
| DETERMINE_BUILD_TRIPLET | ||
| OPTIONS | ||
| --enable-libs-only | ||
| --disable-python | ||
| --disable-doc | ||
| --without-systemdsystemunitdir | ||
| --without-systemduserunitdir | ||
| ) | ||
| vcpkg_install_make() | ||
| vcpkg_fixup_pkgconfig() | ||
| file(REMOVE_RECURSE | ||
| "${CURRENT_PACKAGES_DIR}/debug/include" | ||
| "${CURRENT_PACKAGES_DIR}/debug/share" | ||
| ) | ||
| vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING.LGPL") | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| { | ||
| "name": "libspeechd", | ||
| "version": "0.12.1", | ||
| "description": "Client library for Speech Dispatcher", | ||
| "homepage": "https://github.com/brailcom/speechd", | ||
| "license": "LGPL-2.1-or-later", | ||
| "supports": "!windows & !uwp & !xbox & !android & !osx & !ios & !mingw & !emscripten", | ||
|
ethindp marked this conversation as resolved.
|
||
| "dependencies": [ | ||
| "glib" | ||
| ] | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| { | ||
| "versions": [ | ||
| { | ||
| "git-tree": "c41a108b6f5ecebdedf55b40e180c1c7db23b373", | ||
| "version": "0.12.1", | ||
| "port-version": 0 | ||
| } | ||
| ] | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.