Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Andraž Levstik (11282f6874267c5b5f8699ca44621630c5f9bdc4)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Andraž Levstik <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Andraž Levstik (11282f6874267c5b5f8699ca44621630c5f9bdc4)
  • Date: Thu, 30 Aug 2007 05:14:06 -0500

GIT changes to master grimoire by Andraž Levstik <ruskie AT mages.ath.cx>:

http/gnash/BUILD | 11 +----
http/gnash/CONFIGURE | 40 ++++++++++++++------
http/gnash/DEPENDS | 64 ++++++++++++++++-----------------
http/gnash/DETAILS | 7 ++-
http/gnash/HISTORY | 10 +++++
http/gnash/INSTALL | 91
+++++++++++------------------------------------
http/gnash/PRE_BUILD | 7 +++
http/gnash/gnash.gpg |binary
video/ffmpeg-svn/DEPENDS | 28 ++++++++++++--
video/ffmpeg-svn/HISTORY | 3 +
10 files changed, 133 insertions(+), 128 deletions(-)

New commits:
commit a9c10567bf4bcc816277a6fc26b1e845823038cf
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

gnash: update to 0.8.1, upstream gpg, other fixups/revamping

commit 51b092783abff556340de4e11cc1b659d04e84ac
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

ffmpeg-svn: sync the DEPENDS file with regular ffmpeg spell

