here we go

Original commit message from CVS:
here we go
parent a7fc1047
......@@ -10,14 +10,14 @@ else
EXT_DIR=
endif
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = gstreamer-libs.pc
SUBDIRS=gst-libs gst sys $(EXT_DIR) examples tools $(GCONF_DIR) ## testsuite
DIST_SUBDIRS=gst-libs gst sys ext examples tools gconf ## testsuite
EXTRA_DIST=gst-plugins.spec depcomp \
AUTHORS COPYING README RELEASE LICENSE LICENSE_readme \
ChangeLog autogen.sh common m4
dist-hook:
rm -rf `find $(distdir)/common -name CVS`
rm -rf `find $(distdir)/m4 -name CVS`
gstreamer-libs.pc.in gstreamer-libs-uninstalled.pc.in \
AUTHORS COPYING README RELEASE \
ChangeLog autogen.sh
......@@ -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, 4)
AS_VERSION(gst-plugins, GST_PLUGINS, 0, 4, 0, 0)
AM_INIT_AUTOMAKE($PACKAGE,$VERSION)
AS_LIBTOOL(GST_PLUGINS, 0, 0, 0, yes)
......@@ -406,13 +406,12 @@ dnl AC_CHECK_LIB(cdda_paranoia, paranoia_init, : , HAVE_CDPARANOIA=no, -lcdda_in
dnl AC_CHECK_HEADER(cdda_paranoia.h, :, HAVE_CDPARANOIA=no)
dnl *** libdv ***
translit(dnm, m, l) AM_CONDITIONAL(USE_LIBDV, true)
GST_CHECK_FEATURE(LIBDV, [libdv DV/video decoder], dvdec, [
dnl use this when gtk deps are removed from its pkg-config .pc
dnl PKG_CHECK_MODULES(LIBDV, libdv, HAVE_LIBDV="yes", HAVE_LIBDV="no")
AM_PATH_LIBDV(HAVE_LIBDV="yes", HAVE_LIBDV="no")
AC_SUBST(LIBDV_CFLAGS)
AC_SUBST(LIBDV_LIBS)
translit(dnm, m, l) AM_CONDITIONAL(USE_DV, true)
GST_CHECK_FEATURE(DV, [libdv DV/video decoder], dvdec, [
dnl use pkg-config when gtk deps are removed from its pkg-config .pc
AM_PATH_LIBDV(HAVE_DV="yes", HAVE_DV="no")
AC_SUBST(DV_CFLAGS)
AC_SUBST(DV_LIBS)
])
dnl *** dvdread ***
......
......@@ -46,10 +46,10 @@ else
CDPARANOIA_DIR=
endif
if USE_LIBDV
LIBDV_DIR=dv
if USE_DV
DV_DIR=dv
else
LIBDV_DIR=
DV_DIR=
endif
if USE_DVDREAD
......@@ -228,7 +228,7 @@ endif
SUBDIRS=$(A52DEC_DIR) $(AALIB_DIR) $(ALSA_DIR) \
$(ARTS_DIR) $(ARTSC_DIR) $(AUDIOFILE_DIR) \
$(AVIFILE_DIR) $(CDPARANOIA_DIR) $(LIBDV_DIR) \
$(AVIFILE_DIR) $(CDPARANOIA_DIR) $(DV_DIR) \
$(DVDREAD_DIR) $(DVDNAV_DIR) $(ESD_DIR) \
$(FLAC_DIR) $(GNOMEVFS_DIR) $(GSM_DIR) \
$(HERMES_DIR) $(HTTP_DIR) $(JACK_DIR) $(JPEG_DIR) \
......
......@@ -3,8 +3,8 @@ plugindir = $(libdir)/gst
plugin_LTLIBRARIES = libgstdvdec.la
libgstdvdec_la_SOURCES = gstdvdec.c
libgstdvdec_la_CFLAGS = $(GST_CFLAGS) $(LIBDV_CFLAGS)
libgstdvdec_la_LIBADD = $(LIBDV_LIBS)
libgstdvdec_la_CFLAGS = $(GST_CFLAGS) $(DV_CFLAGS)
libgstdvdec_la_LIBADD = $(DV_LIBS)
libgstdvdec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = gstdvdec.h
......
This diff is collapsed.
This diff is collapsed.
......@@ -8,5 +8,3 @@ libgsteffectv_la_LIBADD =
libgsteffectv_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = gsteffectv.h
EXTRA_DIST = LICENSE
......@@ -54,6 +54,7 @@ sub read_config
sub playfile($$)
{
my ($file, $ext) = @_;
$ext = lc $ext;
my $pipe;
if ($cfg{VISUALIZER} && ($pipe = $pipes{"vis." . $ext}))
......@@ -88,7 +89,7 @@ read_config ();
"mpg", "mpegdemux video_%02d! { queue ! mpeg2dec ! $cfg{VIDEOSINK} } mpegdemux0.audio_%02d! { queue ! mad ! $cfg{AUDIOSINK} }",
"ogg", "vorbisdec ! $cfg{AUDIOSINK}",
"sid", "siddec ! $cfg{AUDIOSINK}",
"vob", "mpegdemux name=foo video_%02d! { queue ! mpeg2dec ! $cfg{VIDEOSINK} } foo.private_stream_1__%02d! { queue ! a52dec ! $cfg{AUDIOSINK} }",
"vob", "mpegdemux video_%02d! { queue ! mpeg2dec ! $cfg{VIDEOSINK} } mpegdemux0.private_stream_1_%02d! { queue ! a52dec ! $cfg{AUDIOSINK} }",
);
if ($cfg{VISUALIZER}) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment