diff --git a/configure.ac b/configure.ac index 5bca237d5c..67b174225d 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, 2, 2) +AS_VERSION(gst-plugins, GST_PLUGINS, 0, 3, 3, 1) AM_INIT_AUTOMAKE($PACKAGE,$VERSION) AS_LIBTOOL(GST_PLUGINS, 0, 0, 0, yes) @@ -426,19 +426,13 @@ GST_CHECK_FEATURE(HTTP, [http plugins], gsthttpsrc, [ AC_SUBST(GST_HTTPSRC_GET_TYPE) ]) -dnl *** lame *** -translit(dnm, m, l) AM_CONDITIONAL(USE_LAME, true) -GST_CHECK_FEATURE(LAME, [lame mp3 encoder library], lame, [ -GST_CHECK_LIBHEADER(LAME, mp3lame, lame_init, -lm, lame/lame.h, HAVE_LAME="yes" LAME_LIBS="-lmp3lame") +dnl *** Jack *** +translit(dnm, m, l) AM_CONDITIONAL(USE_JACK, true) +GST_CHECK_FEATURE(JACK, Jack, jack, [ + PKG_CHECK_MODULES(JACK, jack, HAVE_JACK="yes", HAVE_JACK="no") + AC_SUBST(JACK_CFLAGS) + AC_SUBST(JACK_LIBS) ]) -AC_SUBST(LAME_LIBS) - - -dnl FIXME : check if these CPP flags can be dealt with otherwise -dnl libdvcheck_save_CPPFLAGS="$CPPFLAGS" -dnl CPPFLAGS="$CPPFLAGS $GST_CFLAGS" -dnl AC_CHECK_HEADER(libdv/dv.h, :, HAVE_LIBDV=no) -dnl CPPFLAGS="$libdvcheck_save_CPPFLAGS" dnl *** jpeg *** dnl FIXME: we could use header checks here as well IMO @@ -449,6 +443,19 @@ GST_CHECK_FEATURE(JPEG, [jpeg], jpegenc jpegdec, [ AC_SUBST(JPEG_LIBS) ]) +dnl *** lame *** +translit(dnm, m, l) AM_CONDITIONAL(USE_LAME, true) +GST_CHECK_FEATURE(LAME, [lame mp3 encoder library], lame, [ +GST_CHECK_LIBHEADER(LAME, mp3lame, lame_init, -lm, lame/lame.h, HAVE_LAME="yes" LAME_LIBS="-lmp3lame") +]) +AC_SUBST(LAME_LIBS) + +dnl FIXME : check if these CPP flags can be dealt with otherwise +dnl libdvcheck_save_CPPFLAGS="$CPPFLAGS" +dnl CPPFLAGS="$CPPFLAGS $GST_CFLAGS" +dnl AC_CHECK_HEADER(libdv/dv.h, :, HAVE_LIBDV=no) +dnl CPPFLAGS="$libdvcheck_save_CPPFLAGS" + dnl *** mad *** dnl FIXME: we could use header checks here as well IMO translit(dnm, m, l) AM_CONDITIONAL(USE_MAD, true) @@ -780,6 +787,7 @@ ext/gnomevfs/Makefile ext/gsm/Makefile ext/hermes/Makefile ext/http/Makefile +ext/jack/Makefile ext/jpeg/Makefile ext/ladspa/Makefile ext/lame/Makefile diff --git a/ext/Makefile.am b/ext/Makefile.am index e03242b70e..39e6a98628 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -100,6 +100,12 @@ else HTTP_DIR= endif +if USE_JACK +JACK_DIR=jack +else +JACK_DIR= +endif + if USE_JPEG JPEG_DIR=jpeg else @@ -203,7 +209,7 @@ SUBDIRS=$(A52DEC_DIR) $(AALIB_DIR) $(ALSA_DIR) \ $(AVIFILE_DIR) $(CDPARANOIA_DIR) $(DV_DIR) \ $(DVDREAD_DIR) $(ESD_DIR) $(FESTIVAL_DIR) \ $(FLAC_DIR) $(GNOMEVFS_DIR) $(GSM_DIR) \ - $(HERMES_DIR) $(HTTP_DIR) $(JPEG_DIR) \ + $(HERMES_DIR) $(HTTP_DIR) $(JACK_DIR) $(JPEG_DIR) \ $(LADSPA_DIR) $(LAME_DIR) \ $(MAD_DIR) $(MIKMOD_DIR) $(MJPEGTOOLS_DIR) $(MPEG2DEC_DIR) \ $(OPENQUICKTIME_DIR) $(RAW1394_DIR) $(RTP_DIR) \ @@ -216,7 +222,7 @@ DIST_SUBDIRS=\ audiofile cdparanoia dv \ dvdread esd festival \ flac gnomevfs gsm \ - hermes http jpeg \ + hermes http jack jpeg \ ladspa lame \ mad mikmod mjpegtools mpeg2dec \ openquicktime raw1394 rtp \ diff --git a/ext/gnomevfs/gstgnomevfssink.c b/ext/gnomevfs/gstgnomevfssink.c index fd45309ac6..38776d873e 100644 --- a/ext/gnomevfs/gstgnomevfssink.c +++ b/ext/gnomevfs/gstgnomevfssink.c @@ -147,7 +147,7 @@ gst_gnomevfssink_class_init (GstGnomeVFSSinkClass *klass) parent_class = g_type_class_ref (GST_TYPE_ELEMENT); - gst_element_install_std_props ( + gst_element_class_install_std_props ( GST_ELEMENT_CLASS (klass), "location", ARG_LOCATION, G_PARAM_READWRITE, NULL); diff --git a/ext/gnomevfs/gstgnomevfssrc.c b/ext/gnomevfs/gstgnomevfssrc.c index 58fb74624b..ab0e67b555 100644 --- a/ext/gnomevfs/gstgnomevfssrc.c +++ b/ext/gnomevfs/gstgnomevfssrc.c @@ -161,7 +161,7 @@ static void gst_gnomevfssrc_class_init(GstGnomeVFSSrcClass *klass) parent_class = g_type_class_ref(GST_TYPE_ELEMENT); - gst_element_install_std_props ( + gst_element_class_install_std_props ( GST_ELEMENT_CLASS (klass), "offset", ARG_OFFSET, G_PARAM_READWRITE, "filesize", ARG_FILESIZE, G_PARAM_READABLE,