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

George Sherwood scm at sourcemage.org
Sun Aug 29 16:17:21 EDT 2010


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

 http/gnash/DEPENDS              |    8 ++++----
 http/gnash/DETAILS              |    4 ++--
 http/gnash/HISTORY              |    9 +++++++++
 http/gnash/INSTALL              |    8 ++++----
 http/gnash/PRE_BUILD            |    8 --------
 http/gnash/configure-nspr.patch |   40 ----------------------------------------
 6 files changed, 19 insertions(+), 58 deletions(-)

New commits:
commit c33eeb2c00e8d984aa6d26b98ef7234ae85bf334
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    gnash: Updated to 0.8.8.  Cleaned up spell.  Need to get optional_depends
    nspr working still.

diff --git a/http/gnash/DEPENDS b/http/gnash/DEPENDS
index 8a84e07..24300a1 100755
--- a/http/gnash/DEPENDS
+++ b/http/gnash/DEPENDS
@@ -54,10 +54,10 @@ suggest_depends  NS-PLUGIN-COMPATIBLE                             \
                   '--disable-npapi'                               \
                   'Suggested to run the plugin from a browser'    &&
 
-optional_depends nspr                                       \
-                 "--with-nspr-incl=${INSTALL_ROOT}/usr/include/nspr --with-nspr-lib=${INSTALL_ROOT}/usr/lib"  \
-                 ""                                         \
-                 "Enable support for Netscape Portable Runtime (NSPR)" &&
+optional_depends speex  \
+                 ""     \
+                 ""     \
+                 "Enable decoding of Speex encode audio in FLV files" &&
 
 optional_depends  libxft                                    \
                   "--with-Xft-incl=${INSTALL_ROOT}/usr/include/X11/Xft --with-Xft-lib=${INSTALL_ROOT}/usr/lib"  \
diff --git a/http/gnash/DETAILS b/http/gnash/DETAILS
index 80d5911..317c010 100755
--- a/http/gnash/DETAILS
+++ b/http/gnash/DETAILS
@@ -1,5 +1,5 @@
            SPELL=gnash
-         VERSION=0.8.7
+         VERSION=0.8.8
           SOURCE=$SPELL-$VERSION.tar.bz2
          SOURCE2=$SOURCE.sig
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
@@ -8,7 +8,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
   SOURCE2_IGNORE=signature
       SOURCE_GPG=gnash.gpg:$SOURCE2:UPSTREAM_KEY
       LICENSE[0]=GPL
-        WEB_SITE=http://www.gnu.org/software/gnash/
+        WEB_SITE=http://www.gnashdev.org/
          ENTERED=20070308
            SHORT="GNU flash implementation"
 cat << EOF
diff --git a/http/gnash/HISTORY b/http/gnash/HISTORY
index f79afbb..4f509cd 100644
--- a/http/gnash/HISTORY
+++ b/http/gnash/HISTORY
@@ -1,3 +1,12 @@
+2010-08-29 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated to version 0.8.8. Updated WEB_SITE
+	* DEPENDS: Added optional_depends speex.
+	  Removed optional_depends nspr. Needs to be fixed and added back
+	* INSTALL: Updated directory for location of plugin
+	* PRE_BUILD: Removed.  sed's and patch not needed
+	* configure-nspr.patch: Removed, doesn't apply and configure
+	  has changed so that a new approach will be needed
+
 2010-04-15 Ladislav Hagara <hgr at vabo.cz>
 	* DEPENDS: disabled xpcom support in NPAPI plugin temporarily #15660
 
diff --git a/http/gnash/INSTALL b/http/gnash/INSTALL
index 9da3cf0..4d4ff9a 100755
--- a/http/gnash/INSTALL
+++ b/http/gnash/INSTALL
@@ -1,5 +1,5 @@
 default_install  &&
-if [[ -e $SOURCE_DIRECTORY/plugin/.libs/libgnashplugin.so ]] ;
+if [[ -e $SOURCE_DIRECTORY/plugin/npapi/.libs/libgnashplugin.so ]] ;
 then
 local ns_compat
 for ns_compat in mozilla firefox icecat seamonkey xulrunner opera netscape4; do
@@ -10,7 +10,7 @@ if  spell_installed  $ns_compat;  then
     rm -f $INSTALL_ROOT/usr/lib/$ns_compat/plugins/libgnashplugin.so
   fi  &&
 
-  cp  -v plugin/.libs/libgnashplugin.so \
+  cp  -v plugin/npapi/.libs/libgnashplugin.so \
       $INSTALL_ROOT/usr/lib/$ns_compat/plugins/
 fi
 done  &&
