[Gnash-commit] [SCM] Gnash branch, master, updated. 981f1af1ff1b0f21386a53b88159ca343c5e43b6

[Sandro Santilli]

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  981f1af1ff1b0f21386a53b88159ca343c5e43b6 (commit)
      from  6e8b1e6917753fa28539cfa55d5c57b47be35fe9 (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=981f1af1ff1b0f21386a53b88159ca343c5e43b6


commit 981f1af1ff1b0f21386a53b88159ca343c5e43b6
Author: Sandro Santilli <address@hidden>
Date:   Fri Dec 3 21:58:04 2010 +0100

    Implement yes/no/auto semantic for ffmpeg

diff --git a/configure.ac b/configure.ac
index e783e2d..0cae92a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -762,7 +762,7 @@ dnl --------------------------------------------------------
 dnl  Media handler selection
 dnl --------------------------------------------------------
 build_media_gst=no
-build_media_ffmpeg=no
+build_media_ffmpeg=auto
 build_media_none=no
 AC_ARG_ENABLE(media,
   AC_HELP_STRING([--enable-media=handler],
@@ -771,6 +771,10 @@ AC_ARG_ENABLE(media,
     if test -n ${enableval}; then
       enableval=`echo ${enableval} | tr '\054' ' ' `
     fi
+    dnl When --enable-media is given, all media defaults to off
+    dnl except the explicitly enabled ones
+    build_media_ffmpeg=no
+    build_media_gst=no
     while test -n "${enableval}"; do
       val=`echo ${enableval} | cut -d ' ' -f 1`
       [case "${val}" in
@@ -784,8 +788,6 @@ AC_ARG_ENABLE(media,
           ;;
         no|NO|none)
           build_media_none=yes
-          build_media_ffmpeg=no
-          build_media_gst=no
           media_list="none"
           ;;
         *)
@@ -813,12 +815,22 @@ if test x${build_media_none} = xno -a x${build_media_gst} 
= xno -a x${build_medi
   build_media_gst=yes
 fi
 
+if test x"$build_media_ffmpeg" != x"no"; then # yes or auto
+  GNASH_PATH_FFMPEG
+  if test x"${build_media_ffmpeg}" = xauto; then
+    dnl TODO: have GNASH_PATH_FFMPEG set ${has_ffmpeg}
+    if test x"$FFMPEG_LIBS" != x; then
+      build_media_ffmpeg=yes
+      media_list="${media_list} ffmpeg"
+    else
+      build_ogl=no
+    fi
+  fi
+fi
+
 MEDIA_CONFIG="${media_list}"
 AC_SUBST(MEDIA_CONFIG)
 
-if test x"$build_media_ffmpeg" = x"yes"; then
-  GNASH_PATH_FFMPEG
-fi
 
 dnl -------------------------------
 dnl Input Device selection

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

Summary of changes:
 configure.ac |   24 ++++++++++++++++++------
 1 files changed, 18 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
Gnash