Fix NPAPI detection to use correct main declaration. Fix a bunch of

C++11 issues and request it for Clang.

8 files changed, 119 insertions, 4 deletions

diff --git a/multimedia/gnash/Makefile b/multimedia/gnash/Makefile
index 4250c26e0ce..3ba715f14fd 100644
--- a/multimedia/gnash/Makefile
+++ b/multimedia/gnash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2013/02/16 11:23:32 wiz Exp $
+# $NetBSD: Makefile,v 1.69 2013/02/26 11:04:25 joerg Exp $
 #
 
 DISTNAME=		gnash-0.8.10
@@ -39,6 +39,11 @@ CONF_FILES+=		${EGDIR}/gnashrc ${PKG_SYSCONFDIR}/gnashrc
 # against symbol `_ZNKSs5c_strEv'
 BUILDLINK_TRANSFORM+=	rm:-fvisibility-inlines-hidden
 
+.include "../../mk/compiler.mk"
+.if !empty(PKGSRC_COMPILER:Mclang)
+CXXFLAGS+=	-std=c++11
+.endif
+
 .include "../../audio/speex/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
diff --git a/multimedia/gnash/distinfo b/multimedia/gnash/distinfo
index 804ef70316b..4d9ab84a03c 100644
--- a/multimedia/gnash/distinfo
+++ b/multimedia/gnash/distinfo
@@ -1,13 +1,18 @@
-$NetBSD: distinfo,v 1.19 2012/09/21 15:44:54 ryoon Exp $
+$NetBSD: distinfo,v 1.20 2013/02/26 11:04:25 joerg Exp $
 
 SHA1 (gnash-0.8.10.tar.bz2) = be3b12a5edcd3b05f2ae73d02f0991aa786e7300
 RMD160 (gnash-0.8.10.tar.bz2) = 0093174ec0a912309772c033b5f1c1ad46ab41dc
 Size (gnash-0.8.10.tar.bz2) = 4238106 bytes
-SHA1 (patch-aa) = a2739f522d1c7a6680fd85a44eeae7267e0a4e8d
+SHA1 (patch-aa) = 5e3cfa0c21f6bd9ad01ce4c9f68f245316d063a3
 SHA1 (patch-ae) = ca44e2559a1ce0a24baf6d5479636f967e011202
+SHA1 (patch-libbase_GnashSleep.h) = f713b29feb0153efa24c10df20e0ac8342b88265
 SHA1 (patch-libbase_Makefile.in) = c5b6533f5ac2b2ee26d0547c3054375e72512ccf
+SHA1 (patch-libbase_rc.cpp) = 2df75034a7f195864931504041ad956142495313
 SHA1 (patch-libcore_Makefile.in) = 6b92917f0be3779b7f6e1993ac29960cef50c736
+SHA1 (patch-libcore_movie__root.cpp) = 5ee7321011961427effd7951860cbf5f3c0b0a6f
+SHA1 (patch-libcore_swf_DefineButtonTag.h) = 9306aab8a56e3447037d7aa1f9f67daec3c6c15a
 SHA1 (patch-libmedia_Makefile.in) = 10fde4560a20dcb28599d8c51a4fc7af93109474
 SHA1 (patch-librender_Makefile.in) = 25e38d82e3ecc156ff1f2b855a05437da015f3ce
 SHA1 (patch-libsound_Makefile.in) = 26c7390196b7e0bb301427b27cf87a1ae52f0b87
 SHA1 (patch-plugin_klash4_Makefile.in) = 86c669eb0ed2478a6f4d328266af2188395f0f10
+SHA1 (patch-plugin_npapi_plugin.cpp) = 94b21a1717916aaaf35a5906ca3b893751803e30
diff --git a/multimedia/gnash/patches/patch-aa b/multimedia/gnash/patches/patch-aa
index ad1aaaaa757..0400f6110f6 100644
--- a/multimedia/gnash/patches/patch-aa
+++ b/multimedia/gnash/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.15 2012/09/21 15:44:54 ryoon Exp $
+$NetBSD: patch-aa,v 1.16 2013/02/26 11:04:25 joerg Exp $
 
 --- configure.orig	2012-01-19 19:19:29.000000000 +0000
 +++ configure
