aboutsummaryrefslogtreecommitdiff
path: root/sound/svox
diff options
context:
space:
mode:
authorIlya Lipnitskiy <ilya.lipnitskiy@gmail.com>2021-02-20 16:02:15 -0800
committerIlya Lipnitskiy <ilya.lipnitskiy@gmail.com>2021-02-20 16:02:15 -0800
commit5d8d4fbbcb5c5de9370711c19bb3510210989a98 (patch)
treed0754921833f413b7eb93fb6bb1b1c8a22fb0498 /sound/svox
parentd651082447b4392399a40ea1ae11d0bce4bfe83a (diff)
treewide: Run refresh on all packages
The crude loop I wrote to come up with this changeset: find -L package/feeds/packages/ -name patches | \ sed 's/patches$/refresh/' | sort | xargs make Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
Diffstat (limited to 'sound/svox')
-rw-r--r--sound/svox/patches/0002-gitignore-for-autotools-files.patch6
-rw-r--r--sound/svox/patches/0003-pico2wave-Convert-text-to-.wav-using-svox-text-to-sp.patch12
-rw-r--r--sound/svox/patches/0004-add-header-files.patch5
-rw-r--r--sound/svox/patches/0005-Install-lang-files.patch5
-rw-r--r--sound/svox/patches/0006-Set-picolangdir.patch9
-rw-r--r--sound/svox/patches/0008-64bits.patch12
-rw-r--r--sound/svox/patches/0009-Fix-link-order.patch10
-rw-r--r--sound/svox/patches/0011-subdir.patch7
-rw-r--r--sound/svox/patches/0012-no-headers.patch7
9 files changed, 17 insertions, 56 deletions
diff --git a/sound/svox/patches/0002-gitignore-for-autotools-files.patch b/sound/svox/patches/0002-gitignore-for-autotools-files.patch
index df57df7f7..9fc0d792a 100644
--- a/sound/svox/patches/0002-gitignore-for-autotools-files.patch
+++ b/sound/svox/patches/0002-gitignore-for-autotools-files.patch
@@ -8,9 +8,6 @@ Subject: [PATCH 2/7] gitignore for autotools files
1 files changed, 32 insertions(+), 0 deletions(-)
create mode 100644 pico/.gitignore
-diff --git a/pico/.gitignore b/pico/.gitignore
-new file mode 100644
-index 0000000..4235569
--- /dev/null
+++ b/pico/.gitignore
@@ -0,0 +1,32 @@
@@ -46,6 +43,3 @@ index 0000000..4235569
+.libs
+libttspico.la
+
---
-1.7.1
-
diff --git a/sound/svox/patches/0003-pico2wave-Convert-text-to-.wav-using-svox-text-to-sp.patch b/sound/svox/patches/0003-pico2wave-Convert-text-to-.wav-using-svox-text-to-sp.patch
index 19b6df1b9..7744964ad 100644
--- a/sound/svox/patches/0003-pico2wave-Convert-text-to-.wav-using-svox-text-to-sp.patch
+++ b/sound/svox/patches/0003-pico2wave-Convert-text-to-.wav-using-svox-text-to-sp.patch
@@ -11,8 +11,6 @@ Subject: [PATCH 3/7] pico2wave: Convert text to .wav using svox text-to-speech s
4 files changed, 352 insertions(+), 0 deletions(-)
create mode 100644 pico/bin/pico2wave.c
-diff --git a/pico/.gitignore b/pico/.gitignore
-index 4235569..a110298 100644
--- a/pico/.gitignore
+++ b/pico/.gitignore
@@ -29,4 +29,5 @@ libtool
@@ -21,8 +19,6 @@ index 4235569..a110298 100644
libttspico.la
+pico2wave
-diff --git a/pico/Makefile.am b/pico/Makefile.am
-index 6d8a10c..0d9472d 100644
--- a/pico/Makefile.am
+++ b/pico/Makefile.am
@@ -34,3 +34,10 @@ libttspico_la_SOURCES = \
@@ -36,9 +32,6 @@ index 6d8a10c..0d9472d 100644
+ libttspico.la -lm -lpopt
+pico2wave_CFLAGS = -Wall -I lib
+
-diff --git a/pico/bin/pico2wave.c b/pico/bin/pico2wave.c
-new file mode 100644
-index 0000000..0c035a7
--- /dev/null
+++ b/pico/bin/pico2wave.c
@@ -0,0 +1,342 @@
@@ -384,8 +377,6 @@ index 0000000..0c035a7
+ exit(ret);
+}
+
-diff --git a/pico/configure.in b/pico/configure.in
-index 0afb56d..349eb1d 100644
--- a/pico/configure.in
+++ b/pico/configure.in
@@ -14,3 +14,6 @@ AC_CONFIG_FILES([Makefile])
@@ -395,6 +386,3 @@ index 0afb56d..349eb1d 100644
+
+AC_CHECK_LIB(popt, poptGetContext)
+
---
-1.7.1
-
diff --git a/sound/svox/patches/0004-add-header-files.patch b/sound/svox/patches/0004-add-header-files.patch
index f05730827..3294b1467 100644
--- a/sound/svox/patches/0004-add-header-files.patch
+++ b/sound/svox/patches/0004-add-header-files.patch
@@ -7,8 +7,6 @@ Subject: [PATCH 4/7] add header files
pico/Makefile.am | 36 ++++++++++++++++++++++++++++++++++++
1 files changed, 36 insertions(+), 0 deletions(-)
-diff --git a/pico/Makefile.am b/pico/Makefile.am
-index 0d9472d..9151042 100644
--- a/pico/Makefile.am
+++ b/pico/Makefile.am
@@ -34,6 +34,42 @@ libttspico_la_SOURCES = \
@@ -54,6 +52,3 @@ index 0d9472d..9151042 100644
bin_PROGRAMS = pico2wave
pico2wave_SOURCES = \
bin/pico2wave.c
---
-1.7.1
-
diff --git a/sound/svox/patches/0005-Install-lang-files.patch b/sound/svox/patches/0005-Install-lang-files.patch
index 95344e31f..b5dbf78e0 100644
--- a/sound/svox/patches/0005-Install-lang-files.patch
+++ b/sound/svox/patches/0005-Install-lang-files.patch
@@ -7,8 +7,6 @@ Subject: [PATCH 5/7] Install lang files
pico/Makefile.am | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
-diff --git a/pico/Makefile.am b/pico/Makefile.am
-index 9151042..8898050 100644
--- a/pico/Makefile.am
+++ b/pico/Makefile.am
@@ -70,6 +70,15 @@ libttspico_la_HEADERS = \
@@ -27,6 +25,3 @@ index 9151042..8898050 100644
bin_PROGRAMS = pico2wave
pico2wave_SOURCES = \
bin/pico2wave.c
---
-1.7.1
-
diff --git a/sound/svox/patches/0006-Set-picolangdir.patch b/sound/svox/patches/0006-Set-picolangdir.patch
index 1ec646d75..c6291a666 100644
--- a/sound/svox/patches/0006-Set-picolangdir.patch
+++ b/sound/svox/patches/0006-Set-picolangdir.patch
@@ -8,8 +8,6 @@ Subject: [PATCH 6/7] Set picolangdir
pico/bin/pico2wave.c | 4 ++++
2 files changed, 5 insertions(+), 1 deletions(-)
-diff --git a/pico/Makefile.am b/pico/Makefile.am
-index 8898050..a19c42a 100644
--- a/pico/Makefile.am
+++ b/pico/Makefile.am
@@ -84,5 +84,5 @@ pico2wave_SOURCES = \
@@ -19,11 +17,9 @@ index 8898050..a19c42a 100644
-pico2wave_CFLAGS = -Wall -I lib
+pico2wave_CFLAGS = -Wall -Dpicolangdir=\"$(picolangdir)\" -I lib
-diff --git a/pico/bin/pico2wave.c b/pico/bin/pico2wave.c
-index 0c035a7..ec7ab79 100644
--- a/pico/bin/pico2wave.c
+++ b/pico/bin/pico2wave.c
-@@ -35,7 +35,11 @@
+@@ -36,7 +36,11 @@
/* string constants */
#define MAX_OUTBUF_SIZE 128
@@ -35,6 +31,3 @@ index 0c035a7..ec7ab79 100644
const char * PICO_VOICE_NAME = "PicoVoice";
/* supported voices
---
-1.7.1
-
diff --git a/sound/svox/patches/0008-64bits.patch b/sound/svox/patches/0008-64bits.patch
index 883a42e6d..432c16905 100644
--- a/sound/svox/patches/0008-64bits.patch
+++ b/sound/svox/patches/0008-64bits.patch
@@ -2,9 +2,9 @@ Description: fix execution on 64bit archs
Bug: http://code.google.com/p/android/issues/detail?id=12224
Author: Samuel Thibault <sthibault@debian.org>
---- svox/pico/lib/picoapi.c.original 2010-10-25 19:06:57.000000000 +0200
-+++ svox/pico/lib/picoapi.c 2010-10-25 19:07:18.000000000 +0200
-@@ -90,7 +90,7 @@
+--- a/pico/lib/picoapi.c
++++ b/pico/lib/picoapi.c
+@@ -90,7 +90,7 @@ pico_Status pico_initialize_priv(
status = PICO_ERR_NULLPTR_ACCESS;
} else {
byte_ptr_t rest_mem;
@@ -13,9 +13,9 @@ Author: Samuel Thibault <sthibault@debian.org>
pico_System sys;
picoos_MemoryManager sysMM;
picoos_ExceptionManager sysEM;
---- svox/pico/lib/picosig2.c.original 2010-10-26 00:17:18.000000000 +0200
-+++ svox/pico/lib/picosig2.c 2010-10-26 00:17:19.000000000 +0200
-@@ -568,7 +568,7 @@
+--- a/pico/lib/picosig2.c
++++ b/pico/lib/picosig2.c
+@@ -552,7 +552,7 @@ void mel_2_lin_lookup(sig_innerobj_t *si
for (nI = 1; nI < m1; nI++) {
XXr[nI] = c1[nI] << shift;
}
diff --git a/sound/svox/patches/0009-Fix-link-order.patch b/sound/svox/patches/0009-Fix-link-order.patch
index bcf3870fe..b9c650397 100644
--- a/sound/svox/patches/0009-Fix-link-order.patch
+++ b/sound/svox/patches/0009-Fix-link-order.patch
@@ -1,8 +1,6 @@
-Index: svox-1.0+git20130326/pico/Makefile.am
-===================================================================
---- svox-1.0+git20130326.orig/pico/Makefile.am 2013-11-12 12:37:05.939979854 -0500
-+++ svox-1.0+git20130326/pico/Makefile.am 2013-11-12 13:00:52.336945041 -0500
-@@ -70,6 +70,8 @@
+--- a/pico/Makefile.am
++++ b/pico/Makefile.am
+@@ -70,6 +70,8 @@ libttspico_la_HEADERS = \
lib/picotrns.h \
lib/picowa.h
@@ -11,7 +9,7 @@ Index: svox-1.0+git20130326/pico/Makefile.am
picolangdir = $(datadir)/pico/lang
picolang_DATA = \
lang/de-DE*.bin \
-@@ -83,6 +85,6 @@
+@@ -83,6 +85,6 @@ bin_PROGRAMS = pico2wave
pico2wave_SOURCES = \
bin/pico2wave.c
pico2wave_LDADD = \
diff --git a/sound/svox/patches/0011-subdir.patch b/sound/svox/patches/0011-subdir.patch
index fa9e91ffc..6f3e34f32 100644
--- a/sound/svox/patches/0011-subdir.patch
+++ b/sound/svox/patches/0011-subdir.patch
@@ -1,7 +1,6 @@
-diff -urN a/pico/configure.in b/pico/configure.in
---- a/pico/configure.in 2015-01-21 18:59:39.604452795 +0100
-+++ b/pico/configure.in 2015-01-21 19:00:53.288777298 +0100
-@@ -4,7 +4,7 @@
+--- a/pico/configure.in
++++ b/pico/configure.in
+@@ -4,7 +4,7 @@ AC_PREREQ(2.59)
AC_INIT([svox], [1.0], [math.parent@gmail.com])
diff --git a/sound/svox/patches/0012-no-headers.patch b/sound/svox/patches/0012-no-headers.patch
index edf4d046e..6e932556c 100644
--- a/sound/svox/patches/0012-no-headers.patch
+++ b/sound/svox/patches/0012-no-headers.patch
@@ -1,7 +1,6 @@
-diff -urN a/pico/Makefile.am b/pico/Makefile.am
---- a/pico/Makefile.am 2015-01-22 01:33:21.470895431 +0100
-+++ b/pico/Makefile.am 2015-01-22 01:36:03.042228475 +0100
-@@ -34,42 +34,6 @@
+--- a/pico/Makefile.am
++++ b/pico/Makefile.am
+@@ -34,42 +34,6 @@ libttspico_la_SOURCES = \
lib/picotrns.c \
lib/picowa.c