[Gnash-commit] gnash Makefile.am configure.ac ChangeLog macros...

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    06/10/02 16:32:39

Modified files:
        .              : Makefile.am configure.ac ChangeLog 
Added files:
        macros         : ffmpeg.m4 

Log message:
                * configure.ac: Look for ffmpeg paths. Add --enable-sound=ffmpeg
                or --enable-sound=mad.
                * macros/ffmpeg.m4: Look for ffmpeg paths.
                * Makefile.am: Print ffmpeg paths for dumpconfig target.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/ffmpeg.m4?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/Makefile.am?cvsroot=gnash&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.120&r2=1.121
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.991&r2=1.992

Patches:
Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/Makefile.am,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- Makefile.am 30 Sep 2006 15:56:30 -0000      1.35
+++ Makefile.am 2 Oct 2006 16:32:39 -0000       1.36
@@ -142,6 +142,8 @@
        @echo "CURL_LIBS is $(CURL_LIBS)"
        @echo "GSTREAMER_CFLAGS is $(GSTREAMER_CFLAGS)"
        @echo "GSTREAMER_LIBS is $(GSTREAMER_LIBS)"
+       @echo "FFMPEG_CFLAGS is $(FFMPEG_CFLAGS)"
+       @echo "FFMPEG_LIBS is $(FFMPEG_LIBS)"
        @echo "KDE_INCLUDES is $(KDE_INCLUDES)"
        @echo "KDE_LDFLAGS is $(KDE_LDFLAGS)"
        @echo "CAIRO_CFLAGS is $(CAIRO_CFLAGS)"

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -b -r1.120 -r1.121
--- configure.ac        30 Sep 2006 15:56:30 -0000      1.120
+++ configure.ac        2 Oct 2006 16:32:39 -0000       1.121
@@ -33,7 +33,7 @@
 dnl also makes it possible to release a modified version which carries
 dnl forward this exception.
 
-dnl $Id: configure.ac,v 1.120 2006/09/30 15:56:30 rsavoye Exp $
+dnl $Id: configure.ac,v 1.121 2006/10/02 16:32:39 rsavoye Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, 0.7.1-cvs)
@@ -215,10 +215,14 @@
  sound,
  [  --enable-sound=handler  Enable sound support using the specified handler:
                                  GST (Gstreamer)
+                                 FFMPEG
+                                MAD (libmad)
                                  SDL (SDL_Mixer)],
  [case "${enableval}" in
    GST|gst) sound_handler=gst ;;
    sdl|SDL) sound_handler=sdl  ;;
+   ffmpeg|FFMPEG) sound_handler=ffmpeg ;;
+   mad|MAD) sound_handler=mad ;;
    *) sound_handler=none ;;
   esac],
  [sound_handler=none]
@@ -226,11 +230,15 @@
 case "${sound_handler}" in
        gst)  AC_DEFINE([SOUND_GST],  [1], [Use GSTREAMER for sound]) ;;
        sdl)  AC_DEFINE([SOUND_SDL],  [1], [Use SDL-mixer for sound]) ;;
+       ffmpeg)  AC_DEFINE([SOUND_SDL],  [1], [Use FFMPEG for sound]) ;;
+       mad)  AC_DEFINE([SOUND_SDL],  [1], [Use libMAD for sound]) ;;
        *)
 esac
 
 AM_CONDITIONAL(USE_SOUND_GST, test x$sound_handler = xgst)
 AM_CONDITIONAL(USE_SOUND_SDL, test x$sound_handler = xsdl)
+AM_CONDITIONAL(USE_SOUND_MAD, test x$sound_handler = xsdl)
+AM_CONDITIONAL(USE_SOUND_FFMPEG, test x$sound_handler = xffmpeg)
 
 dnl --------------------------------------------------------
 dnl  ...
@@ -398,7 +406,7 @@
 GNASH_PATH_GLIB
 AM_PATH_LIBXML2 
 GNASH_PATH_GSTREAMER
-
+GNASH_PATH_FFMPEG
 GNASH_PATH_OPENGL
 GNASH_PATH_GLEXT
 GNASH_PATH_GTK2
