mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 09:10:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

attempt to fix my sucky dv and festival breakage.

Browse source 
Original commit message from CVS:
attempt to fix my sucky dv and festival breakage.
This commit is contained in:
David I. Lehn 2002-07-05 10:17:09 +00:00
parent fbb485606a
commit aaeb23ccc8
4 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
configure.ac
View file

@ -403,12 +403,14 @@ dnl FIXME : add second check somehow if that is necessary
dnl AC_CHECK_LIB(cdda_paranoia, paranoia_init, : , HAVE_CDPARANOIA=no, -lcdda_interface ) dnl AC_CHECK_LIB(cdda_paranoia, paranoia_init, : , HAVE_CDPARANOIA=no, -lcdda_interface )
dnl AC_CHECK_HEADER(cdda_paranoia.h, :, HAVE_CDPARANOIA=no) dnl AC_CHECK_HEADER(cdda_paranoia.h, :, HAVE_CDPARANOIA=no)
dnl *** dv *** dnl *** libdv ***
translit(dnm, m, l) AM_CONDITIONAL(USE_DV, true) translit(dnm, m, l) AM_CONDITIONAL(USE_LIBDV, true)
GST_CHECK_FEATURE(DV, [libdv DV/video decoder], dvdec, [ GST_CHECK_FEATURE(LIBDV, [libdv DV/video decoder], dvdec, [
PKG_CHECK_MODULES(DV, libdv, HAVE_DV="yes", HAVE_DV="no") dnl use this when gtk deps are removed from its pkg-config .pc
AC_SUBST(DV_CFLAGS) dnl PKG_CHECK_MODULES(LIBDV, libdv, HAVE_LIBDV="yes", HAVE_LIBDV="no")
AC_SUBST(DV_LIBS) AM_PATH_LIBDV(HAVE_LIBDV="yes", HAVE_LIBDV="no")
AC_SUBST(LIBDV_CFLAGS)
AC_SUBST(LIBDV_LIBS)
]) ])
dnl *** dvdread *** dnl *** dvdread ***

12
ext/Makefile.am
View file

@ -46,10 +46,10 @@ else
CDPARANOIA_DIR= CDPARANOIA_DIR=
endif endif
if USE_DV if USE_LIBDV
DV_DIR=dv LIBDV_DIR=dv
else else
DV_DIR= LIBDV_DIR=
endif endif
if USE_DVDREAD if USE_DVDREAD
@ -228,9 +228,9 @@ endif
SUBDIRS=$(A52DEC_DIR) $(AALIB_DIR) $(ALSA_DIR) \ SUBDIRS=$(A52DEC_DIR) $(AALIB_DIR) $(ALSA_DIR) \
$(ARTS_DIR) $(ARTSC_DIR) $(AUDIOFILE_DIR) \ $(ARTS_DIR) $(ARTSC_DIR) $(AUDIOFILE_DIR) \
$(AVIFILE_DIR) $(CDPARANOIA_DIR) $(DV_DIR) \ $(AVIFILE_DIR) $(CDPARANOIA_DIR) $(LIBDV_DIR) \
$(DVDREAD_DIR) $(DVDNAV_DIR) $(ESD_DIR) \ $(DVDREAD_DIR) $(DVDNAV_DIR) $(ESD_DIR) \
$(FESTIVAL_DIR) $(FLAC_DIR) $(GNOMEVFS_DIR) $(GSM_DIR) \ $(FLAC_DIR) $(GNOMEVFS_DIR) $(GSM_DIR) \
$(HERMES_DIR) $(HTTP_DIR) $(JACK_DIR) $(JPEG_DIR) \ $(HERMES_DIR) $(HTTP_DIR) $(JACK_DIR) $(JPEG_DIR) \
$(LADSPA_DIR) $(LAME_DIR) $(LCS_DIR) $(LIBFAME_DIR) \ $(LADSPA_DIR) $(LAME_DIR) $(LCS_DIR) $(LIBFAME_DIR) \
$(MAD_DIR) $(MIKMOD_DIR) $(MJPEGTOOLS_DIR) $(MPEG2DEC_DIR) \ $(MAD_DIR) $(MIKMOD_DIR) $(MJPEGTOOLS_DIR) $(MPEG2DEC_DIR) \
@ -242,7 +242,7 @@ DIST_SUBDIRS=\
a52dec aalib alsa \ a52dec aalib alsa \
arts artsd avifile \ arts artsd avifile \
audiofile cdparanoia dv \ audiofile cdparanoia dv \
dvdread dvdnav esd festival ffmpeg \ dvdread dvdnav esd ffmpeg \
flac gnomevfs gsm \ flac gnomevfs gsm \
hermes http jack jpeg \ hermes http jack jpeg \
ladspa lame lcs libfame \ ladspa lame lcs libfame \

4
ext/dv/Makefile.am
View file

@ -3,8 +3,8 @@ plugindir = $(libdir)/gst
plugin_LTLIBRARIES = libgstdvdec.la plugin_LTLIBRARIES = libgstdvdec.la
libgstdvdec_la_SOURCES = gstdvdec.c libgstdvdec_la_SOURCES = gstdvdec.c
libgstdvdec_la_CFLAGS = $(GST_CFLAGS) $(DV_CFLAGS) libgstdvdec_la_CFLAGS = $(GST_CFLAGS) $(LIBDV_CFLAGS)
libgstdvdec_la_LIBADD = $(DV_LIBS) libgstdvdec_la_LIBADD = $(LIBDV_LIBS)
libgstdvdec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstdvdec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = gstdvdec.h noinst_HEADERS = gstdvdec.h

2
m4/libdv.m4
View file

@ -23,7 +23,7 @@ AC_ARG_ENABLE(libdvtest, [ --disable-libdvtest Do not try to compile and
LIBDV_LIBS="-L$prefix/lib" LIBDV_LIBS="-L$prefix/lib"
fi fi
LIBDV_LIBS="$LIBDV_LIBS -ldv" LIBDV_LIBS="$LIBDV_LIBS -ldv -lm"
if test "x$libdv_includes" != "x" ; then if test "x$libdv_includes" != "x" ; then
LIBDV_CFLAGS="-I$libdv_includes" LIBDV_CFLAGS="-I$libdv_includes"