On 2008-06-25 09:08:58 +0200, Fabian Greffrath wrote:
> We are going to remove ffmpeg-config in the next upload of the ffmpeg
> package (0.svn20080206-9), so your package might FTBFS if it relies on
> ffmpeg-config and has not been patches until then.
Although ffmpeg-config still exists, it caused a FTBFS of moc in Ubuntu
intrepid, as the output from ffmpeg-config differed from the output of
pkg-config (for libavformat). I fixed it by removing the use of
ffmpeg-config and use pkg-config (till now fall-back) always.
Although the FTBFS seems to be Ubuntu-specific (due to the split of
main and universe, ffmpeg has slightly different dependencies in
Ubuntu), I'm still forwarding the patch to Debian, in hope it might be
helpfull.
I'm not yet sure if it's worth keeping once ffmpeg-config got removed.
The patch contains the changes to configure.in and configure. I manually
patched configure (instead of running autoreconf) to keep the patch
small.
Regards,
Michael
Index: moc-2.5.0~alpha3/configure
===================================================================
--- moc-2.5.0~alpha3.orig/configure 2008-06-29 15:25:41.000000000 +0200
+++ moc-2.5.0~alpha3/configure 2008-06-29 15:31:21.000000000 +0200
@@ -30006,25 +30006,8 @@
fi
fi
-FFMPEG_CONFIG=$ac_cv_prog_FFMPEG_CONFIG
-if test -n "$FFMPEG_CONFIG"; then
- { echo "$as_me:$LINENO: result: $FFMPEG_CONFIG" >&5
-echo "${ECHO_T}$FFMPEG_CONFIG" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
- if test "x$FFMPEG_CONFIG" = "xyes"
- then
- libavformat_CFLAGAS=`ffmpeg-config --cflags`
- libavformat_LIBS=`ffmpeg-config --plugin-libs avformat`
-
-
- DECODER_PLUGINS="$DECODER_PLUGINS ffmpeg"
- else
-
pkg_failed=no
{ echo "$as_me:$LINENO: checking for libavformat" >&5
echo $ECHO_N "checking for libavformat... $ECHO_C" >&6; }
@@ -30097,7 +30080,6 @@
DECODER_PLUGINS="$DECODER_PLUGINS ffmpeg"
fi
- fi
fi
Index: moc-2.5.0~alpha3/configure.in
===================================================================
--- moc-2.5.0~alpha3.orig/configure.in 2008-06-29 15:25:43.000000000 +0200
+++ moc-2.5.0~alpha3/configure.in 2008-06-29 15:26:12.000000000 +0200
@@ -465,21 +465,11 @@
Compile without ffmpeg))
if test "x$with_ffmpeg" != "xno"
then
- AC_CHECK_PROG([FFMPEG_CONFIG], [ffmpeg-config], [yes])
- if test "x$FFMPEG_CONFIG" = "xyes"
- then
- libavformat_CFLAGAS=`ffmpeg-config --cflags`
- libavformat_LIBS=`ffmpeg-config --plugin-libs avformat`
- AC_SUBST(libavformat_CFLAGAS)
- AC_SUBST(libavformat_LIBS)
- DECODER_PLUGINS="$DECODER_PLUGINS ffmpeg"
- else
- PKG_CHECK_MODULES(libavformat, libavformat,
- [AC_SUBST(libavformat_CFLAGS)
- AC_SUBST(libavformat_LIBS)
- DECODER_PLUGINS="$DECODER_PLUGINS ffmpeg"],
- [true])
- fi
+ PKG_CHECK_MODULES(libavformat, libavformat,
+ [AC_SUBST(libavformat_CFLAGS)
+ AC_SUBST(libavformat_LIBS)
+ DECODER_PLUGINS="$DECODER_PLUGINS ffmpeg"],
+ [true])
fi
dnl speex