diff --git a/http/gnash/BUILD b/http/gnash/BUILD
index 96d6f2e..dd214c4 100755
--- a/http/gnash/BUILD
+++ b/http/gnash/BUILD
@@ -1,9 +1,4 @@
-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
-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 &&
-
+CXXFLAGS=${CXXFLAGS/-Os/-O2}
+CFLAGS=${CFLAGS/-Os/-O2}
+OPTS="$GNASH_OPTS $OPTS" &&
default_build
diff --git a/http/gnash/CONFIGURE b/http/gnash/CONFIGURE
index 1fb40da..5d61e1e 100755
--- a/http/gnash/CONFIGURE
+++ b/http/gnash/CONFIGURE
@@ -1,12 +1,28 @@
-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
-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
+config_query_option GNASH_OPTS \
+ "Build a netscape-api compatible plugin?" \
+ y \
+ "--enable-nsapi" \
+ "--disable-nsapi" &&
+config_query_option GNASH_OPTS \
+ "Enable support for the MIT-SHM X extension" \
+ n \
+ "--enable-mit-shm" \
+ "--disable-mit-shm" &&
+config_query_option GNASH_OPTS \
+ "Makes the plugin write the currently playing SWF to
/tmp." \
+ n \
+ "--enable-write" \
+ "--disable-write" &&
+config_query_list GNASH_GUI \
+ "Which GUI do you want to use?" \
+ GTK KDE &&
+config_query_list GNASH_MEDIA \
+ "Which media backend do you want to use?" \
+ ffmpeg gstreamer libmad &&
+GNASH_SOUND=${GNASH_SOUND/SDL/sdl} &&
+GNASH_SOUND=${GNASH_SOUND/GST/gstreamer} &&
+GNASH_SOUND=${GNASH_SOUND/gst/gstreamer} &&
+# doesn't have much sense to keep this here but anyway...
+config_query_list GNASH_SOUND \
+ "Which sound system do you want to use?" \
+ sdl gstreamer
diff --git a/http/gnash/DEPENDS b/http/gnash/DEPENDS
index cc78fe8..7b8ec40 100755
--- a/http/gnash/DEPENDS
+++ b/http/gnash/DEPENDS
@@ -1,39 +1,37 @@
-depends -sub THREAD boost &&
-depends libpng &&
-
-optional_depends jpeg \
- '--enable-jpeg' \
- '--disable-jpeg' \
- 'for JPEG image support' &&
-
-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' \
- '--disable-plugin' \
- 'for Netscape/Mozilla plugin' &&
-
+depends boost &&
+sub_depends boost THREAD &&
+sub_depends boost DATE_TIME &&
+depends g++ &&
+depends libpng &&
+depends jpeg &&
+depends libxml2 &&
+depends curl &&
+# only recommnedde renderer is ogl... the other
+# one is agg which we don't have a spell yet for and doesn't
+# have the same performance under certain conditions
+depends OPENGL '--enable-renderer=ogl' &&
+if [[ $GNASH_MEDIA == "gstreamer" ]]; then
+ depends $GNASH_MEDIA '--enable-media=GST'
+elif [[ $GNASH_MEDIA == "libmad" ]]; then
+ depends $GNASH_MEDIA '--enable-media=mad}'
+elif [[ $GNASH_MEDIA == "ffmpeg" ]]; then
+ depends LIBAVCODEC '--enable-media=ffmpeg'
+fi &&
+# There's no --enable/--disable sound option
+depends $GNASH_SOUND &&
+# no longer needed to build
+suggest_depends NS-PLUGIN-COMPATIBLE \
+ '' \
+ '' \
+ 'Suggested to run the plugin from a browser' &&
if [[ "${GNASH_GUI}" == "GTK" ]]; then
depends atk &&
depends cairo &&
- depends GTK2 '--enable-gui=GTK --enable-renderer=opengl' &&
+ depends GTK2 '--enable-gui=gtk' &&
depends gtkglext '--enable-glext' &&
depends pango
-elif [[ "${GNASH_GUI}" == "SDL" ]]; then
- depends OPENGL &&
- depends sdl '--enable-gui=SDL --enable-renderer=opengl --disable-glext'
-fi &&
-
-if [[ "${GNASH_SOUND}" == "GST" ]]; then
- depends gstreamer '--enable-sound=gst'
-elif [[ "${GNASH_SOUND}" == "SDL" ]]; then
- depends sdl '--enable-sound=SDL'
+elif [[ "${GNASH_GUI}" == "KDE" ]]; then
+ depends kdebase '--enable-gui=kde' &&
+ depends kdelibs '--enable-kparts'
fi
+
diff --git a/http/gnash/DETAILS b/http/gnash/DETAILS
index 168b96e..420c681 100755
--- a/http/gnash/DETAILS
+++ b/http/gnash/DETAILS
@@ -1,9 +1,12 @@
SPELL=gnash
- VERSION=0.7.2
+ VERSION=0.8.1
SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$GNU_URL/$SPELL/$VERSION/$SOURCE
-
SOURCE_HASH=sha512:6039876cc29259dfcaad4c41839216cc830bb070d1861dedfa141f1bc4012b360b08dd72281596381f4c0f9bb8099f66ad517d4d47ee2997cb513d4b49bd75d0
+ SOURCE2_URL[0]=$GNU_URL/$SPELL/$VERSION/$SOURCE2
+ SOURCE_GPG=gnash.gpg:$SOURCE2:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
WEB_SITE=http://www.gnu.org/software/gnash/
ENTERED=20070308
LICENSE[0]=GPL
diff --git a/http/gnash/HISTORY b/http/gnash/HISTORY
index 4e1a2b3..ab1ca6a 100644
--- a/http/gnash/HISTORY
+++ b/http/gnash/HISTORY
@@ -1,3 +1,13 @@
+2007-08-30 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * gnash.gpg: added gpg keyring
+ * DETAILS: updated spell to 0.8.1
+ converted to upstream signature checking
+ * PRE_BUILD: add the sedits
+ * BUILD: drop the sedits
+ * CONFIGURE: added some options and some revamping
+ * DEPENDS: revamp of depends
+ * INSTALL: reduce all the code duplication with two for loops
+
2007-06-01 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Don't bother with --plugin-dir, as we'll install the plugin
ourselves
diff --git a/http/gnash/INSTALL b/http/gnash/INSTALL
index edeca3f..25fe1ef 100755
--- a/http/gnash/INSTALL
+++ b/http/gnash/INSTALL
@@ -1,46 +1,28 @@
default_install &&
+local ns_compat
+for ns_compat in mozilla firefox seamonkey xulrunner opera netscape4; do
+if spell_installed $ns_compat; then
+ message "${MESSAGE_COLOR}Installing for $ns_compat${DEFAULT_COLOR}\n" &&

