Here is an update to Gnash 0.8.9.
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/www/gnash/Makefile,v
retrieving revision 1.38
diff -u -p -r1.38 Makefile
--- Makefile 15 Jan 2011 10:56:51 -0000 1.38
+++ Makefile 19 Mar 2011 20:26:49 -0000
@@ -6,14 +6,11 @@ ONLY_FOR_ARCHS= ${GCC4_ARCHS}
COMMENT= SWF player with Firefox browser plugin
-VER= 0.8.8
+VER= 0.8.9
DISTNAME= gnash-${VER}
-REVISION= 2
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_GNU:=gnash/${VER}/}
-SHARED_LIBS= gnashrender 0.0
-
HOMEPAGE= http://gnashdev.org
MAINTAINER= Brad Smith <b...@comstyle.com>
@@ -23,22 +20,25 @@ PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= ICE SDL>=8 SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
- Xfixes Xi Xinerama Xrandr Xrender Xv agg>=2 atk-1.0 \
- avcodec>=14 avformat>=13 avutil>=7 boost_date_time-mt>=2 \
- boost_thread-mt>=2 bz2 c cairo crypto curl>=5 expat faac \
- faad freetype fontconfig gdk_pixbuf-2.0 gdk-x11-2.0 gif>=5 \
- gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gsm gthread-2.0 \
- gtk-x11-2.0 idn jpeg>=63 mp3lame m ogg orc-0.4 pango-1.0 \
- pangocairo-1.0 pangoft2-1.0 pangox-1.0 pcre pixman-1 png>=9 \
- pthread-stubs pthread schroedinger-1.0 sndio speex>=8 \
- speexdsp>=1 ssl stdc++ swscale>=2 theora usbhid vorbis \
- vorbisenc x264 xcb xcb-render xcb-render-util z
+WANTLIB= ICE SDL SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
+ Xfixes Xi Xinerama Xrandr Xrender Xv agg atk-1.0 avcodec \
+ avformat avutil boost_date_time-mt boost_program_options-mt \
+ boost_thread-mt bz2 c cairo crypto curl expat faac faad \
+ freetype fontconfig gdk_pixbuf-2.0 gdk-x11-2.0 gif gio-2.0 \
+ glib-2.0 gmodule-2.0 gobject-2.0 gsm gthread-2.0 gtk-x11-2.0 \
+ idn jpeg ltdl mp3lame m ogg orc-0.4 pango-1.0 pangocairo-1.0 \
+ pangoft2-1.0 pangox-1.0 pcre pixman-1 png pthread-stubs \
+ pthread schroedinger-1.0 sndio speex speexdsp ssl stdc++ \
+ swscale theora usbhid vorbis vorbisenc x264 xcb xcb-render \
+ xcb-render-util z
MODULES= devel/gettext
+BUILD_DEPENDS= devel/xulrunner/1.9,-devel
+RUN_DEPENDS= devel/desktop-file-utils
LIB_DEPENDS= archivers/bzip2 \
audio/speex \
devel/boost \
+ devel/libtool,-ltdl \
devel/sdl \
graphics/agg \
graphics/ffmpeg \
@@ -49,9 +49,7 @@ LIB_DEPENDS= archivers/bzip2 \
x11/gtk+2
USE_GMAKE= Yes
-# Gnash requires GNU libtool 2.2 or greater, so use the bundled one
-USE_LIBTOOL= gnu
-LIBTOOL= ${WRKSRC}/libtool
+USE_LIBTOOL= Yes
LIBTOOL_FLAGS+= --tag=disable-static
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+=--disable-cygnal \
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/www/gnash/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo 12 Oct 2010 09:38:16 -0000 1.6
+++ distinfo 19 Mar 2011 18:00:10 -0000
@@ -1,5 +1,5 @@
-MD5 (gnash-0.8.8.tar.gz) = rsQU7jvruJAQVIGPrnNSFA==
-RMD160 (gnash-0.8.8.tar.gz) = GSh9Mg4+fKKXlrk9T0ijBo5bnzQ=
-SHA1 (gnash-0.8.8.tar.gz) = BkP5VpMCK5/mxXR5nz6Q4NDrZlU=
-SHA256 (gnash-0.8.8.tar.gz) = Pxnd8dGLoorZSftOs0aHhs0oq7WRVKaKACVR7k5n9eQ=
-SIZE (gnash-0.8.8.tar.gz) = 5074764
+MD5 (gnash-0.8.9.tar.gz) = AdBCCTLu3gchHjaNQFrunA==
+RMD160 (gnash-0.8.9.tar.gz) = /xnsPC/2b6U/NTZYDTB4iB3DFmM=
+SHA1 (gnash-0.8.9.tar.gz) = FhO/QjqWKl9v4W7KSRtL+FC+hcs=
+SHA256 (gnash-0.8.9.tar.gz) = tzmpYmF4L9NOlP1/m0/+v4EoBjt/sR2cqQunmat7zko=
+SIZE (gnash-0.8.9.tar.gz) = 5081709
Index: patches/patch-configure
===================================================================
RCS file: /home/cvs/ports/www/gnash/patches/patch-configure,v
retrieving revision 1.4
diff -u -p -r1.4 patch-configure
--- patches/patch-configure 12 Oct 2010 09:38:16 -0000 1.4
+++ patches/patch-configure 19 Mar 2011 18:01:38 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.4 2010/10/12 09:38:16 dcoppa Exp $
---- configure.orig Sat Aug 21 13:30:15 2010
-+++ configure Sun Oct 10 14:48:18 2010
-@@ -21058,70 +21058,6 @@ $as_echo "$as_me: ffmpeg top lib dir is $top_lib_dir"
+--- configure.orig Fri Mar 18 09:50:30 2011
++++ configure Sat Mar 19 14:01:22 2011
+@@ -9625,70 +9625,6 @@ $as_echo "$as_me: ffmpeg top lib dir is $top_lib_dir"
if test x"${ac_cv_path_ffmpeg_lib}" != x; then
@@ -72,7 +72,7 @@ $OpenBSD: patch-configure,v 1.4 2010/10/
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libvorbisenc
library" >&5
$as_echo_n "checking for libvorbisenc library... " >&6; }
if test x"$PKG_CONFIG" != x -a x${cross_compiling} = xno; then
-@@ -32317,51 +32253,6 @@ _ACEOF
+@@ -29704,51 +29640,6 @@ _ACEOF
fi
done
Index: patches/patch-doc_C_Makefile_in
===================================================================
RCS file: /home/cvs/ports/www/gnash/patches/patch-doc_C_Makefile_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-doc_C_Makefile_in
--- patches/patch-doc_C_Makefile_in 12 Oct 2010 09:38:16 -0000 1.1
+++ patches/patch-doc_C_Makefile_in 19 Mar 2011 20:17:35 -0000
@@ -1,12 +1,12 @@
$OpenBSD: patch-doc_C_Makefile_in,v 1.1 2010/10/12 09:38:16 dcoppa Exp $
---- doc/C/Makefile.in.orig Sat Aug 21 14:04:38 2010
-+++ doc/C/Makefile.in Wed Aug 25 20:22:57 2010
-@@ -492,7 +492,7 @@ target_alias = @target_alias@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--man1dir = ${prefix}/share/man/man1
-+man1dir = ${mandir}/man1
- docname = gnash
- lang = C
- omffile = gnash-C.omf
+--- doc/C/Makefile.in.orig Fri Mar 18 21:57:44 2011
++++ doc/C/Makefile.in Fri Mar 18 22:00:17 2011
+@@ -443,7 +443,7 @@ curlconfig = @curlconfig@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docbook_styles = @docbook_styles@
+-docdir = $(datadir)/$(PACKAGE)/doc/$(docname)/$(lang)
++docdir = $(datadir)/doc/$(PACKAGE)
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
Index: patches/patch-gui_Makefile_in
===================================================================
RCS file: patches/patch-gui_Makefile_in
diff -N patches/patch-gui_Makefile_in
--- patches/patch-gui_Makefile_in 12 Oct 2010 09:38:16 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-gui_Makefile_in,v 1.1 2010/10/12 09:38:16 dcoppa Exp $
---- gui/Makefile.in.orig Tue Sep 14 04:01:39 2010
-+++ gui/Makefile.in Tue Sep 14 04:08:43 2010
-@@ -1438,7 +1438,7 @@ INSTALL_INFO = @INSTALL_INFO@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
--INTLLIBS = @INTLLIBS@
-+INTLLIBS = @LTLIBINTL@
- INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
- JAVA = @JAVA@
- JPEG_CFLAGS = @JPEG_CFLAGS@
Index: patches/patch-gui_Player_cpp
===================================================================
RCS file: patches/patch-gui_Player_cpp
diff -N patches/patch-gui_Player_cpp
--- patches/patch-gui_Player_cpp 7 Nov 2010 18:58:24 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-$OpenBSD: patch-gui_Player_cpp,v 1.1 2010/11/07 18:58:24 dcoppa Exp $
-
-"base" parameter is always to be considered a directory.
-
---- gui/Player.cpp.orig Sat Aug 7 11:50:00 2010
-+++ gui/Player.cpp Fri Nov 5 21:15:25 2010
-@@ -314,9 +314,12 @@ Player::run(int argc, char* argv[], const std::string&
-
- // Parse player parameters. These are not passed to the SWF, but rather
- // control stage properties etc.
-+ // NOTE: it is intentional to force a trailing slash to "base" argument
-+ // as it was tested that the "base" argument is always considered
-+ // a directory!
- Params::const_iterator it = _params.find("base");
- const URL baseURL = (it == _params.end()) ? _baseurl :
-- URL(it->second, _baseurl);
-+ URL(it->second+"/", _baseurl);
- /// The RunResources should be populated before parsing.
- _runResources.reset(new RunResources(baseURL.str()));
-
Index: patches/patch-libbase_Makefile_in
===================================================================
RCS file: /home/cvs/ports/www/gnash/patches/patch-libbase_Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-libbase_Makefile_in
--- patches/patch-libbase_Makefile_in 12 Oct 2010 09:38:16 -0000 1.2
+++ patches/patch-libbase_Makefile_in 18 Mar 2011 23:12:54 -0000
@@ -1,23 +1,12 @@
$OpenBSD: patch-libbase_Makefile_in,v 1.2 2010/10/12 09:38:16 dcoppa Exp $
---- libbase/Makefile.in.orig Sat Aug 21 14:04:42 2010
-+++ libbase/Makefile.in Tue Sep 14 02:32:53 2010
-@@ -445,8 +445,8 @@ LIBADD_DLOPEN = @LIBADD_DLOPEN@
- LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
- LIBAVCODEC_IDENT = @LIBAVCODEC_IDENT@
- LIBEXT = @LIBEXT@
--LIBICONV = @LIBICONV@
--LIBINTL = @LIBINTL@
-+LIBICONV = @LTLIBICONV@
-+LIBINTL = @LTLIBINTL@
- LIBLTDL = @LIBLTDL@
- LIBOBJS = @LIBOBJS@
- LIBPNG_CFLAGS = @LIBPNG_CFLAGS@
-@@ -1393,7 +1393,7 @@ install-dvi: install-dvi-am
+--- libbase/Makefile.in.orig Tue Mar 15 11:21:22 2011
++++ libbase/Makefile.in Tue Mar 15 19:48:16 2011
+@@ -1387,7 +1387,7 @@ install-dvi: install-dvi-am
install-dvi-am:
-install-exec-am: install-pkglibLTLIBRARIES install-sysconfDATA
+install-exec-am: install-pkglibLTLIBRARIES
-
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
install-html: install-html-am
-
Index: patches/patch-libcore_DisplayList_cpp
===================================================================
RCS file: patches/patch-libcore_DisplayList_cpp
diff -N patches/patch-libcore_DisplayList_cpp
--- patches/patch-libcore_DisplayList_cpp 7 Nov 2010 18:58:24 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,71 +0,0 @@
-$OpenBSD: patch-libcore_DisplayList_cpp,v 1.1 2010/11/07 18:58:24 dcoppa Exp $
-
-Drop assertion, handle the case instead.
-
---- libcore/DisplayList.cpp.orig Sat Aug 7 11:50:00 2010
-+++ libcore/DisplayList.cpp Fri Nov 5 21:15:20 2010
-@@ -45,15 +45,11 @@ namespace {
- DisplayList::const_iterator beginNonRemoved(
- const DisplayList::container_type& c);
-
-- /// Return an iterator succeeding the last element in zone
-- /// (-16384, 0xffff-16384)
-+ /// Return the first element in the DisplayList whose depth exceeds
-+ /// 65535 (-16384).
- DisplayList::iterator dlistTagsEffectiveZoneEnd(
- DisplayList::container_type& c);
-
-- /// Return an constant iterator succeeding the last element
-- /// in (-16384, 0xffff-16384)
-- DisplayList::const_iterator dlistTagsEffectiveZoneEnd(
-- const DisplayList::container_type& c);
- }
-
- /// Anonymous namespace for generic algorithm functors.
-@@ -881,21 +877,27 @@ DisplayList::sort()
- }
-
- void
--DisplayList::mergeDisplayList(DisplayList & newList)
-+DisplayList::mergeDisplayList(DisplayList& newList)
- {
- testInvariant();
-
-+ log_debug("New list size: %s", newList.size());
-+
- iterator itOld = beginNonRemoved(_charsByDepth);
- iterator itNew = beginNonRemoved(newList._charsByDepth);
-
- iterator itOldEnd = dlistTagsEffectiveZoneEnd(_charsByDepth);
-- iterator itNewEnd = newList._charsByDepth.end();
-- assert(itNewEnd == dlistTagsEffectiveZoneEnd(newList._charsByDepth) );
-
-+ // There used to be an assertion here that no character in the new list
-+ // is at depth 65535 or higher. There's no reason why the tags executed
-+ // on the new list shouldn't do this though. Bug #29282 does this.
-+ // TODO: check whether we should be ignoring that character.
-+ iterator itNewEnd = dlistTagsEffectiveZoneEnd(newList._charsByDepth);
-+
- // step1.
- // starting scanning both lists.
-- while (itOld != itOldEnd)
-- {
-+ while (itOld != itOldEnd) {
-+
- iterator itOldBackup = itOld;
-
- DisplayObject* chOld = *itOldBackup;
-@@ -1105,13 +1107,6 @@ beginNonRemoved(const DisplayList::container_type& c)
-
- DisplayList::iterator
- dlistTagsEffectiveZoneEnd(DisplayList::container_type& c)
--{
-- return std::find_if(c.begin(), c.end(),
-- DepthGreaterOrEqual(0xffff + DisplayObject::staticDepthOffset));
--}
--
--DisplayList::const_iterator
--dlistTagsEffectiveZoneEnd(const DisplayList::container_type& c)
- {
- return std::find_if(c.begin(), c.end(),
- DepthGreaterOrEqual(0xffff + DisplayObject::staticDepthOffset));
Index: patches/patch-libcore_ExternalInterface_cpp
===================================================================
RCS file: patches/patch-libcore_ExternalInterface_cpp
diff -N patches/patch-libcore_ExternalInterface_cpp
--- patches/patch-libcore_ExternalInterface_cpp 7 Nov 2010 18:58:24 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,31 +0,0 @@
-$OpenBSD: patch-libcore_ExternalInterface_cpp,v 1.1 2010/11/07 18:58:24 dcoppa
Exp $
-
-Don't wait for data in ::readBrowser, read only if data is available..
-
---- libcore/ExternalInterface.cpp.orig Sat Aug 7 11:50:00 2010
-+++ libcore/ExternalInterface.cpp Fri Nov 5 21:29:04 2010
-@@ -663,21 +663,12 @@ ExternalInterface::readBrowser(int fd)
- std::string empty;
- // Wait for some data from the player
- int bytes = 0;
-- fd_set fdset;
-- FD_ZERO(&fdset);
-- FD_SET(fd, &fdset);
-- struct timeval tval;
-- tval.tv_sec = 10;
-- tval.tv_usec = 0;
-- // log_debug("Waiting for data... ");
-- if (select(fd+1, &fdset, NULL, NULL, &tval)) {
-- // log_debug("There is data in the network");
-+
- #ifndef _WIN32
-- ioctl(fd, FIONREAD, &bytes);
-+ ioctl(fd, FIONREAD, &bytes);
- #else
-- ioctlSocket(fd, FIONREAD, &bytes);
-+ ioctlSocket(fd, FIONREAD, &bytes);
- #endif
-- }
-
- // No data yet
- if (bytes == 0) {
Index: patches/patch-libcore_asobj_XMLNode_as_cpp
===================================================================
RCS file: patches/patch-libcore_asobj_XMLNode_as_cpp
diff -N patches/patch-libcore_asobj_XMLNode_as_cpp
--- patches/patch-libcore_asobj_XMLNode_as_cpp 7 Nov 2010 18:58:24 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-$OpenBSD: patch-libcore_asobj_XMLNode_as_cpp,v 1.1 2010/11/07 18:58:24 dcoppa
Exp $
-
-Mark parent XMLNodes. Fixes bug #31044.
-
---- libcore/asobj/XMLNode_as.cpp.orig Sat Aug 7 11:50:00 2010
-+++ libcore/asobj/XMLNode_as.cpp Fri Nov 5 21:15:00 2010
-@@ -465,6 +465,11 @@ XMLNode_as::stringify(const XMLNode_as& xml, std::ostr
- void
- XMLNode_as::setReachable()
- {
-+ // If there is a parent, make sure its object is reachable. This goes
-+ // up towards the root node of tree without marking the XMLNode
-+ // resources (which would cause infinite recursion).
-+ if (_parent && _parent->_object) _parent->_object->setReachable();
-+
- // Mark children
- std::for_each(_children.begin(), _children.end(),
- boost::mem_fn(&XMLNode_as::setReachable));
Index: patches/patch-libsound_sdl_sound_handler_sdl_cpp
===================================================================
RCS file: patches/patch-libsound_sdl_sound_handler_sdl_cpp
diff -N patches/patch-libsound_sdl_sound_handler_sdl_cpp
--- patches/patch-libsound_sdl_sound_handler_sdl_cpp 7 Nov 2010 18:58:24
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,47 +0,0 @@
-$OpenBSD: patch-libsound_sdl_sound_handler_sdl_cpp,v 1.1 2010/11/07 18:58:24
dcoppa Exp $
-
-Use exact-size integers for WAV header (see bug #30993)
-
---- libsound/sdl/sound_handler_sdl.cpp.orig Sat Aug 7 11:50:00 2010
-+++ libsound/sdl/sound_handler_sdl.cpp Fri Nov 5 21:15:15 2010
-@@ -31,6 +31,7 @@
-
- #include <vector>
- #include <boost/scoped_array.hpp>
-+#include <boost/cstdint.hpp>
- #include <SDL.h>
-
- // Define this to get debugging call about pausing/unpausing audio
-@@ -45,23 +46,23 @@ namespace { // anonymous
- // http://ftp.iptel.org/pub/sems/doc/full/current/wav__hdr_8c-source.html
- typedef struct{
- char rID[4]; // 'RIFF'
-- long int rLen;
-+ boost::uint32_t rLen;
- char wID[4]; // 'WAVE'
- char fId[4]; // 'fmt '
-- long int pcm_header_len; // varies...
-- short int wFormatTag;
-- short int nChannels; // 1,2 for stereo data is (l,r) pairs
-- long int nSamplesPerSec;
-- long int nAvgBytesPerSec;
-- short int nBlockAlign;
-- short int nBitsPerSample;
-+ boost::uint32_t pcm_header_len; // varies...
-+ boost::int16_t wFormatTag;
-+ boost::int16_t nChannels; // 1,2 for stereo data is (l,r) pairs
-+ boost::uint32_t nSamplesPerSec;
-+ boost::uint32_t nAvgBytesPerSec;
-+ boost::int16_t nBlockAlign;
-+ boost::int16_t nBitsPerSample;
- } WAV_HDR;
-
- // Chunk of wave file
- // http://ftp.iptel.org/pub/sems/doc/full/current/wav__hdr_8c-source.html
- typedef struct{
- char dId[4]; // 'data' or 'fact'
-- long int dLen;
-+ boost::uint32_t dLen;
- } CHUNK_HDR;
-
- } // end of anonymous namespace
Index: patches/patch-plugin_npapi_plugin_cpp
===================================================================
RCS file: patches/patch-plugin_npapi_plugin_cpp
diff -N patches/patch-plugin_npapi_plugin_cpp
--- patches/patch-plugin_npapi_plugin_cpp 7 Nov 2010 18:58:24 -0000
1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,71 +0,0 @@
-$OpenBSD: patch-plugin_npapi_plugin_cpp,v 1.3 2010/11/07 18:58:24 dcoppa Exp $
-
-Use window.document.baseURI rather than
-window.document.location.href. The former
-honours <base> tags, fixing bug #31497
-(aka easy come, easy go)
-
---- plugin/npapi/plugin.cpp.orig Mon Aug 16 11:46:55 2010
-+++ plugin/npapi/plugin.cpp Fri Nov 5 21:15:29 2010
-@@ -1218,6 +1218,13 @@ nsPluginInstance::startProc()
- std::string
- nsPluginInstance::getCurrentPageURL() const
- {
-+ // Return:
-+ // window.document.baseURI
-+ //
-+ // Was (bogus):
-+ // window.document.location.href
-+ //
-+
- NPP npp = _instance;
-
- NPIdentifier sDocument = NPN_GetStringIdentifier("document");
-@@ -1230,20 +1237,21 @@ nsPluginInstance::getCurrentPageURL() const
- NPN_ReleaseObject(window);
-
- if (!NPVARIANT_IS_OBJECT(vDoc)) {
-- gnash::log_error("Can't get window object");
-- return NULL;
-+ gnash::log_error("Can't get window.document object");
-+ return std::string();
- }
-
- NPObject* npDoc = NPVARIANT_TO_OBJECT(vDoc);
-
-+/*
- NPIdentifier sLocation = NPN_GetStringIdentifier("location");
- NPVariant vLoc;
- NPN_GetProperty(npp, npDoc, sLocation, &vLoc);
- NPN_ReleaseObject(npDoc);
-
- if (!NPVARIANT_IS_OBJECT(vLoc)) {
-- gnash::log_error("Can't get window.location object");
-- return NULL;
-+ gnash::log_error("Can't get window.document.location object");
-+ return std::string();
- }
-
- NPObject* npLoc = NPVARIANT_TO_OBJECT(vLoc);
-@@ -1254,8 +1262,19 @@ nsPluginInstance::getCurrentPageURL() const
- NPN_ReleaseObject(npLoc);
-
- if (!NPVARIANT_IS_STRING(vProp)) {
-- gnash::log_error("Can't get window.location.href object");
-- return NULL;
-+ gnash::log_error("Can't get window.document.location.href string");
-+ return std::string();
-+ }
-+*/
-+
-+ NPIdentifier sProperty = NPN_GetStringIdentifier("baseURI");
-+ NPVariant vProp;
-+ NPN_GetProperty(npp, npDoc, sProperty, &vProp);
-+ NPN_ReleaseObject(npDoc);
-+
-+ if (!NPVARIANT_IS_STRING(vProp)) {
-+ gnash::log_error("Can't get window.document.baseURI string");
-+ return std::string();
- }
-
- const NPString& propValue = NPVARIANT_TO_STRING(vProp);
Index: patches/patch-utilities_Makefile_in
===================================================================
RCS file: patches/patch-utilities_Makefile_in
diff -N patches/patch-utilities_Makefile_in
--- patches/patch-utilities_Makefile_in 12 Oct 2010 09:38:16 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-utilities_Makefile_in,v 1.1 2010/10/12 09:38:16 dcoppa Exp $
---- utilities/Makefile.in.orig Tue Sep 14 04:13:30 2010
-+++ utilities/Makefile.in Tue Sep 14 04:13:49 2010
-@@ -385,7 +385,7 @@ LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
- LIBAVCODEC_IDENT = @LIBAVCODEC_IDENT@
- LIBEXT = @LIBEXT@
- LIBICONV = @LIBICONV@
--LIBINTL = @LIBINTL@
-+LIBINTL = @LTLIBINTL@
- LIBLTDL = @LIBLTDL@
- LIBOBJS = @LIBOBJS@
- LIBPNG_CFLAGS = @LIBPNG_CFLAGS@
Index: pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/www/gnash/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST
--- pkg/PLIST 27 Oct 2010 07:57:34 -0000 1.8
+++ pkg/PLIST 19 Mar 2011 20:30:18 -0000
@@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST,v 1.8 2010/10/27 07:57:34 dcoppa Exp $
bin/gnash
+bin/gnash-gtk-launcher
@bin bin/gprocessor
@bin bin/gtk-gnash
@bin bin/rtmpget
@@ -7,8 +8,6 @@ include/gnash/
include/gnash/AMF.h
include/gnash/BevelFilter_as.h
include/gnash/BitmapData_as.h
-include/gnash/BitmapFilterQuality_as.h
-include/gnash/BitmapFilterType_as.h
include/gnash/BitmapFilter_as.h
include/gnash/BitsReader.h
include/gnash/BlurFilter_as.h
@@ -17,14 +16,13 @@ include/gnash/ClockTime.h
include/gnash/ColorMatrixFilter_as.h
include/gnash/ColorTransform_as.h
include/gnash/ConvolutionFilter_as.h
-include/gnash/DisplacementMapFilterMode_as.h
include/gnash/DisplacementMapFilter_as.h
include/gnash/DropShadowFilter_as.h
include/gnash/ExternalInterface_as.h
-include/gnash/FileTypes.h
include/gnash/GC.h
include/gnash/GlowFilter_as.h
include/gnash/GnashAlgorithm.h
+include/gnash/GnashEnums.h
include/gnash/GnashException.h
include/gnash/GnashFactory.h
include/gnash/GnashFileUtilities.h
@@ -38,6 +36,7 @@ include/gnash/GnashSystemNetHeaders.h
include/gnash/GradientBevelFilter_as.h
include/gnash/GradientGlowFilter_as.h
include/gnash/IOChannel.h
+include/gnash/ImageIterators.h
include/gnash/Matrix_as.h
include/gnash/NamingPolicy.h
include/gnash/NetworkAdapter.h
@@ -46,16 +45,23 @@ include/gnash/Point_as.h
include/gnash/RTMP.h
include/gnash/Range2d.h
include/gnash/Rectangle_as.h
+include/gnash/Renderer.h
+include/gnash/SWFCtype.h
include/gnash/SharedMem.h
include/gnash/SimpleBuffer.h
include/gnash/Socket.h
+include/gnash/Stats.h
+include/gnash/StreamProvider.h
include/gnash/StringPredicates.h
include/gnash/Transform_as.h
include/gnash/URL.h
+include/gnash/URLAccessManager.h
include/gnash/WallClockTimer.h
+include/gnash/accumulator.h
include/gnash/arg_parser.h
include/gnash/asobj/
include/gnash/asobj/AMFConverter.h
+include/gnash/asobj/ASConversions.h
include/gnash/asobj/Accessibility_as.h
include/gnash/asobj/Array_as.h
include/gnash/asobj/AsBroadcaster.h
@@ -66,18 +72,18 @@ include/gnash/asobj/Color_as.h
include/gnash/asobj/ContextMenuItem_as.h
include/gnash/asobj/ContextMenu_as.h
include/gnash/asobj/ControlTag.h
-include/gnash/asobj/CustomActions.h
include/gnash/asobj/Date_as.h
include/gnash/asobj/DefinitionTag.h
include/gnash/asobj/DisplayList.h
include/gnash/asobj/DisplayObject.h
include/gnash/asobj/DisplayObjectContainer.h
+include/gnash/asobj/DragState.h
include/gnash/asobj/DynamicShape.h
include/gnash/asobj/Error_as.h
include/gnash/asobj/FillStyle.h
+include/gnash/asobj/Function_as.h
include/gnash/asobj/Geometry.h
include/gnash/asobj/Global_as.h
-include/gnash/asobj/Globals.h
include/gnash/asobj/GnashKey.h
include/gnash/asobj/InteractiveObject.h
include/gnash/asobj/Key_as.h
@@ -108,6 +114,7 @@ include/gnash/asobj/RGBA.h
include/gnash/asobj/Relay.h
include/gnash/asobj/RunResources.h
include/gnash/asobj/SWF.h
+include/gnash/asobj/SWFCxForm.h
include/gnash/asobj/SWFMatrix.h
include/gnash/asobj/SWFRect.h
include/gnash/asobj/Selection_as.h
@@ -115,7 +122,6 @@ include/gnash/asobj/ShapeRecord.h
include/gnash/asobj/SharedObject_as.h
include/gnash/asobj/Sound_as.h
include/gnash/asobj/Stage_as.h
-include/gnash/asobj/StreamProvider.h
include/gnash/asobj/String_as.h
include/gnash/asobj/System_as.h
include/gnash/asobj/TagLoadersTable.h
@@ -132,10 +138,7 @@ include/gnash/asobj/as_function.h
include/gnash/asobj/as_object.h
include/gnash/asobj/as_value.h
include/gnash/asobj/builtin_function.h
-include/gnash/asobj/cxform.h
-include/gnash/asobj/drag_state.h
include/gnash/asobj/event_id.h
-include/gnash/asobj/gnash.h
include/gnash/asobj/movie_root.h
include/gnash/asobj/namedStrings.h
include/gnash/display_pkg.h
@@ -151,7 +154,6 @@ include/gnash/jemtree.h
include/gnash/log.h
include/gnash/net_pkg.h
include/gnash/noseek_fd_adapter.h
-include/gnash/ogl.h
include/gnash/parser/
include/gnash/parser/movie_definition.h
include/gnash/rc.h
@@ -163,7 +165,6 @@ include/gnash/string_table.h
include/gnash/text_pkg.h
include/gnash/tree.hh
include/gnash/tu_file.h
-include/gnash/tu_opengl_includes.h
include/gnash/utf8.h
include/gnash/utility.h
include/gnash/vm/
@@ -171,45 +172,42 @@ include/gnash/vm/ASHandlers.h
include/gnash/vm/ActionExec.h
include/gnash/vm/CallStack.h
include/gnash/vm/ExecutableCode.h
-include/gnash/vm/Machine.h
include/gnash/vm/SafeStack.h
include/gnash/vm/VM.h
include/gnash/vm/fn_call.h
include/gnash/zlib_adapter.h
lib/gnash/
lib/gnash/libgnashbase-${VER}.so
-lib/gnash/libgnashbase.la
lib/gnash/libgnashbase.so
lib/gnash/libgnashcore-${VER}.so
-lib/gnash/libgnashcore.la
lib/gnash/libgnashcore.so
lib/gnash/libgnashmedia-${VER}.so
-lib/gnash/libgnashmedia.la
lib/gnash/libgnashmedia.so
-lib/gnash/libgnashrender.la
-@lib lib/gnash/libgnashrender.so.${LIBgnashrender_VERSION}
+lib/gnash/libgnashrender-${VER}.so
+lib/gnash/libgnashrender.so
lib/gnash/libgnashsound-${VER}.so
-lib/gnash/libgnashsound.la
lib/gnash/libgnashsound.so
lib/mozilla/
lib/mozilla/plugins/
lib/mozilla/plugins/libgnashplugin.so
lib/pkgconfig/gnash.pc
@comment @man man/man1/cygnal.1
-@man man/man1/findmicrophones.1
-@man man/man1/findwebcams.1
+@comment @man man/man1/findmicrophones.1
+@comment @man man/man1/findwebcams.1
@comment @man man/man1/flvdumper.1
+@man man/man1/gnash-gtk-launcher.1
@man man/man1/gnash.1
@man man/man1/gprocessor.1
@man man/man1/gtk-gnash.1
@comment @man man/man1/kde4-gnash.1
@man man/man1/rtmpget.1
@comment @man man/man1/soldumper.1
+share/applications/
+share/applications/gnash.desktop
share/doc/gnash/
share/doc/gnash/gnashref.html
share/doc/gnash/gnashuser.html
share/doc/gnash/images/
-share/doc/gnash/images/car_crash.png
share/doc/gnash/images/rtmp.png
share/examples/gnash/
share/examples/gnash/gnashpluginrc
@@ -218,7 +216,9 @@ share/examples/gnash/gnashrc
@sample ${SYSCONFDIR}/gnashrc
share/gnash/
share/gnash/GnashG.png
+share/gnash/gnash-splash.swf
share/gnash/gnash_128_96.ico
+share/icons/hicolor/32x32/apps/gnash.xpm
share/locale/cs/LC_MESSAGES/gnash.mo
share/locale/de/LC_MESSAGES/gnash.mo
share/locale/es/LC_MESSAGES/gnash.mo
@@ -226,3 +226,7 @@ share/locale/fi/LC_MESSAGES/gnash.mo
share/locale/fr/LC_MESSAGES/gnash.mo
share/locale/it/LC_MESSAGES/gnash.mo
share/locale/ja/LC_MESSAGES/gnash.mo
+@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2>
/dev/null || true
+@unexec-delete %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2>
/dev/null || true
+@exec %D/bin/update-desktop-database
+@unexec-delete %D/bin/update-desktop-database
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
