Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (22c0c1f66d7dc5548cd0dc0582dd29ed6620514a)
  • Date: Mon, 2 Apr 2007 16:58:37 -0500

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

ChangeLog | 4
dev/null |binary
video-libs/swfdec-mozilla/BUILD | 12 ++
video-libs/swfdec-mozilla/DEPENDS | 3
video-libs/swfdec-mozilla/DETAILS | 15 ++
video-libs/swfdec-mozilla/HISTORY | 6 +
video-libs/swfdec-mozilla/POST_REMOVE | 1
video-libs/swfdec-mozilla/PRE_BUILD | 4
video-libs/swfdec-mozilla/browser-plugin.patch | 82
++++++++++++++
video-libs/swfdec-mozilla/swfdec-mozilla-0.4.3.tar.gz.sig |binary
video-libs/swfdec/BUILD | 15 --
video-libs/swfdec/CONFIGURE | 1
video-libs/swfdec/DEPENDS | 41 +++++--
video-libs/swfdec/DETAILS | 15 +-
video-libs/swfdec/FINAL | 2
video-libs/swfdec/HISTORY | 13 ++
video-libs/swfdec/INSTALL | 5
video-libs/swfdec/PRE_BUILD | 4
video-libs/swfdec/browser-plugin.patch | 73 ------------
video-libs/swfdec/swfdec-0.3.6.tar.gz.sig | 0
video-libs/swfdec/swfdec-0.4.3.tar.gz.sig |binary
21 files changed, 191 insertions(+), 105 deletions(-)

New commits:
commit 22c0c1f66d7dc5548cd0dc0582dd29ed6620514a
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

swfdec: Updated to 0.4.3 (mozilla-plugin is no longer distributed with
swfdec)
swfdec-mozilla: Mozilla plugin for swfdec

