Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (53c297031aedd9a933e5e063ee6dd4aa61bd60bf)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (53c297031aedd9a933e5e063ee6dd4aa61bd60bf)
  • Date: Thu, 26 Apr 2007 11:47:33 -0500

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

http/gnash/BUILD | 11 ++++++-----
http/gnash/CONFIGURE | 12 ++++++++++++
http/gnash/DEPENDS | 2 +-
http/gnash/HISTORY | 5 +++++
http/gnash/PREPARE | 4 ----
5 files changed, 24 insertions(+), 10 deletions(-)

New commits:
commit 91aca8fe3eeabb30e1d2b65a20cd59f413ca888a
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

gnash: some fixup to make configurability actually work
It still didn't install the plugins / klash for me ...
But it also doesn't seem to work that well either.

diff --git a/http/gnash/BUILD b/http/gnash/BUILD
index f82da74..3d22273 100755
--- a/http/gnash/BUILD
+++ b/http/gnash/BUILD
@@ -1,13 +1,14 @@
-. $GRIMOIRE/is_depends_enabled.function
+. $GRIMOIRE/is_depends_enabled.function &&

if is_depends_enabled $SPELL firefox; then
- sedit 's#$HOME/.firefox/plugins#$INSTALL_ROOT/usr/lib/firefox/plugins#g'
configure
+ sedit 's#$HOME/.firefox/plugins#$INSTALL_ROOT/usr/lib/firefox/plugins#g'
configure &&
sedit 's#$HOME/.mozilla/plugins#$INSTALL_ROOT/usr/lib/mozilla/plugins#g'
configure
-fi
+fi &&

if is_depends_enabled $SPELL mozilla; then
- sedit 's#$HOME/.firefox/plugins#$INSTALL_ROOT/usr/lib/firefox/plugins#g'
configure
+ sedit 's#$HOME/.firefox/plugins#$INSTALL_ROOT/usr/lib/firefox/plugins#g'
configure &&
sedit 's#$HOME/.mozilla/plugins#$INSTALL_ROOT/usr/lib/mozilla/plugins#g'
configure
-fi
+fi &&

+OPTS="$OPTS --enable-gui=$GNASH_GUI --enable-sound=$GNASH_SOUND" &&
default_build
diff --git a/http/gnash/CONFIGURE b/http/gnash/CONFIGURE
new file mode 100755
index 0000000..39ba394
--- /dev/null
+++ b/http/gnash/CONFIGURE
@@ -0,0 +1,12 @@
+config_query_list GNASH_GUI "Which GUI do you want to use?" \
+ SDL GTK FB KDE &&
+# fix old stored values to match configure options
+if [[ "$GNASH_SOUND" == sdl ]]; then
+ GNASH_SOUND=SDL
+fi &&
+if [[ "$GNASH_SOUND" == gstreamer ]]; then
+ GNASH_SOUND=GST
+fi &&
+config_query_list GNASH_SOUND \
+ "Which soundsystem do you want to use (GST=gstreamer)?" \
+ NO SDL GST
diff --git a/http/gnash/DEPENDS b/http/gnash/DEPENDS
index e65db5f..8845ab7 100755
--- a/http/gnash/DEPENDS
+++ b/http/gnash/DEPENDS
@@ -19,7 +19,7 @@ if [[ "${GNASH_GUI}" == "KDE" ]]; then
depends kdebase
fi

-if [[ "${GNASH_SOUND}" == "gstreamer" ]]; then
+if [[ "${GNASH_SOUND}" == "GST" ]]; then
depends gstreamer
fi

diff --git a/http/gnash/HISTORY b/http/gnash/HISTORY
index a584f5d..89556b8 100644
--- a/http/gnash/HISTORY
+++ b/http/gnash/HISTORY
@@ -1,3 +1,8 @@
+2007-04-26 Thomas Orgis <sobukus AT sourcemage.org>
+ * PREPARE,CONFIGURE,DEPENDS,BUILD: fix some config values,
+ move questions to CONFIGURE, actually give gui and sound
+ option to configure; which would always demand gtk
+
2007-03-27 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DEPENDS: missing subdepends on boost THREAD

diff --git a/http/gnash/PREPARE b/http/gnash/PREPARE
deleted file mode 100755
index f26d240..0000000
--- a/http/gnash/PREPARE
+++ /dev/null
@@ -1,4 +0,0 @@
-config_query_list GNASH_GUI "Which GUI do you want to use?" \
- SDL GTK FB KDE &&
-config_query_list GNASH_SOUND "Which soundsystem do you want to use?" \
- NO sdl gstreamer



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (53c297031aedd9a933e5e063ee6dd4aa61bd60bf), Thomas Orgis, 04/26/2007

Archive powered by MHonArc 2.6.24.

Top of Page