Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by George Sherwood (367e557d1418eefc0ac40684880b6385ecb310f0)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by George Sherwood (367e557d1418eefc0ac40684880b6385ecb310f0)
  • Date: Tue, 7 Oct 2008 19:15:14 -0500

GIT changes to master grimoire by George Sherwood <gsherwood AT sourcemage.org>:

dev/null |binary
video/mplayerplug-in/BUILD | 10 -
video/mplayerplug-in/DEPENDS | 2
video/mplayerplug-in/DETAILS | 9 +
video/mplayerplug-in/HISTORY | 7 +
video/mplayerplug-in/INSTALL | 23 ++--
video/mplayerplug-in/PRE_BUILD | 3
video/mplayerplug-in/mplayerplug-in-3.50.tar.gz.sig | 0
video/mplayerplug-in/mplayerplug-in-3.55.tar.gz.sig |binary
video/mplayerplug-in/mplayerplugin.patch | 103
++++++++++++++++++++
10 files changed, 132 insertions(+), 25 deletions(-)

New commits:
commit 367e557d1418eefc0ac40684880b6385ecb310f0
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

mplayerplug-in: Updated to version 3.5.5. Only can get it to build
with xulrunner. Updated to so that and install for seamonkey and
firefox if needed. Patch from gentoo.

diff --git a/video/mplayerplug-in/BUILD b/video/mplayerplug-in/BUILD
index 3bd6762..073578a 100755
--- a/video/mplayerplug-in/BUILD
+++ b/video/mplayerplug-in/BUILD
@@ -1,13 +1,3 @@
-if test "$(get_spell_provider $SPELL GECKO)" = "firefox"; then
- if ! ldd $INSTALL_ROOT/usr/lib/firefox/firefox-bin |
- grep -q libgtk-x11-2.0.so; then
- OPTS="--disable-gtk2 --enable-gtk1 $OPTS"
- fi
-elif test "$(get_spell_provider $SPELL GECKO)" = "seamonkey"; then
- sedit 's/mozilla-plugin/seamonkey-plugin/' configure
-elif test "$(get_spell_provider $SPELL GECKO)" = "xulrunner"; then
- sedit 's/mozilla-plugin/xulrunner-plugin/' configure
-fi &&
./configure --prefix=${INSTALL_ROOT}/usr \
--sysconfdir=${INSTALL_ROOT}/etc \
--localstatedir=${INSTALL_ROOT}/var \
diff --git a/video/mplayerplug-in/DEPENDS b/video/mplayerplug-in/DEPENDS
index e521ebf..8ec3a91 100755
--- a/video/mplayerplug-in/DEPENDS
+++ b/video/mplayerplug-in/DEPENDS
@@ -1,2 +1,2 @@
-depends GECKO &&
+depends xulrunner &&
depends mplayer
diff --git a/video/mplayerplug-in/DETAILS b/video/mplayerplug-in/DETAILS
index cc42eec..ceb579b 100755
--- a/video/mplayerplug-in/DETAILS
+++ b/video/mplayerplug-in/DETAILS
@@ -1,13 +1,16 @@
SPELL=mplayerplug-in
- VERSION=3.50
+ VERSION=3.55
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
WEB_SITE=http://mplayerplug-in.sourceforge.net/
ENTERED=20030202
KEYWORDS="web player video"
SHORT="MPlayer web browser plugin"
cat << EOF
-mplayerplug-in is a browser plugin that uses mplayer to play videos from
websites. A current version of mplayer (1.0pre5) is required. This plugin
gives Netscape, Mozilla and Konqueror the ability to play videos off the net.
+mplayerplug-in is a browser plugin that uses mplayer to play videos from
+websites. A current version of mplayer (1.0pre5) is required. This plugin
+gives Netscape, Mozilla and Konqueror the ability to play videos off
+the net.
EOF
diff --git a/video/mplayerplug-in/HISTORY b/video/mplayerplug-in/HISTORY
index 099376a..ce71cc8 100644
--- a/video/mplayerplug-in/HISTORY
+++ b/video/mplayerplug-in/HISTORY
@@ -1,3 +1,10 @@
+2008-10-07 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version 3.55
+ * INSTALL: Install for seamonkey or firefox
+ * DEPENDS: depends xulrunner not GECKO
+ * PRE_BUILD: Added patch.
+ * mplayerplugin.patch: Added to work with xulrunner 1.9.x
+
2007-12-02 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DETAILS: updated to 3.50

