[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-84-g53edeeb

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  53edeeb42c5b3476c207cad07fe9c09595620018 (commit)
      from  1a66f8ec076d883f728b0905e14b1bf74f10c03f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 53edeeb42c5b3476c207cad07fe9c09595620018
Author: Samuel Martin <s.m...@gm...>
Date:   Tue Dec 25 15:07:04 2012 +0100

    [BUILDROOT] 2012.11: clean-up for BR upstream integration. Thx Smartin

-----------------------------------------------------------------------

Summary of changes:
 .../buildroot/2012.11/097-adds_flite_package.patch |  117 ++++++++++++--------
 1 files changed, 72 insertions(+), 45 deletions(-)

diff --git a/patches/buildroot/2012.11/097-adds_flite_package.patch b/patches/buildroot/2012.11/097-adds_flite_package.patch
index 3e2c54c..6485b5c 100644
--- a/patches/buildroot/2012.11/097-adds_flite_package.patch
+++ b/patches/buildroot/2012.11/097-adds_flite_package.patch
@@ -1,12 +1,21 @@
 Add Flite package (speech synthesis engine).
 
 Signed-off-by: Julien Boibessot <jul...@ar...>
+Cc: Eric Jarrige <eri...@ar...>
+Signed-off-by: Samuel Martin <s.m...@gm...>
+---
+ package/multimedia/Config.in       |  1 +
+ package/multimedia/flite/Config.in | 11 ++++++++
+ package/multimedia/flite/flite.mk  | 57 ++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 69 insertions(+)
+ create mode 100644 package/multimedia/flite/Config.in
+ create mode 100644 package/multimedia/flite/flite.mk
 
-Index: buildroot/package/multimedia/Config.in
-===================================================================
---- buildroot/package/multimedia/Config.in
-+++ buildroot/package/multimedia/Config.in
-@@ -4,6 +4,7 @@
+diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in
+index 273d9bc..3ca0531 100644
+--- a/package/multimedia/Config.in
++++ b/package/multimedia/Config.in
+@@ -4,6 +4,7 @@ source "package/multimedia/aumix/Config.in"
  source "package/multimedia/bellagio/Config.in"
  source "package/multimedia/faad2/Config.in"
  source "package/multimedia/flac/Config.in"
@@ -14,10 +23,11 @@ Index: buildroot/package/multimedia/Config.in
  source "package/multimedia/ffmpeg/Config.in"
  source "package/multimedia/gstreamer/Config.in"
  source "package/multimedia/gst-ffmpeg/Config.in"
-Index: buildroot/package/multimedia/flite/Config.in
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/multimedia/flite/Config.in	2012-02-21 16:44:45.000000000 +0100
+diff --git a/package/multimedia/flite/Config.in b/package/multimedia/flite/Config.in
+new file mode 100644
+index 0000000..bef989c
+--- /dev/null
++++ b/package/multimedia/flite/Config.in
 @@ -0,0 +1,11 @@
 +config BR2_PACKAGE_FLITE
 +	bool "flite"
@@ -30,52 +40,69 @@ Index: buildroot/package/multimedia/flite/Config.in
 +	  building tools.
 +
 +	  http://www.speech.cs.cmu.edu/flite
-Index: buildroot/package/multimedia/flite/flite.mk
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/multimedia/flite/flite.mk	2012-02-21 16:44:45.000000000 +0100
-@@ -0,0 +1,44 @@
+diff --git a/package/multimedia/flite/flite.mk b/package/multimedia/flite/flite.mk
+new file mode 100644
+index 0000000..c72988f
+--- /dev/null
++++ b/package/multimedia/flite/flite.mk
+@@ -0,0 +1,57 @@
 +#############################################################
 +#
 +# flite
 +#
 +#############################################################
-+
 +FLITE_VERSION = 1.4
 +FLITE_SOURCE = flite-$(FLITE_VERSION)-release.tar.bz2
-+FLITE_SITE = http://www.speech.cs.cmu.edu/flite/packed/flite-$(FLITE_VERSION)/
++FLITE_SITE = http://www.speech.cs.cmu.edu/flite/packed/flite-$(FLITE_VERSION)
++FLITE_LICENSE = BSD-4c
++FLITE_LICENSE_FILES = COPYING
++
 +FLITE_INSTALL_STAGING = YES
-+FLITE_INSTALL_TARGET = YES
 +
-+FLITE_CONF_OPT = --enable-shared
-+FLITE_INSTALL_STAGING_OPT = INSTALLBINDIR=$(STAGING_DIR)/usr/bin INSTALLLIBDIR=$(STAGING_DIR)/usr/lib INSTALLINCDIR=$(STAGING_DIR)/usr/include/flite install
-+FLITE_INSTALL_TARGET_OPT = INSTALLBINDIR=$(TARGET_DIR)/usr/bin INSTALLLIBDIR=$(TARGET_DIR)/usr/lib INSTALLINCDIR=$(STAGING_DIR)/usr/include/flite install
++# Sadly, Flite does not support parallel build,
++# especially when build its shared libraries.
++FLITE_MAKE = $(MAKE1)
 +
-+$(eval $(autotools-package))
++FLITE_CONF_OPT = \
++	$(if $(BR2_PREFER_STATIC_LIB),,--enable-shared)
 +
-+# Flite (strange) archive format makes Buildroot failed to extract it (--strip-components).
-+# So do it manually:
-+$(FLITE_TARGET_EXTRACT): $(FLITE_TARGET_SOURCE)
-+	$(call MESSAGE,"Extracting")
-+	$(INFLATE$(suffix $($(PKG)_SOURCE))) $(DL_DIR)/$($(PKG)_SOURCE) | \
-+		$(TAR) -C $(BUILD_DIR) $(TAR_OPTIONS) -
-+	$(Q)mv $(@D)/.stamp* $(BUILD_DIR)/flite-$(FLITE_VERSION)-release/
-+	$(Q)rm -rf $(@D)
-+	$(Q)mv $(BUILD_DIR)/flite-$(FLITE_VERSION)-release $(@D)
-+# some packages have messed up permissions inside
-+	$(Q)chmod -R ug+rw $(@D)
-+	touch $@
++FLITE_INSTALL_STAGING_OPT = \
++	INSTALLBINDIR=$(STAGING_DIR)/usr/bin \
++	INSTALLLIBDIR=$(STAGING_DIR)/usr/lib \
++	INSTALLINCDIR=$(STAGING_DIR)/usr/include/flite \
++	install
++
++FLITE_INSTALL_TARGET_OPT = \
++	INSTALLBINDIR=$(TARGET_DIR)/usr/bin \
++	INSTALLLIBDIR=$(TARGET_DIR)/usr/lib \
++	INSTALLINCDIR=$(TARGET_DIR)/usr/include/flite \
++	install
 +
-+$(FLITE_HOOK_POST_INSTALL): $(FLITE_TARGET_INSTALL_TARGET)
-+	rm -f $(TARGET_DIR)/usr/lib/libflite*.a
-+ifeq ($(BR2_ENABLE_DEBUG),)
-+	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libflite*.so.$(FLITE_VERSION)
-+	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/flite*
-+endif
-+	touch $@
++# Flite totally screw up their tarball generation, so that:
++#
++#   $ tar tf flite-1.4-release.tar.bz2
++#   ...
++#   flite-1.4-release//install-sh
++#   flite-1.4-release//mkinstalldirs
++#   flite-1.4-release//Exports.def
++#   flite-1.4-release//flite.sln
++#   flite-1.4-release//fliteDll.vcproj
++#   flite-1.4-release/config/Makefile
++#   flite-1.4-release/config/common_make_rules
++#   flite-1.4-release/config/project.mak
++#   flite-1.4-release/config/config.in
++#   flite-1.4-release/config/system.mak.in
++#
++# So, the strip-component trick does not work at all.
++# Let's redefine the extract command.
++define FLITE_EXTRACT_CMDS
++	$(RM) -rf $(FLITE_DIR)
++	$(INFLATE$(suffix $(FLITE_SOURCE))) $(DL_DIR)/$(FLITE_SOURCE) | \
++		$(TAR) -C $(BUILD_DIR) $(TAR_OPTIONS) -
++	mv $(BUILD_DIR)/$(subst .tar.bz2,,$(FLITE_SOURCE)) $(FLITE_DIR)
++endef
 +
-+# Flite has no uninstall target
-+$(FLITE_TARGET_UNINSTALL):
-+	$(call MESSAGE,"Uninstalling")
-+	rm -f $(TARGET_DIR)/usr/lib/libflite*
-+	rm -f $(TARGET_DIR)/usr/bin/flite*
++$(eval $(autotools-package))
+-- 
+1.8.0.1
+


hooks/post-receive
-- 
armadeus


