From 9399a4b087bf4981c258741bec343fd5f64fd747 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Tue, 9 Mar 2004 06:15:35 +0000 Subject: [PATCH] configure.ac: Patch properly. Update version. Original commit message from CVS: * configure.ac: Patch properly. Update version. * gst-libs/ext/ffmpeg/Makefile.am: Comment out patching - all handled by configure. * gst-libs/ext/ffmpeg/Tag: Update version. * gst-libs/ext/ffmpeg/patch/autotools.diff: Some small updates to improve compiling. * gst-libs/ext/ffmpeg/patch/functions.diff: Update date. * gst-libs/ext/ffmpeg/patch/matroska.diff: Newer patch - see ffmpeg-devel mailinglists. * gst-libs/ext/ffmpeg/patch/function.patch: Remove old cruft. * gst-libs/ext/ffmpeg/patch/disabletools.diff: Now handled by --disable-... in configure. --- ChangeLog | 19 +++++++++++++++++++ configure.ac | 8 ++++---- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index d6f4725..4e8f297 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,22 @@ +2004-03-09 Ronald Bultje + + * configure.ac: + Patch properly. Update version. + * gst-libs/ext/ffmpeg/Makefile.am: + Comment out patching - all handled by configure. + * gst-libs/ext/ffmpeg/Tag: + Update version. + * gst-libs/ext/ffmpeg/patch/autotools.diff: + Some small updates to improve compiling. + * gst-libs/ext/ffmpeg/patch/functions.diff: + Update date. + * gst-libs/ext/ffmpeg/patch/matroska.diff: + Newer patch - see ffmpeg-devel mailinglists. + * gst-libs/ext/ffmpeg/patch/function.patch: + Remove old cruft. + * gst-libs/ext/ffmpeg/patch/disabletools.diff: + Now handled by --disable-... in configure. + 2004-03-07 David Schleef * ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps): diff --git a/configure.ac b/configure.ac index 72d62fd..d7a0123 100644 --- a/configure.ac +++ b/configure.ac @@ -84,13 +84,13 @@ GST_CHECK_FEATURE(FFMPEG, [ffmpeg plug-ins], ffmpeg, [ if test "x$GST_PLUGINS_VERSION_NANO" = x1; then AC_MSG_NOTICE(slurping FFmpeg CVS source) dnl until someone fixes this... I guess this should be in ./autogen.sh - AS_SLURP_FFMPEG(gst-libs/ext/ffmpeg, 2004-02-29 20:00 GMT, + AS_SLURP_FFMPEG(gst-libs/ext/ffmpeg, 2004-03-09 06:00 GMT, if ! test -f gst-libs/ext/ffmpeg/ffmpeg/configure.ac; then AC_MSG_NOTICE(setting up ffmpeg build system and applying patches) CURDIR=`pwd` cd gst-libs/ext/ffmpeg - for PATCH in patch/*.diff; do - patch -p0 -N -r rejects < $PATCH > /dev/null || true + for PATCH in matroska autotools disablemmx disableinstalllibs functions; do + patch -p0 -N -r rejects < patch/${PATCH}.diff > /dev/null || true done cd ffmpeg chmod a+x ./autogen.sh @@ -114,7 +114,7 @@ dnl ########################### dnl # Configure external libs # dnl ########################### if test "x$HAVE_FFMPEG" = "xyes"; then - ac_configure_args="$ac_configure_args --disable-v4l --disable-audio-oss --disable-dv1394" + ac_configure_args="$ac_configure_args --disable-v4l --disable-audio-oss --disable-dv1394 --disable-vhook --disable-ffmpeg --disable-ffplay --disable-ffserver" AC_CONFIG_SUBDIRS(gst-libs/ext/ffmpeg/ffmpeg) fi -- 2.7.4