[SM-Commit] GIT changes to master grimoire by George Sherwood (063039568ae4badc82738844f763fe12bf0b53b3)

George Sherwood scm at mail.sourcemage.org
Wed Mar 21 10:19:18 EDT 2007


GIT changes to master grimoire by George Sherwood <chat at sourcemage.org>:

 video/mplayerplug-in/DETAILS                           |    4 -
 video/mplayerplug-in/HISTORY                           |    7 +-
 video/mplayerplug-in/PRE_BUILD                         |    3 
 video/mplayerplug-in/mplayerplug-in-3.35-firefox.patch |   58 -----------------
 4 files changed, 8 insertions(+), 64 deletions(-)

New commits:
commit 063039568ae4badc82738844f763fe12bf0b53b3
Author: George Sherwood <chat at sourcemage.org>
Commit: George Sherwood <chat at sourcemage.org>

    mplayerplug-in: Updated to version 3.40.  Removed patch for firefox.
    Fixed upstream now.

diff --git a/video/mplayerplug-in/DETAILS b/video/mplayerplug-in/DETAILS
index ab5bdff..0f4dc32 100755
--- a/video/mplayerplug-in/DETAILS
+++ b/video/mplayerplug-in/DETAILS
@@ -1,9 +1,9 @@
            SPELL=mplayerplug-in
-         VERSION=3.35
+         VERSION=3.40
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-     SOURCE_HASH=sha512:85d5d4782ce1757465b1e922a0a0976bec61ed1dbd8c5b4de77d841f5fe3e83f3131d9b3de6c8d48c8375b9ca0b2f6ccabf43aa888fa77ad5f17d83920e61a3c
+     SOURCE_HASH=sha512:12644cac5a13c433700ce10e68411d504a2c8576cec6ec223ae18a8aa6ce2676c913f3ffd9a46391d5ce027538818f6e9dd8252b1aa8072426a2f044052ea136
         WEB_SITE=http://mplayerplug-in.sourceforge.net/
          ENTERED=20030202
         KEYWORDS="web player video"
diff --git a/video/mplayerplug-in/HISTORY b/video/mplayerplug-in/HISTORY
index f79c491..7f8ea0d 100644
--- a/video/mplayerplug-in/HISTORY
+++ b/video/mplayerplug-in/HISTORY
@@ -1,4 +1,9 @@
-2008-03-18 Eric Sandall <sandalle at sourcemage.org>
+2007-03-21 George Sherwood <george at beernabeer.com>
+	* DETAILS: Updated to version 3.40
+	* PRE_BUILD: Removed, not needed.
+	* mplayerplug-in-3.35-firefox.patch: Removed. Fixed upstream.
+
+2007-03-18 Eric Sandall <sandalle at sourcemage.org>
 	* BUILD: Don't fix the firefox.pc in configure, let the patch do it
 	* PRE_BUILD: Apply mplayerplug-in-3.35-firefox.patch
 	* mplayerplug-in-3.35-firefox.patch: Patch pointed out by George
diff --git a/video/mplayerplug-in/PRE_BUILD b/video/mplayerplug-in/PRE_BUILD
deleted file mode 100755
index c98435a..0000000
--- a/video/mplayerplug-in/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build  &&
-cd  $SOURCE_DIRECTORY  &&
-patch -p0 < $SCRIPT_DIRECTORY/mplayerplug-in-3.35-firefox.patch
diff --git a/video/mplayerplug-in/mplayerplug-in-3.35-firefox.patch b/video/mplayerplug-in/mplayerplug-in-3.35-firefox.patch
deleted file mode 100644
index 5fa85b0..0000000
--- a/video/mplayerplug-in/mplayerplug-in-3.35-firefox.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- configure.in	2007/01/28 14:24:25	1.75
-+++ configure.in	2007/02/26 18:28:41	1.76
-@@ -59,7 +59,7 @@
- ],[AC_MSG_WARN([mozilla-plugin not found])])
- 
- 	if test "$MOZPLUG_CFLAGS" = ""; then
--		PKG_CHECK_MODULES(MOZPLUG,[firefox-plugin],[AC_SUBST(MOZPLUG_CFLAGS) MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS} -I`$PKG_CONFIG --variable=includedir firefox-plugin`"
-+		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`
- ],[AC_MSG_WARN([firefox-plugin not found])])
- 	fi
---- configure	2007/01/28 14:24:24	1.76
-+++ configure	2007/02/26 18:28:37	1.77
-@@ -3128,12 +3128,12 @@
-         pkg_cv_MOZPLUG_CFLAGS="$MOZPLUG_CFLAGS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"firefox-plugin\"") >&5
--  ($PKG_CONFIG --exists --print-errors "firefox-plugin") 2>&5
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"firefox-plugin firefox-xpcom\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "firefox-plugin firefox-xpcom") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--  pkg_cv_MOZPLUG_CFLAGS=`$PKG_CONFIG --cflags "firefox-plugin" 2>/dev/null`
-+  pkg_cv_MOZPLUG_CFLAGS=`$PKG_CONFIG --cflags "firefox-plugin firefox-xpcom" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -3146,12 +3146,12 @@
-         pkg_cv_MOZPLUG_LIBS="$MOZPLUG_LIBS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"firefox-plugin\"") >&5
--  ($PKG_CONFIG --exists --print-errors "firefox-plugin") 2>&5
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"firefox-plugin firefox-xpcom\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "firefox-plugin firefox-xpcom") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--  pkg_cv_MOZPLUG_LIBS=`$PKG_CONFIG --libs "firefox-plugin" 2>/dev/null`
-+  pkg_cv_MOZPLUG_LIBS=`$PKG_CONFIG --libs "firefox-plugin firefox-xpcom" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -3170,9 +3170,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        MOZPLUG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "firefox-plugin"`
-+	        MOZPLUG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "firefox-plugin firefox-xpcom"`
-         else
--	        MOZPLUG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "firefox-plugin"`
-+	        MOZPLUG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "firefox-plugin firefox-xpcom"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$MOZPLUG_PKG_ERRORS" >&5
-



More information about the SM-Commit mailing list