mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-24 02:31:03 +00:00
Code Issues 1 Projects Releases Wiki Activity

added jpeg and shout (icecastsend has been renamed to shout, there are other libs that do icecast too)

Browse source 
Original commit message from CVS:
added jpeg and shout
(icecastsend has been renamed to shout, there are other libs that do icecast too)
This commit is contained in:
Thomas Vander Stichele 2001-12-23 15:24:07 +00:00
parent e834b38e89
commit 617db413e4
2 changed files with 28 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
configure.ac
View file

@ -504,11 +504,13 @@ dnl CPPFLAGS="$CPPFLAGS $GLIB_CFLAGS"
dnl AC_CHECK_HEADER(libdv/dv.h, :, HAVE_LIBDV=no) dnl AC_CHECK_HEADER(libdv/dv.h, :, HAVE_LIBDV=no)
dnl CPPFLAGS="$libdvcheck_save_CPPFLAGS" dnl CPPFLAGS="$libdvcheck_save_CPPFLAGS"
dnl *** libjpeg *** dnl *** jpeg ***
dnl FIXME: we could use header checks here as well IMO dnl FIXME: we could use header checks here as well IMO
translit(dnm, m, l) AM_CONDITIONAL(USE_LIBJPEG, true) translit(dnm, m, l) AM_CONDITIONAL(USE_JPEG, true)
GST_CHECK_FEATURE(LIBJPEG, [libjpeg], jpegenc jpegdec, [ GST_CHECK_FEATURE(JPEG, [jpeg], jpegenc jpegdec, [
AC_CHECK_LIB(jpeg, jpeg_set_defaults, HAVE_LIBJPEG="yes", HAVE_LIBJPEG="no") AC_CHECK_LIB(jpeg, jpeg_set_defaults, HAVE_JPEG="yes", HAVE_JPEG="no")
JPEG_LIBS="-ljpeg"
AC_SUBST(JPEG_LIBS)
]) ])
dnl *** mad *** dnl *** mad ***
@ -565,9 +567,10 @@ GST_CHECK_FEATURE(SDL, [SDL plugin], sdlvideosink, [
]) ])
dnl *** shout *** dnl *** shout ***
translit(dnm, m, l) AM_CONDITIONAL(USE_LIBSHOUT, true) translit(dnm, m, l) AM_CONDITIONAL(USE_SHOUT, true)
GST_CHECK_FEATURE(LIBSHOUT, [shout plugin], icecastsend, [ GST_CHECK_FEATURE(SHOUT, [shout plugin], icecastsend, [
GST_CHECK_LIBHEADER(LIBSHOUT, shout, shout_init_connection,, shout/shout.h, LIBSHOUT_LIBS="-lshout") GST_CHECK_LIBHEADER(SHOUT, shout, shout_init_connection,, shout/shout.h, SHOUT_LIBS="-lshout")
AC_SUBST(SHOUT_LIBS)
]) ])
dnl for sidplay dnl for sidplay
@ -861,14 +864,6 @@ if test "x$HAVE_LIBMIKMOD" = xyes; then
AC_DEFINE(HAVE_LIBMIKMOD) AC_DEFINE(HAVE_LIBMIKMOD)
fi fi
if test "x$HAVE_LIBJPEG" = xyes; then
AC_DEFINE(HAVE_LIBJPEG)
fi
if test "x$HAVE_LIBHERMES" = "xyes"; then
AC_DEFINE(HAVE_LIBHERMES)
fi
if test "x$HAVE_A52DEC" = xyes; then if test "x$HAVE_A52DEC" = xyes; then
AC_DEFINE(HAVE_A52DEC) AC_DEFINE(HAVE_A52DEC)
fi fi
@ -896,9 +891,7 @@ AM_CONDITIONAL(EXPERIMENTAL, test "$EXPERIMENTAL" = "$xyes")
AM_CONDITIONAL(BROKEN, test "$BROKEN" = "$xyes") AM_CONDITIONAL(BROKEN, test "$BROKEN" = "$xyes")
AM_CONDITIONAL(HAVE_LIBMIKMOD, test "x$HAVE_LIBMIKMOD" = "xyes") AM_CONDITIONAL(HAVE_LIBMIKMOD, test "x$HAVE_LIBMIKMOD" = "xyes")
AM_CONDITIONAL(HAVE_LIBJPEG, test "x$HAVE_LIBJPEG" = "xyes")
AM_CONDITIONAL(HAVE_LIBSDL, test "x$HAVE_LIBSDL" = "xyes") AM_CONDITIONAL(HAVE_LIBSDL, test "x$HAVE_LIBSDL" = "xyes")
AM_CONDITIONAL(HAVE_LIBHERMES, test "x$HAVE_LIBHERMES" = "xyes")
AM_CONDITIONAL(HAVE_NASM, test "x$HAVE_NASM" = "xyes") AM_CONDITIONAL(HAVE_NASM, test "x$HAVE_NASM" = "xyes")
AM_CONDITIONAL(HAVE_LIBGLADE_GNOME, test "x$HAVE_LIBGLADE_GNOME" = "xyes") AM_CONDITIONAL(HAVE_LIBGLADE_GNOME, test "x$HAVE_LIBGLADE_GNOME" = "xyes")
AM_CONDITIONAL(HAVE_GNOME, test "x$HAVE_GNOME" = "xyes") AM_CONDITIONAL(HAVE_GNOME, test "x$HAVE_GNOME" = "xyes")
@ -913,7 +906,6 @@ AM_CONDITIONAL(HAVE_PDFTOPS, $HAVE_PDFTOPS)
AM_CONDITIONAL(HAVE_XSLTPROC, $HAVE_XSLTPROC) AM_CONDITIONAL(HAVE_XSLTPROC, $HAVE_XSLTPROC)
AM_CONDITIONAL(HAVE_FIG2DEV_PNG, $HAVE_FIG2DEV_PNG) AM_CONDITIONAL(HAVE_FIG2DEV_PNG, $HAVE_FIG2DEV_PNG)
AM_CONDITIONAL(HAVE_FIG2DEV_PDF, $HAVE_FIG2DEV_PDF) AM_CONDITIONAL(HAVE_FIG2DEV_PDF, $HAVE_FIG2DEV_PDF)
AM_CONDITIONAL(HAVE_LIBSHOUT, test "x$HAVE_LIBSHOUT" = "xyes")
AM_CONDITIONAL(HAVE_LIBRTP, test "x$HAVE_LIBRTP" = "xyes") AM_CONDITIONAL(HAVE_LIBRTP, test "x$HAVE_LIBRTP" = "xyes")
AM_CONDITIONAL(HAVE_ARTS, test "x$HAVE_ARTS" = "xyes") AM_CONDITIONAL(HAVE_ARTS, test "x$HAVE_ARTS" = "xyes")
AM_CONDITIONAL(HAVE_XMMS, test "x$HAVE_XMMS" = "xyes") AM_CONDITIONAL(HAVE_XMMS, test "x$HAVE_XMMS" = "xyes")
@ -1079,9 +1071,11 @@ ext/esd/Makefile
ext/flac/Makefile ext/flac/Makefile
ext/gsm/Makefile ext/gsm/Makefile
ext/hermes/Makefile ext/hermes/Makefile
ext/jpeg/Makefile
ext/lame/Makefile ext/lame/Makefile
ext/mad/Makefile ext/mad/Makefile
ext/mpeg2dec/Makefile ext/mpeg2dec/Makefile
ext/shout/Makefile
ext/sdl/Makefile ext/sdl/Makefile
ext/vorbis/Makefile ext/vorbis/Makefile
gst-libs/Makefile gst-libs/Makefile

