diff --git a/configure.ac b/configure.ac
index 9aecfcd49a76adbf47933f54fe368aa1d56d3c92..7a4d897e77e738dadce170e84da61031f462344d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
dnl initialize autoconf
dnl releases only do -Wall, cvs and prerelease does -Werror too
dnl use a three digit version number for releases, and four for cvs/prerelease
-AC_INIT(GStreamer Ugly Plug-ins, 0.10.15.4,
+AC_INIT(GStreamer Ugly Plug-ins, 0.10.18.2,
http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer,
gst-plugins-ugly)
AM_PROG_LIBTOOL
dnl *** required versions of GStreamer stuff ***
-GST_REQ=0.10.26
-GSTPB_REQ=0.10.26
+GST_REQ=0.10.35.2
+GSTPB_REQ=0.10.35.2
dnl *** autotools stuff ****
dnl *** checks for dependency libraries ***
dnl GLib is required
-AG_GST_GLIB_CHECK([2.20])
-ORC_CHECK([0.4.5])
+AG_GST_GLIB_CHECK([2.24])
+ORC_CHECK([0.4.11])
dnl checks for gstreamer
dnl uninstalled is selected preferentially -- see pkg-config(1)
dnl set location of plugin directory
AG_GST_SET_PLUGINDIR
+dnl set release date/time
+AG_GST_SET_PACKAGE_RELEASE_DATETIME_WITH_NANO([$PACKAGE_VERSION_NANO],
+ ["${srcdir}/gst-plugins-ugly.doap"],
+ [$PACKAGE_VERSION_MAJOR.$PACKAGE_VERSION_MINOR.$PACKAGE_VERSION_MICRO])
+
dnl define an ERROR_CFLAGS Makefile variable
AG_GST_SET_ERROR_CFLAGS($GST_GIT, [
-Wmissing-declarations -Wmissing-prototypes -Wredundant-decls
AG_GST_CHECK_FEATURE(AMRNB, [amrnb library], amrnb, [
PKG_CHECK_MODULES(AMRNB, opencore-amrnb, HAVE_AMRNB="yes",
[ AG_GST_CHECK_LIBHEADER(AMRNB, opencore-amrnb,
- Decoder_Interface_init, -lm,
+ Decoder_Interface_init, $LIBM,
opencore-amrnb/interf_dec.h,
AMRNB_LIBS="-lopencore-amrnb")
])
dnl *** lame ***
translit(dnm, m, l) AM_CONDITIONAL(USE_LAME, true)
AG_GST_CHECK_FEATURE(LAME, [lame mp3 encoder library], lame, [
- AG_GST_CHECK_LIBHEADER(LAME, mp3lame, lame_init, -lm, lame/lame.h,
+ AG_GST_CHECK_LIBHEADER(LAME, mp3lame, lame_init, $LIBM, lame/lame.h,
[
HAVE_LAME="yes"
- LAME_LIBS="-lmp3lame -lm"
+ LAME_LIBS="-lmp3lame $LIBM"
dnl is lame presets available
LAME_CFLAGS=""
AC_TRY_COMPILE([#include <lame/lame.h>], [ int preset = MEDIUM ],
AG_GST_CHECK_FEATURE(MAD, [mad mp3 decoder], mad, [
dnl check with pkg-config first
- AG_GST_PKG_CHECK_MODULES(ID3TAG, id3tag >= 0.15)
- if test "x$HAVE_ID3TAG" = "xno"; then
+ AG_GST_PKG_CHECK_MODULES(MAD, mad >= 0.15)
+ MAD_LIBS="$MAD_LIBS"
+ if test "x$HAVE_MAD" = "xno"; then
dnl fall back to oldskool detection
- AC_CHECK_HEADER(id3tag.h, [
- save_LIBS=$LIBS
- LIBS="-lz"
- AC_CHECK_LIB(id3tag, id3_tag_options,
- HAVE_ID3TAG="yes" ID3TAG_LIBS="-lid3tag -lz")
- LIBS=$save_LIBS
- AC_SUBST(ID3TAG_LIBS)
+ AC_CHECK_HEADER(mad.h, [
+ AC_CHECK_LIB(mad, mad_decoder_finish,
+ HAVE_MAD="yes" MAD_LIBS="-lmad")
])
fi
-
- if test "x$HAVE_ID3TAG" = "xyes"; then
- dnl check with pkg-config first
- AG_GST_PKG_CHECK_MODULES(MAD, mad >= 0.15)
- MAD_LIBS="$MAD_LIBS $ID3TAG_LIBS"
- if test "x$HAVE_MAD" = "xno"; then
- dnl fall back to oldskool detection
- AC_CHECK_HEADER(mad.h, [
- AC_CHECK_LIB(mad, mad_decoder_finish,
- HAVE_MAD="yes" MAD_LIBS="-lmad $ID3TAG_LIBS")
- ])
- fi
- else
- HAVE_MAD="no"
- AC_MSG_WARN([libid3tag not available, cannot build MAD MP3 decoder plugin])
- fi
])
AC_SUBST(MAD_LIBS)
PKG_CHECK_MODULES(TWOLAME, twolame >= 0.3.10, [
HAVE_TWOLAME="yes"], [
HAVE_TWOLAME="no"
- AC_MSG_RESULT(no)
])
AC_SUBST(TWOLAME_CFLAGS)
AC_SUBST(TWOLAME_LIBS)
dnl *** x264 (MPEG-4 part 10/h.264/AVC encoder) ***
translit(dnm, m, l) AM_CONDITIONAL(USE_X264, true)
AG_GST_CHECK_FEATURE(X264, [x264 plug-in], x264, [
- AG_GST_CHECK_LIBHEADER(X264, x264, x264_encoder_encode, -lm, x264.h,
- AC_MSG_CHECKING([for uptodate x264 API version])
- dnl _stdint not yet generated, so no compiling
- AC_TRY_CPP([
- #include <x264.h>
- #if X264_BUILD < 55
- #error "x264 build too old"
- #endif
- ], [
- AC_MSG_RESULT(yes)
- X264_LIBS="$LDFLAGS -lx264 -lm"
- X264_CFLAGS="$CFLAGS"
- AC_SUBST(X264_LIBS)
- AC_SUBST(X264_CFLAGS)
- ], [
- AC_MSG_RESULT(no)
- HAVE_X264=no
- ]))
+ AG_GST_PKG_CHECK_MODULES(X264, x264 >= 0.55.0)
])
else
dnl this really should only contain flags, not libs - they get added before
dnl whatevertarget_LIBS and -L flags here affect the rest of the linking
-GST_PLUGIN_LDFLAGS="-module -avoid-version -export-symbols-regex '^[_]*gst_plugin_desc\$\$' $GST_ALL_LDFLAGS"
+GST_PLUGIN_LDFLAGS="-module -avoid-version -export-symbols-regex '^[_]*gst_plugin_desc.*' $GST_ALL_LDFLAGS"
AC_SUBST(GST_PLUGIN_LDFLAGS)
dnl *** output files ***
tests/check/Makefile
m4/Makefile
po/Makefile.in
+pkgconfig/Makefile
+pkgconfig/gstreamer-plugins-ugly-uninstalled.pc
gst-plugins-ugly.spec
)
-e 's/.* GST_MAJORMINOR$/#define GST_MAJORMINOR "'$GST_MAJORMINOR'"/' \
-e "s,.* GST_PACKAGE_NAME$,#define GST_PACKAGE_NAME \"${GST_PACKAGE_NAME}\"," \
-e 's/.* GST_PACKAGE_ORIGIN$/#define GST_PACKAGE_ORIGIN "Unknown package origin"/' \
+ -e "s,.* GST_PACKAGE_RELEASE_DATETIME$,#define GST_PACKAGE_RELEASE_DATETIME \"${GST_PACKAGE_RELEASE_DATETIME}\"," \
-e 's/.* HAVE_CPU_I386$/#define HAVE_CPU_I386 1/' \
-e 's/.* HAVE_FGETPOS$/#define HAVE_FGETPOS 1/' \
-e 's/.* HAVE_FSETPOS$/#define HAVE_FSETPOS 1/' \
-e 's/.* PLUGINDIR$/#ifdef _DEBUG\n# define PLUGINDIR PREFIX "\\\\debug\\\\lib\\\\gstreamer-0.10"\n#else\n# define PLUGINDIR PREFIX "\\\\lib\\\\gstreamer-0.10"\n#endif/' \
-e 's/.* USE_BINARY_REGISTRY$/#define USE_BINARY_REGISTRY/' \
-e 's/.* VERSION$/#define VERSION "'$VERSION'"/' \
- -e "s/.* DEFAULT_AUDIOSINK$/#define DEFAULT_AUDIOSINK \"directaudiosink\"/" \
+ -e "s/.* DEFAULT_AUDIOSINK$/#define DEFAULT_AUDIOSINK \"directsoundsink\"/" \
-e "s/.* DEFAULT_AUDIOSRC$/#define DEFAULT_AUDIOSRC \"audiotestsrc\"/" \
-e "s/.* DEFAULT_VIDEOSRC$/#define DEFAULT_VIDEOSRC \"videotestsrc\"/" \
-e "s/.* DEFAULT_VISUALIZER$/#define DEFAULT_VISUALIZER \"goom\"/" \