Source Mage code commit list

[Pol Vinogradov <scm AT sourcemage.org>]

GIT changes to master grimoire by Pol Vinogradov <vin.public AT gmail.com>:

 http/gnash/CONFIGURE            |   18 +++++++++++++++---
 http/gnash/DEPENDS              |   22 ++++++++++++++++++++--
 http/gnash/DETAILS              |    2 +-
 http/gnash/HISTORY              |    7 +++++++
 http/gnash/PRE_BUILD            |    3 ++-
 http/gnash/configure-nspr.patch |   40 
++++++++++++++++++++++++++++++++++++++++
 6 files changed, 85 insertions(+), 7 deletions(-)

New commits:
commit 68412b133bb1528e280889e7a520d680da824ebd
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

    http/gnash: updated to 0.8.7, more fixes and additions

diff --git a/http/gnash/CONFIGURE b/http/gnash/CONFIGURE
index c72b155..ffc5eb8 100755
--- a/http/gnash/CONFIGURE
+++ b/http/gnash/CONFIGURE
@@ -3,11 +3,23 @@ config_query_list GNASH_MEMORY                              
   \
                   sysv posix                                   &&
 
 config_query_option GNASH_OPTS                                 \
+                    "Enable Cygnal server"                     \
+                    n                                          \
+                    "--enable-cygnal"                          \
+                    "--disable-cygnal"                         &&
+
+config_query_option GNASH_OPTS                                 \
+                    "Enable CGIs for Cygnal"                   \
+                    n                                          \
+                    "--enable-cgibins"                         \
+                    "--disable-cgibins"                        &&
+
+config_query_option GNASH_OPTS                                 \
                     "Makes the plugin write the currently playing SWF to 
/tmp."  \
                     n                                          \
                     "--enable-write"                           \
                     "--disable-write"                          &&
- 
+
 config_query_list GNASH_GUI                                    \
                   "Which GUI do you want to use?"              \
                   GTK KDE KDE4                                 &&
@@ -21,7 +33,7 @@ config_query_list GNASH_RENDERER                            
   \
                   cairo opengl agg                             &&
 
 if [[ "$GNASH_MEMORY" == "posix" ]]; then
-  list_add GNASH_OPTS "--with-shm=posix"
+  list_add OPTS "--with-shm=posix"
 else
-  list_add GNASH_OPTS "--with-shm=sysv"
+  list_add OPTS "--with-shm=sysv"
 fi
diff --git a/http/gnash/DEPENDS b/http/gnash/DEPENDS
index f6be2ff..2dec224 100755
--- a/http/gnash/DEPENDS
+++ b/http/gnash/DEPENDS
@@ -27,7 +27,6 @@ elif [[ $GNASH_MEDIA == "ffmpeg" ]]; then
   depends  sdl
 fi  &&
 
-
 #
 # GUI
 #
@@ -91,5 +90,24 @@ optional_depends giflib                                    
 \
 optional_depends expat                                      \
                  ''                                         \
                  ''                                         \
-                 'Enable support for Expat library.'
+                 'Enable support for Expat library.'        &&
+
+optional_depends docbook-utils                              \
+                 "--enable-docbook"                         \
+                 "--disable-docbook"                        \
+                 "Enable support for building documentation"  &&
+
+optional_depends openssh                                    \
+                 "--enable-ssh"                             \
+                 "--disable-ssh"                            \
+                 "Enable using SSH for network communication"  &&
+
+optional_depends openssl                                    \
+                 "--enable-ssl"                             \
+                 "--disable-ssl"                            \
+                 "Enable using OpenSSL directly"            &&
 
+optional_depends python                                     \
+                 "--enable-python"                          \
+                 "--disable-python"                         \
+                 "Enable python wrapper support"
diff --git a/http/gnash/DETAILS b/http/gnash/DETAILS
index ff32364..80d5911 100755
--- a/http/gnash/DETAILS
+++ b/http/gnash/DETAILS
@@ -1,5 +1,5 @@
            SPELL=gnash
-         VERSION=0.8.6
+         VERSION=0.8.7
           SOURCE=$SPELL-$VERSION.tar.bz2
          SOURCE2=$SOURCE.sig
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/http/gnash/HISTORY b/http/gnash/HISTORY
index cd87063..6e9eb94 100644
--- a/http/gnash/HISTORY
+++ b/http/gnash/HISTORY
@@ -1,3 +1,10 @@
+2010-02-19 Pol Vinogradov <vin.public AT gmail.com>
+       * CONFIGURE: options for Cygnal server, removed redundancy
+       * DETAILS: updated to 0.8.7
+       * DEPENDS: added dockbook-utils, openssh, openssl and python
+       * PRE_BUILD, configure-nspr.patch: added patch for proper detection of
+         nspr
+
 2010-02-17 Pol Vinogradov <vin.public AT gmail.com>
        * CONFIGURE, DEPENDS: moved back shared memory type choice, libxft and
          nspr dependemcies, added  KDE4, more fix for renderer selection
diff --git a/http/gnash/PRE_BUILD b/http/gnash/PRE_BUILD
index 1de75a4..a2cb292 100755
--- a/http/gnash/PRE_BUILD
+++ b/http/gnash/PRE_BUILD
@@ -4,4 +4,5 @@ sed -i 
"s#\$HOME/.firefox/plugins#${INSTALL_ROOT}/usr/lib/firefox/plugins#g"
 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
+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
new file mode 100644
index 0000000..1cdb1f2
--- /dev/null
+++ b/http/gnash/configure-nspr.patch
@@ -0,0 +1,40 @@
+--- 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