[Gnash-commit] [SCM] Gnash branch, master, updated. 80a20bb315d9b60a0b1ec0d612e7a18365bc1170

[Andrea Palmatè]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  80a20bb315d9b60a0b1ec0d612e7a18365bc1170 (commit)
      from  ef777c9994a5a7883fd9309c0f1039a334199fe4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=80a20bb315d9b60a0b1ec0d612e7a18365bc1170


commit 80a20bb315d9b60a0b1ec0d612e7a18365bc1170
Author: Andrea Palmatè <address@hidden>
Date:   Sun Oct 17 19:52:17 2010 +0200

    Fix an assertion on URL.cpp. On Amiga all urls are valid

diff --git a/configure.ac b/configure.ac
index 7ade808..d0b7788 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2877,6 +2877,7 @@ plugin/npapi/Makefile
 plugin/klash/Makefile
 plugin/klash4/Makefile
 plugin/win32/Makefile
+plugin/aos4/Makefile
 cygnal/Makefile
 cygnal/libnet/Makefile
 cygnal/libamf/Makefile
diff --git a/libbase/URL.cpp b/libbase/URL.cpp
index b779512..a28361a 100644
--- a/libbase/URL.cpp
+++ b/libbase/URL.cpp
@@ -237,6 +237,7 @@ URL::init_relative(const std::string& relative_url, const 
URL& baseurl)
                                       baseurl._path.find_last_of("\\")+1);
         }
         
+#ifndef __amigaos4__
         assert(basedir[0] == '/'
                || basedir[1] == ':');  // for WIN32
 #ifndef __OS2__
@@ -244,6 +245,7 @@ URL::init_relative(const std::string& relative_url, const 
URL& baseurl)
         assert(*(basedir.rbegin()) == '/' 
                || *(basedir.rbegin()) == '\\');        // for WIN32
 #endif
+#endif
         std::string::size_type lpos =  basedir.size()-1;
         for (int i=0; i<dirsback; ++i) {
             if ( lpos == 0 ) break;
diff --git a/plugin/Makefile.am b/plugin/Makefile.am
index 3ba034d..e9bc790 100644
--- a/plugin/Makefile.am
+++ b/plugin/Makefile.am
@@ -33,6 +33,9 @@ SUBDIRS += npapi
 if WIN32
 SUBDIRS += win32
 endif
+if AMIGAOS4
+SUBDIRS += aos4
+endif
 endif # NPAPI
 
 # make sure these files make it into the distribution tarball.
diff --git a/plugin/npapi/Makefile.am b/plugin/npapi/Makefile.am
index 4d4bed5..264c552 100644
--- a/plugin/npapi/Makefile.am
+++ b/plugin/npapi/Makefile.am
@@ -46,8 +46,12 @@ AM_CPPFLAGS = -DPLUGIN_TRACE 
-DGNASHBINDIR=\"$(GNASHBINDIR)\" \
 if HAIKU
   AM_CPPFLAGS += -DXP_HAIKU
 else
+if AMIGAOS4
+  AM_CPPFLAGS += -DXP_AMIGAOS4
+else
   AM_CPPFLAGS += -DXP_UNIX -DMOZ_X11
 endif
+endif
 
 # AM_CXXFLAGS = $(AM_CPPFLAGS)
 
@@ -60,7 +64,7 @@ noinst_HEADERS = plugin.h \
          mozilla-sdk/include/nptypes.h
 
 if !WIN32
-
+if !AMIGAOS4
 plugin_LTLIBRARIES = libgnashplugin.la
 
 libgnashplugin_la_SOURCES  = plugin.cpp \
@@ -101,6 +105,7 @@ if VISIBILITY_WORKS
 libgnashplugin_la_CXXFLAGS = -fvisibility=hidden
 endif
 
+endif # AMIGAOS4
 endif # WIN32
 
 test_perms:
@@ -117,6 +122,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
        $(RM) $(DESTDIR)$(plugindir)/*.a $(DESTDIR)$(plugindir)/*.la
 
 if !WIN32
+if !AMIGAOS4
 install-plugin install-plugins: $(plugin_LTLIBRARIES) $(PKGLIB)
        @test -d "$(DESTDIR)$(plugindir)" || $(mkinstalldirs) 
"$(DESTDIR)$(plugindir)"
        @echo "Installing plugin to $(DESTDIR)$(plugindir)"
@@ -128,6 +134,10 @@ install-plugin install-plugins: $(plugin_LTLIBRARIES) 
$(PKGLIB)
 else
 install-plugin install-plugins: 
        : # do nothing
+endif  # end of if not amigaos4
+else
+install-plugin install-plugins: 
+       : # do nothing
 endif  # end of if not windoze
 
 uninstall-plugin uninstall-plugins: 

-----------------------------------------------------------------------

Summary of changes:
 configure.ac             |    1 +
 libbase/URL.cpp          |    2 ++
 plugin/Makefile.am       |    3 +++
 plugin/npapi/Makefile.am |   12 +++++++++++-
 4 files changed, 17 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Gnash