[Gnash-commit] gnash configure.ac ChangeLog macros/ffmpeg.m4

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    07/02/09 20:03:15

Modified files:
        .              : configure.ac ChangeLog 
        macros         : ffmpeg.m4 

Log message:
                * macros/ffmpeg.m4: Check for the version of ffmpeg and print a
                warning if it's too old to use.
                * configure.ac: Print warning if you have ffmpeg, but it's a
                version older than 5.29.0.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.253&r2=1.254
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2293&r2=1.2294
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/ffmpeg.m4?cvsroot=gnash&r1=1.27&r2=1.28

Patches:
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -b -r1.253 -r1.254
--- configure.ac        8 Feb 2007 16:33:46 -0000       1.253
+++ configure.ac        9 Feb 2007 20:03:15 -0000       1.254
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.253 2007/02/08 16:33:46 martinwguy Exp $
+dnl $Id: configure.ac,v 1.254 2007/02/09 20:03:15 rsavoye Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -1141,6 +1141,10 @@
     fi
   else
   if test x"$mp3_decoder" = x"ffmpeg"; then
+      if test x${ffmpeg_version} != xok; then
+         echo "WARNING: You have version ${ffmpeg_version} of ffmpeg 
installed.\
+Version 51.29.0 or newer is highly recommended"
+      fi
     if test x"$FFMPEG_LIBS" != x; then
       echo "        MP3 support enabled through ffmpeg"
       if test x"$FFMPEG_CFLAGS" != x; then

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2293
retrieving revision 1.2294
diff -u -b -r1.2293 -r1.2294
--- ChangeLog   9 Feb 2007 17:23:03 -0000       1.2293
+++ ChangeLog   9 Feb 2007 20:03:15 -0000       1.2294
@@ -1,3 +1,10 @@
+2007-02-09  Rob Savoye  <address@hidden>
+
+       * macros/ffmpeg.m4: Check for the version of ffmpeg and print a
+       warning if it's too old to use.
+       * configure.ac: Print warning if you have ffmpeg, but it's a
+       version older than 5.29.0.
+
 2007-02-09 Bastiaan Jacques <address@hidden>
 
        * libbase/tu_types.h: Add the BYTE_ORDER name used on Mac OSX.

Index: macros/ffmpeg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/ffmpeg.m4,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- macros/ffmpeg.m4    9 Jan 2007 00:43:43 -0000       1.27
+++ macros/ffmpeg.m4    9 Feb 2007 20:03:15 -0000       1.28
@@ -1,5 +1,5 @@
 dnl  
-dnl    Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+dnl    Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 dnl  
 dnl  This program is free software; you can redistribute it and/or modify
 dnl  it under the terms of the GNU General Public License as published by
@@ -14,7 +14,7 @@
 dnl  along with this program; if not, write to the Free Software
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-dnl $Id: ffmpeg.m4,v 1.27 2007/01/09 00:43:43 rsavoye Exp $
+dnl $Id: ffmpeg.m4,v 1.28 2007/02/09 20:03:15 rsavoye Exp $
 
 AC_DEFUN([GNASH_PATH_FFMPEG],
 [
@@ -34,6 +34,7 @@
   if test x${cross_compiling} = xno; then
     if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_ffmpeg_incl}" = x; then
       $PKG_CONFIG --exists libavcodec && ac_cv_path_ffmpeg_incl=`$PKG_CONFIG 
--cflags libavcodec`
+      topdir=`$PKG_CONFIG --cflags-only-I libavcodec | cut -d ' ' -f 2 | sed 
-e 's:-I::'`
     fi
   fi
 
@@ -42,6 +43,7 @@
     for i in $incllist; do
       if test -f $i/ffmpeg/avcodec.h; then
         ac_cv_path_ffmpeg_incl="-I$i/ffmpeg"
+        topdir=$i
         break
       fi
     done
@@ -56,6 +58,22 @@
     AC_MSG_RESULT(${ac_cv_path_ffmpeg_incl})
   fi
 
+  dnl We need LIBAVCODEC VERSION of at least 51.29.0 to get 
avcodec_decode_audio2
+dnl   AC_PATH_PROG(FFMPEG, ffmpeg, ,[${pathlist}])
+dnl   if test "x$FFMPEG" = "x" ; then
+dnl     ffmpeg_version=`$FFMPEG uglyhack 2>&1 | grep "libavcodec version" | 
cut -d ' ' -f 5 | tr -d '.'`
+dnl     if test $ffmpeg -lt 51290; then
+dnl       AC_MSG_ERROR([])
+dnl     fi
+dnl   fi
+  ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION " ${topdir}/avcodec.h | 
cut -d ' ' -f 8 | tr -d '.'`
+dnl   AC_EGREP_HEADER(avcodec_decode_audio2, ${topdir}/avcodec.h, 
[avfound=yes], [avfound=no])
+  if test $ffmpeg_version -lt 51290; then
+    AC_MSG_WARN([Wrong avcode version! 51.29.0 or greater required])
+  else
+    ffmpeg_version=ok
+  fi
+
   if test x"${ac_cv_path_ffmpeg_incl}" != x ; then
     FFMPEG_CFLAGS="${ac_cv_path_ffmpeg_incl}"
   else
@@ -77,11 +95,13 @@
   dnl Try with pkg-config
   if test x${cross_compiling} = xno; then
     if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_ffmpeg_lib}" = x; then
-      $PKG_CONFIG --exists libavcodec && ac_cv_path_ffmpeg_lib=`$PKG_CONFIG 
--libs libavcodec`
+      $PKG_CONFIG --exists libavcodec && libavcodec=`$PKG_CONFIG --libs 
libavcodec`
     fi
   fi
 
-  if test x"${ac_cv_path_ffmpeg_lib}" = x; then
+  if test x"${libavcodec}" != x; then
+    ac_cv_path_ffmpeg_lib="${libavcodec}"
+  else
     AC_MSG_CHECKING([for libavcodec library])
     topdir=""
     for i in $libslist; do
@@ -101,14 +121,15 @@
     if test x"${ac_cv_path_ffmpeg_lib}" = x; then
       AC_MSG_RESULT(no)
       if test x${cross_compiling} = xno; then
+        dnl avcodec_decode_audio2 starts 51.29.0
         AC_CHECK_LIB(avcodec, ff_eval, [ac_cv_path_ffmpeg_lib="-lavcodec"])
       fi
     fi
+  fi
 
     if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_ffmpeg_lib}" != x; then
       $PKG_CONFIG --exists libavcodec && topdir=`$PKG_CONFIG --libs-only-L 
libavcodec | sed -e 's/-L//' | cut -d ' ' -f 1`
     fi
-  fi
 
   dnl Look for the DTS library, which is required on some systems.
   if test x"${ac_cv_path_ffmpeg_lib}" != x; then