@@ -822,6 +830,20 @@
   fi
 fi
 
+if test "$sound_handler" = "ffmpeg"; then
+  if test x"$FFMPEG_LIBS" != x; then
+    if test x"$FFMPEG_CFLAGS" != x; then
+      echo "        ffmpeg flags are: $FFMPEG_CFLAGS"
+    else
+      echo "        ffmpeg flags are: default include path"
+    fi
+      echo "        ffmpeg libs are: $FFMPEG_LIBS"
+  else
+    echo "ERROR: gstreamer sound requested, but no gstreamer found"
+    nogo=true
+  fi
+fi
+
 if test "$renderer" = "cairo"; then
   if test x"$CAIRO_LIBS" != x; then
     if test x"$CAIRO_CFLAGS" != x; then

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.991
retrieving revision 1.992
diff -u -b -r1.991 -r1.992
--- ChangeLog   2 Oct 2006 16:28:11 -0000       1.991
+++ ChangeLog   2 Oct 2006 16:32:39 -0000       1.992
@@ -1,3 +1,10 @@
+2006-10-02  Rob Savoye  <address@hidden>
+
+       * configure.ac: Look for ffmpeg paths. Add --enable-sound=ffmpeg
+       or --enable-sound=mad.
+       * macros/ffmpeg.m4: Look for ffmpeg paths.
+       * Makefile.am: Print ffmpeg paths for dumpconfig target.
+
 2006-10-02 Bastiaan Jacques <address@hidden>
 
        * libamf/amf.h: Prevent character type overflow warnings by using int