diff --git a/video/mplayerplug-in/INSTALL b/video/mplayerplug-in/INSTALL
index c5c902f..1d7b55f 100755
--- a/video/mplayerplug-in/INSTALL
+++ b/video/mplayerplug-in/INSTALL
@@ -1,14 +1,15 @@
-local DEST
-if test "$(get_spell_provider $SPELL GECKO)" = "firefox"; then
- DEST=$INSTALL_ROOT/usr/lib/firefox/plugins
-elif test "$(get_spell_provider $SPELL GECKO)" = "seamonkey"; then
- DEST=$INSTALL_ROOT/usr/lib/seamonkey/plugins
-elif test "$(get_spell_provider $SPELL GECKO)" = "xulrunner"; then
- DEST=$INSTALL_ROOT/usr/lib/xulrunner/plugins
-else
- DEST=$INSTALL_ROOT/usr/lib/mozilla/plugins
-fi &&
-install -m 0755 *.so *.xpt $DEST &&
+if spell_ok firefox; then
+DEST=$INSTALL_ROOT/usr/lib/firefox/plugins &&
+mkdir -pv $DEST &&
+install -m 0755 *.so *.xpt $DEST
+fi &&
+
+if spell_ok seamonkey; then
+DEST=$INSTALL_ROOT/usr/lib/seamonkey/plugins &&
+mkdir -pv $DEST &&
+install -m 0755 *.so *.xpt $DEST
+fi &&
+
install_config_file mplayerplug-in.conf /etc/mplayerplug-in.conf &&
install_config_file mplayerplug-in.types /etc/mplayerplug-in.types &&
make -C po install
diff --git a/video/mplayerplug-in/PRE_BUILD b/video/mplayerplug-in/PRE_BUILD
new file mode 100755
index 0000000..5417934
--- /dev/null
+++ b/video/mplayerplug-in/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p0 < $SCRIPT_DIRECTORY/mplayerplugin.patch
diff --git a/video/mplayerplug-in/mplayerplug-in-3.50.tar.gz.sig
b/video/mplayerplug-in/mplayerplug-in-3.50.tar.gz.sig
deleted file mode 100644
index 57ea33a..0000000
Binary files a/video/mplayerplug-in/mplayerplug-in-3.50.tar.gz.sig and
/dev/null differ
diff --git a/video/mplayerplug-in/mplayerplug-in-3.55.tar.gz.sig
b/video/mplayerplug-in/mplayerplug-in-3.55.tar.gz.sig
new file mode 100644
index 0000000..9250d1c
Binary files /dev/null and
b/video/mplayerplug-in/mplayerplug-in-3.55.tar.gz.sig differ
diff --git a/video/mplayerplug-in/mplayerplugin.patch
b/video/mplayerplug-in/mplayerplugin.patch
new file mode 100644
index 0000000..0ed18e9
--- /dev/null
+++ b/video/mplayerplug-in/mplayerplugin.patch
@@ -0,0 +1,103 @@
+--- configure.in 2008-06-24 09:12:43.000000000 -0400
++++ configure.in 2008-09-19 00:32:17.000000000 -0400
+@@ -28,7 +28,7 @@
+ AC_SUBST(PKG_CONFIG_PATH)
+ AC_MSG_NOTICE("Using pkg-config path of ${PKG_CONFIG_PATH}")
+ fi
+-
++
+ #tell us where gecko-sdk is, try to find if not provided
+
+ AC_ARG_WITH([gecko-sdk],[ --with-gecko-sdk=<path> prefix of gecko-sdk
installation],
+@@ -53,48 +53,49 @@
+ fi
+
+ ],[
+- AC_MSG_NOTICE([Determining mozilla/firefox packages to build against])
+- PKG_CHECK_MODULES(MOZPLUG,[mozilla-plugin
mozilla-xpcom],[AC_SUBST(MOZPLUG_CFLAGS) MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS}
-I`$PKG_CONFIG --variable=includedir mozilla-plugin`"
+-MOZILLA_HOME=`$PKG_CONFIG --variable=libdir mozilla-plugin`
+-GECKO_IDLDIR=`$PKG_CONFIG --variable=idldir mozilla-xpcom`
+-],[AC_MSG_WARN([mozilla-plugin not found])])
+-
+- if test "$MOZPLUG_CFLAGS" = ""; then
+- PKG_CHECK_MODULES(MOZPLUG,[firefox-plugin
firefox-xpcom],[AC_SUBST(MOZPLUG_CFLAGS) MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS}
-I`$PKG_CONFIG --variable=includedir firefox-plugin`"
+-MOZILLA_HOME=`$PKG_CONFIG --variable=libdir firefox-plugin`
+-GECKO_IDLDIR=`$PKG_CONFIG --variable=idldir firefox-xpcom`
+-],[AC_MSG_WARN([firefox-plugin not found])])
+- fi
+- if test "$MOZPLUG_CFLAGS" = ""; then
+- PKG_CHECK_MODULES(MOZPLUG,[seamonkey-plugin
seamonkey-xpcom],[AC_SUBST(MOZPLUG_CFLAGS) MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS}
-I`$PKG_CONFIG --variable=includedir seamonkey-plugin`"
+-MOZILLA_HOME=`$PKG_CONFIG --variable=libdir seamonkey-plugin`
+-GECKO_IDLDIR=`$PKG_CONFIG --variable=idldir seamonkey-xpcom`
+-],[AC_MSG_WARN([seamonkey-plugin not found])])
+- fi
+- if test "$MOZPLUG_CFLAGS" = ""; then
+- PKG_CHECK_MODULES(MOZPLUG,[xulrunner-plugin
xulrunner-xpcom],[AC_SUBST(MOZPLUG_CFLAGS) MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS}
-I`$PKG_CONFIG --variable=includedir xulrunner-plugin`"
+-MOZILLA_HOME=`$PKG_CONFIG --variable=libdir xulrunner-plugin`
+-GECKO_IDLDIR=`$PKG_CONFIG --variable=idldir xulrunner-xpcom`
+-],[AC_MSG_WARN([xulrunner-plugin not found])])
+- fi
+- if test "$MOZPLUG_CFLAGS" = ""; then
+- PKG_CHECK_MODULES(MOZPLUG,[libxul],[AC_SUBST(MOZPLUG_CFLAGS)
MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS} -I`$PKG_CONFIG --variable=includedir
libxul`"
+-MOZILLA_HOME=`$PKG_CONFIG --variable=libdir libxul`
+-GECKO_IDLDIR=`$PKG_CONFIG --variable=idldir libxul`
+-],[AC_MSG_WARN([libxul not found])])
+- fi
+- if test "$MOZPLUG_CFLAGS" = ""; then
+- PKG_CHECK_MODULES(MOZPLUG,[iceape-plugin
iceape-xpcom],[AC_SUBST(MOZPLUG_CFLAGS) MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS}
-I`$PKG_CONFIG --variable=includedir iceape-plugin`"
+-MOZILLA_HOME=`$PKG_CONFIG --variable=libdir iceape-plugin`
+-GECKO_IDLDIR=`$PKG_CONFIG --variable=idldir iceape-xpcom`
+-],[AC_MSG_WARN([iceape-plugin not found])])
+- fi
+-
+- if test "$MOZPLUG_CFLAGS" = ""; then
+- AC_MSG_ERROR([Unable to find mozilla or firefox development
files])
+- fi
+- ]
+-)
++
++PKG_CHECK_MODULES(MOZPLUG,[mozilla-plugin
mozilla-xpcom],[AC_SUBST(MOZPLUG_CFLAGS) MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS}
-I`$PKG_CONFIG --variable=includedir mozilla-plugin`"
++ MOZILLA_HOME=`$PKG_CONFIG --variable=libdir mozilla-plugin`
++ GECKO_IDLDIR=`$PKG_CONFIG --variable=idldir mozilla-xpcom`
++ ],[AC_MSG_WARN([mozilla-plugin not found])])
++
++if test "$MOZPLUG_CFLAGS" = ""; then
++ PKG_CHECK_MODULES(MOZPLUG,[firefox-plugin
firefox-xpcom],[AC_SUBST(MOZPLUG_CFLAGS) MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS}
-I`$PKG_CONFIG --variable=includedir firefox-plugin`"
++ MOZILLA_HOME=`$PKG_CONFIG --variable=libdir firefox-plugin`
++ GECKO_IDLDIR=`$PKG_CONFIG --variable=idldir firefox-xpcom`
++ ],[AC_MSG_WARN([firefox-plugin not found])])
++fi
++if test "$MOZPLUG_CFLAGS" = ""; then
++ PKG_CHECK_MODULES(MOZPLUG,[seamonkey-plugin
seamonkey-xpcom],[AC_SUBST(MOZPLUG_CFLAGS) MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS}
-I`$PKG_CONFIG --variable=includedir seamonkey-plugin`"
++ MOZILLA_HOME=`$PKG_CONFIG --variable=libdir seamonkey-plugin`
++ GECKO_IDLDIR=`$PKG_CONFIG --variable=idldir seamonkey-xpcom`
++ ],[AC_MSG_WARN([seamonkey-plugin not found])])
++fi
++
++if test "$MOZPLUG_CFLAGS" = ""; then
++ PKG_CHECK_MODULES(MOZPLUG,[xulrunner-plugin
xulrunner-xpcom],[AC_SUBST(MOZPLUG_CFLAGS) MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS}
-I`$PKG_CONFIG --variable=includedir xulrunner-plugin`"
++ MOZILLA_HOME=`$PKG_CONFIG --variable=libdir xulrunner-plugin`
++ GECKO_IDLDIR=`$PKG_CONFIG --variable=idldir xulrunner-xpcom`
++ ],[AC_MSG_WARN([xulrunner-plugin not found])])
++fi
++
++if test "$MOZPLUG_CFLAGS" = ""; then
++ PKG_CHECK_MODULES(MOZPLUG,[libxul],[AC_SUBST(MOZPLUG_CFLAGS)
MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS} -I`$PKG_CONFIG --variable=includedir
libxul`"
++ MOZILLA_HOME=`$PKG_CONFIG --variable=sdkdir libxul`
++ GECKO_IDLDIR=`$PKG_CONFIG --variable=idldir
libxul`/`pkg-config --variable=includetype libxul`
++ ],[AC_MSG_WARN([xulrunner not found])])
++fi
++if test "$MOZPLUG_CFLAGS" = ""; then
++ PKG_CHECK_MODULES(MOZPLUG,[iceape-plugin
iceape-xpcom],[AC_SUBST(MOZPLUG_CFLAGS) MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS}
-I`$PKG_CONFIG --variable=includedir iceape-plugin`"
++ MOZILLA_HOME=`$PKG_CONFIG --variable=libdir iceape-plugin`
++ GECKO_IDLDIR=`$PKG_CONFIG --variable=idldir iceape-xpcom`
++ ],[AC_MSG_WARN([iceape-plugin not found])])
++fi
++])
++
++if test "$MOZPLUG_CFLAGS" = ""; then
++ AC_MSG_ERROR([Unable to find mozilla or firefox development files])
++fi
+
+ AC_ARG_WITH([mozilla-home],[ --with-mozilla-home=<path> prefix of
mozilla/firefox installation],
+ [MOZ_HOME=$with_mozilla_home



  • [SM-Commit] GIT changes to master grimoire by George Sherwood (367e557d1418eefc0ac40684880b6385ecb310f0), George Sherwood, 10/07/2008

Archive powered by MHonArc 2.6.24.

Top of Page