espeak: new package
PATCH v5 1/1 espeak: new package
---
Changes v4 -> v5:
- remove useless comment line
Changes v3 -> v4:
- remove extre new lines
- remove useless help
- remove -source from ESPEAK_VERSION
- update extract command to remove -source
--- package/Config.in | 1 + package/espeak/Config.in | 41 ++++++++++++++++++++ .../espeak-1-do-not-compil-when-install.patch | 15 ++++++++ package/espeak/espeak.mk | 44 ++++++++++++++++++++++ 4 files changed, 101 insertions(+) create mode 100644 package/espeak/Config.in create mode 100644 package/espeak/espeak-1-do-not-compil-when-install.patch create mode 100644 package/espeak/espeak.mk
package/Config.in +1 -0
@@ -6,6 +6,7 @@ menu "Audio and video applications" source "package/alsa-utils/Config.in" source "package/aumix/Config.in" source "package/bellagio/Config.in" +source "package/espeak/Config.in" source "package/faad2/Config.in" source "package/ffmpeg/Config.in" source "package/flac/Config.in"
package/espeak/Config.in new file +41 -0
41 lines not on this page · raw message
package/espeak/espeak-1-do-not-compil-when-install.patch new file +15 -0
@@ -0,0 +1,15 @@ +Makefile: do not execute the rule "all" when executing "install" + +signed-off-by: Arnaud Aujon <[email protected]> +=================================================================== +--- espeak-1.47.11-source.orig/src/Makefile ++++ espeak-1.47.11-source/src/Makefile +@@ -131,7 +131,7 @@ + rm -f $(BIN2_NAME) + rm -f $(LIB_NAME)* + +-install: all ++install: + # Create directories + rm -rf $(DESTDIR)$(DATADIR) + $(MKDIR) $(DESTDIR)$(BINDIR)
package/espeak/espeak.mk new file +43 -0
43 lines not on this page · raw message
Signature · 1 line
1.8.3.1
PATCH v5 1/1 espeak: new package
Arnaud Aujon <[email protected]> wrote on 10/14/2013 12:15:29 PM:
Quoted 1 line
Signed-off-by Arnaud Aujon <[email protected]>
Quoted 11 lines
---
Changes v4 -> v5:
- remove useless comment line
Changes v3 -> v4:
- remove extre new lines
- remove useless help
- remove -source fromESPEAK_VERSION
- update extract command to remove -source--- package/Config.in | 1 + package/espeak/Config.in | 41
++++++++++++++++++++
Quoted 2 lines
.../espeak-1-do-not-compil-when-install.patch | 15 ++++++++ package/espeak/espeak.mk | 44
++++++++++++++++++++++
Quoted 3 lines
4 files changed, 101 insertions(+) create mode 100644 package/espeak/Config.in create mode 100644
package/espeak/espeak-1-do-not-compil-when-install.patch
Quoted 20 lines
create mode 100644 package/espeak/espeak.mkpackage/Config.in +1
-0@@ -6,6 +6,7 @@ menu "Audio and video applications" source "package/alsa-utils/Config.in" source "package/aumix/Config.in" source "package/bellagio/Config.in" +source "package/espeak/Config.in" source "package/faad2/Config.in" source "package/ffmpeg/Config.in" source "package/flac/Config.in"package/espeak/Config.in new file +0
-0
package/espeak/Config.in line 9
Quoted 9 lines
package/espeak/Config.in new file +9
-0@@ -0,0 +1,41 @@ +comment "eSpeak requires a toolchain with C++ and WCHAR support" + depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR) + +config BR2_PACKAGE_ESPEAK + bool "eSpeak" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_USE_WCHAR + help + eSpeak is a speech synthesizer software for English and other
languages.
Quoted 11 lines
package/espeak/Config.in new file +11
-0+ + http://espeak.sourceforge.net/ + +if BR2_PACKAGE_ESPEAK +choice + prompt "choose audio backend" + default BR2_PACKAGE_ESPEAK_AUDIO_BACKEND_NONE + + config BR2_PACKAGE_ESPEAK_AUDIO_BACKEND_NONE + bool "No sound backend, only produce wav files" +
package/espeak/Config.in
Quoted 10 lines
package/espeak/Config.in new file +10
-0+ comment "ALSA backend requires a toolchain with threads support" + depends on !BR2_TOOLCHAIN_HAS_THREADS + + config BR2_PACKAGE_ESPEAK_AUDIO_BACKEND_ALSA + bool "ALSA via Portaudio" + select BR2_PACKAGE_PORTAUDIO + select BR2_PACKAGE_PORTAUDIO_CXX + depends on BR2_TOOLCHAIN_HAS_THREADS #portaudio + + comment "Pulseaudio backend requires a toolchain with WCHAR,
LARGEFILE and threads support"
package/espeak/Config.in line 31
Quoted 1 line
package/espeak/Config.in new file +1
-0+ depends on !(BR2_TOOLCHAIN_HAS_THREADS && BR2_USE_WCHAR &&
BR2_LARGEFILE)
Review
Quoted 11 lines
package/espeak/Config.in new file +10
-0+ + config BR2_PACKAGE_ESPEAK_AUDIO_BACKEND_PULSEAUDIO + bool "pulseaudio" + select BR2_PACKAGE_PULSEAUDIO + depends on BR2_TOOLCHAIN_HAS_THREADS # pulseaudio + depends on BR2_USE_WCHAR # pulseaudio + depends on BR2_LARGEFILE # pulseaudio + +endchoice +endif #BR2_PACKAGE_ESPEAK(quoted diff) +0
-0
b/package/espeak/espeak-1-do-not-compil-when-install.patch
package/espeak/espeak.mk
Quoted 27 lines
new file mode 100644
index 0000000..983cd1cpackage/espeak/espeak-1-do-not-compil-when-install.patch new file +15
-0@@ -0,0 +1,15 @@ +Makefile: do not execute the rule "all" when executing "install" + +signed-off-by: Arnaud Aujon <[email protected]> +=================================================================== +--- espeak-1.47.11-source.orig/src/Makefile ++++ espeak-1.47.11-source/src/Makefile +@@ -131,7 +131,7 @@ + rm -f $(BIN2_NAME) + rm -f $(LIB_NAME)* + +-install: all ++install: + # Create directories + rm -rf $(DESTDIR)$(DATADIR) + $(MKDIR) $(DESTDIR)$(BINDIR)package/espeak/espeak.mk new file +0
-0@@ -0,0 +1,44 @@
+###############################################################################
package/espeak/espeak.mk line 4
Quoted 4 lines
package/espeak/espeak.mk new file +3
-0+# +# espeak +#
+###############################################################################
package/espeak/espeak.mk
Quoted 4 lines
package/espeak/espeak.mk new file +4
-0+ +ESPEAK_VERSION = 1.47.11 +ESPEAK_SOURCE = espeak-$(ESPEAK_VERSION)-source.zip +ESPEAK_SITE =
http://downloads.sourceforge.net/project/espeak/espeak/espeak-1.47
Quoted 10 lines
package/espeak/espeak.mk new file +10
-0+ESPEAK_LICENSE = GPLv3 +ESPEAK_LICENSE_FILES = Licence.txt + +ifeq ($(BR2_PACKAGE_ESPEAK_AUDIO_BACKEND_ALSA),y) +ESPEAK_AUDIO_BACKEND = portaudio +ESPEAK_DEPENDENCIES = portaudio +endif +ifeq ($(BR2_PACKAGE_ESPEAK_AUDIO_BACKEND_PULSEAUDIO),y) +ESPEAK_AUDIO_BACKEND = pulseaudio +ESPEAK_DEPENDENCIES = pulseaudio
package/espeak/espeak.mk
Quoted 10 lines
package/espeak/espeak.mk new file +10
-0+endif + +define ESPEAK_EXTRACT_CMDS + unzip -d $(@D) $(DL_DIR)/$(ESPEAK_SOURCE) + mv $(@D)/espeak-$(ESPEAK_VERSION)-source/* $(@D) + $(RM) -r $(@D)/espeak-$(ESPEAK_VERSION)-source +endef + +define ESPEAK_CONFIGURE_CMDS + # Buildroot provides portaudio V19, see ReadMe file for more
details.
Quoted 21 lines
package/espeak/espeak.mk new file +14
-0+ cp $(@D)/src/portaudio19.h $(@D)/src/portaudio.h +endef + +define ESPEAK_BUILD_CMDS + $(MAKE) $(TARGET_CONFIGURE_OPTS)\ + AUDIO="$(ESPEAK_AUDIO_BACKEND)"\ + -C $(@D)/src all +endef + +define ESPEAK_INSTALL_TARGET_CMDS + $(MAKE) install DESTDIR="$(TARGET_DIR)" -C $(@D)/src +endef + +$(eval $(generic-package))Signature · 6 lines
1.8.3.1 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
PATCH v5 1/1 espeak: new package
In reply to Arnaud AujonDear Arnaud Aujon,
Quoted 16 lines
package/espeak/Config.in new file +16
-0+if BR2_PACKAGE_ESPEAK +choice + prompt "choose audio backend" + default BR2_PACKAGE_ESPEAK_AUDIO_BACKEND_NONE + + config BR2_PACKAGE_ESPEAK_AUDIO_BACKEND_NONE + bool "No sound backend, only produce wav files" + + comment "ALSA backend requires a toolchain with threads support" + depends on !BR2_TOOLCHAIN_HAS_THREADS + + config BR2_PACKAGE_ESPEAK_AUDIO_BACKEND_ALSA + bool "ALSA via Portaudio" + select BR2_PACKAGE_PORTAUDIO + select BR2_PACKAGE_PORTAUDIO_CXX + depends on BR2_TOOLCHAIN_HAS_THREADS #portaudio
package/espeak/Config.in line 38
Quoted 10 lines
package/espeak/Config.in new file +10
-0+ + comment "Pulseaudio backend requires a toolchain with WCHAR, LARGEFILE and threads support" + depends on !(BR2_TOOLCHAIN_HAS_THREADS && BR2_USE_WCHAR && BR2_LARGEFILE) + + config BR2_PACKAGE_ESPEAK_AUDIO_BACKEND_PULSEAUDIO + bool "pulseaudio" + select BR2_PACKAGE_PULSEAUDIO + depends on BR2_TOOLCHAIN_HAS_THREADS # pulseaudio + depends on BR2_USE_WCHAR # pulseaudio + depends on BR2_LARGEFILE # pulseaudio
Throughout the Buildroot tree, I don't think we have the habit of indenting things inside a choice, so I would remove one tab from this entire block. However, the "depends on" for the comments should be intended.
package/espeak/Config.in line 41
Quoted 3 lines
package/espeak/Config.in new file +3
-0+ +endchoice +endif #BR2_PACKAGE_ESPEAK
Nit pick: one space between # and BR2_...
package/espeak/espeak-1-do-not-compil-when-install.patch
Quoted 1 line
package/espeak/espeak-1-do-not-compil-when-install.patch +0
-0
Even we have agreed on the number of digits we should use, I believe 1 digit is really too short. We don't even notice it's the patch number. So if you could replace that by espeak-01-....patch it would be great.
package/espeak/espeak-1-do-not-compil-when-install.patch
Quoted 4 lines
package/espeak/espeak-1-do-not-compil-when-install.patch +4
-0+ESPEAK_VERSION = 1.47.11 +ESPEAK_SOURCE = espeak-$(ESPEAK_VERSION)-source.zip +ESPEAK_SITE = http://downloads.sourceforge.net/project/espeak/espeak/espeak-1.47 +ESPEAK_LICENSE = GPLv3
License is actually GPLv3+, as the source code states:
* This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 3 of the License, or * * (at your option) any later version. *
package/espeak/espeak-1-do-not-compil-when-install.patch
Quoted 3 lines
package/espeak/espeak-1-do-not-compil-when-install.patch +3
-0+define ESPEAK_BUILD_CMDS + $(MAKE) $(TARGET_CONFIGURE_OPTS)\ + AUDIO="$(ESPEAK_AUDIO_BACKEND)"\
One space before backslashes.
package/espeak/espeak-1-do-not-compil-when-install.patch
Quoted 6 lines
package/espeak/espeak-1-do-not-compil-when-install.patch +6
-0+ -C $(@D)/src all +endef + +define ESPEAK_INSTALL_TARGET_CMDS + $(MAKE) install DESTDIR="$(TARGET_DIR)" -C $(@D)/src +endef
Other than that, looks good to me. Thanks a lot for the quick turnaround of new versions!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH v5 1/1 espeak: new package
Thomas,
I will send a new patch shortly.
About the licence, the file Licence.txt say GPLv3 but you're right in the source code we can find GPLv3+, what do you do in this case ?
2013/10/14 Thomas Petazzoni <[email protected]>
Quoted 83 lines
Dear Arnaud Aujon,
Quoted 8 lines
package/espeak/Config.in new file +8
-0+if BR2_PACKAGE_ESPEAK +choice + prompt "choose audio backend" + default BR2_PACKAGE_ESPEAK_AUDIO_BACKEND_NONE + + config BR2_PACKAGE_ESPEAK_AUDIO_BACKEND_NONE + bool "No sound backend, only produce wav files" +package/espeak/Config.in
Quoted 10 lines
package/espeak/Config.in new file +10
-0+ comment "ALSA backend requires a toolchain with threads support" + depends on !BR2_TOOLCHAIN_HAS_THREADS + + config BR2_PACKAGE_ESPEAK_AUDIO_BACKEND_ALSA + bool "ALSA via Portaudio" + select BR2_PACKAGE_PORTAUDIO + select BR2_PACKAGE_PORTAUDIO_CXX + depends on BR2_TOOLCHAIN_HAS_THREADS #portaudio + + comment "Pulseaudio backend requires a toolchain with WCHAR,LARGEFILE and threads support"
Quoted 1 line
+ depends on !(BR2_TOOLCHAIN_HAS_THREADS &&
BR2_USE_WCHAR&&
BR2_LARGEFILE)package/espeak/Config.in line 38
Quoted 7 lines
package/espeak/Config.in new file +7
-0+ + config BR2_PACKAGE_ESPEAK_AUDIO_BACKEND_PULSEAUDIO + bool "pulseaudio" + select BR2_PACKAGE_PULSEAUDIO + depends on BR2_TOOLCHAIN_HAS_THREADS # pulseaudio + depends on BR2_USE_WCHAR # pulseaudio + depends on BR2_LARGEFILE # pulseaudioThroughout the Buildroot tree, I don't think we have the habit of indenting things inside a choice, so I would remove one tab from this entire block. However, the "depends on" for the comments should be intended.
package/espeak/Config.in line 41
Quoted 3 lines
package/espeak/Config.in new file +3
-0+ +endchoice +endif #BR2_PACKAGE_ESPEAKNit pick: one space between # and
BR2_...Review
Quoted 1 line
(quoted diff) +0
-0
b/package/espeak/espeak-1-do-not-compil-when-install.patchEven we have agreed on the number of digits we should use, I believe 1 digit is really too short. We don't even notice it's the patch number. So if you could replace that by espeak-01-....patch it would be great.
package/espeak/espeak.mk
Quoted 3 lines
package/espeak/espeak.mk new file +3
-0+ESPEAK_VERSION = 1.47.11 +ESPEAK_SOURCE = espeak-$(ESPEAK_VERSION)-source.zip +ESPEAK_SITE =http://downloads.sourceforge.net/project/espeak/espeak/espeak-1.47
Quoted 1 line
+ESPEAK_LICENSE = GPLv3
License is actually GPLv3+, as the source code states:
* This program is free software; you can redistribute it and/or modify
*
* it under the terms of the GNU General Public License as published by
*
* the Free Software Foundation; either version 3 of the License, or
*
* (at your option) any later version.
*package/espeak/espeak.mk line 35
Quoted 3 lines
package/espeak/espeak.mk new file +3
-0+define ESPEAK_BUILD_CMDS + $(MAKE) $(TARGET_CONFIGURE_OPTS)\ + AUDIO="$(ESPEAK_AUDIO_BACKEND)"\One space before backslashes.
package/espeak/espeak.mk line 41
Quoted 6 lines
package/espeak/espeak.mk new file +6
-0+ -C $(@D)/src all +endef + +define ESPEAK_INSTALL_TARGET_CMDS + $(MAKE) install DESTDIR="$(TARGET_DIR)" -C $(@D)/src +endefOther than that, looks good to me. Thanks a lot for the quick turnaround of new versions!
Quoted 6 lines
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20131014/6957be57/attachment.html>
PATCH v5 1/1 espeak: new package
Dear arnaud aujon,
Quoted 3 lines · arnaud aujon
I will send a new patch shortly.
About the licence, the file Licence.txt say GPLv3 but you're right in the source code we can find GPLv3+, what do you do in this case ?
It's very often the case: the COPYING or License file provides the license text for a given version of the GPL license, and the code itself precises whether it's only this version, or this version or later. And since the FSF recommends using the "or later" wording, many projects do this.
In this case, the <pkg>_LICENSE should really be GPLv3+, because that's what the source code says.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH v5 1/1 espeak: new package
2013/10/14 Thomas Petazzoni <[email protected]>
Quoted 8 lines
Dear arnaud aujon,
Quoted 3 lines · arnaud aujon
I will send a new patch shortly.
About the licence, the file Licence.txt say GPLv3 but you're right in the source code we can find GPLv3+, what do you do in this case ?
Quoted 10 lines
It's very often the case: the COPYING or License file provides the license text for a given version of the GPL license, and the code itself precises whether it's only this version, or this version or later. And since the FSF recommends using the "or later" wording, many projects do this.
In this case, the <pkg>_LICENSE should really be GPLv3+, because that's what the source code says.
Thanks for your explanation.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20131014/98e4b369/attachment.html>