Index: macros/ffmpeg.m4
===================================================================
RCS file: macros/ffmpeg.m4
diff -N macros/ffmpeg.m4
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ macros/ffmpeg.m4    2 Oct 2006 16:32:39 -0000       1.1
@@ -0,0 +1,138 @@
+dnl  
+dnl    Copyright (C) 2005, 2006 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
+dnl  the Free Software Foundation; either version 2 of the License, or
+dnl  (at your option) any later version.
+dnl  
+dnl  This program is distributed in the hope that it will be useful,
+dnl  but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl  GNU General Public License for more details.
+dnl  You should have received a copy of the GNU General Public License
+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 Linking Gnash statically or dynamically with other modules is making a
+dnl combined work based on Gnash. Thus, the terms and conditions of the GNU
+dnl General Public License cover the whole combination.
+dnl
+dnl As a special exception, the copyright holders of Gnash give you
+dnl permission to combine Gnash with free software programs or libraries
+dnl that are released under the GNU LGPL and with code included in any
+dnl release of Talkback distributed by the Mozilla Foundation. You may
+dnl copy and distribute such a system following the terms of the GNU GPL
+dnl for all but the LGPL-covered parts and Talkback, and following the
+dnl LGPL for the LGPL-covered parts.
+dnl
+dnl Note that people who make modified versions of Gnash are not obligated
+dnl to grant this special exception for their modified versions; it is their
+dnl choice whether to do so. The GNU General Public License gives permission
+dnl to release a modified version without this exception; this exception
+dnl also makes it possible to release a modified version which carries
+dnl forward this exception.
+dnl  
+dnl 
+
+dnl Ffmpeg modules are:
+dnl date-time, filesystem. graph. iostreams, program options, python,
+dnl regex, serialization, signals, unit test, thead, and wave.
+
+AC_DEFUN([GNASH_PATH_FFMPEG],
+[
+  dnl Lool for the header
+  AC_ARG_WITH(ffmpeg_incl, [  --with-ffmpeg-incl        directory where ffmpeg 
headers are], with_ffmpeg_incl=${withval})
+  AC_CACHE_VAL(ac_cv_path_ffmpeg_incl,[
+  if test x"${with_ffmpeg_incl}" != x ; then
+    if test -f ${with_ffmpeg_incl}/avcodec.h ; then
+      ac_cv_path_ffmpeg_incl=`(cd ${with_ffmpeg_incl}; pwd)`
+    elif test -f ${with_ffmpeg_incl}/avcodec.h; then
+      ac_cv_path_ffmpeg_incl=`(cd ${with_ffmpeg_incl}; pwd)`
+    else
+      AC_MSG_ERROR([${with_ffmpeg_incl} directory doesn't contain any headers])
+    fi
+  fi
+  ])
+
+  pkg=no
+  if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_ffmpeg_incl}" = x; then
+    ac_cv_path_ffmpeg_incl=`$PKG_CONFIG --cflags libavcodec`
+    pkg=yes
+  fi
+
+  if test x"${ac_cv_path_ffmpeg_incl}" = x ; then
+    AC_MSG_CHECKING([for ffmpeg header])
+    incllist="${prefix}/include /sw/include /usr/local/include 
/home/latest/include /opt/include /usr/include .. ../.."
+
+    for i in $incllist; do
+      if test -f $i/ffmpeg/avcodec.h; then
+        ac_cv_path_ffmpeg_incl="-I$i/ffmpeg"
+        break
+      fi
+    done
+  fi
+
+  if test x"${ac_cv_path_ffmpeg_incl}" != x ; then
+    FFMPEG_CFLAGS="${ac_cv_path_ffmpeg_incl}"
+  fi
+  AC_SUBST(FFMPEG_CFLAGS)
+
+
+  dnl Look for the library
+  AC_ARG_WITH(ffmpeg_lib, [  --with-ffmpeg-lib         directory where ffmpeg 
libraries are], with_ffmpeg_lib=${withval})
+    AC_CACHE_VAL(ac_cv_path_ffmpeg_lib,[
+    if test x"${with_ffmpeg_lib}" != x ; then
+      if test -f ${with_ffmpeg_lib}/libavcodec.a -o -f 
${with_ffmpeg_lib}/libavcodec.so; then
+       ac_cv_path_ffmpeg_lib=`(cd ${with_ffmpeg_incl}; pwd)`
+      else
+       AC_MSG_ERROR([${with_ffmpeg_lib} directory doesn't contain ffmpeg 
libraries.])
+      fi
+    fi
+  ])
+
+  dnl Try with pkg-config
+  if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_ffmpeg_lib}" = x; then
+    ac_cv_path_ffmpeg_lib=`$PKG_CONFIG --libs libavcodec`
+  fi
+
+
+  if test x"${ac_cv_path_ffmpeg_lib}" = x; then
+    AC_CHECK_LIB(ffmpeg_thread, cleanup_slots, [ac_cv_path_ffmpeg_lib=""],[
+      AC_MSG_CHECKING([for libffmpeg library])
+      libslist="${prefix}/lib64 ${prefix}/lib /usr/lib64 /usr/lib /sw/lib 
/usr/local/lib /home/latest/lib /opt/lib /usr/pkg/lib .. ../.."
+      for i in $libslist; do
+       if test -f $i/libavcodec.a -o -f $i/libavcodec.so; then
+         if test x"$i" != x"/usr/lib"; then
+           ac_cv_path_ffmpeg_lib="-L$i"
+            AC_MSG_RESULT(${ac_cv_path_ffmpeg_lib})
+           break
+          else
+           ac_cv_path_ffmpeg_lib=""
+            AC_MSG_RESULT(yes)
+           break
+          fi
+        fi
+      done])
+  else
+    if test -f ${ac_cv_path_ffmpeg_lib}/libavcodec.a -o -f 
${ac_cv_path_ffmpeg_lib}/libavcodec.so; then
+
+      if test x"${ac_cv_path_ffmpeg_lib}" != x"/usr/lib"; then
+       ac_cv_path_ffmpeg_lib="-L${ac_cv_path_ffmpeg_lib}"
+      else
+        ac_cv_path_ffmpeg_lib=""
+      fi
+    fi
+  fi
+
+  if test x"${ac_cv_path_ffmpeg_lib}" != x ; then
+      FFMPEG_LIBS="${ac_cv_path_ffmpeg_lib}"
+  else
+      FFMPEG_LIBS="-lavcodec -lavutil"
+  fi
+
+  AM_CONDITIONAL(HAVE_FFMPEG, [test x${ac_cv_path_ffmpeg_lib} != x])
+
+  AC_SUBST(FFMPEG_LIBS)
+
+])