-if spell_installed mozilla; then
- message "${MESSAGE_COLOR}Installing for Mozilla${DEFAULT_COLOR}\n" &&
-
- if [ -e $INSTALL_ROOT/usr/lib/mozilla/plugins/libgnashplugin.so ]; then
- rm -f $INSTALL_ROOT/usr/lib/mozilla/plugins/libgnashplugin.so
- fi &&
-
- cp plugin/.libs/libgnashplugin.so $INSTALL_ROOT/usr/lib/mozilla/plugins/
-fi &&
-
-if spell_installed firefox; then
- FIREFOX_DIR="/usr/lib/firefox" &&
-
- message "${MESSAGE_COLOR}Installing for firefox${DEFAULT_COLOR}\n" &&
-
- if [ -e $FIREFOX_DIR/plugins/libgnashplugin.so ]; then
- rm -f $FIREFOX_DIR/plugins/libgnashplugin.so
- fi &&
-
- cp plugin/.libs/libgnashplugin.so $FIREFOX_DIR/plugins/
-fi &&
-
-if spell_installed seamonkey; then
- message "${MESSAGE_COLOR}Installing for Seamonkey${DEFAULT_COLOR}\n" &&
-
- if [ -e $INSTALL_ROOT/usr/lib/seamonkey/plugins/libgnashplugin.so ]; then
- rm -f $INSTALL_ROOT/usr/lib/seamonkey/plugins/libgnashplugin.so
+ if [[ -e $INSTALL_ROOT/usr/lib/$ns_compat/plugins/libgnashplugin.so ]];
then
+ rm -f $INSTALL_ROOT/usr/lib/$ns_compat/plugins/libgnashplugin.so
fi &&

- cp plugin/.libs/libgnashplugin.so $INSTALL_ROOT/usr/lib/seamonkey/plugins/
-fi &&
-
-if spell_installed firefox-bin; then
- message "${MESSAGE_COLOR}Installing for Firefox-bin${DEFAULT_COLOR}\n" &&
-
- if [ -e /opt/firefox/plugins/libgnashplugin.so ]; then
- rm -f /opt/firefox/plugins/libgnashplugin.so
+ cp -v plugin/.libs/libgnashplugin.so \
+ $INSTALL_ROOT/usr/lib/$ns_compat/plugins/
+fi
+done &&
+for ns_compat in mozilla firefox seamonkey xulrunner opera netscape4; do
+if spell_installed firefox-bin seamonkey-bin; then
+ message "${MESSAGE_COLOR}Installing for $ns_compat${DEFAULT_COLOR}\n" &&
+ if [[ -e $INSTALL_ROOT/opt/${ns_compat/-bin}/plugins/libgnashplugin.so ]];
then
+ rm -f $INSTALL_ROOT/opt/${ns_compat/-bin}/plugins/libgnashplugin.so
fi &&

- cp plugin/.libs/libgnashplugin.so /opt/firefox/plugins/
-fi &&
+ cp plugin/.libs/libgnashplugin.so \
+ $INSTALL_ROOT/opt/${ns_compat/-bin}/plugins/
+fi
+done &&

if spell_installed kdebase; then
message "${MESSAGE_COLOR}Installing for Konqueror${DEFAULT_COLOR}\n"
&&
@@ -48,7 +30,7 @@ if spell_installed kdebase; then
"After install, add /usr/lib/konqueror to the Plugins folders\n"
\
"list and click on the \"Scan for New Plugins\" button${DEFAULT_COLOR}\n"
&&

- if [ -e $INSTALL_ROOT/usr/lib/konqueror/libgnashplugin.so ]; then
+ if [[ -e $INSTALL_ROOT/usr/lib/konqueror/libgnashplugin.so ]]; then
rm -f $INSTALL_ROOT/usr/lib/konqueror/libgnashplugin.so
fi &&

@@ -56,35 +38,6 @@ if spell_installed kdebase; then
mkdir --mode=755 $INSTALL_ROOT/usr/lib/konqueror
fi &&

