espeak: new package
PATCH v6 1/1 espeak: new package
---
Changes v5 -> v6:
- fix indent
- rename patch
- fix licence to GPLv3+
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-01-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-01-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-01-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 +44 -0
44 lines not on this page · raw message
Signature · 1 line
1.8.3.1
PATCH v6 1/1 espeak: new package
Arnaud,
Looks like the change you made in v5 crept back into v6 here...
Arnaud Aujon <[email protected]> wrote on 10/14/2013 01:05:33 PM:
Quoted 13 lines
Signed-off-by Arnaud Aujon <[email protected]>---
Changes v5 -> v6:
- fix indent
- rename patch
- fix licence to GPLv3+
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
Quoted 3 lines
--- package/Config.in | 1 + package/espeak/Config.in | 41
++++++++++++++++++++
Quoted 2 lines
.../espeak-01-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-01-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-01-do-not-compil-when-install.patch
package/espeak/espeak.mk
Quoted 27 lines
new file mode 100644
index 0000000..983cd1cpackage/espeak/espeak-01-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.
package/espeak/espeak.mk line 36
Quoted 7 lines
package/espeak/espeak.mk new file +7
-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
The comment line that you removed in v5 is back here in v6...
package/espeak/espeak.mk line 35
Quoted 1 line
package/espeak/espeak.mk new file +1
-0+# $(MAKE) CXX="$(TARGET_CXX)" LD="$(TARGET_LD)"
AUDIO="$(ESPEAK_AUDIO_BACKEND)" -C $(@D)/src all
Quoted 14 lines
package/espeak/espeak.mk new file +7
-0+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 v6 1/1 espeak: new package
In reply to Arnaud AujonHi Arnaud,
Quoted 41 lines · Arnaud Aujon
Signed-off-by Arnaud Aujon <[email protected]>---
Changes v5 -> v6:
- fix indent
- rename patch
- fix licence to GPLv3+
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 ++++++++++++++++++++ .../espeak-01-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-01-do-not-compil-when-install.patch 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 2
Quoted 2 lines
package/espeak/Config.in new file +2
-0@@ -0,0 +1,41 @@ +comment "eSpeak requires a toolchain with C++ and WCHAR support" + depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR)
I have a patchset waiting to be merged that unifies these comments. This comment should be adapted according to the new format:
eSpeak needs a toolchain w/ C++, wchar
See: http://patchwork.ozlabs.org/patch/283094/
Also: is it really needed to capitalize the S ? Most packages are written in all-lowercase in the menuconfig, so unless there is a very specific reason I would continue doing this (not sure if this point has been addressed in earlier reviews)
package/espeak/Config.in line 5
Quoted 3 lines
package/espeak/Config.in new file +3
-0+ +config BR2_PACKAGE_ESPEAK + bool "eSpeak"
Same comment about capitalization.
Quoted 7 lines
package/espeak/Config.in new file +7
-0+ depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_USE_WCHAR + help + eSpeak is a speech synthesizer software for English and other languages. + + http://espeak.sourceforge.net/ +
package/espeak/Config.in line 22
Quoted 10 lines
package/espeak/Config.in new file +10
-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
This should become:
ALSA backend needs a toolchain w/ threads
Note that my preference about capitalization in this case is also to use all-lowercase.
Currently you use ALSA, Portaudio, and pulseaudio. But you could equally use PulseAudio as is the actual project spelling. Same for PortAudio. My suggestion is alsa, portaudio, pulseaudio, but note that this is very subjective. Other inputs are certainly welcome.
package/espeak/Config.in line 31
Quoted 9 lines
package/espeak/Config.in new file +9
-0+ +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" +depends on !(BR2_TOOLCHAIN_HAS_THREADS && BR2_USE_WCHAR && BR2_LARGEFILE)
should become:
pulseaudio backend needs a toolchain w/ wchar, largefile, threads
Quoted 72 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_ESPEAKpackage/espeak/espeak-01-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 +35
-0@@ -0,0 +1,44 @@ +############################################################################### +# +# espeak +# +############################################################################### + +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+ +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 +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. + cp $(@D)/src/portaudio19.h $(@D)/src/portaudio.h +endef + +define ESPEAK_BUILD_CMDS + $(MAKE) $(TARGET_CONFIGURE_OPTS) \ + AUDIO="$(ESPEAK_AUDIO_BACKEND)" \
package/espeak/espeak.mk
Quoted 10 lines
package/espeak/espeak.mk new file +9
-1+ -C $(@D)/src all +# $(MAKE) CXX="$(TARGET_CXX)" LD="$(TARGET_LD)" 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)) --
Best regards,
Thomas