Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pol Vinogradov (0707c371c011a7c31a2168bff1b1272760728585)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pol Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pol Vinogradov (0707c371c011a7c31a2168bff1b1272760728585)
  • Date: Wed, 17 Feb 2010 19:34:36 -0600

GIT changes to master grimoire by Pol Vinogradov <vin.public AT gmail.com>:

http/gnash/CONFIGURE | 14 ++++++++++++--
http/gnash/DEPENDS | 26 +++++++++++++++++++-------
http/gnash/HISTORY | 4 ++++
3 files changed, 35 insertions(+), 9 deletions(-)

New commits:
commit 0707c371c011a7c31a2168bff1b1272760728585
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

http/gnash: moved back shared memory type choice, libxft and nspr
dependemcies, added KDE4, more fix for renderer selection

diff --git a/http/gnash/CONFIGURE b/http/gnash/CONFIGURE
index 89515f6..c72b155 100755
--- a/http/gnash/CONFIGURE
+++ b/http/gnash/CONFIGURE
@@ -1,3 +1,7 @@
+config_query_list GNASH_MEMORY \
+ "Which shared memory type do you want to use?" \
+ sysv posix &&
+
config_query_option GNASH_OPTS \
"Makes the plugin write the currently playing SWF to
/tmp." \
n \
@@ -6,7 +10,7 @@ config_query_option GNASH_OPTS
\

config_query_list GNASH_GUI \
"Which GUI do you want to use?" \
- GTK KDE &&
+ GTK KDE KDE4 &&

config_query_list GNASH_MEDIA \
"Which media backend do you want to use?" \
@@ -14,4 +18,10 @@ config_query_list GNASH_MEDIA
\

config_query_list GNASH_RENDERER \
"Which renderer to use?" \
- cairo opengl agg
+ cairo opengl agg &&
+
+if [[ "$GNASH_MEMORY" == "posix" ]]; then
+ list_add GNASH_OPTS "--with-shm=posix"
+else
+ list_add GNASH_OPTS "--with-shm=sysv"
+fi
diff --git a/http/gnash/DEPENDS b/http/gnash/DEPENDS
index 20583f3..f6be2ff 100755
--- a/http/gnash/DEPENDS
+++ b/http/gnash/DEPENDS
@@ -10,13 +10,11 @@ depends zlib &&
#
# Video rendering
#
-if [[ "$GNASH_RENDERER" == "opengl" ]]; then
- depends OPENGL '--enable-renderer=ogl'
-elif [[ "$GNASH_RENDERER" == "cairo" ]]; then
- depends cairo '--enable-renderer=cairo'
-else
- depends agg '--enable-renderer=agg'
-fi &&
+case "$GNASH_RENDERER" in
+ opengl) depends OPENGL "--enable-renderer=ogl";;
+ cairo) depends cairo "--enable-renderer=cairo";;
+ *) depends agg "--enable-renderer=agg";;
+esac &&

#
# Media rendering
@@ -43,6 +41,10 @@ elif [[ "${GNASH_GUI}" == "KDE" ]]; then
depends kdebase '--enable-gui=kde' &&
depends kdelibs '--enable-kparts' &&
depends qt-x11
+elif [[ "${GNASH_GUI}" == "KDE4" ]]; then
+ depends kdebase4 '--enable-gui=kde4' &&
+ depends kdelibs4 '--enable-kparts4' &&
+ depends qt4
fi &&

# no longer needed to build
@@ -51,6 +53,16 @@ suggest_depends NS-PLUGIN-COMPATIBLE
\
'--disable-npapi' \
'Suggested to run the plugin from a browser' &&

+optional_depends nspr \
+ "--with-nspr-incl=${INSTALL_ROOT}/usr/include/nspr
--with-nspr-lib=${INSTALL_ROOT}/usr/lib" \
+ "" \
+ "Enable support for Netscape Portable Runtime (NSPR)" &&
+
+optional_depends libxft \
+ "--with-Xft-incl=${INSTALL_ROOT}/usr/include/X11/Xft
--with-Xft-lib=${INSTALL_ROOT}/usr/lib" \
+ "" \
+ 'Enable support for xft library' &&
+
optional_depends dbus \
'--enable-extensions=dbus' \
'' \
diff --git a/http/gnash/HISTORY b/http/gnash/HISTORY
index 38d9dfd..cd87063 100644
--- a/http/gnash/HISTORY
+++ b/http/gnash/HISTORY
@@ -1,3 +1,7 @@
+2010-02-17 Pol Vinogradov <vin.public AT gmail.com>
+ * CONFIGURE, DEPENDS: moved back shared memory type choice, libxft and
+ nspr dependemcies, added KDE4, more fix for renderer selection
+
2010-02-16 Pol Vinogradov <vin.public AT gmail.com>
* CONFIGURE, DEPENDS: added cairo renderer, various cleanups




  • [SM-Commit] GIT changes to master grimoire by Pol Vinogradov (0707c371c011a7c31a2168bff1b1272760728585), Pol Vinogradov, 02/17/2010

Archive powered by MHonArc 2.6.24.

Top of Page