[Gnash-commit] /srv/bzr/gnash/trunk r9639: Fix ffmpeg version detection for deb-based packages

[Sandro Santilli]

------------------------------------------------------------
revno: 9639
committer: Sandro Santilli <address@hidden>
branch nick: trunk
timestamp: Mon 2008-08-25 11:58:35 +0200
message:
  Fix ffmpeg version detection for deb-based packages
modified:
  macros/ffmpeg.m4
    ------------------------------------------------------------
    revno: 9637.2.1
    committer: Sandro Santilli <address@hidden>
    branch nick: mybranch
    timestamp: Mon 2008-08-25 11:18:07 +0200
    message:
      Strip the debian-specific 'ffmpeg distribution' prefix from version.
    modified:
      macros/ffmpeg.m4

=== modified file 'macros/ffmpeg.m4'
--- a/macros/ffmpeg.m4  2008-08-19 06:56:50 +0000
+++ b/macros/ffmpeg.m4  2008-08-25 09:18:07 +0000
@@ -204,7 +204,8 @@
     ffmpeg_num_version=$ffmpeg_version
     if test x"${ffmpeg_version}" = x ; then
 
-      ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION " ${avcodec_h} | sed 
-e "s%[[^0-9]]%%g"`
+      dnl NOTE: the [0-9]*d. pattern discards deb-heads rubbish prefix
+      ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION " ${avcodec_h} | sed 
-e "s% [[0-9]]*d\.%%" -e "s%[[^0-9]]%%g"`
       ffmpeg_num_version=$ffmpeg_version
 
       if test x"${ffmpeg_version}" = x ; then