diff options
| -rw-r--r-- | configure.ac | 16 | ||||
| -rw-r--r-- | ext/Makefile.am | 14 | ||||
| -rw-r--r-- | gst-plugins.spec.in | 30 | ||||
| -rw-r--r-- | gst/y4m/gsty4mencode.c | 4 |
4 files changed, 32 insertions, 32 deletions
diff --git a/configure.ac b/configure.ac index 9f28cc10..5a393844 100644 --- a/configure.ac +++ b/configure.ac @@ -10,7 +10,7 @@ AM_DISABLE_STATIC 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) @@ -169,9 +169,10 @@ dnl ========================================================================== 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\ @@ -373,8 +374,8 @@ GST_CHECK_FEATURE(ESD, [esound plugins], esdsink esdmon, [ ]) 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++) @@ -386,8 +387,8 @@ GST_CHECK_FEATURE(FESTIVAL, [festival plugins], festivalsrc, [ 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) @@ -753,6 +754,7 @@ gst/cdxaparse/Makefile gst/chart/Makefile gst/cutter/Makefile gst/deinterlace/Makefile +gst/festival/Makefile gst/flx/Makefile gst/goom/Makefile gst/intfloat/Makefile @@ -811,7 +813,7 @@ ext/cdparanoia/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 2e4cd315..dfc17a09 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -64,11 +64,11 @@ else 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 @@ -213,7 +213,7 @@ endif 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) \ @@ -226,7 +226,7 @@ DIST_SUBDIRS=\ 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 \ diff --git a/gst-plugins.spec.in b/gst-plugins.spec.in index e46053fe..83201b6c 100644 --- a/gst-plugins.spec.in +++ b/gst-plugins.spec.in @@ -234,22 +234,20 @@ fi @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 diff --git a/gst/y4m/gsty4mencode.c b/gst/y4m/gsty4mencode.c index 3a913b72..65343337 100644 --- a/gst/y4m/gsty4mencode.c +++ b/gst/y4m/gsty4mencode.c @@ -240,7 +240,7 @@ plugin_init (GModule *module, GstPlugin *plugin) { GstElementFactory *factory; - factory = gst_element_factory_new("lavencode",GST_TYPE_LAVENCODE, + factory = gst_element_factory_new("lavenc",GST_TYPE_LAVENCODE, &lavencode_details); g_return_val_if_fail(factory != NULL, FALSE); @@ -257,6 +257,6 @@ plugin_init (GModule *module, GstPlugin *plugin) GstPluginDesc plugin_desc = { GST_VERSION_MAJOR, GST_VERSION_MINOR, - "lavencode", + "lavenc", plugin_init }; |