Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (4218bf6ffc390a30f8e5ae9a2d42079421e7f7b8)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (4218bf6ffc390a30f8e5ae9a2d42079421e7f7b8)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Arwed von Merkatz <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (4218bf6ffc390a30f8e5ae9a2d42079421e7f7b8)
  • Date: Sat, 25 Aug 2007 14:59:07 -0500
GIT changes to master grimoire by Arwed von Merkatz <v.merkatz AT gmx.net>:

dev/null |binary
video-libs/swfdec-mozilla/BUILD | 12 --
video-libs/swfdec-mozilla/DEPENDS | 1
video-libs/swfdec-mozilla/DETAILS | 2
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 | 0
video-libs/swfdec-mozilla/swfdec-mozilla-0.5.2.tar.gz.sig |binary
video-libs/swfdec/BUILD | 3
video-libs/swfdec/DEPENDS | 41 +++----
video-libs/swfdec/DETAILS | 2
video-libs/swfdec/HISTORY | 9 +
video-libs/swfdec/POST_REMOVE | 1
video-libs/swfdec/swfdec-0.4.3.tar.gz.sig | 0
video-libs/swfdec/swfdec-0.5.2.tar.gz.sig |binary
17 files changed, 41 insertions(+), 123 deletions(-)

New commits:
commit 4218bf6ffc390a30f8e5ae9a2d42079421e7f7b8
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

swfdec-mozilla: updated to 0.5.2

commit bafa1a13934fdf77984a08d243bced7e5b7b66ec
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

swfdec: updated to 0.5.2

diff --git a/video-libs/swfdec-mozilla/BUILD b/video-libs/swfdec-mozilla/BUILD
index b856226..4cf571e 100755
--- a/video-libs/swfdec-mozilla/BUILD
+++ b/video-libs/swfdec-mozilla/BUILD
@@ -1,12 +1,2 @@
-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 &&
+OPTS="$OPTS --with-plugin-dir=$INSTALL_ROOT/usr/lib/$(get_spell_provider
$SPELL GECKO)/plugins" &&
default_build
diff --git a/video-libs/swfdec-mozilla/DEPENDS
b/video-libs/swfdec-mozilla/DEPENDS
index 6706b05..92eb8fb 100755
--- a/video-libs/swfdec-mozilla/DEPENDS
+++ b/video-libs/swfdec-mozilla/DEPENDS
@@ -1,3 +1,2 @@
depends GECKO &&
-depends gst-plugins-base &&
depends swfdec
diff --git a/video-libs/swfdec-mozilla/DETAILS
b/video-libs/swfdec-mozilla/DETAILS
index d2c5f81..e15fef5 100755
--- a/video-libs/swfdec-mozilla/DETAILS
+++ b/video-libs/swfdec-mozilla/DETAILS
@@ -1,5 +1,5 @@
SPELL=swfdec-mozilla
- VERSION=0.4.3
+ VERSION=0.5.2
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
diff --git a/video-libs/swfdec-mozilla/HISTORY
b/video-libs/swfdec-mozilla/HISTORY
index 7cb1916..d88184b 100644
--- a/video-libs/swfdec-mozilla/HISTORY
+++ b/video-libs/swfdec-mozilla/HISTORY
@@ -1,3 +1,9 @@
+2007-08-25 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated to 0.5.2
+ * PRE_BUILD, POST_REMOVE, browser-plugin.patch: removed
+ * DEPENDS: removed gst-plugins-base
+ * BUILD: replaced --with-mozilla flags by --with-plugin-dir
+
2007-04-02 Eric Sandall <sandalle AT sourcemage.org>
* Copied from swfdec and modified to install the mozilla plugin
* CONFIGURE: Removed
diff --git a/video-libs/swfdec-mozilla/POST_REMOVE
b/video-libs/swfdec-mozilla/POST_REMOVE
deleted file mode 100755
index cbc86ac..0000000
--- a/video-libs/swfdec-mozilla/POST_REMOVE
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100755
index 6be05c6..0000000
--- a/video-libs/swfdec-mozilla/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index 47b2d72..0000000
--- a/video-libs/swfdec-mozilla/browser-plugin.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-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
deleted file mode 100644
index 41dd200..0000000
Binary files a/video-libs/swfdec-mozilla/swfdec-mozilla-0.4.3.tar.gz.sig and
/dev/null differ
diff --git a/video-libs/swfdec-mozilla/swfdec-mozilla-0.5.2.tar.gz.sig
b/video-libs/swfdec-mozilla/swfdec-mozilla-0.5.2.tar.gz.sig
new file mode 100644
index 0000000..8c93dee
Binary files /dev/null and
b/video-libs/swfdec-mozilla/swfdec-mozilla-0.5.2.tar.gz.sig differ
diff --git a/video-libs/swfdec/BUILD b/video-libs/swfdec/BUILD
deleted file mode 100755
index feceeab..0000000
--- a/video-libs/swfdec/BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-make_single &&
-default_build &&
-make_normal
diff --git a/video-libs/swfdec/DEPENDS b/video-libs/swfdec/DEPENDS
index 5365c87..e1527bf 100755
--- a/video-libs/swfdec/DEPENDS
+++ b/video-libs/swfdec/DEPENDS
@@ -1,37 +1,42 @@
-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 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 \
+optional_depends gstreamer \
+ '--enable-gstreamer' \
+ '--disable-gstreamer' \
+ 'for gstreamer audio/video support' &&
+
+optional_depends LIBAVCODEC \
'--enable-ffmpeg' \
'--disable-ffmpeg' \
'for Internet audio and video' &&

