[oe-commits] org.oe.dev merge of '32e15a2c3c11153e8886b20192817c1ff773b323'

[mickeyl commit]

merge of '32e15a2c3c11153e8886b20192817c1ff773b323'
     and '5ecfc6cd9727453503405bbb7de81a74344de218'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: d8eaee1beb7bbcbdba9f7dae65bcedef164a64e1
ViewMTN: http://monotone.openembedded.org/revision/info/d8eaee1beb7bbcbdba9f7dae65bcedef164a64e1
Files:
1
packages/libol/libol_0.3.16.bb
packages/libol/libol_0.3.18.bb
packages/speech-dispatcher/files/configure_fix.patch
packages/speech-dispatcher/speech-dispatcher_0.6.5.bb
Diffs:

#
# mt diff -r32e15a2c3c11153e8886b20192817c1ff773b323 -rd8eaee1beb7bbcbdba9f7dae65bcedef164a64e1
#
#
#
# delete "packages/libol/libol_0.3.16.bb"
# 
# patch "packages/libol/libol_0.3.18.bb"
#  from [a545d5692f51a931712602d69f586675ee7ac004]
#    to [9af4b21753afc6dd460268a2111b70af976f2911]
#
============================================================
--- packages/libol/libol_0.3.18.bb	a545d5692f51a931712602d69f586675ee7ac004
+++ packages/libol/libol_0.3.18.bb	9af4b21753afc6dd460268a2111b70af976f2911
@@ -1,14 +1,12 @@
-PR = "r7"
+DESCRIPTION = "A tiny C support library"
+SECTION = "libs"
+LICENSE = "GPL"
+PR = "r8"
 
 SRC_URI = "http://www.balabit.com/downloads/files/libol/0.3/${P}.tar.gz"
 
-S = "${WORKDIR}/${PN}-${PV}"
-
 inherit autotools binconfig
 
 do_stage() {
-        install -d ${STAGING_INCDIR}/libol
-        install -m 0755 ${S}/src/.libs/libol.so.0.0.0 ${STAGING_LIBDIR}/
-        ln -fs ${STAGING_LIBDIR}/libol.so.0.0.0 ${STAGING_LIBDIR}/libol.so.0
-        install ${S}/src/*.h ${STAGING_INCDIR}/libol/
+	autotools_stage_all
 }


#
# mt diff -r5ecfc6cd9727453503405bbb7de81a74344de218 -rd8eaee1beb7bbcbdba9f7dae65bcedef164a64e1
#
#
#
# add_file "packages/speech-dispatcher/files/configure_fix.patch"
#  content [414e2b325a6a6f7240beb5f7ad791b83dc462295]
# 
# patch "packages/speech-dispatcher/speech-dispatcher_0.6.5.bb"
#  from [b70cba0c2b41cdc634eb88c2b47dabab343b316a]
#    to [234b25c309b6b52f26d9fb1a049e4227b90ba438]
#
============================================================
--- packages/speech-dispatcher/files/configure_fix.patch	414e2b325a6a6f7240beb5f7ad791b83dc462295
+++ packages/speech-dispatcher/files/configure_fix.patch	414e2b325a6a6f7240beb5f7ad791b83dc462295
@@ -0,0 +1,46 @@
+Index: speech-dispatcher-0.6.5/configure.in
+===================================================================
+--- speech-dispatcher-0.6.5.orig/configure.in	2008-03-10 23:11:42.000000000 +0000
++++ speech-dispatcher-0.6.5/configure.in	2008-03-10 23:14:02.000000000 +0000
+@@ -134,12 +134,15 @@
+ AC_SUBST(ibmtts_include)
+ 
+ dnl check for espeak support
++AC_LANG_PUSH([C++])
+ AC_CHECK_LIB(espeak,
+ espeak_Initialize,
+ 		espeak_ok="true"; echo "Compiling with espeak support.",
+ 		espeak_ok="false"; echo "Espeak not found.",
+          	-lpthread -lm)
+ 
++AC_LANG_POP([C++])
++
+ AC_ARG_WITH(espeak, AS_HELP_STRING(--with-espeak, Compile with espeak support),
+ 		 if test $withval = "no"; then 
+ 		    echo "Forced compilation without espeak support."; 
+Index: speech-dispatcher-0.6.5/src/modules/Makefile.am
+===================================================================
+--- speech-dispatcher-0.6.5.orig/src/modules/Makefile.am	2008-03-10 23:18:50.000000000 +0000
++++ speech-dispatcher-0.6.5/src/modules/Makefile.am	2008-03-10 23:25:39.000000000 +0000
+@@ -8,6 +8,7 @@
+ EXTRA_DIST = module_main.c module_utils_addvoice.c festival_client.c festival_client.h
+ 
+ AM_CFLAGS = -Wall -DLOCALEDIR=\"$(localedir)\" $(inc_local) @glib_include@ -L$(top_srcdir)/src/audio -I$(top_srcdir)/src/audio -I../../intl/ $(ibmtts_include) @SNDFILE_CFLAGS@ -Wl,--rpath -Wl,$(spdlibdir)
++AM_CXXFLAGS = -Wall -DLOCALEDIR=\"$(localedir)\" $(inc_local) @glib_include@ -L$(top_srcdir)/src/audio -I$(top_srcdir)/src/audio -I../../intl/ $(ibmtts_include) @SNDFILE_CFLAGS@ -Wl,--rpath -Wl,$(spdlibdir)
+ 
+ if flite_support
+ if ibmtts_support
+@@ -45,6 +46,6 @@
+ sd_cicero_SOURCES = cicero.c module_utils.c module_utils.h
+ sd_cicero_LDADD = -lm -lpthread -ldotconf @glib_libs@
+ 
+-sd_espeak_SOURCES = espeak.c module_utils.c module_utils.h
++sd_espeak_SOURCES = espeak.c module_utils.c module_utils.h dummy.cpp
+ sd_espeak_LDFLAGS = -rpath '$(spdlibdir)'
+ sd_espeak_LDADD = -lsdaudio -lm -lespeak -lpthread -ldotconf @SNDFILE_LIBS@ @gthread_libs@
+Index: speech-dispatcher-0.6.5/src/modules/dummy.cpp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ speech-dispatcher-0.6.5/src/modules/dummy.cpp	2008-03-10 23:26:50.000000000 +0000
+@@ -0,0 +1 @@
++
============================================================
--- packages/speech-dispatcher/speech-dispatcher_0.6.5.bb	b70cba0c2b41cdc634eb88c2b47dabab343b316a
+++ packages/speech-dispatcher/speech-dispatcher_0.6.5.bb	234b25c309b6b52f26d9fb1a049e4227b90ba438
@@ -5,13 +5,14 @@ RPROVIDES_${PN} += "speechd"
 DEPENDS = "espeak flite pulseaudio libdotconf glib-2.0"
 RPROVIDES_${PN} += "speechd"
 
-PR = "r7"
+PR = "r8"
 
 inherit autotools update-rc.d
 
 SRC_URI = "http://www.freebsoft.org/pub/projects/speechd/${PN}-${PV}.tar.gz \
 	   file://speech-dispatcher.init \
            file://srcMakefile.am.patch;patch=1 \
+           file://configure_fix.patch;patch=1 \
 	   file://configSpeechd.conf.in_00.patch;patch=1"
 
 LEAD_SONAME = "libspeechd.so"