[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1713-gf3d20b5

[Gabriele Giacone]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  f3d20b5cef8a51df62108a6c4e3e3943cde651c9 (commit)
      from  317582391d683d0d2a7ad5da9160033d00062472 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=f3d20b5cef8a51df62108a6c4e3e3943cde651c9


commit f3d20b5cef8a51df62108a6c4e3e3943cde651c9
Author: Gabriele Giacone <address@hidden>
Date:   Wed Aug 7 00:57:16 2013 +0200

    Configure and docs fixes.
    
    + fix media handler configure option.
    + remove ALP and Hildon gui.
    + make media handler, renderer and gui options usage clearer.
    + typos

diff --git a/configure.ac b/configure.ac
index 8a89cb9..7ac0a68 100644
--- a/configure.ac
+++ b/configure.ac
@@ -762,7 +762,7 @@ build_media_ffmpeg=auto
 build_media_none=no
 AC_ARG_ENABLE(media,
   AC_HELP_STRING([--enable-media=handler],
-    [Enable media handling support using the specified handler: gst, ffmpeg or 
none (no sound) [[gst]] ]),
+    [Enable media handling support using the specified handlers: ffmpeg gst 
none(no sound) (default=auto) ]),
   
     if test -n ${enableval}; then
       enableval=`echo ${enableval} | tr '\054' ' ' `
diff --git a/doc/C/refmanual/feature_configuration.xml 
b/doc/C/refmanual/feature_configuration.xml
index 63cdeb5..a65e2e2 100644
--- a/doc/C/refmanual/feature_configuration.xml
+++ b/doc/C/refmanual/feature_configuration.xml
@@ -23,7 +23,7 @@
     <listitem>
       <para>
        <option>--enable-media</option> permits a media handler to be
-       selected.  The default is Gstreamer. 
+       selected.  The default is auto.
       </para>
     </listitem>
   </itemizedlist>
@@ -79,8 +79,25 @@
        </row>
 
        <row>
-         
<entry><option>--enable-gui=gtk|sdl|kde|fltk|fb|hildon|alp</option></entry>
-         <entry><para>Select the Graphic User Interface to use (choose 
one).</para>
+         <entry>
+           <option>
+             <programlisting>
+--enable-gui=&lt;gui&gt;[,&lt;gui&gt;]...
+
+      gui can be: aos4
+                 aqua
+                 dump
+                 fb
+                 fltk
+                 gtk
+                 haiku
+                 qt3
+                 qt4
+                 sdl
+             </programlisting>
+           </option>
+         </entry>
+         <entry><para>Select the Graphic User Interface to build.</para>
          <variablelist>
            <varlistentry>
              <term>GTK</term>
@@ -92,23 +109,6 @@
              </listitem>
            </varlistentry>
            <varlistentry>
-             <term>Hildon</term>
-             <listitem>
-               <para>
-                 The Hildon toolkist is based on GTK+, and is use by
-                 some mobile devices.
-               </para>
-             </listitem>
-           </varlistentry>
-           <varlistentry>
-             <term>ALP</term>
-             <listitem>
-               <para>
-                 The ALP "Hiker" GUI is used for the Access Linux platform.
-               </para>
-             </listitem>
-           </varlistentry>
-           <varlistentry>
              <term>SDL</term>
              <listitem>
                <para>
@@ -119,7 +119,7 @@
              </listitem>
            </varlistentry>
            <varlistentry>
-             <term>KDE</term>
+             <term>QT</term>
              <listitem>
                <para>
                  An interface adapted to the KDE Desktop Environment.
@@ -153,21 +153,34 @@
          </entry>
        </row>
        <row>
-         <entry><option>--enable-media=ffmpeg|gst|none</option>
+         <entry>
+           <option>
+             <programlisting>
+--enable-media=&lt;handler&gt;[,&lt;handler&gt;]...
+
+      handler can be: ffmpeg
+                     gst
+                     none
+             </programlisting>
+           </option>
          </entry>
-         <entry>  <para>
-           Select the specified media decoder and sound engine.
-           FFmpeg uses the SDL sound engine; GST uses its own.
-           <option>GST</option> is the default decoder.
+         <entry>
+         <para>
+           Select the specified media decoders.
+           Both ffmpeg and gst use SDL sound engine.
          </para>
          <para>
-           You should only select one media decoder.
+           If option is not given and required dependencies are
+           present, it will build both ffmpeg and gst media
+           handlers. Runtime default will be the first in
+           alphabetical order i.e. ffmpeg.
+           See <option>MediaHandler</option> gnashrc option.
          </para></entry>
        </row>
        <row>
          <entry>
-           <option>--disable-nsapi</option>
-           <option>--enable-nsapi</option>
+           <para><option>--disable-npapi</option></para>
+           <para><option>--enable-npapi</option></para>
          </entry>
          <entry>Force disable/enable building the NPAPI plugin.
          By default the Mozilla plugin is built if the GTK gui 
@@ -178,8 +191,8 @@
        </row>
        <row>
          <entry>
-           <option>--disable-kparts</option>
-           <option>--enable-kparts</option>
+           <para><option>--disable-kparts</option></para>
+           <para><option>--enable-kparts</option></para>
          </entry>
          <entry>Force disable/enable building the KPARTS plugin. By default the
          KDE plugin is built if the kde gui is selected. 
@@ -197,7 +210,16 @@
          <entry>Disable build of both kparts and npapi plugins</entry>
        </row>
        <row>
-         <entry><option>--enable-renderer=opengl|cairo|agg</option>
+         <entry>
+           <option>
+             <programlisting>
+--enable-renderer=&lt;renderer&gt;[,&lt;renderer&gt;]...
+
+      renderer can be: agg
+                      cairo
+                      opengl
+             </programlisting>
+           </option>
          </entry>
          <entry>Enable support for a graphics backend. Currently
          only <option>opengl</option> and

-----------------------------------------------------------------------

Summary of changes:
 configure.ac                              |    2 +-
 doc/C/refmanual/feature_configuration.xml |   86 ++++++++++++++++++-----------
 2 files changed, 55 insertions(+), 33 deletions(-)


hooks/post-receive
-- 
Gnash