[Gnash-commit] /srv/bzr/gnash/trunk r9805: Pad ffmpeg version to make space for 2 digit per version level, cleanups

[Sandro Santilli]

------------------------------------------------------------
revno: 9805
committer: Sandro Santilli <address@hidden>
branch nick: trunk
timestamp: Mon 2008-09-22 12:22:09 +0200
message:
  Pad ffmpeg version to make space for 2 digit per version level, cleanups
  and improvements in output. See bug #24310.
modified:
  configure.ac
  macros/ffmpeg.m4

=== modified file 'configure.ac'
--- a/configure.ac      2008-09-19 20:01:29 +0000
+++ b/configure.ac      2008-09-22 10:22:09 +0000
@@ -1775,7 +1775,7 @@
   GNASH_PATH_FFMPEG
   if test x"${media_handler_specified}" = xfalse; then
      # If the library is not found, or its version is not ok, we'll try gst
-     if test x"${ac_cv_path_ffmpeg_lib}" = x -o x"${ffmpeg_version}" != xok; 
then
+     if test x"${ac_cv_path_ffmpeg_lib}" = x -o x"${ffmpeg_version_check}" != 
xok; then
        AC_MSG_WARN([No appropriate ffmpeg library found, disabling media 
handling.])
        media_handler=none
      fi
@@ -2612,7 +2612,7 @@
   if test x"$media_handler" = x"ffmpeg"; then
     if test x"$FFMPEG_LIBS" != x; then
       echo "        MP3 and video support enabled through ffmpeg"
-      if test x"${ffmpeg_version}" != xok; then
+      if test x"${ffmpeg_version_check}" != xok; then
         echo "        ERROR: You have version ${ffmpeg_version} of ffmpeg 
installed." >&3
         echo "               This version of ffmpeg may not work!" >&3
         echo "               Version 51.27.0 or newer is highly recommended." 
>&3

=== modified file 'macros/ffmpeg.m4'
--- a/macros/ffmpeg.m4  2008-08-25 09:18:07 +0000
+++ b/macros/ffmpeg.m4  2008-09-22 10:22:09 +0000
@@ -200,53 +200,71 @@
   if test x"${avcodec_h}" != x; then
 
     AC_MSG_CHECKING([ffmpeg version])
-    ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION_MAJOR " ${avcodec_h} | 
sed -e "s%[[^0-9]]%%g"``$EGREP "define LIBAVCODEC_VERSION_MINOR " ${avcodec_h} 
| sed -e "s%[[^0-9]]%%g"``$EGREP "define LIBAVCODEC_VERSION_MICRO " 
${avcodec_h} | sed -e "s%[[^0-9]]%%g"`
-    ffmpeg_num_version=$ffmpeg_version
-    if test x"${ffmpeg_version}" = x ; then
+
+    ffmpeg_major_version=`$EGREP "define LIBAVCODEC_VERSION_MAJOR " 
${avcodec_h} | sed -e "s%[[^0-9]]%%g"`
+    ffmpeg_minor_version=`$EGREP "define LIBAVCODEC_VERSION_MINOR " 
${avcodec_h} | sed -e "s%[[^0-9]]%%g"`
+    ffmpeg_micro_version=`$EGREP "define LIBAVCODEC_VERSION_MICRO " 
${avcodec_h} | sed -e "s%[[^0-9]]%%g"`
+
+    if test x"${ffmpeg_major_version}" != x ; then
+
+      
ffmpeg_version="${ffmpeg_major_version}.${ffmpeg_minor_version}.${ffmpeg_micro_version}"
+
+    else
 
       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
+      ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION " ${avcodec_h} | awk 
'{print $'3'}' | sed -e "s%^[[0-9]]d\.%%"` 
 
       if test x"${ffmpeg_version}" = x ; then
