Add service.info0.3

3 files changed, 39 insertions, 29 deletions

diff --git a/configure.ac b/configure.ac
index ae34351..fe41fd8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -124,17 +124,23 @@ fi
 AC_SUBST(plugindir)
 
 dnl set proper LDFLAGS for plugins
-GST_PLUGIN_LDFLAGS='-module -avoid-version -export-symbols-regex [_]*\(gst_\|Gst\|GST_\).*'
+GST_PLUGIN_LDFLAGS='-module -avoid-version'
 AC_SUBST(GST_PLUGIN_LDFLAGS)
 
-dnl check espeak dependencies
-AC_CHECK_LIB(espeak, espeak_Initialize,, AC_MSG_ERROR())
 PKG_CHECK_MODULES(GST_AUDIO, gstreamer-audio-0.10, HAVE_AUDIO=yes, HAVE_AUDIO=no)
-
 if test "x$HAVE_AUDIO" = "xno"; then
     AC_CHECK_LIB(gstbase-0.10, gst_base_src_get_type,, AC_MSG_ERROR())
     AC_CHECK_LIB(gstaudio-0.10, gst_base_audio_src_get_type,, AC_MSG_ERROR())
 fi
 
-AC_OUTPUT(Makefile m4/Makefile src/Makefile)
+dnl check espeak
+if test "${ESPEAK_PREFIX}"; then
+    ESPEAK_CFLAGS="-I${ESPEAK_PREFIX}/include"
+    ESPEAK_LIBS="-L${ESPEAK_PREFIX}/lib -lespeak"
+    AC_SUBST(ESPEAK_CFLAGS)
+    AC_SUBST(ESPEAK_LIBS)
+else
+    AC_CHECK_LIB(espeak, espeak_Initialize,, AC_MSG_ERROR())
+fi
 
+AC_OUTPUT(Makefile m4/Makefile src/Makefile)
diff --git a/service/service.info b/service/service.info
index aa10f17..8d91194 100644
--- a/service/service.info
+++ b/service/service.info
@@ -1,27 +1,31 @@
-[Service]
-name = gst-plugins-espeak
+[DEFAULT]
+uid = gst-plugins-espeak
 summary = eSpeak library as a sound source for GStreamer
-description = %(summary)s
-homepage = http://wiki.sugarlabs.org/go/Activity_Team/gst-plugins-espeak
-compatibility-version = 0
-version = 3
 license = GPLv2+
-build-command = "$SRCDIR"/configure --prefix="$DISTDIR" && make install
-binding = GST_PLUGIN_PATH lib/gstreamer-0.10
-requires = espeak; gstreamer; gst-plugins-base; gst-plugins-good
-build-requires = %(requires)s; make; gcc-c
-
-[Distro:*]
-name = gst-plugins-espeak
-
-[Distro:gentoo]
-name = media-sound/gst-plugins-espeak
+homepage = http://wiki.sugarlabs.org/go/Activity_Team/gst-plugins-espeak
 
-[Distro:mandriva]
-name = gstreamer0.10-espeak
+[Service]
+requires = espeak >= 1.42, gstreamer, gst-plugins-base, gst-plugins-good
+packaged = rpm gst-plugins-espeak
+           suse gstreamer-0_10-plugins-espeak
+           debian gstreamer0.10-plugins-espeak
+           mandriva gstreamer0.10-espeak
+           gentoo media-sound/gst-plugins-espeak
+binding  = GST_PLUGIN_PATH lib
+include  = *.so*
+machine  = build
 
-[Distro:suse]
-name = gstreamer-0_10-plugins-espeak
+[Build]
+requires = espeak/devel, gstreamer/devel, gst-plugins-base/devel
+           gst-plugins-good/devel, make, gcc-c
+exec     = "$SRCDIR"/configure
+                CFLAGS="%(cflags)s"
+                --prefix="$DISTDIR"
+                %(chost)s
+           && make
+           && make install-strip
 
-[Distro:debian]
-name = gstreamer0.10-plugins-espeak
+[Maintain]
+version = 1
+exec = ./autogen.sh && make distcheck
+export-versions = gstreamer >= %(version)s
diff --git a/src/Makefile.am b/src/Makefile.am
index c1d1f49..049a21c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,8 +2,8 @@ plugin_LTLIBRARIES = libgstespeak.la
 
 libgstespeak_la_SOURCES = espeak.c gstespeak.c
 
-libgstespeak_la_CFLAGS = $(GST_CFLAGS) $(GST_AUDIO_CFLAGS)
-libgstespeak_la_LIBADD = $(GST_LIBS) $(GST_AUDIO_LIBS)
+libgstespeak_la_CFLAGS = $(GST_CFLAGS) $(GST_AUDIO_CFLAGS) $(ESPEAK_CFLAGS)
+libgstespeak_la_LIBADD = $(GST_LIBS) $(GST_AUDIO_LIBS) $(ESPEAK_LIBS)
 libgstespeak_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstespeak_la_LIBTOOLFLAGS = --tag=disable-static