mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-24 09:10:36 +00:00
configure.ac: add audioresample and cairo plugins. Remove
Original commit message from CVS: * configure.ac: add audioresample and cairo plugins. Remove HAVE_MMX stuff, because it's not used. * ext/Makefile.am: same * ext/audioresample/Makefile.am: You are not ready for an audio resampling element based on audioresample. * ext/audioresample/gstaudioresample.c: * ext/audioresample/gstaudioresample.h: * ext/cairo/Makefile.am: You are not ready for overlay elements based on cairo. Don't look too closely, these elements kinda suck right now. * ext/cairo/gstcairo.c: new * ext/cairo/gsttextoverlay.c: new * ext/cairo/gsttextoverlay.h: new * ext/cairo/gsttimeoverlay.c: new * ext/cairo/gsttimeoverlay.h: new * gst-libs/gst/media-info/media-info-priv.h: fix compile problem with compilers that don't support variadic macros.
This commit is contained in:
parent
0ae0b53c42
commit
287ccb5f97
4 changed files with 55 additions and 15 deletions
20
ChangeLog
20
ChangeLog
|
@ -1,3 +1,23 @@
|
||||||
|
2004-12-15 David Schleef <ds@schleef.org>
|
||||||
|
|
||||||
|
* configure.ac: add audioresample and cairo plugins. Remove
|
||||||
|
HAVE_MMX stuff, because it's not used.
|
||||||
|
* ext/Makefile.am: same
|
||||||
|
* ext/audioresample/Makefile.am: You are not ready for an
|
||||||
|
audio resampling element based on audioresample.
|
||||||
|
* ext/audioresample/gstaudioresample.c:
|
||||||
|
* ext/audioresample/gstaudioresample.h:
|
||||||
|
* ext/cairo/Makefile.am: You are not ready for overlay elements
|
||||||
|
based on cairo. Don't look too closely, these elements kinda
|
||||||
|
suck right now.
|
||||||
|
* ext/cairo/gstcairo.c: new
|
||||||
|
* ext/cairo/gsttextoverlay.c: new
|
||||||
|
* ext/cairo/gsttextoverlay.h: new
|
||||||
|
* ext/cairo/gsttimeoverlay.c: new
|
||||||
|
* ext/cairo/gsttimeoverlay.h: new
|
||||||
|
* gst-libs/gst/media-info/media-info-priv.h: fix compile
|
||||||
|
problem with compilers that don't support variadic macros.
|
||||||
|
|
||||||
2004-12-15 Balamurali Viswanathan <balamurali.viswanathan@wipro.com>
|
2004-12-15 Balamurali Viswanathan <balamurali.viswanathan@wipro.com>
|
||||||
|
|
||||||
Reviewed by: David Schleef <ds@schleef.org>
|
Reviewed by: David Schleef <ds@schleef.org>
|
||||||
|
|
33
configure.ac
33
configure.ac
|
@ -806,6 +806,22 @@ GST_CHECK_FEATURE(AUDIOFILE, [audiofile], afsink afsrc, [
|
||||||
AC_CHECK_LIB(audiofile, af_virtual_file_new, , HAVE_AUDIOFILE="no")
|
AC_CHECK_LIB(audiofile, af_virtual_file_new, , HAVE_AUDIOFILE="no")
|
||||||
fi])
|
fi])
|
||||||
|
|
||||||
|
dnl *** audioresample ***
|
||||||
|
translit(dnm, m, l) AM_CONDITIONAL(USE_AUDIORESAMPLE, true)
|
||||||
|
GST_CHECK_FEATURE(AUDIORESAMPLE, [audioresample plug-in], audioresample, [
|
||||||
|
PKG_CHECK_MODULES(AUDIORESAMPLE, audioresample-0.1, HAVE_AUDIORESAMPLE=yes, HAVE_AUDIORESAMPLE=no)
|
||||||
|
AC_SUBST(AUDIORESAMPLE_CFLAGS)
|
||||||
|
AC_SUBST(AUDIORESAMPLE_LIBS)
|
||||||
|
])
|
||||||
|
|
||||||
|
dnl *** cairo ***
|
||||||
|
translit(dnm, m, l) AM_CONDITIONAL(USE_CAIRO, true)
|
||||||
|
GST_CHECK_FEATURE(CAIRO, [cairo plug-in], cairo, [
|
||||||
|
PKG_CHECK_MODULES(CAIRO, cairo, HAVE_CAIRO=yes, HAVE_CAIRO=no)
|
||||||
|
AC_SUBST(CAIRO_CFLAGS)
|
||||||
|
AC_SUBST(CAIRO_LIBS)
|
||||||
|
])
|
||||||
|
|
||||||
dnl *** cdaudio ***
|
dnl *** cdaudio ***
|
||||||
translit(dnm, m, l) AM_CONDITIONAL(USE_CDAUDIO, true)
|
translit(dnm, m, l) AM_CONDITIONAL(USE_CDAUDIO, true)
|
||||||
GST_CHECK_FEATURE(CDAUDIO, [cdaudio], cdaudio, [
|
GST_CHECK_FEATURE(CDAUDIO, [cdaudio], cdaudio, [
|
||||||
|
@ -1722,15 +1738,6 @@ dnl ######################################################################
|
||||||
dnl # Check command line parameters, and set shell variables accordingly #
|
dnl # Check command line parameters, and set shell variables accordingly #
|
||||||
dnl ######################################################################
|
dnl ######################################################################
|
||||||
|
|
||||||
AC_ARG_ENABLE(libmmx,
|
|
||||||
AC_HELP_STRING([--enable-libmmx],[use libmmx, if available]),
|
|
||||||
[case "${enableval}" in
|
|
||||||
yes) USE_LIBMMX=$HAVE_LIBMMX ;;
|
|
||||||
no) USE_LIBMMX=no ;;
|
|
||||||
*) AC_MSG_ERROR(bad value ${enableval} for --enable-libmmx) ;;
|
|
||||||
esac],
|
|
||||||
[USE_LIBMMX=$HAVE_LIBMMX]) dnl Default value
|
|
||||||
|
|
||||||
AC_ARG_ENABLE(atomic,
|
AC_ARG_ENABLE(atomic,
|
||||||
AC_HELP_STRING([--enable-atomic],[use atomic reference counting header]),
|
AC_HELP_STRING([--enable-atomic],[use atomic reference counting header]),
|
||||||
[case "${enableval}" in
|
[case "${enableval}" in
|
||||||
|
@ -1783,10 +1790,6 @@ dnl # Set defines according to variables set above #
|
||||||
dnl ################################################
|
dnl ################################################
|
||||||
|
|
||||||
|
|
||||||
if test "x$USE_LIBMMX" = xyes; then
|
|
||||||
AC_DEFINE(HAVE_LIBMMX, 1, [Define if libmmx is available])
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "x$USE_ATOMIC_H" = xyes; then
|
if test "x$USE_ATOMIC_H" = xyes; then
|
||||||
AC_DEFINE(HAVE_ATOMIC_H, 1, [Define if atomic.h header file is available])
|
AC_DEFINE(HAVE_ATOMIC_H, 1, [Define if atomic.h header file is available])
|
||||||
fi
|
fi
|
||||||
|
@ -1804,8 +1807,6 @@ dnl #############################
|
||||||
|
|
||||||
dnl These should be "USE_*" instead of "HAVE_*", but some packages expect
|
dnl These should be "USE_*" instead of "HAVE_*", but some packages expect
|
||||||
dnl HAVE_ and it is likely to be easier to stick with the old name
|
dnl HAVE_ and it is likely to be easier to stick with the old name
|
||||||
AM_CONDITIONAL(HAVE_LIBMMX, test "x$USE_LIBMMX" = "xyes")
|
|
||||||
|
|
||||||
AM_CONDITIONAL(HAVE_ATOMIC_H, test "x$USE_ATOMIC_H" = "xyes")
|
AM_CONDITIONAL(HAVE_ATOMIC_H, test "x$USE_ATOMIC_H" = "xyes")
|
||||||
|
|
||||||
AM_CONDITIONAL(EXPERIMENTAL, test "$EXPERIMENTAL" = "$xyes")
|
AM_CONDITIONAL(EXPERIMENTAL, test "$EXPERIMENTAL" = "$xyes")
|
||||||
|
@ -1980,6 +1981,8 @@ ext/alsa/Makefile
|
||||||
ext/arts/Makefile
|
ext/arts/Makefile
|
||||||
ext/artsd/Makefile
|
ext/artsd/Makefile
|
||||||
ext/audiofile/Makefile
|
ext/audiofile/Makefile
|
||||||
|
ext/audioresample/Makefile
|
||||||
|
ext/cairo/Makefile
|
||||||
ext/cdaudio/Makefile
|
ext/cdaudio/Makefile
|
||||||
ext/cdparanoia/Makefile
|
ext/cdparanoia/Makefile
|
||||||
ext/dirac/Makefile
|
ext/dirac/Makefile
|
||||||
|
|
|
@ -34,6 +34,18 @@ else
|
||||||
AUDIOFILE_DIR=
|
AUDIOFILE_DIR=
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
if USE_AUDIORESAMPLE
|
||||||
|
AUDIORESAMPLE_DIR=audioresample
|
||||||
|
else
|
||||||
|
AUDIORESAMPLE_DIR=
|
||||||
|
endif
|
||||||
|
|
||||||
|
if USE_CAIRO
|
||||||
|
CAIRO_DIR=cairo
|
||||||
|
else
|
||||||
|
CAIRO_DIR=
|
||||||
|
endif
|
||||||
|
|
||||||
if USE_CDAUDIO
|
if USE_CDAUDIO
|
||||||
CDAUDIO_DIR=cdaudio
|
CDAUDIO_DIR=cdaudio
|
||||||
else
|
else
|
||||||
|
@ -383,6 +395,8 @@ SUBDIRS=\
|
||||||
$(ARTS_DIR) \
|
$(ARTS_DIR) \
|
||||||
$(ARTSC_DIR) \
|
$(ARTSC_DIR) \
|
||||||
$(AUDIOFILE_DIR) \
|
$(AUDIOFILE_DIR) \
|
||||||
|
$(AUDIORESAMPLE_DIR) \
|
||||||
|
$(CAIRO_DIR) \
|
||||||
$(CDAUDIO_DIR) \
|
$(CDAUDIO_DIR) \
|
||||||
$(CDPARANOIA_DIR) \
|
$(CDPARANOIA_DIR) \
|
||||||
$(DIRAC_DIR) \
|
$(DIRAC_DIR) \
|
||||||
|
@ -446,6 +460,8 @@ DIST_SUBDIRS=\
|
||||||
arts \
|
arts \
|
||||||
artsd \
|
artsd \
|
||||||
audiofile \
|
audiofile \
|
||||||
|
audioresample \
|
||||||
|
cairo \
|
||||||
cdaudio \
|
cdaudio \
|
||||||
cdparanoia \
|
cdparanoia \
|
||||||
dirac \
|
dirac \
|
||||||
|
|
|
@ -23,6 +23,7 @@
|
||||||
#define __GST_MEDIA_INFO_PRIV_H__
|
#define __GST_MEDIA_INFO_PRIV_H__
|
||||||
|
|
||||||
#include <gst/gst.h>
|
#include <gst/gst.h>
|
||||||
|
#include <glib/gprintf.h>
|
||||||
|
|
||||||
/* debug */
|
/* debug */
|
||||||
GST_DEBUG_CATEGORY_EXTERN (gst_media_info_debug);
|
GST_DEBUG_CATEGORY_EXTERN (gst_media_info_debug);
|
||||||
|
|
Loading…
Reference in a new issue