@@ -21,7 +21,7 @@ if  spell_installed  $ns_compat ;  then
     rm -f $INSTALL_ROOT/opt/${ns_compat/-bin}/plugins/libgnashplugin.so
   fi  &&
 
-  cp  -v plugin/.libs/libgnashplugin.so \
+  cp  -v plugin/npapi/.libs/libgnashplugin.so \
       $INSTALL_ROOT/opt/${ns_compat/-bin}/plugins/
 fi
 done  &&
@@ -40,7 +40,7 @@ if  spell_installed  kdebase;  then
     mkdir -v --mode=755 $INSTALL_ROOT/usr/lib/konqueror
   fi  &&
 
-  cp  -v plugin/.libs/libgnashplugin.so \
+  cp  -v plugin/npapi/.libs/libgnashplugin.so \
       $INSTALL_ROOT/usr/lib/konqueror/
 fi
 fi
diff --git a/http/gnash/PRE_BUILD b/http/gnash/PRE_BUILD
deleted file mode 100755
index a2cb292..0000000
--- a/http/gnash/PRE_BUILD
+++ /dev/null
@@ -1,8 +0,0 @@
-default_pre_build     &&
-cd $SOURCE_DIRECTORY  &&
-sed -i "s#\$HOME/.firefox/plugins#${INSTALL_ROOT}/usr/lib/firefox/plugins#g"       configure &&
-sed -i "s#\$HOME/.mozilla/plugins#${INSTALL_ROOT}/usr/lib/mozilla/plugins#g"       configure &&
-sed -i "s#\$HOME/.seamonkey/plugins#${INSTALL_ROOT}/usr/lib/seamonkey/plugins#g"   configure &&
-sed -i "s#\$HOME/.xulrunner/plugins#${INSTALL_ROOT}/usr/lib/xulrunner/plugins#g"   configure &&
-sed -i "s:#include <boost/utility.hpp>:#include <boost/utility.hpp>\n#include <cstring>:" libcore/vm/CodeStream.h  &&
-patch -p0 < ${SCRIPT_DIRECTORY}/configure-nspr.patch
diff --git a/http/gnash/configure-nspr.patch b/http/gnash/configure-nspr.patch
deleted file mode 100644
index 1cdb1f2..0000000
--- a/http/gnash/configure-nspr.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- configure.orig	2010-02-19 16:59:22.822114694 -0500
-+++ configure	2010-02-19 17:08:13.241973620 -0500
-@@ -33502,7 +33502,7 @@
- else
- 
-     if test x"${with_nspr_lib}" != x ; then
--      if test -f ${with_nspr_libs}/libnspr.so; then
-+      if test -f ${with_nspr_libs}/libnspr4.so; then
-         ac_cv_path_nspr_lib="-L`(cd ${with_nspr_lib}; pwd)` -lplds4 -lplc4 -lnspr4"
-       fi
-     fi
-@@ -39309,9 +39309,9 @@
-   if test x"${with_nspr_lib}" != x ; then
-     { $as_echo "$as_me:$LINENO: checking for libnspr library in specified directory" >&5
- $as_echo_n "checking for libnspr library in specified directory... " >&6; }
--    if test -f ${with_nspr_lib}/lib$name.a -o -f ${with_nspr_lib}/lib$name.${shlibext}; then
-+    if test -f ${with_nspr_lib}/lib${name}4.a -o -f ${with_nspr_lib}/lib${name}4.${shlibext}; then
-       tmp="`(cd ${with_nspr_lib}; pwd)`"
--      ac_cv_path_nspr_lib="-L${tmp} -l$name"
-+      ac_cv_path_nspr_lib="-L${tmp} -l${name}4"
-       { $as_echo "$as_me:$LINENO: result: yes" >&5
- $as_echo "yes" >&6; }
-           else
-@@ -39398,12 +39398,12 @@
-     ac_save_LIBS=$LIBS
-     LIBS=""
-     for i in $libslist; do
--      if test -f $i/libnspr.a -o -f $i/libnspr.${shlibext}; then
--        if test -f "$i/libnspr.a" -o -f "$i/libnspr.${shlibext}"; then
-+      if test -f $i/libnspr4.a -o -f $i/libnspr4.${shlibext}; then
-+        if test -f "$i/libnspr4.a" -o -f "$i/libnspr4.${shlibext}"; then
-           if test ! x"$i" = x"/usr/lib" -a ! x"$i" = x"/usr/lib64"; then
--            ac_cv_path_nspr_lib="-L$i -lnspr "
-+            ac_cv_path_nspr_lib="-L$i -lnspr4 "
-           else
--            ac_cv_path_nspr_lib="-lnspr "
-+            ac_cv_path_nspr_lib="-lnspr4 "
-           fi
-           break
-         fi



More information about the SM-Commit mailing list