summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4755ec0)
raw | patch | inline | side by side (parent: 4755ec0)
author | Thomas Vander Stichele <thomas@apestaart.org> | |
Fri, 3 May 2002 09:59:10 +0000 (09:59 +0000) | ||
committer | Thomas Vander Stichele <thomas@apestaart.org> | |
Fri, 3 May 2002 09:59:10 +0000 (09:59 +0000) |
Original commit message from CVS:
various name fixes and sundry
various name fixes and sundry
configure.ac | patch | blob | history | |
ext/Makefile.am | patch | blob | history | |
gst-plugins-ugly.spec.in | patch | blob | history |
diff --git a/configure.ac b/configure.ac
index 9f28cc10e08279909cfa14ee04e190e424093972..5a393844b7fd2c43ef4646be41aad25e662831e2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
dnl when going to/from release please set the nano (fourth number) right !
dnl We disable static building for development, for time savings
AM_DISABLE_STATIC
-AS_VERSION(gst-plugins, GST_PLUGINS, 0, 3, 4, 0)
+AS_VERSION(gst-plugins, GST_PLUGINS, 0, 3, 4, 1)
AM_INIT_AUTOMAKE($PACKAGE,$VERSION)
AS_LIBTOOL(GST_PLUGINS, 0, 0, 0, yes)
GST_PLUGIN_LDFLAGS='-module -avoid-version'
AC_SUBST(GST_PLUGIN_LDFLAGS)
+dnl these are all the gst plugins, compilable without additional libs
GST_PLUGINS_ALL="\
ac3parse adder audioscale auparse avi cdxaparse chart\
- cutter deinterlace flx goom intfloat law level\
+ cutter deinterlace festival flx goom intfloat law level\
median mpeg1enc mpeg1sys mpeg1videoparse mpeg2enc mpeg2sub\
mpegaudio mpegaudioparse mpegstream mpegtypes modplug\
monoscope passthrough playondemand qtdemux rtjpeg silence sine\
])
dnl **** festival ****
-translit(dnm, m, l) AM_CONDITIONAL(USE_FESTIVAL, true)
-GST_CHECK_FEATURE(FESTIVAL, [festival plugins], festivalsrc, [
+dnl translit(dnm, m, l) AM_CONDITIONAL(USE_FESTIVAL, true)
+dnl GST_CHECK_FEATURE(FESTIVAL, [festival plugins], festivalsrc, [
dnl NOTE: just using local net connection now, add this lib check
dnl in the future if needed
dnl AC_LANG_PUSH(C++)
dnl GST_CHECK_LIBHEADER(FESTIVAL, Festival, , , festival/festival.h, FESTIVAL_LIBS="-lFestival")
dnl AC_LANG_POP(C++)
dnl AC_SUBST(FESTIVAL_LIBS)
- HAVE_FESTIVAL=yes
-])
+dnl HAVE_FESTIVAL=yes
+dnl])
dnl *** FLAC ***
translit(dnm, m, l) AM_CONDITIONAL(USE_FLAC, true)
gst/chart/Makefile
gst/cutter/Makefile
gst/deinterlace/Makefile
+gst/festival/Makefile
gst/flx/Makefile
gst/goom/Makefile
gst/intfloat/Makefile
ext/dv/Makefile
ext/dvdread/Makefile
ext/esd/Makefile
-ext/festival/Makefile
+ext/ffmpeg/Makefile
ext/flac/Makefile
ext/gnomevfs/Makefile
ext/gsm/Makefile
diff --git a/ext/Makefile.am b/ext/Makefile.am
index 2e4cd315ab013418d867e81287ddac9e324ea3c7..dfc17a09bccc6c31e9b85ddcea26bf49a3b7831a 100644 (file)
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
ESD_DIR=
endif
-if USE_FESTIVAL
-FESTIVAL_DIR=festival
-else
-FESTIVAL_DIR=
-endif
+## if USE_FESTIVAL
+## FESTIVAL_DIR=festival
+## else
+## FESTIVAL_DIR=
+## endif
if USE_GSM
GSM_DIR=gsm
SUBDIRS=$(A52DEC_DIR) $(AALIB_DIR) $(ALSA_DIR) \
$(ARTS_DIR) $(ARTSC_DIR) $(AUDIOFILE_DIR) \
$(AVIFILE_DIR) $(CDPARANOIA_DIR) $(DV_DIR) \
- $(DVDREAD_DIR) $(ESD_DIR) $(FESTIVAL_DIR) \
+ $(DVDREAD_DIR) $(ESD_DIR) \
$(FLAC_DIR) $(GNOMEVFS_DIR) $(GSM_DIR) \
$(HERMES_DIR) $(HTTP_DIR) $(JACK_DIR) $(JPEG_DIR) \
$(LADSPA_DIR) $(LAME_DIR) $(LCS_DIR) \
a52dec aalib alsa \
arts artsd avifile \
audiofile cdparanoia dv \
- dvdread esd festival \
+ dvdread esd ffmpeg \
flac gnomevfs gsm \
hermes http jack jpeg \
ladspa lame lcs \
index e46053fe31ac50f8c9724255f338ed4cd53a9a4a..83201b6c81cbda9bbd6e0759f1decf6756aac7fe 100644 (file)
--- a/gst-plugins-ugly.spec.in
+++ b/gst-plugins-ugly.spec.in
@USE_ESD_TRUE@/sbin/ldconfig
### FESTIVAL ###
-@USE_FESTIVAL_TRUE@%package -n gstreamer-festival
-@USE_FESTIVAL_TRUE@Summary: GStreamer plugin for text-to-speech support using Festival
-@USE_FESTIVAL_TRUE@Group: Libraries/Multimedia
-@USE_FESTIVAL_TRUE@Requires: gstreamer-plugins >= %{version}
-@USE_FESTIVAL_TRUE@Requires: festival >= 1.4.1
-@USE_FESTIVAL_TRUE@BuildRequires: festival-devel >= 1.4.1
-@USE_FESTIVAL_TRUE@
-@USE_FESTIVAL_TRUE@%description -n gstreamer-festival
-@USE_FESTIVAL_TRUE@Element for text-to-speech using the festival server.
-@USE_FESTIVAL_TRUE@
-@USE_FESTIVAL_TRUE@%files -n gstreamer-festival
-@USE_FESTIVAL_TRUE@%defattr(-, root, root)
-@USE_FESTIVAL_TRUE@%{prefix}/lib/gst/libgstfestival*
-@USE_FESTIVAL_TRUE@
-@USE_FESTIVAL_TRUE@%post -n gstreamer-festival
-@USE_FESTIVAL_TRUE@%{prefix}/bin/gst-register --gst-mask=0 2> /dev/null
+%package -n gstreamer-festival
+Summary: GStreamer plugin for text-to-speech support using Festival
+Group: Libraries/Multimedia
+Requires: gstreamer-plugins >= %{version}
+
+%description -n gstreamer-festival
+Element for text-to-speech using the festival server.
+
+%files -n gstreamer-festival
+%defattr(-, root, root)
+%{prefix}/lib/gst/libgstfestival*
+
+%post -n gstreamer-festival
+%{prefix}/bin/gst-register --gst-mask=0 2> /dev/null
### FLAC ###
@USE_FLAC_TRUE@%package -n gstreamer-flac