diff --git a/ChangeLog b/ChangeLog
index 27176a9..e73bfef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-04-02 Eric Sandall <sandalle AT sourcemage.org>
+ * video-libs/swfdec-mozilla: Mozilla plugin for swfdec (developers
+ split swfdec and its plugin)
+
2007-04-02 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* http/javascriptcore: new spell java script engine from gtk-webcore
* http/nrcore: new spell khtml core engine from gtk-webcore
diff --git a/video-libs/swfdec-mozilla/BUILD b/video-libs/swfdec-mozilla/BUILD
new file mode 100755
index 0000000..b856226
--- /dev/null
+++ b/video-libs/swfdec-mozilla/BUILD
@@ -0,0 +1,12 @@
+if test "$(get_spell_provider $SPELL GECKO)" = firefox; then
+ OPTS="$OPTS --with-mozilla=firefox"
+elif test "$(get_spell_provider $SPELL GECKO)" = seamonkey; then
+ OPTS="$OPTS --with-mozilla=seamonkey"
+elif test "$(get_spell_provider $SPELL GECKO)" = mozilla; then
+ OPTS="$OPTS --with-mozilla=mozilla"
+elif test "$(get_spell_provider $SPELL GECKO)" = xulrunner; then
+ OPTS="$OPTS --with-mozilla=xulrunner"
+else
+ OPTS="$OPTS --without-mozilla"
+fi &&
+default_build
diff --git a/video-libs/swfdec-mozilla/DEPENDS
b/video-libs/swfdec-mozilla/DEPENDS
new file mode 100755
index 0000000..6706b05
--- /dev/null
+++ b/video-libs/swfdec-mozilla/DEPENDS
@@ -0,0 +1,3 @@
+depends GECKO &&
+depends gst-plugins-base &&
+depends swfdec
diff --git a/video-libs/swfdec-mozilla/DETAILS
b/video-libs/swfdec-mozilla/DETAILS
new file mode 100755
index 0000000..d2c5f81
--- /dev/null
+++ b/video-libs/swfdec-mozilla/DETAILS
@@ -0,0 +1,15 @@
+ SPELL=swfdec-mozilla
+ VERSION=0.4.3
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+
SOURCE_URL[0]=http://swfdec.freedesktop.org/download/swfdec-mozilla/${VERSION:0:3}/$SOURCE
+ SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
+ LICENSE[0]=LGPL
+ WEB_SITE=http://swfdec.freedesktop.org/
+ KEYWORDS="plugin video libs"
+ ENTERED=20070402
+ SHORT='Mozilla SWF plugin'
+cat << EOF
+Swfdec-Mozilla contains a plugin for Mozilla browsers that uses the Swfdec
+library for playing SWF files.
+EOF
diff --git a/video-libs/swfdec-mozilla/HISTORY
b/video-libs/swfdec-mozilla/HISTORY
new file mode 100644
index 0000000..7cb1916
--- /dev/null
+++ b/video-libs/swfdec-mozilla/HISTORY
@@ -0,0 +1,6 @@
+2007-04-02 Eric Sandall <sandalle AT sourcemage.org>
+ * Copied from swfdec and modified to install the mozilla plugin
+ * CONFIGURE: Removed
+ * DEPENDS: Depends on GECKO and gst-plugins-base
+ * browser-plugin.patch: Updated to 0.4.3
+
diff --git a/video-libs/swfdec-mozilla/POST_REMOVE
b/video-libs/swfdec-mozilla/POST_REMOVE
new file mode 100755
index 0000000..cbc86ac
--- /dev/null
+++ b/video-libs/swfdec-mozilla/POST_REMOVE
@@ -0,0 +1 @@
+gdk-pixbuf-query-loaders > $INSTALL_ROOT/etc/gtk-2.0/gdk-pixbuf.loaders
diff --git a/video-libs/swfdec-mozilla/PRE_BUILD
b/video-libs/swfdec-mozilla/PRE_BUILD
new file mode 100755
index 0000000..6be05c6
--- /dev/null
+++ b/video-libs/swfdec-mozilla/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SCRIPT_DIRECTORY/browser-plugin.patch &&
+autoreconf
diff --git a/video-libs/swfdec-mozilla/browser-plugin.patch
b/video-libs/swfdec-mozilla/browser-plugin.patch
new file mode 100644
index 0000000..47b2d72
--- /dev/null
+++ b/video-libs/swfdec-mozilla/browser-plugin.patch
@@ -0,0 +1,82 @@
+diff -Naur swfdec-mozilla-0.4.3.orig/configure.ac
swfdec-mozilla-0.4.3/configure.ac
+--- swfdec-mozilla-0.4.3.orig/configure.ac 2007-04-02 14:15:48.286730883
-0700
++++ swfdec-mozilla-0.4.3/configure.ac 2007-04-02 14:49:09.712400849 -0700
+@@ -112,23 +112,50 @@
+ AC_MSG_ERROR([cannot find cairo, which is required for build])
+ fi
+
+-PKG_CHECK_MODULES(MOZILLA, mozilla-plugin, HAVE_MOZILLA=yes,
HAVE_MOZILLA=no)
+-MOZILLA_DIR=mozilla
+-if test "$HAVE_MOZILLA" = no ; then
+- PKG_CHECK_MODULES(MOZILLA, firefox-plugin, HAVE_MOZILLA=yes,
HAVE_MOZILLA=no)
+- MOZILLA_DIR=mozilla-firefox
+-fi
+-if test "$HAVE_MOZILLA" = no ; then
+- PKG_CHECK_MODULES(MOZILLA, iceape-plugin, HAVE_MOZILLA=yes,
HAVE_MOZILLA=no)
+- MOZILLA_DIR=iceape
+-fi
+-AC_SUBST(MOZILLA_CFLAGS)
+-AC_SUBST(MOZILLA_LIBS)
+-AC_SUBST(MOZILLA_DIR)
+-AM_CONDITIONAL(HAVE_MOZILLA, [test $HAVE_MOZILLA = yes])
+-if test "x$HAVE_MOZILLA" = "xno"; then
+- AC_MSG_ERROR([Mozilla not found. Mozilla/Netscape plugin will not be
built.])
++dnl ******************
++dnl Mozilla name check
++dnl ******************
++AC_MSG_CHECKING([which mozilla to use])
++MOZILLA=
++AC_ARG_WITH([mozilla],
++
AS_HELP_STRING([--with-mozilla@<:@=mozilla|firefox|seamonkey|xulrunner@:>@],
++ [Which mozilla to use for plugin (default:
autodetect)]),
++ [MOZILLA="$withval"])
++if test "x$MOZILLA" = "x"; then
++ if $PKG_CONFIG --exists mozilla-plugin; then
++ MOZILLA=mozilla
++ elif $PKG_CONFIG --exists firefox-plugin; then
++ MOZILLA=firefox
++ elif $PKG_CONFIG --exists seamonkey-plugin; then
++ MOZILLA=seamonkey
++ elif $PKG_CONFIG --exists xulrunner-plugin; then
++ MOZILLA=xulrunner
++ else
++ AC_MSG_WARN([no mozilla installation found. Mozilla plugin will not be
built])
++ HAVE_MOZILLA=no
++ fi
++elif test "x$with_mozilla" != "xmozilla" -a "x$with_mozilla" != "xfirefox"
-a "x$with_mozilla" != "xseamonkey" -a "x$with_mozilla" != "xxulrunner" -a
"x$with_mozilla" != "xno"; then
++ AC_MSG_ERROR([unknown mozilla name ($MOZILLA)])
++ fi
++
++AC_SUBST(MOZILLA)
++AC_MSG_RESULT([$MOZILLA])
++
++if test "x$with_mozilla" != "xno"; then
++ PKG_CHECK_MODULES(MOZILLA, $MOZILLA-plugin, HAVE_MOZILLA="yes",
HAVE_MOZILLA="no")
++ AC_SUBST(MOZILLA_CFLAGS)
++ AC_SUBST(MOZILLA_LIBS)
++ if test "x$HAVE_MOZILLA" = "xyes"; then
++ MOZILLA_PLUGIN_DIR=`pkg-config --variable=libdir
$MOZILLA-plugin`/plugins
++ else
++ MOZILLA_PLUGIN_DIR=
++ fi
++else
++ MOZILLA_PLUGIN_DIR=
++ HAVE_MOZILLA=no
+ fi
++AC_SUBST(MOZILLA_PLUGIN_DIR)
++AM_CONDITIONAL(HAVE_MOZILLA,[test "$HAVE_MOZILLA" = "yes"])
+
+ dnl define standard mozilla defines
+ dnl this needs updates if we want to compile on Windows or OS X
+diff -Naur swfdec-mozilla-0.4.3.orig/src/Makefile.am
swfdec-mozilla-0.4.3/src/Makefile.am
+--- swfdec-mozilla-0.4.3.orig/src/Makefile.am 2007-04-02 14:15:48.279731951
-0700
++++ swfdec-mozilla-0.4.3/src/Makefile.am 2007-04-02 14:33:03.215845958
-0700
+@@ -8,7 +8,7 @@
+ BUILT_SOURCES = swfdec_playback.c
+ CLEANFILES = swfdec_playback.c
+
+-plugindir = $(libdir)/$(MOZILLA_DIR)/plugins
++plugindir = @MOZILLA_PLUGIN_DIR@
+ plugin_LTLIBRARIES = libswfdecmozilla.la
+
+ libswfdecmozilla_la_CFLAGS = $(GLOBAL_CFLAGS) $(MOZILLA_CFLAGS)
$(SWFDEC_CFLAGS) \
diff --git a/video-libs/swfdec-mozilla/swfdec-mozilla-0.4.3.tar.gz.sig
b/video-libs/swfdec-mozilla/swfdec-mozilla-0.4.3.tar.gz.sig
new file mode 100644
index 0000000..41dd200
Binary files /dev/null and
b/video-libs/swfdec-mozilla/swfdec-mozilla-0.4.3.tar.gz.sig differ
diff --git a/video-libs/swfdec/BUILD b/video-libs/swfdec/BUILD
index b856226..feceeab 100755
--- a/video-libs/swfdec/BUILD
+++ b/video-libs/swfdec/BUILD
@@ -1,12 +1,3 @@
-if test "$(get_spell_provider $SPELL GECKO)" = firefox; then
- OPTS="$OPTS --with-mozilla=firefox"
-elif test "$(get_spell_provider $SPELL GECKO)" = seamonkey; then
- OPTS="$OPTS --with-mozilla=seamonkey"
-elif test "$(get_spell_provider $SPELL GECKO)" = mozilla; then
- OPTS="$OPTS --with-mozilla=mozilla"
-elif test "$(get_spell_provider $SPELL GECKO)" = xulrunner; then
- OPTS="$OPTS --with-mozilla=xulrunner"
-else
- OPTS="$OPTS --without-mozilla"
-fi &&
-default_build
+make_single &&
+default_build &&
+make_normal
diff --git a/video-libs/swfdec/CONFIGURE b/video-libs/swfdec/CONFIGURE
deleted file mode 100755
index 1f1123e..0000000
--- a/video-libs/swfdec/CONFIGURE
+++ /dev/null
@@ -1 +0,0 @@
-config_query SWFDEC_MOZPLUGIN "Build mozilla plugin?" n
diff --git a/video-libs/swfdec/DEPENDS b/video-libs/swfdec/DEPENDS
index 63db227..5365c87 100755
--- a/video-libs/swfdec/DEPENDS
+++ b/video-libs/swfdec/DEPENDS
@@ -1,11 +1,38 @@
-depends automake &&
-depends libtool &&
-depends gtk+2 &&
-depends libmad &&
-depends liboil &&
-depends cairo &&
+depends automake &&
+depends cairo &&
+depends liboil &&
+depends libtool &&
+depends glib2 &&
+depends gtk+2 &&
+depends pango &&
+depends pkgconfig &&
+
if test "$SWFDEC_MOZPLUGIN" = "y"; then
depends GECKO &&
depends gst-plugins-base
fi &&
-optional_depends gimp "" "" "for gimp plugin"
+
+optional_depends gimp \
+ '' \
+ '' \
+ 'for gimp plugin' &&
+
+optional_depends alsa-lib \
+ '--with-audio=alsa' \
+ '--with-audio=auto' \
+ 'for ALSA audio backend' &&
+
+optional_depends libmad \
+ '--enable-mad' \
+ '--disable-mad' \
+ 'for high-quality MPEG audio decoder' &&
+
+optional_depends ffmpeg \
+ '--enable-ffmpeg' \
+ '--disable-ffmpeg' \
+ 'for Internet audio and video' &&
+
+optional_depends gtk-doc \
+ '--enable-gtk-doc' \
+ '--disable-gtk-doc' \
+ 'for documentation'
diff --git a/video-libs/swfdec/DETAILS b/video-libs/swfdec/DETAILS
index dc42b3b..ce2d1cc 100755
--- a/video-libs/swfdec/DETAILS
+++ b/video-libs/swfdec/DETAILS
@@ -1,16 +1,15 @@
SPELL=swfdec
- VERSION=0.3.6
+ VERSION=0.4.3
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://www.schleef.org/swfdec/download/$SOURCE
+
SOURCE_URL[0]=http://swfdec.freedesktop.org/download/swfdec/${VERSION:0:3}/$SOURCE
SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
LICENSE[0]=LGPL
- WEB_SITE=http://www.schleef.org/swfdec/
- ENTERED=20041105
+ WEB_SITE=http://swfdec.freedesktop.org/
KEYWORDS="player video libs"
- SHORT="Library and small player for SWF files"
+ ENTERED=20041105
+ SHORT="Library and player for SWF files"
cat << EOF
-swfdec is a library for decoding SWF files. It is among other
-things used by GStreamer for this purpose. The swfdec library
-also contains a simple command line swf player.
+swfdec is a library for decoding SWF files. It is among other things used by
+GStreamer for this purpose. Also includes a small SWF player and debugger.
EOF
diff --git a/video-libs/swfdec/FINAL b/video-libs/swfdec/FINAL
new file mode 100755
index 0000000..e0ee731
--- /dev/null
+++ b/video-libs/swfdec/FINAL
@@ -0,0 +1,2 @@
+message "${MESSAGE_COLOR}The Mozilla plugin has been moved to" \
+ " ${SPELL_COLOR}swfdec-mozilla${DEFAULT_COLOR}"
diff --git a/video-libs/swfdec/HISTORY b/video-libs/swfdec/HISTORY
index 6d66b33..a8fbf22 100644
--- a/video-libs/swfdec/HISTORY
+++ b/video-libs/swfdec/HISTORY
@@ -1,3 +1,16 @@
+2007-04-02 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 0.4.3 (plays YouTube)
+ Now hosted at http://swfdec.freedesktop.org/
+ * DEPENDS: libmad is now optional
+ Depends on pango, glib2, and pkgconfig
+ Optionally depend on alsa-lib, ffmpeg, and gtk-doc
+ * CONFIGURE, PRE_BUILD, browser-plugin.patch: Removed, mozilla plug-in
+ is now a separate package
+ * BUILD: Fails with multiple make jobs
+ * INSTALL: Manually install swfdebug and swfplayer (not installed by
+ `make install`...
+ * FINAL: Inform the user that the Mozilla plugin is now swfdec-mozilla
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/video-libs/swfdec/INSTALL b/video-libs/swfdec/INSTALL
new file mode 100755
index 0000000..9e6dba1
--- /dev/null
+++ b/video-libs/swfdec/INSTALL
@@ -0,0 +1,5 @@
+default_install &&
+
+for bin in swfdebug swfplay; do
+ install -m 0755 -o root -g root player/$bin $INSTALL_ROOT/usr/bin/$bin
+done
diff --git a/video-libs/swfdec/PRE_BUILD b/video-libs/swfdec/PRE_BUILD
deleted file mode 100755
index 78e3b5c..0000000
--- a/video-libs/swfdec/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p0 < $SCRIPT_DIRECTORY/browser-plugin.patch &&
-autoreconf
diff --git a/video-libs/swfdec/browser-plugin.patch
b/video-libs/swfdec/browser-plugin.patch
deleted file mode 100644
index e8f1b6d..0000000
--- a/video-libs/swfdec/browser-plugin.patch
+++ /dev/null
@@ -1,73 +0,0 @@
---- configure.ac.orig 2006-08-30 19:26:19.000000000 +0200
-+++ configure.ac 2006-08-30 19:28:46.000000000 +0200
-@@ -121,17 +121,52 @@
- AC_DEFINE(HAVE_MAD, 1, [Define if mad is enabled])
- fi
-
--PKG_CHECK_MODULES(MOZILLA, mozilla-plugin, HAVE_MOZILLA=yes,
HAVE_MOZILLA=no)
--if test "$HAVE_MOZILLA" = no ; then
-- PKG_CHECK_MODULES(MOZILLA, firefox-plugin, HAVE_MOZILLA=yes,
HAVE_MOZILLA=no)
--fi
--AC_SUBST(MOZILLA_CFLAGS)
--AC_SUBST(MOZILLA_LIBS)
--AM_CONDITIONAL(HAVE_MOZILLA, [test $HAVE_MOZILLA = yes])
--if test "x$HAVE_MOZILLA" = "xno"; then
-- AC_MSG_WARN([mozilla-config not found. Mozilla/Netscape plugin will not
be built])
-+dnl ******************
-+dnl Mozilla name check
-+dnl ******************
-+AC_MSG_CHECKING([which mozilla to use])
-+MOZILLA=
-+AC_ARG_WITH([mozilla],
-+
AS_HELP_STRING([--with-mozilla@<:@=mozilla|firefox|seamonkey|xulrunner@:>@],
-+ [Which mozilla to use for plugin (default:
autodetect)]),
-+ [MOZILLA="$withval"])
-+if test "x$MOZILLA" = "x"; then
-+ if $PKG_CONFIG --exists mozilla-plugin; then
-+ MOZILLA=mozilla
-+ elif $PKG_CONFIG --exists firefox-plugin; then
-+ MOZILLA=firefox
-+ elif $PKG_CONFIG --exists seamonkey-plugin; then
-+ MOZILLA=seamonkey
-+ elif $PKG_CONFIG --exists xulrunner-plugin; then
-+ MOZILLA=xulrunner
-+ else
-+ AC_MSG_WARN([no mozilla installation found. Mozilla plugin will not be
built])
-+ HAVE_MOZILLA=no
-+ fi
-+elif test "x$with_mozilla" != "xmozilla" -a "x$with_mozilla" != "xfirefox"
-a "x$with_mozilla" != "xseamonkey" -a "x$with_mozilla" != "xxulrunner" -a
"x$with_mozilla" != "xno"; then
-+ AC_MSG_ERROR([unknown mozilla name ($MOZILLA)])
- fi
-
-+AC_SUBST(MOZILLA)
-+AC_MSG_RESULT([$MOZILLA])
-+
-+if test "x$with_mozilla" != "xno"; then
-+ PKG_CHECK_MODULES(MOZILLA, $MOZILLA-plugin, HAVE_MOZILLA="yes",
HAVE_MOZILLA="no")
-+ AC_SUBST(MOZILLA_CFLAGS)
-+ AC_SUBST(MOZILLA_LIBS)
-+ if test "x$HAVE_MOZILLA" = "xyes"; then
-+ MOZILLA_PLUGIN_DIR=`pkg-config --variable=libdir
$MOZILLA-plugin`/plugins
-+ else
-+ MOZILLA_PLUGIN_DIR=
-+ fi
-+else
-+ MOZILLA_PLUGIN_DIR=
-+ HAVE_MOZILLA=no
-+fi
-+AC_SUBST(MOZILLA_PLUGIN_DIR)
-+AM_CONDITIONAL(HAVE_MOZILLA,[test "$HAVE_MOZILLA" = "yes"])
-+
-+
- dnl GdkPixbuf loader
-
- AC_PATH_PROG(QUERYLOADERS, gdk-pixbuf-query-loaders, true)
---- plugin/Makefile.am.orig 2006-08-30 19:26:40.000000000 +0200
-+++ plugin/Makefile.am 2006-08-30 19:27:14.000000000 +0200
-@@ -1,5 +1,5 @@
-
--plugindir = $(libdir)/mozilla/plugins/
-+plugindir = @MOZILLA_PLUGIN_DIR@
-
- if HAVE_MOZILLA
- plugin_LTLIBRARIES = libswfdecmozilla.la
diff --git a/video-libs/swfdec/swfdec-0.3.6.tar.gz.sig
b/video-libs/swfdec/swfdec-0.3.6.tar.gz.sig
deleted file mode 100644
index 2d0bd2f..0000000
Binary files a/video-libs/swfdec/swfdec-0.3.6.tar.gz.sig and /dev/null differ
diff --git a/video-libs/swfdec/swfdec-0.4.3.tar.gz.sig
b/video-libs/swfdec/swfdec-0.4.3.tar.gz.sig
new file mode 100644
index 0000000..e671f4d
Binary files /dev/null and b/video-libs/swfdec/swfdec-0.4.3.tar.gz.sig differ



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (22c0c1f66d7dc5548cd0dc0582dd29ed6620514a), Eric Sandall, 04/02/2007

Archive powered by MHonArc 2.6.24.

Top of Page