19
ext/Makefile.am
View file

@ -76,6 +76,13 @@ else
LAME_DIR= LAME_DIR=
endif endif
if USE_JPEG
JPEG_DIR=jpeg
else
JPEG_DIR=
endif
if USE_MAD if USE_MAD
MAD_DIR=mad MAD_DIR=mad
else else
@ -94,6 +101,12 @@ else
SDL_DIR= SDL_DIR=
endif endif
if USE_SHOUT
SHOUT_DIR=shout
else
SHOUT_DIR=
endif
if USE_VORBIS if USE_VORBIS
VORBIS_DIR=vorbis VORBIS_DIR=vorbis
else else
@ -103,8 +116,8 @@ endif
SUBDIRS=$(A52_DIR) $(AALIB_DIR) $(ALSA_DIR) $(AUDIOFILE_DIR) \ SUBDIRS=$(A52_DIR) $(AALIB_DIR) $(ALSA_DIR) $(AUDIOFILE_DIR) \
$(AVIFILE_DIR) $(CDPARANOIA_DIR) $(DVDREAD_DIR) $(ESD_DIR) \ $(AVIFILE_DIR) $(CDPARANOIA_DIR) $(DVDREAD_DIR) $(ESD_DIR) \
$(FESTIVAL_DIR) $(FLAC_DIR) $(GSM_DIR) $(HERMES_DIR) \ $(FESTIVAL_DIR) $(FLAC_DIR) $(GSM_DIR) $(HERMES_DIR) \
$(LAME_DIR) $(MAD_DIR) $(MPEG2DEC_DIR) \ $(JPEG_DIR) $(LAME_DIR) $(MAD_DIR) $(MPEG2DEC_DIR) \
$(SDL_DIR) $(VORBIS_DIR) $(SDL_DIR) $(SHOUT_DIR) $(VORBIS_DIR)
DIST_SUBDIRS=a52 aalib alsa avifile audiofile cdparanoia dvdread esd \ DIST_SUBDIRS=a52 aalib alsa avifile audiofile cdparanoia dvdread esd \
festival flac gsm hermes lame mad mpeg2dec sdl vorbis festival flac gsm hermes jpeg lame mad mpeg2dec sdl shout vorbis