[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog configure.ac doc/C/usermanual/g... [relea
|
From: |
Sandro Santilli |
|
Subject: |
[Gnash-commit] gnash ChangeLog configure.ac doc/C/usermanual/g... [release_0_8_2_rc1] |
|
Date: |
Thu, 28 Feb 2008 08:16:18 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Branch: release_0_8_2_rc1
Changes by: Sandro Santilli <strk> 08/02/28 08:16:18
Modified files:
. : ChangeLog configure.ac
doc/C/usermanual: glossary.xml
doc/C/usermanual/installation: configuration.xml
feature_configuration.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,
installation/configuration.xml,
installation/feature_configuration.xml: update dox about
--enable-media and mad.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_2_rc1&r1=1.5711.2.32&r2=1.5711.2.33
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&only_with_tag=release_0_8_2_rc1&r1=1.479.2.4&r2=1.479.2.5
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/usermanual/glossary.xml?cvsroot=gnash&only_with_tag=release_0_8_2_rc1&r1=1.5&r2=1.5.2.1
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/usermanual/installation/configuration.xml?cvsroot=gnash&only_with_tag=release_0_8_2_rc1&r1=1.7&r2=1.7.2.1
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/usermanual/installation/feature_configuration.xml?cvsroot=gnash&only_with_tag=release_0_8_2_rc1&r1=1.17&r2=1.17.2.1
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5711.2.32
retrieving revision 1.5711.2.33
diff -u -b -r1.5711.2.32 -r1.5711.2.33
--- ChangeLog 28 Feb 2008 07:26:00 -0000 1.5711.2.32
+++ ChangeLog 28 Feb 2008 08:16:14 -0000 1.5711.2.33
@@ -1,5 +1,13 @@
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, installation/configuration.xml,
+ installation/feature_configuration.xml: update dox about
+ --enable-media and mad.
+
+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.479.2.4
retrieving revision 1.479.2.5
diff -u -b -r1.479.2.4 -r1.479.2.5
--- configure.ac 25 Feb 2008 11:13:06 -0000 1.479.2.4
+++ configure.ac 28 Feb 2008 08:16:16 -0000 1.479.2.5
@@ -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,16 +1523,46 @@
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
- else
+ 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
CFLAGS=$GSTREAMER_CFLAGS
- AC_TRY_COMPILE([#include <gst/pbutils/install-plugins.h>],[void* pointer =
&gst_install_plugins_sync],
+ AC_TRY_COMPILE([#include <gst/pbutils/install-plugins.h>],[void* pointer =
&gst_install_plugins_async],
GSTREAMER_LIBS="$GSTREAMER_LIBS -lgstpbutils-0.10",
- has_modern_gstpbutils='no')]
+ has_modern_gstpbutils='no')
+ AC_TRY_COMPILE([#include <gst/pbutils/install-plugins.h>],[void* pointer =
&gst_install_plugins_supported],
+ AC_DEFINE([HAVE_GST_INSTALL_PLUGINS_SUPPORTED], [], [GStreamer provides
the gst_install_plugins_supported function]),
+ has_gst_install_plugins_supported='no')
CFLAGS=$save_cflags
if test x$has_modern_gstpbutils = xno; then
AC_MSG_RESULT([no {GSTREAMER_CFLAGS=$GSTREAMER_CFLAGS}])
@@ -1551,21 +1570,8 @@
AC_DEFINE([GST_HAS_MODERN_PBUTILS], [], [GStreamer has pbutils with
missing codec install routines installed])
AC_MSG_RESULT([ok])
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$build_cairo = xyes; then
GNASH_PKG_FIND(cairo, [cairo.h], [cairo render library], cairo_status)
@@ -2275,7 +2281,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
@@ -2327,7 +2333,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
@@ -2343,7 +2349,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.5
retrieving revision 1.5.2.1
diff -u -b -r1.5 -r1.5.2.1
--- doc/C/usermanual/glossary.xml 19 Feb 2008 02:30:50 -0000 1.5
+++ doc/C/usermanual/glossary.xml 28 Feb 2008 08:16:17 -0000 1.5.2.1
@@ -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>
Index: doc/C/usermanual/installation/configuration.xml
===================================================================
RCS file:
/sources/gnash/gnash/doc/C/usermanual/installation/Attic/configuration.xml,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -b -r1.7 -r1.7.2.1
--- doc/C/usermanual/installation/configuration.xml 20 Feb 2008 11:33:54
-0000 1.7
+++ doc/C/usermanual/installation/configuration.xml 28 Feb 2008 08:16:17
-0000 1.7.2.1
@@ -45,7 +45,7 @@
<programlisting>
./configure --disable-debugger --disable-cygnal --disable-docbook \
---disable-plugin --enable-media=mad --enable-gui=sdl
+--disable-plugin --enable-media=ffmpeg --enable-gui=sdl
</programlisting>
<sect2 id="features">
Index: doc/C/usermanual/installation/feature_configuration.xml
===================================================================
RCS file:
/sources/gnash/gnash/doc/C/usermanual/installation/Attic/feature_configuration.xml,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -u -b -r1.17 -r1.17.2.1
--- doc/C/usermanual/installation/feature_configuration.xml 11 Jan 2008
18:10:10 -0000 1.17
+++ doc/C/usermanual/installation/feature_configuration.xml 28 Feb 2008
08:16:17 -0000 1.17.2.1
@@ -22,7 +22,7 @@
<listitem>
<para>
<option>--enable-media</option> permits a media handler to be
-selected. The default is FFMPEG with SDL sound.
+selected. The default is first available in Gstreamer, ffmpeg.
</para>
</listitem>
</itemizedlist>
@@ -97,7 +97,7 @@
<listitem>
<para>
Simple DirectMedia Layer, a simple and portable GUI.
- Its sound facilities are used when --enable-media=ffmpeg|mad
+ Its sound facilities are used when --enable-media=ffmpeg
regardless of whether it is also in charge of the GUI.
</para>
</listitem>
@@ -157,14 +157,12 @@
Klash.</entry>
</row>
<row>
- <entry><option>--enable-media=ffmpeg|mad|gst</option>
+ <entry><option>--enable-media=ffmpeg|gst|none</option>
</entry>
<entry> <para>
Select the specified media decoder and sound engine.
- FFMPEG and MAD use the SDL sound engine; GST uses its own.
- MAD only decodes MP3 sounds and uses integer arithmetic while
- the others also decode video files and use floating point.
- <option>FFMPEG</option> is the default decoder.
+ FFMPEG uses the SDL sound engine; GST uses its own.
+ <option>GST</option> is the default decoder.
</para>
<para>
You should only select one media decoder.
- [Gnash-commit] gnash ChangeLog configure.ac doc/C/usermanual/g... [release_0_8_2_rc1],
Sandro Santilli <=