@@ -33,6 +33,15 @@ $NetBSD: patch-aa,v 1.15 2012/09/21 15:44:54 ryoon Exp $
      fi
  
    if test x"${ac_cv_path_kde4_incl}" != x ; then
+@@ -30994,7 +30994,7 @@ $as_echo_n "checking whether NPString ha
+ 
+                   #include "npapi.h"
+                   #include "npruntime.h"
+-                  int main(int argc, char* argv){
++                  int main(int argc, char** argv){
+ 	            NPString str;
+                     uint32_t len = str.UTF8Length;
+ 	            return 0;
 @@ -31356,6 +31356,9 @@ else
      if test x"${with_x11_incl}" != x ; then
        if test -f ${with_x11_incl}/X11/X.h ; then
diff --git a/multimedia/gnash/patches/patch-libbase_GnashSleep.h b/multimedia/gnash/patches/patch-libbase_GnashSleep.h
new file mode 100644
index 00000000000..dca9aef8e9c
--- /dev/null
+++ b/multimedia/gnash/patches/patch-libbase_GnashSleep.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-libbase_GnashSleep.h,v 1.1 2013/02/26 11:04:25 joerg Exp $
+
+--- libbase/GnashSleep.h.orig	2013-02-25 18:39:09.000000000 +0000
++++ libbase/GnashSleep.h
+@@ -38,7 +38,7 @@ inline void gnashSleep(size_t useconds)
+     Sleep(useconds / 1000);
+ #else
+     const size_t m = 1000000;
+-    const struct timespec t = { useconds / m, (useconds % m) * 1000 };
++    const struct timespec t = { static_cast<time_t>(useconds / m), static_cast<long>((useconds % m) * 1000) };
+     ::nanosleep(&t, 0);
+ #endif
+ }
diff --git a/multimedia/gnash/patches/patch-libbase_rc.cpp b/multimedia/gnash/patches/patch-libbase_rc.cpp
new file mode 100644
index 00000000000..e879bcb84e9
--- /dev/null
+++ b/multimedia/gnash/patches/patch-libbase_rc.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-libbase_rc.cpp,v 1.1 2013/02/26 11:04:25 joerg Exp $
+
+--- libbase/rc.cpp.orig	2013-02-25 18:40:46.000000000 +0000
++++ libbase/rc.cpp
+@@ -83,7 +83,7 @@ RcInitFile::RcInitFile()
+         DEFAULT_FLASH_REV_NUMBER ",0"),
+     // An empty string leaves detection to VM.cpp:
+     _flashSystemOS(""),
+-    _flashSystemManufacturer("Gnash "DEFAULT_FLASH_SYSTEM_OS),
++    _flashSystemManufacturer("Gnash " DEFAULT_FLASH_SYSTEM_OS),
+     _actionDump(false),
+     _parserDump(false),
+     _verboseASCodingErrors(false),
diff --git a/multimedia/gnash/patches/patch-libcore_movie__root.cpp b/multimedia/gnash/patches/patch-libcore_movie__root.cpp
new file mode 100644
index 00000000000..97970208e37
--- /dev/null
+++ b/multimedia/gnash/patches/patch-libcore_movie__root.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-libcore_movie__root.cpp,v 1.1 2013/02/26 11:04:25 joerg Exp $
+
+--- libcore/movie_root.cpp.orig	2013-02-25 18:54:08.000000000 +0000
++++ libcore/movie_root.cpp
+@@ -156,7 +156,7 @@ movie_root::movie_root(VirtualClock& clo
+     _hostfd(-1),
+     _controlfd(-1),
+     _quality(QUALITY_HIGH),
+-    _alignMode(0),
++    _alignMode(0ULL),
+     _allowScriptAccess(SCRIPT_ACCESS_SAME_DOMAIN),
+     _showMenu(true),
+     _scaleMode(SCALEMODE_SHOWALL),
diff --git a/multimedia/gnash/patches/patch-libcore_swf_DefineButtonTag.h b/multimedia/gnash/patches/patch-libcore_swf_DefineButtonTag.h
new file mode 100644
index 00000000000..81b03b9389b
--- /dev/null
+++ b/multimedia/gnash/patches/patch-libcore_swf_DefineButtonTag.h
@@ -0,0 +1,22 @@
+$NetBSD: patch-libcore_swf_DefineButtonTag.h,v 1.1 2013/02/26 11:04:25 joerg Exp $
+
+--- libcore/swf/DefineButtonTag.h.orig	2013-02-25 19:42:00.000000000 +0000
++++ libcore/swf/DefineButtonTag.h
+@@ -157,8 +157,6 @@ public:
+         return (_conditions & KEYPRESS);
+     }
+ 
+-private:
+-
+     /// Return the keycode triggering this action
+     //
+     /// Return 0 if no key is supposed to trigger us
+@@ -166,6 +164,8 @@ private:
+         return (_conditions & KEYPRESS) >> 9;
+     }
+ 
++private:
++
+     enum Condition
+     {
+         IDLE_TO_OVER_UP = 1 << 0,
diff --git a/multimedia/gnash/patches/patch-plugin_npapi_plugin.cpp b/multimedia/gnash/patches/patch-plugin_npapi_plugin.cpp
new file mode 100644
index 00000000000..f4fbb12018a
--- /dev/null
+++ b/multimedia/gnash/patches/patch-plugin_npapi_plugin.cpp
@@ -0,0 +1,35 @@
+$NetBSD: patch-plugin_npapi_plugin.cpp,v 1.1 2013/02/26 11:04:26 joerg Exp $
+
+--- plugin/npapi/plugin.cpp.orig	2012-01-19 19:17:50.000000000 +0000
++++ plugin/npapi/plugin.cpp
+@@ -50,17 +50,17 @@
+ // The name must be this value to get flash movies that check the
+ // plugin version to load.
+ #define PLUGIN_NAME    "Shockwave Flash"
+-#define MIME_TYPES_DESCRIPTION  MIME_TYPES_HANDLED":swf:"PLUGIN_NAME
++#define MIME_TYPES_DESCRIPTION  MIME_TYPES_HANDLED ":swf:" PLUGIN_NAME
+ 
+ // Some javascript plugin detectors use the description
+ // to decide the flash version to display. They expect the
+ // form (major version).(minor version) r(revision).
+ // e.g. "8.0 r99."
+-#define FLASH_VERSION DEFAULT_FLASH_MAJOR_VERSION"."\
+-    DEFAULT_FLASH_MINOR_VERSION" r"DEFAULT_FLASH_REV_NUMBER"."
++#define FLASH_VERSION DEFAULT_FLASH_MAJOR_VERSION "."\
++    DEFAULT_FLASH_MINOR_VERSION" r" DEFAULT_FLASH_REV_NUMBER "."
+ 
+ #define PLUGIN_DESCRIPTION \
+-  "Shockwave Flash "FLASH_VERSION"<br>Gnash "VERSION", the GNU SWF Player. \
++  "Shockwave Flash " FLASH_VERSION "<br>Gnash " VERSION ", the GNU SWF Player. \
+   Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 \
+   <a href=\"http://www.fsf.org\">Free \
+   Software Foundation</a>, Inc. <br> \
+@@ -71,7 +71,7 @@
+   href=\"http://www.gnu.org/software/gnash/\"> \
+   http://www.gnu.org/software/gnash</a>. \
+   <br>\
+-  Compatible Shockwave Flash "FLASH_VERSION
++  Compatible Shockwave Flash " FLASH_VERSION
+ 
+ #include "plugin.h" 
+ #include "GnashSystemIOHeaders.h"