+optional_depends gtk+2 \
+ '--enable-gtk' \
+ '--disable-gtk' \
+ 'for gtk integration lib' &&
+
+if is_depends_enabled $SPELL gtk+2; then
+optional_depends alsa-lib \
+ '--with-audio=alsa' \
+ '--with-audio=auto' \
+ 'for ALSA support in gtk integration' &&
+
+optional_depends libsoup \
+ '--enable-soup' \
+ '--disable-soup' \
+ 'for HTTP support in gtk integration'
+fi &&
+
optional_depends gtk-doc \
'--enable-gtk-doc' \
'--disable-gtk-doc' \
diff --git a/video-libs/swfdec/DETAILS b/video-libs/swfdec/DETAILS
index 388862c..79989b4 100755
--- a/video-libs/swfdec/DETAILS
+++ b/video-libs/swfdec/DETAILS
@@ -1,5 +1,5 @@
SPELL=swfdec
- VERSION=0.4.3
+ VERSION=0.5.2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=http://swfdec.freedesktop.org/download/swfdec/${VERSION:0:3}/$SOURCE
diff --git a/video-libs/swfdec/HISTORY b/video-libs/swfdec/HISTORY
index 6973f57..49b71ed 100644
--- a/video-libs/swfdec/HISTORY
+++ b/video-libs/swfdec/HISTORY
@@ -1,3 +1,12 @@
+2007-08-25 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated to 0.5.2
+ * DEPENDS: removed automake, gimp and the mozilla plugin stuff,
+ gtk+2 is optional, changed ffmpeg to LIBAVCODEC, added optional
+ depends on gstreamer, alsa and libsoup are optional if gtk+2 is
+ used
+ * BUILD: removed, works fine with multiple make jobs
+ * POST_REMOVE: removed, there's no gdkpixbuf support anymore
+
2007-04-02 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 0.4.3 (plays YouTube)
Now hosted at http://swfdec.freedesktop.org/
diff --git a/video-libs/swfdec/POST_REMOVE b/video-libs/swfdec/POST_REMOVE
deleted file mode 100755
index cbc86ac..0000000
--- a/video-libs/swfdec/POST_REMOVE
+++ /dev/null
@@ -1 +0,0 @@
-gdk-pixbuf-query-loaders > $INSTALL_ROOT/etc/gtk-2.0/gdk-pixbuf.loaders
diff --git a/video-libs/swfdec/swfdec-0.4.3.tar.gz.sig
b/video-libs/swfdec/swfdec-0.4.3.tar.gz.sig
deleted file mode 100644
index e671f4d..0000000
Binary files a/video-libs/swfdec/swfdec-0.4.3.tar.gz.sig and /dev/null differ
diff --git a/video-libs/swfdec/swfdec-0.5.2.tar.gz.sig
b/video-libs/swfdec/swfdec-0.5.2.tar.gz.sig
new file mode 100644
index 0000000..ed5e7aa
Binary files /dev/null and b/video-libs/swfdec/swfdec-0.5.2.tar.gz.sig differ


  • [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (4218bf6ffc390a30f8e5ae9a2d42079421e7f7b8), Arwed von Merkatz, 08/25/2007

Archive powered by MHonArc 2.6.24.

Top of Page