[Gnash-commit] gnash ChangeLog configure.ac doc/C/usermanual/g...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/02/28 08:17:53

Modified files:
        .              : ChangeLog configure.ac 
        doc/C/usermanual: glossary.xml 

Log message:
                * configure.ac: never attempt to use libmad, fallback to ffmpeg 
if
                  gstreamer is not supported and not explicitly requested.
                * doc/C/usermanual/glossary.xml: update info about libmedia.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5755&r2=1.5756
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.486&r2=1.487
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/usermanual/glossary.xml?cvsroot=gnash&r1=1.6&r2=1.7

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5755
retrieving revision 1.5756
diff -u -b -r1.5755 -r1.5756
--- ChangeLog   28 Feb 2008 07:26:41 -0000      1.5755
+++ ChangeLog   28 Feb 2008 08:17:52 -0000      1.5756
@@ -1,5 +1,11 @@
 2008-02-28 Sandro Santilli <address@hidden>
 
+       * configure.ac: never attempt to use libmad, fallback to ffmpeg if
+         gstreamer is not supported and not explicitly requested.
+       * doc/C/usermanual/glossary.xml: update info about libmedia.
+
+2008-02-28 Sandro Santilli <address@hidden>
+
        * server/Property.{cpp,h}: drop left over debugging calls.
 
 2008-02-27 Bastiaan Jacques <address@hidden>

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.486
retrieving revision 1.487
diff -u -b -r1.486 -r1.487
--- configure.ac        26 Feb 2008 17:11:12 -0000      1.486
+++ configure.ac        28 Feb 2008 08:17:53 -0000      1.487
@@ -1501,17 +1501,6 @@
   AC_MSG_WARN([GTK2 specified for the GUI, but GtkGlExt is not present. Trying 
SDL instead.])
 fi
 
-if test x"$media_handler" = x"ffmpeg"; then
-  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
-       AC_MSG_WARN([No appropriate ffmpeg library found, will try using 
gstreamer.])
-       media_handler=gst
-     fi
-  fi
-fi
-
 missing_codecs=""
 if test "$media_handler" = "gst"; then
   AC_PATH_PROG(GST_INSPECT, gst-inspect, ,[${pathlist}])
@@ -1534,12 +1523,36 @@
   if test x"${media_handler_specified}" = xfalse; then
     # If the library is not found, or its version is not ok, we'll try mad
     if test x"$GSTREAMER_LIBS" = x; then
-       AC_MSG_WARN([No appropriate gstreamer library found, will try using 
mad.])
-       media_handler=mad
+       AC_MSG_WARN([No appropriate gstreamer library found, will try using 
ffmpeg.])
+       media_handler=ffmpeg
     fi
   fi
 fi
 
+if test x"$media_handler" = x"ffmpeg"; then
+  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
+       AC_MSG_WARN([No appropriate ffmpeg library found, disabling media 
handling.])
+       media_handler=none
+     fi
+  fi
+fi
+
+#if test x"$media_handler" = x"mad"; then
+#  dnl Will set MAD_LIBS and MAD_CFLAGS.
+#  dnl Handles --with-mad-incl and --with-mad-lib
+#  GNASH_PKG_FIND(mad, [mad.h], [mad library], mad_copyright)
+#  if test x"${media_handler_specified}" = xfalse; then
+#    # If the library is not found, we'll disable media handling
+#    if test x"${ac_cv_path_mad_lib}" = x ; then
+#      AC_MSG_WARN([No libmad found, disabling media handling.])
+#      media_handler=none
+#    fi
+#  fi
+#fi
+
 if test x"$media_handler" = x"gst"; then
   AC_MSG_CHECKING([for modern pbutils])
   save_cflags=$CFLAGS
@@ -1560,18 +1573,6 @@
 fi
 
 
-if test x"$media_handler" = x"mad"; then
-  dnl Will set MAD_LIBS and MAD_CFLAGS.
-  dnl Handles --with-mad-incl and --with-mad-lib
-  GNASH_PKG_FIND(mad, [mad.h], [mad library], mad_copyright)
-  if test x"${media_handler_specified}" = xfalse; then
-    # If the library is not found, we'll disable media handling
-    if test x"${ac_cv_path_mad_lib}" = x ; then
-      AC_MSG_WARN([No libmad found, disabling media handling.])
-      media_handler=none
-    fi
-  fi
-fi
 
 if test x$build_cairo = xyes; then
   GNASH_PKG_FIND(cairo, [cairo.h], [cairo render library], cairo_status)
@@ -2281,7 +2282,7 @@
 
 if test "$media_handler" = "gst"; then
   if test x"$missing_codecs" != x; then   
-      echo "        Your Gstreamer installtion is missing these codecs: 
$missing_codecs"
+      echo "        Your Gstreamer installation is missing these codecs: 
$missing_codecs"
       echo "        Please install the gstreamer-ffmpeg for Gstreamer"
   fi  
   if test x"$GSTREAMER_LIBS" != x; then
@@ -2333,7 +2334,7 @@
          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"
+          echo "               or reconfigure with --enable-media=gst"
          nogo=true
        else
           if test x"$FFMPEG_CFLAGS" != x; then
@@ -2349,7 +2350,7 @@
       echo "               You can install FFMPEG from 
http://ffmpeg.mplayerhq.hu";
       echo "               or .deb users: apt-get install libavformat-dev"
       echo "               or .rpm users: yum install ffmpeg-devel"
-      echo "               or reconfigure with --enable-media=mad"
+      echo "               or reconfigure with --enable-media=gst"
       nogo=true
     fi
   fi

Index: doc/C/usermanual/glossary.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/usermanual/glossary.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- doc/C/usermanual/glossary.xml       26 Feb 2008 15:20:50 -0000      1.6
+++ doc/C/usermanual/glossary.xml       28 Feb 2008 08:17:53 -0000      1.7
@@ -335,8 +335,8 @@
       </glossterm>
       <glossdef>
        <para>
-         libmad is a mp3-decoding library, which can be used by Gnash's
-         sound handler to decode mp3-audio.  
+         libmad is a mp3-decoding library, which used to be an option for Gnash
+         handling of sound (dropped since 0.8.2).
        </para>
       </glossdef>
     </glossentry>
@@ -569,12 +569,12 @@
        </para>
        <para>
          There are currently two sound handlers available in &app;:
-         SDL and Gstreamer.  The SDL sound handler uses ffmpeg or 
-         libmad for decoding mp3-audio, although it can be built without 
-         mp3-support. The Gstreamer-sound handler uses the available 
+         ffmpeg and Gstreamer.  The ffmpeg sound handler uses SDL for
+         mixing.
+         The Gstreamer-sound handler uses the available 
          plugins to decode the audio, so it might not work if some 
-         important plugins are missing.  The SDL sound handler is 
-         recommended.  
+         important plugins are missing.  The GST sound handler is 
+         recommended (the default).
        </para>
       </glossdef>
     </glossentry>