[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-
From: |
Gabriele Giacone |
Subject: |
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-411-gd79ff0c |
Date: |
Sat, 26 Mar 2011 23:56:36 +0000 |
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 d79ff0c92b546184589b34cec5580e34da88fb62 (commit)
via 85f8a77ab3baf552e5507a7cd32d75ccc32036aa (commit)
via 11360ebe9a92b09e5434cce7c6ca279feb6cb9ff (commit)
from 853e7bd2935ef28e3161250aa936a3744b732100 (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=d79ff0c92b546184589b34cec5580e34da88fb62
commit d79ff0c92b546184589b34cec5580e34da88fb62
Author: Gabriele Giacone <address@hidden>
Date: Sun Mar 27 00:17:12 2011 +0100
Fix enable-renderer switch.
diff --git a/configure.ac b/configure.ac
index fe24e58..f94fb5f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -804,10 +804,9 @@ build_gles=no
build_ogl=auto
build_agg=yes
build_cairo=yes
-renderer_list="AGG Cairo"
-nrender=3
+renderer_list="agg cairo"
AC_ARG_ENABLE(renderer,
- AC_HELP_STRING([--enable-renderer=], [Enable support for the specified
renderers (ogl|cairo|agg|all, default=all)]),
+ AC_HELP_STRING([--enable-renderer=], [Enable support for the specified
renderers (agg|cairo|opengl|all, default=all)]),
if test -n ${enableval}; then
if test "x${enableval}" != "xno" -o "x${enableval}" != "xnone" ; then
renderer_list="none"
@@ -818,7 +817,6 @@ AC_ARG_ENABLE(renderer,
fi
fi
renderer_list=""
- nrender=0
build_ovg=no
build_ogl=no
build_gles=no
@@ -834,47 +832,40 @@ AC_ARG_ENABLE(renderer,
build_gles=no
build_agg=no
build_cairo=no
- nrender=1
;;
all|ALL)
- renderer_list="OpenGL, Cairo, AGG"
+ renderer_list="agg cairo opengl"
build_ogl=yes
build_agg=yes
build_cairo=yes
build_ovg=yes
- nrender=4
;;
ogl|OGL|OpenGL|opengl)
- renderer_list="${renderer_list} OpenGL"
+ renderer_list="${renderer_list} opengl"
build_gles=no
build_ogl=yes
- nrender=$((nrender+1))
;;
gles|GLES|GL-ES|gl-es)
- renderer_list="${renderer_list} OpenGL-ES"
+ renderer_list="${renderer_list} opengl-es"
build_gles=yes
build_ogl=no
- nrender=$((nrender+1))
;;
ovg|OVG|OpenVG|openvg)
- renderer_list="${renderer_list} OpenVG"
+ renderer_list="${renderer_list} openvg"
build_ogv=yes
- nrender=$((nrender+1))
;;
agg|AGG)
- renderer_list="${renderer_list} AGG"
+ renderer_list="${renderer_list} agg"
build_agg=yes
- nrender=$((nrender+1))
;;
cairo|CAIRO|Cairo*)
- renderer_list="${renderer_list} Cairo"
+ renderer_list="${renderer_list} cairo"
build_cairo=yes
- nrender=$((nrender+1))
;;
- *) AC_MSG_ERROR([invalid renderer specified: ${enableval} given (accept:
(ogl|cairo|agg|all)])
+ *) AC_MSG_ERROR([invalid renderer specified: ${enableval} given (accept:
(agg|cairo|opengl|all)])
;;
esac]
- enableval=`echo ${enableval} | cut -d ' ' -f 2-6`
+ enableval=`echo ${enableval} | cut -d ' ' -f 2-`
if test "x$val" = "x$enableval"; then
break;
fi
http://git.savannah.gnu.org/cgit//commit/?id=85f8a77ab3baf552e5507a7cd32d75ccc32036aa
commit 85f8a77ab3baf552e5507a7cd32d75ccc32036aa
Author: Sebastian Parborg <address@hidden>
Date: Sat Mar 26 18:00:24 2011 +0100
Made gnash choose the first available render as default.
diff --git a/gui/gnash.cpp b/gui/gnash.cpp
index 61ae72f..b1a19e8 100644
--- a/gui/gnash.cpp
+++ b/gui/gnash.cpp
@@ -382,7 +382,7 @@ getSupportedOptions(gnash::Player& p)
).c_str())
("renderer,R", po::value<string>()
- ->default_value("agg")
+ ->default_value(renderers[0])
->notifier(boost::bind(&Player::setRenderer, &p, _1)),
(string(_("The renderer to use"))
+ string("\n") + boost::join(renderers, "|")
http://git.savannah.gnu.org/cgit//commit/?id=11360ebe9a92b09e5434cce7c6ca279feb6cb9ff
commit 11360ebe9a92b09e5434cce7c6ca279feb6cb9ff
Author: Sebastian Parborg <address@hidden>
Date: Sat Mar 26 17:55:53 2011 +0100
Fixed made the gtk gui respect the Renderer option
diff --git a/gui/gtk/gtk.cpp b/gui/gtk/gtk.cpp
index 2e74517..11aac77 100644
--- a/gui/gtk/gtk.cpp
+++ b/gui/gtk/gtk.cpp
@@ -180,13 +180,13 @@ GtkGui::init(int argc, char **argv[])
addGnashIcon(GTK_WINDOW(_window));
- std::string hwaccel = _runResources.getHWAccelBackend();
+ std::string hwaccel = rcfile.getHWAccel();
if (hwaccel.empty()) {
- hwaccel = rcfile.getHWAccel();
+ hwaccel = _runResources.getHWAccelBackend();
}
- std::string renderer = _runResources.getRenderBackend();
+ std::string renderer = rcfile.getRenderer();
if (renderer.empty()) {
- renderer = rcfile.getRenderer();
+ renderer = _runResources.getRenderBackend();
}
if (renderer == "opengl") {
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 29 ++++++++++-------------------
gui/gnash.cpp | 2 +-
gui/gtk/gtk.cpp | 8 ++++----
3 files changed, 15 insertions(+), 24 deletions(-)
hooks/post-receive
--
Gnash
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-411-gd79ff0c,
Gabriele Giacone <=