[packages/svox] - updated to 20130326 snap from Debian - updated autoconf-building-of-library-using-libtool patch fr
qboosh
qboosh at pld-linux.org
Wed Oct 14 19:17:32 CEST 2015
commit 5cf8677dcae856309470e45a4e8361a1acbafcdb
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Wed Oct 14 19:18:26 2015 +0200
- updated to 20130326 snap from Debian
- updated autoconf-building-of-library-using-libtool patch from Debian
- merged new Fix-link-order and platform patches from Debian (first one replaces our link patch)
...utoconf-building-of-library-using-libtool.patch | 20 ++++-----------
0009-Fix-link-order.patch | 21 +++++++++++++++
0010-platform.patch | 30 ++++++++++++++++++++++
svox-link.patch | 10 --------
svox.spec | 10 +++++---
5 files changed, 62 insertions(+), 29 deletions(-)
---
diff --git a/svox.spec b/svox.spec
index 94bc98a..86248ab 100644
--- a/svox.spec
+++ b/svox.spec
@@ -1,5 +1,5 @@
-%define subver git20110131
-%define rel 2
+%define subver git20130326
+%define rel 1
Summary: SVOX Pico software speech synthesizer engine
Summary(pl.UTF-8): Silnik programowego syntezatora mowy SVOX Pico
Name: svox
@@ -9,7 +9,7 @@ License: Apache v2.0
Group: Libraries
# originally http://android.git.kernel.org/?p=platform/external/svox.git;a=summary
Source0: ftp://ftp.debian.org/debian/pool/non-free/s/svox/%{name}_%{version}+%{subver}.orig.tar.gz
-# Source0-md5: e9dd590721705c50ee5d7f262bd3c697
+# Source0-md5: df4bf610ff4273b420e80ff64af93130
Patch0: 0001-autoconf-building-of-library-using-libtool.patch
Patch1: 0002-gitignore-for-autotools-files.patch
Patch2: 0003-pico2wave-Convert-text-to-.wav-using-svox-text-to-sp.patch
@@ -17,7 +17,8 @@ Patch3: 0004-add-header-files.patch
Patch4: 0005-Install-lang-files.patch
Patch5: 0006-Set-picolangdir.patch
Patch6: 0008-64bits.patch
-Patch7: %{name}-link.patch
+Patch7: 0009-Fix-link-order.patch
+Patch8: 0010-platform.patch
URL: http://www.android.com/
BuildRequires: autoconf >= 2.59
BuildRequires: automake >= 1:1.9
@@ -183,6 +184,7 @@ Dokumentacja silnika syntezy mowy SVOX Pico.
%patch5 -p1
%patch6 -p1
%patch7 -p1
+%patch8 -p1
%build
cd pico
diff --git a/0001-autoconf-building-of-library-using-libtool.patch b/0001-autoconf-building-of-library-using-libtool.patch
index 23201b6..73c76bb 100644
--- a/0001-autoconf-building-of-library-using-libtool.patch
+++ b/0001-autoconf-building-of-library-using-libtool.patch
@@ -12,9 +12,6 @@ Subject: [PATCH 1/7] autoconf building of library (using libtool)
create mode 100755 pico/autogen.sh
create mode 100644 pico/configure.in
-diff --git a/pico/Makefile.am b/pico/Makefile.am
-new file mode 100644
-index 0000000..6d8a10c
--- /dev/null
+++ b/pico/Makefile.am
@@ -0,0 +1,36 @@
@@ -54,12 +51,9 @@ index 0000000..6d8a10c
+ lib/picotrns.c \
+ lib/picowa.c
+
-diff --git a/pico/autogen.sh b/pico/autogen.sh
-new file mode 100755
-index 0000000..a2f757c
--- /dev/null
+++ b/pico/autogen.sh
-@@ -0,0 +1,36 @@
+@@ -0,0 +1,38 @@
+#!/bin/sh
+
+#created by aclocal
@@ -68,6 +62,7 @@ index 0000000..a2f757c
+
+#created by libtoolize
+rm -rf m4
++mkdir m4
+rm -f ltmain.sh
+
+#created by autoconf
@@ -75,6 +70,7 @@ index 0000000..a2f757c
+
+#created by automake
+rm -f install-sh missing depcomp Makefile.in config.guess config.sub
++rm -f INSTALL COPYING compile
+
+#created by ./configure
+rm -rf .deps
@@ -86,19 +82,16 @@ index 0000000..a2f757c
+
+IPATHS="-I lib"
+
-+aclocal $IPATHS
+libtoolize
-+autoconf $IPATHS
++aclocal $IPATHS
+automake --add-missing
++autoconf $IPATHS
+
+rm -rf autom4te.cache
+
+echo "Now run ./configure and then make."
+exit 0
+
-diff --git a/pico/configure.in b/pico/configure.in
-new file mode 100644
-index 0000000..0afb56d
--- /dev/null
+++ b/pico/configure.in
@@ -0,0 +1,16 @@
@@ -118,6 +111,3 @@ index 0000000..0afb56d
+AC_OUTPUT
+
+AC_CONFIG_MACRO_DIR([m4])
---
-1.7.1
-
diff --git a/0009-Fix-link-order.patch b/0009-Fix-link-order.patch
new file mode 100644
index 0000000..bcf3870
--- /dev/null
+++ b/0009-Fix-link-order.patch
@@ -0,0 +1,21 @@
+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 @@
+ lib/picotrns.h \
+ lib/picowa.h
+
++libttspico_la_LIBADD = -lm
++
+ picolangdir = $(datadir)/pico/lang
+ picolang_DATA = \
+ lang/de-DE*.bin \
+@@ -83,6 +85,6 @@
+ pico2wave_SOURCES = \
+ bin/pico2wave.c
+ pico2wave_LDADD = \
+- libttspico.la -lm -lpopt
++ libttspico.la -lpopt
+ pico2wave_CFLAGS = -Wall -Dpicolangdir=\"$(picolangdir)\" -I lib
+
diff --git a/0010-platform.patch b/0010-platform.patch
new file mode 100644
index 0000000..ff76f75
--- /dev/null
+++ b/0010-platform.patch
@@ -0,0 +1,30 @@
+--- a/pico/lib/picopltf.h
++++ b/pico/lib/picopltf.h
+@@ -39,6 +39,8 @@
+ #define PICO_MacOSX 5 /* Macintosh OS X */
+ #define PICO_Linux 7 /* Linux */
+
++#define PICO_GENERIC 99 /* Generic */
++
+ /* * definition of current platform ***/
+ #if !defined(PICO_PLATFORM)
+ #if defined(_WIN32)
+@@ -48,7 +50,7 @@
+ #elif defined(linux) || defined(__linux__) || defined(__linux)
+ #define PICO_PLATFORM PICO_Linux
+ #else
+-#error PICO_PLATFORM not defined
++#define PICO_PLATFORM PICO_GENERIC
+ #endif
+ #endif /* !defined(PICO_PLATFORM) */
+
+@@ -64,7 +66,8 @@
+ #define PICO_PLATFORM_STRING "UnknownPlatform"
+ #endif
+
+-#if (PICO_PLATFORM == PICO_MacOSX)
++#include <endian.h>
++#if __BYTE_ORDER == __BIG_ENDIAN
+ #define PICO_ENDIANNESS ENDIANNESS_BIG
+ #else
+ #define PICO_ENDIANNESS ENDIANNESS_LITTLE
diff --git a/svox-link.patch b/svox-link.patch
deleted file mode 100644
index f2958d5..0000000
--- a/svox-link.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- svox-1.0+git20110131/pico/Makefile.am.orig 2013-03-02 18:42:05.685584071 +0100
-+++ svox-1.0+git20110131/pico/Makefile.am 2013-03-02 18:52:46.005557199 +0100
-@@ -3,6 +3,7 @@
- ACLOCAL_AMFLAGS = -I m4
-
- lib_LTLIBRARIES = libttspico.la
-+libttspico_la_LIBADD = -lm
- libttspico_la_SOURCES = \
- lib/picoacph.c \
- lib/picoapi.c \
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/svox.git/commitdiff/5cf8677dcae856309470e45a4e8361a1acbafcdb
More information about the pld-cvs-commit
mailing list