Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (4b1311a29badfc1a39811e026117b3c6bd7bacd6)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (4b1311a29badfc1a39811e026117b3c6bd7bacd6)
  • Date: Fri, 27 Apr 2007 18:02:06 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

http/gnash/BUILD | 9 +------
http/gnash/CONFIGURE | 4 +--
http/gnash/DEPENDS | 61
+++++++++++++++++++++++++++------------------------
http/gnash/HISTORY | 18 +++++++++++++++
4 files changed, 55 insertions(+), 37 deletions(-)

New commits:
commit 4b1311a29badfc1a39811e026117b3c6bd7bacd6
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

gnash: Update dependencies so it compiles for me and some cleanup

diff --git a/http/gnash/BUILD b/http/gnash/BUILD
index 3d22273..96d6f2e 100755
--- a/http/gnash/BUILD
+++ b/http/gnash/BUILD
@@ -1,14 +1,9 @@
-. $GRIMOIRE/is_depends_enabled.function &&
-
-if is_depends_enabled $SPELL firefox; then
+if [[ "$(get_spell_provider $SPELL NS-PLUGIN-COMPATIBLE)" == "firefox" ]];
then
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 &&
-
-if is_depends_enabled $SPELL mozilla; then
+elif [[ "$(get_spell_provider $SPELL NS-PLUGIN-COMPATIBLE)" == "mozilla" ]];
then
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 &&

-OPTS="$OPTS --enable-gui=$GNASH_GUI --enable-sound=$GNASH_SOUND" &&
default_build
diff --git a/http/gnash/CONFIGURE b/http/gnash/CONFIGURE
index 39ba394..1fb40da 100755
--- a/http/gnash/CONFIGURE
+++ b/http/gnash/CONFIGURE
@@ -1,5 +1,5 @@
-config_query_list GNASH_GUI "Which GUI do you want to use?" \
- SDL GTK FB KDE &&
+config_query_list GNASH_GUI "Which GUI do you want to use?" \
+ SDL GTK FB &&
# fix old stored values to match configure options
if [[ "$GNASH_SOUND" == sdl ]]; then
GNASH_SOUND=SDL
diff --git a/http/gnash/DEPENDS b/http/gnash/DEPENDS
index 8845ab7..841c178 100755
--- a/http/gnash/DEPENDS
+++ b/http/gnash/DEPENDS
@@ -1,34 +1,39 @@
-optional_depends libxml2 "--enable-xml" "--disable-xml" "Enable XML
support?" &&
-optional_depends kdebase "--enable-klash" "--disable-klash" "Build konqueror
plugin?" &&
-optional_depends NS-PLUGIN-COMPATIBLE "--enable-plugin
--with-plugindir=${INSTALL_ROOT}/usr/lib/mozilla/plugins" \
- "--disable-plugin"
+depends -sub THREAD boost &&
+depends libpng &&

-if [[ "${GNASH_GUI}" == "GTK" ]]; then
- depends GTK2 &&
- depends pango &&
- depends atk &&
- depends cairo &&
- depends gtkglext
-fi
+optional_depends jpeg \
+ '--enable-jpeg' \
+ '--disable-jpeg' \
+ 'for JPEG image support' &&

-if [[ "${GNASH_GUI}" == "SDL" ]]; then
- depends sdl
-fi
+optional_depends libxml2 \
+ '--enable-xml' \
+ '--disable-xml' \
+ 'Enable XML support?' &&

-if [[ "${GNASH_GUI}" == "KDE" ]]; then
- depends kdebase
-fi
+optional_depends kdebase \
+ '--enable-klash' \
+ '--disable-klash' \
+ 'Build konqueror plugin?' &&

-if [[ "${GNASH_SOUND}" == "GST" ]]; then
- depends gstreamer
-fi
+optional_depends NS-PLUGIN-COMPATIBLE \
+ "--enable-plugin
--with-plugindir=${INSTALL_ROOT}/usr/lib/mozilla/plugins" \
+ '--disable-plugin' \
+ 'for Netscape/Mozilla plugin' &&

-if [[ "${GNASH_SOUND}" == "SDL" ]]; then
- depends sdl
-fi
+if [[ "${GNASH_GUI}" == "GTK" ]]; then
+ depends atk &&
+ depends cairo &&
+ depends GTK2 '--enable-gui=GTK --enable-renderer=opengl' &&
+ depends gtkglext '--enable-glext' &&
+ depends pango
+elif [[ "${GNASH_GUI}" == "SDL" ]]; then
+ depends OPENGL &&
+ depends sdl '--enable-gui=SDL --enable-renderer=opengl --disable-glext'
+fi &&

-depends libpng &&
-depends jpeg &&
-depends OPENGL &&
-depends boost &&
-sub_depends boost THREAD
+if [[ "${GNASH_SOUND}" == "GST" ]]; then
+ depends gstreamer '--enable-sound=gst'
+elif [[ "${GNASH_SOUND}" == "SDL" ]]; then
+ depends sdl '--enable-sound=SDL'
+fi
diff --git a/http/gnash/HISTORY b/http/gnash/HISTORY
index 89556b8..0c384c2 100644
--- a/http/gnash/HISTORY
+++ b/http/gnash/HISTORY
@@ -1,3 +1,21 @@
+2007-04-27 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFIGURE: Remove KDE option, it's no longer valid (even though it's
+ listed in ./configure --help)
+ * DEPENDS: Set flags to enable dependencies
+ Use if/elif/fi for GUI selection, only need to check until we find
one
+ (same with sound)
+ List hard dependencies first, then optional
+ Use depends -sub rather then depends && sub_depends
+ Properly format optional dependencies
+ Add missing description for NS-PLUGIN-COMPATIBLE
+ Only depends on OPENGL if using the OpenGL renderer (not Cairo or
Agg)
+ Disable GLExt for non-GTK GUIs
+ Don't use cairo, it's experimental and doesn't even compile here :(
+ Remove KDE check
+ * BUILD: Setting flags in OPTS now taken care of by DEPENDS
+ use get_spell_provider to find out which package is providing
+ NS-PLUGIN-COMPATIBLE and modify configure accordingly
+
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



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (4b1311a29badfc1a39811e026117b3c6bd7bacd6), Eric Sandall, 04/27/2007

Archive powered by MHonArc 2.6.24.

Top of Page