- cp plugin/.libs/libgnashplugin.so $INSTALL_ROOT/usr/lib/konqueror/
-fi &&
-
-if spell_installed opera; then
- message "${MESSAGE_COLOR}Installing for Opera${DEFAULT_COLOR}\n" &&
-
- if [ -e $INSTALL_ROOT/usr/lib/opera/plugins/libgnashplugin.so ]; then
- rm -f $INSTALL_ROOT/usr/lib/opera/plugins/libgnashplugin.so
- fi &&
-
- cp plugin/.libs/libgnashplugin.so $INSTALL_ROOT/usr/lib/opera/plugins/
-fi
-
-if spell_installed netscape4; then
- message "${MESSAGE_COLOR}Installing for Netscape${DEFAULT_COLOR}\n" &&
-
- if [ -e $INSTALL_ROOT/usr/lib/netscape4/plugins/libgnashplugin.so ]; then
- rm -f $INSTALL_ROOT/usr/lib/netscape4/plugins/libgnashplugin.so
- fi &&
-
- cp plugin/.libs/libgnashplugin.so $INSTALL_ROOT/usr/lib/netscape4/plugins/
-fi &&
-
-if spell_installed xulrunner; then
- message "${MESSAGE_COLOR}Installing for XULRunner${DEFAULT_COLOR}\n" &&
-
- if [ -e $INSTALL_ROOT/usr/lib/xulrunner/plugins/libgnashplugin.so ]; then
- rm -f $INSTALL_ROOT/usr/lib/xulrunner/plugins/libgnashplugin.so
- fi &&
-
- cp plugin/.libs/libgnashplugin.so $INSTALL_ROOT/usr/lib/xulrunner/plugins/
+ cp plugin/.libs/libgnashplugin.so \
+ $INSTALL_ROOT/usr/lib/konqueror/
fi
diff --git a/http/gnash/PRE_BUILD b/http/gnash/PRE_BUILD
new file mode 100755
index 0000000..282756e
--- /dev/null
+++ b/http/gnash/PRE_BUILD
@@ -0,0 +1,7 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+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 &&
+sedit
"s#\$HOME/.seamonkey/plugins#${INSTALL_ROOT}/usr/lib/seamonkey/plugins#g"
configure &&
+sedit
"s#\$HOME/.xulrunner/plugins#${INSTALL_ROOT}/usr/lib/xulrunner/plugins#g"
configure
+
diff --git a/http/gnash/gnash.gpg b/http/gnash/gnash.gpg
new file mode 100644
index 0000000..f073bd0
Binary files /dev/null and b/http/gnash/gnash.gpg differ
diff --git a/video/ffmpeg-svn/DEPENDS b/video/ffmpeg-svn/DEPENDS
index ccdb929..14238db 100755
--- a/video/ffmpeg-svn/DEPENDS
+++ b/video/ffmpeg-svn/DEPENDS
@@ -1,4 +1,3 @@
-depends subversion &&
optional_depends "nasm" \
"" \
"--disable-mmx" \
@@ -23,11 +22,32 @@ optional_depends "freetype2" \
"" \
"" \
"for a text render plugin" &&
-optional_depends "xvid" \
+optional_depends "libdts" \
+ "--enable-libdts" \
+ "" \
+ "for DTS audio decoding" &&
+optional_depends "xvid" \
"--enable-libxvid" \
- "" \
+ "" \
"for xvid support" &&
optional_depends sdl \
"" \
"--disable-ffplay" \
- "for ffplay video player"
+ "for ffplay video player" &&
+optional_depends a52dec \
+ "--enable-liba52" \
+ "" \
+ "for a52dec support" &&
+optional_depends faac \
+ "--enable-libfaac" \
+ "" \
+ "support for faac" &&
+optional_depends libtheora \
+ "--enable-libtheora" \
+ "" \
+ "theora codec" &&
+optional_depends x264 \
+ "--enable-libx264" \
+ "" \
+ "h.264"
+
diff --git a/video/ffmpeg-svn/HISTORY b/video/ffmpeg-svn/HISTORY
index 7d90e05..0937c9a 100644
--- a/video/ffmpeg-svn/HISTORY
+++ b/video/ffmpeg-svn/HISTORY
@@ -1,3 +1,6 @@
+2007-08-30 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DEPENDS: sync options with normal ffmpeg spell
+
2007-06-10 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DOWNLOAD: added to support stable sorcery, bug #13693
* DEPENDS: enable-xvid option renamed to enable-libxvid




Archive powered by MHonArc 2.6.24.

Top of Page