-        ffmpeg_version=`$EGREP "define LIBAVCODEC_BUILD " ${avcodec_h} | sed 
-e "s%[[^0-9.]]%%g"`
-        ffmpeg_num_version=$ffmpeg_version
-      fi
-    fi
-    if test x"${ffmpeg_version}" = x ; then
-      ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION_TRIPLET " ${avcodec_h} 
| sed -e "s%[[^0-9]]%%g"`
-      ffmpeg_num_version=$ffmpeg_version
-    fi
-
-    AC_MSG_RESULT($ffmpeg_num_version)
+        ffmpeg_version=`$EGREP "define LIBAVCODEC_BUILD " ${avcodec_h} | awk 
'{print $3}'`
+
+        if test x"${ffmpeg_version}" = x ; then
+          ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION_TRIPLET " 
${avcodec_h} | awk '{print $3}'`
+        fi
+      fi
+
+      if test x"${ffmpeg_version}" != x ; then
+        ffmpeg_major_version=`echo ${ffmpeg_version} | cut -d. -f1`
+        ffmpeg_minor_version=`echo ${ffmpeg_version} | cut -d. -f2`
+        ffmpeg_micro_version=`echo ${ffmpeg_version} | cut -d. -f3`
+      fi
+
+    fi
+
+    ffmpeg_num_version=`printf %2.2d%2.2d%2.2d $ffmpeg_major_version 
$ffmpeg_minor_version $ffmpeg_micro_version`
+
+    AC_MSG_RESULT($ffmpeg_version ($ffmpeg_num_version))
+
 
 dnl   AC_EGREP_HEADER(avcodec_decode_audio2, ${avcodec_h}, [avfound=yes], 
[avfound=no])
   
-    if test -z "$ffmpeg_num_version" -o "$ffmpeg_num_version" -lt 51110; then
-      AC_MSG_WARN([Wrong ffmpeg/libavcodec version! 51.11.0 or greater 
required])
+    if test -z "$ffmpeg_num_version" -o "$ffmpeg_num_version" -lt 511100; then
+      AC_MSG_WARN([Wrong ffmpeg/libavcodec version! 51.11.0 or greater 
required, $ffmpeg_version detected.])
     else
-      ffmpeg_version=ok
+      ffmpeg_version_check=ok
     fi
 
-    if test ! -z "$ffmpeg_num_version" -a "$ffmpeg_num_version" -gt 51280; then
+    if test ! -z "$ffmpeg_num_version" -a "$ffmpeg_num_version" -gt 512800; 
then
+      dnl 51.28.0 or higher required
       AC_DEFINE(FFMPEG_AUDIO2, 1, [Define if avcodec_decode_audio2 can be 
used.])
     fi
 
-    if test -z "$ffmpeg_num_version" -o "$ffmpeg_num_version" -lt 51270; then
-      AC_MSG_WARN([This version of ffmpeg/libavcodec is not able to play VP6 
encoded video!])
+    if test -z "$ffmpeg_num_version" -o "$ffmpeg_num_version" -lt 512700; then
+      dnl 51.27.0 or higher required
+      AC_MSG_WARN([This version of ffmpeg/libavcodec ($ffmpeg_version) is not 
able to play VP6 encoded video: 51.27.0 or higher required!])
     else
       AC_DEFINE(FFMPEG_VP6, 1, [Define if ffmpeg can play VP6.])
     fi
 
-    if test -z "$ffmpeg_num_version" -o "$ffmpeg_num_version" -lt 51490; then
-      AC_MSG_WARN([This version of ffmpeg/libavcodec is not able to play VP6A 
encoded video!])
+    if test -z "$ffmpeg_num_version" -o "$ffmpeg_num_version" -lt 514900; then
+      dnl 51.49.0 or higher required
+      AC_MSG_WARN([This version of ffmpeg/libavcodec ($ffmpeg_version) is not 
able to play VP6A encoded video: 51.49.0 or higher required!])
     else
       AC_DEFINE(FFMPEG_VP6A, 1, [Define if ffmpeg can play VP6A.])
     fi
 
   else
     AC_MSG_WARN([Could not check ffmpeg version (dunno where avcodec.h is)])
-    ffmpeg_version=ok # trust the user-specified dir
+    ffmpeg_version_check=ok # trust the user-specified dir
   fi
 
   # Eliminate the pointless -I/usr/include, which can happen
@@ -272,7 +290,7 @@
   AC_MSG_RESULT($avformat_h)
 
   dnl look for swscale.h, but ignore versions older than 51.40.3
-  if test $ffmpeg_num_version -gt 51403; then
+  if test $ffmpeg_num_version -gt 514003; then
     if test -f "${topdir}/ffmpeg/swscale.h"; then
       AC_DEFINE(HAVE_FFMPEG_SWSCALE_H, 1, [Define if swscale.h is found])
     fi