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

[Martin Guy]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Martin Guy <martinwguy> 07/05/18 19:39:20

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

Log message:
                * macros/ffmpeg.m4,configure.ac: Workaround /usr/include/ffmpeg 
reported
                  by pkg-config; move libavformat absence test to final report.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/ffmpeg.m4?cvsroot=gnash&r1=1.40&r2=1.41
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.318&r2=1.319
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3278&r2=1.3279

Patches:
Index: macros/ffmpeg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/ffmpeg.m4,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- macros/ffmpeg.m4    15 May 2007 16:31:02 -0000      1.40
+++ macros/ffmpeg.m4    18 May 2007 19:39:19 -0000      1.41
@@ -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.40 2007/05/15 16:31:02 rsavoye Exp $
+dnl $Id: ffmpeg.m4,v 1.41 2007/05/18 19:39:19 martinwguy Exp $
 
 AC_DEFUN([GNASH_PATH_FFMPEG],
 [
@@ -40,13 +40,20 @@
   if test x${cross_compiling} = xno; then
     if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_ffmpeg_incl}" = x; then
       if $PKG_CONFIG --exists libavcodec; then
-         ac_cv_path_ffmpeg_incl=`$PKG_CONFIG --cflags libavcodec`
+       # Some systems return /usr/include/ffmpeg, others /usr/include.
+       # We use #include <ffmpeg/avcodec.h> everywhere so weed out funny
+       # values into the short form.
+
+       # Here pkg-config outputs two spaces on the end, so match those too!
+       ac_cv_path_ffmpeg_incl=`$PKG_CONFIG --cflags libavcodec | sed 
's:/ffmpeg *$::'`
          CFLAGS="$ac_cv_path_ffmpeg_incl $CFLAGS"
       fi
-      topdir=`$PKG_CONFIG --cflags-only-I libavcodec | sed -e 's:-I::g' | sed 
-e 's:.* /:/:' -e 's: ::g'`
+      topdir=`$PKG_CONFIG --cflags-only-I libavcodec | sed -e 's:-I::g' -e 
's:.* /:/:' -e 's: ::g'`
+      # Again adjust for ffmpeg/ foolery
+      topdir=`echo "$topdir" | sed 's:/ffmpeg *$::'`
       # Gets "" if not installed
       if test x"$topdir" != x; then
-             avcodec_h="$topdir/avcodec.h"
+       avcodec_h="$topdir/ffmpeg/avcodec.h"
       fi
     fi
   fi
@@ -68,14 +75,6 @@
     if test x${cross_compiling} = xno; then
       AC_CHECK_HEADERS(ffmpeg/avcodec.h, [ac_cv_path_ffmpeg_incl=""])
     fi
-  else
-    AC_MSG_CHECKING([for ffmpeg header])
-    if test -f $i/ffmpeg/avformat.h; then
-      AC_MSG_RESULT([yes]);
-    else
-      AC_MSG_RESULT([no])
-      AC_MSG_WARN([you need to install the avformat package!])
-    fi
   fi
 
 dnl We need LIBAVCODEC VERSION of at least 51.29.0 to get avcodec_decode_audio2
@@ -125,7 +124,9 @@
     ffmpeg_version=ok # trust the user-specified dir
   fi
 
-  if test x"${ac_cv_path_ffmpeg_incl}" != x ; then
+  # Eliminate the pointless -I/usr/include, which can happen
+  if test x"${ac_cv_path_ffmpeg_incl}" != x \
+       -a x"${ac_cv_path_ffmpeg_incl}" != x-I/usr/include ; then
     FFMPEG_CFLAGS="${ac_cv_path_ffmpeg_incl}"
   else
     FFMPEG_CFLAGS=""
@@ -317,7 +318,8 @@
     fi
   fi                            dnl end of all optional library tests
 
-  if test x"${ac_cv_path_ffmpeg_lib}" != x; then
+  # Set final compilation flags, eliminating the pointless "-I/usr/include"
+  if test x"${ac_cv_path_ffmpeg_lib}" != x ; then
     FFMPEG_LIBS="${ac_cv_path_ffmpeg_lib}"
   else
     FFMPEG_LIBS=""

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.318
retrieving revision 1.319
diff -u -b -r1.318 -r1.319
--- configure.ac        18 May 2007 10:14:10 -0000      1.318
+++ configure.ac        18 May 2007 19:39:20 -0000      1.319
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.318 2007/05/18 10:14:10 strk Exp $
+dnl $Id: configure.ac,v 1.319 2007/05/18 19:39:20 martinwguy Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -1428,7 +1428,8 @@
       echo "               or reconfigure using --enable-media=ffmpeg"
       nogo=true
     fi
-  else
+  fi
+
     if test x"$media_handler" = x"ffmpeg"; then
       if test x"$FFMPEG_LIBS" != x; then
         echo "        MP3 and video support enabled through ffmpeg"
@@ -1438,6 +1439,14 @@
           echo "               Version 51.27.0 or newer is highly recommended."
          nogo=true
        else
+       avformat_h=`echo $avcodec_h | sed 's/avcodec.h/avformat.h/'`
+       if test ! -f "$avformat_h"; then
+         echo "        ERROR: FFMPEG's libavcodec header is installed but not 
libavformat."
+          echo "               You can install FFMPEG from 
http://ffmpeg.mplayerhq.hu";
+          echo "               or .deb users: apt-get install libavformat-dev"
+          echo "               or reconfigure with --enable-media=mad"
+         nogo=true
+       else
           if test x"$FFMPEG_CFLAGS" != x; then
             echo "        FFMPEG flags are: $FFMPEG_CFLAGS"
           else
@@ -1445,6 +1454,7 @@
           fi
           echo "        FFMPEG libs are: $FFMPEG_LIBS"
        fi
+      fi
       else
         echo "        ERROR: No FFMPEG development package installed!"
         echo "               You can install FFMPEG from 
http://ffmpeg.mplayerhq.hu";
@@ -1453,7 +1463,6 @@
         nogo=true
       fi
     fi
-  fi
 
 if test "$renderer" = "cairo"; then
   if test x"$CAIRO_LIBS" != x; then

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3278
retrieving revision 1.3279
diff -u -b -r1.3278 -r1.3279
--- ChangeLog   18 May 2007 17:27:23 -0000      1.3278
+++ ChangeLog   18 May 2007 19:39:20 -0000      1.3279
@@ -76,6 +76,8 @@
        * backend/sound_handler_sdl.cpp: Remove bug 19750 that garbled
          SOUNDSTREAM audio.
        * server/swf/tag_loaders.cpp: Bug fix: calculate # samples correctly.
+       * macros/ffmpeg.m4,configure.ac: Workaround /usr/include/ffmpeg reported
+         by pkg-config; move libavformat absence test to final report.
 
 2007-05-17  Rob Savoye  <address@hidden>