r480 - in /packages/gnash/branches/squeeze: ./ debian/ debian/patches/
gg0-guest at users.alioth.debian.org
gg0-guest at users.alioth.debian.org
Sat Nov 6 00:17:55 UTC 2010
Author: gg0-guest
Date: Sat Nov 6 00:17:37 2010
New Revision: 480
URL: http://svn.debian.org/wsvn/pkg-flash/?sc=1&rev=480
Log:
preparing 0.8.8-6
Added:
packages/gnash/branches/squeeze/
- copied from r464, packages/gnash/tags/0.8.8-5/
packages/gnash/branches/squeeze/debian/patches/01_38be50cecc
packages/gnash/branches/squeeze/debian/patches/02_b3d5da01fb
packages/gnash/branches/squeeze/debian/patches/03_c22769f0ab
packages/gnash/branches/squeeze/debian/patches/04_baseuri1
packages/gnash/branches/squeeze/debian/patches/05_baseuri2
packages/gnash/branches/squeeze/debian/patches/06_ytfix
packages/gnash/branches/squeeze/debian/patches/fixinfodocs
- copied, changed from r464, packages/gnash/tags/0.8.8-5/debian/patches/fixinfodocs.patch
packages/gnash/branches/squeeze/debian/patches/fixtypos
- copied, changed from r464, packages/gnash/tags/0.8.8-5/debian/patches/fixtypos.patch
packages/gnash/branches/squeeze/debian/patches/release_version
- copied, changed from r464, packages/gnash/tags/0.8.8-5/debian/patches/release_version.patch
Removed:
packages/gnash/branches/squeeze/debian/patches/build_on_ia64.patch
packages/gnash/branches/squeeze/debian/patches/disable_fvisibility-inlines-hidden
packages/gnash/branches/squeeze/debian/patches/fixinfodocs.patch
packages/gnash/branches/squeeze/debian/patches/fixtypos.patch
packages/gnash/branches/squeeze/debian/patches/release_version.patch
packages/gnash/branches/squeeze/debian/patches/sh4_support.patch
Modified:
packages/gnash/branches/squeeze/debian/changelog
packages/gnash/branches/squeeze/debian/patches/series
Modified: packages/gnash/branches/squeeze/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/branches/squeeze/debian/changelog?rev=480&op=diff
==============================================================================
--- packages/gnash/branches/squeeze/debian/changelog (original)
+++ packages/gnash/branches/squeeze/debian/changelog Sat Nov 6 00:17:37 2010
@@ -1,3 +1,12 @@
+gnash (0.8.8-6) UNRELEASED; urgency=low
+
+ * Added patches that fix some upstream bugs
+ + 01_38be50cecc, 02_b3d5da01fb, 03_c22769f0ab
+ + 04_baseuri1, 05_baseuri2
+ + 06_ytfix: youtube videos starts immediately.
+
+ -- Gabriele Giacone <1o5g4r8o at gmail.com> Sat, 06 Nov 2010 01:14:46 +0100
+
gnash (0.8.8-5) unstable; urgency=low
[ Gabriele Giacone ]
Added: packages/gnash/branches/squeeze/debian/patches/01_38be50cecc
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/branches/squeeze/debian/patches/01_38be50cecc?rev=480&op=file
==============================================================================
--- packages/gnash/branches/squeeze/debian/patches/01_38be50cecc (added)
+++ packages/gnash/branches/squeeze/debian/patches/01_38be50cecc Sat Nov 6 00:17:37 2010
@@ -1,0 +1,17 @@
+Description: Mark parent XMLNodes. Fixes upstream bug #31044.
+Author: Benjamin Wolsey <bwy at benjaminwolsey.de>
+
+--- a/libcore/asobj/XMLNode_as.cpp
++++ b/libcore/asobj/XMLNode_as.cpp
+@@ -465,6 +465,11 @@
+ 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));
Added: packages/gnash/branches/squeeze/debian/patches/02_b3d5da01fb
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/branches/squeeze/debian/patches/02_b3d5da01fb?rev=480&op=file
==============================================================================
--- packages/gnash/branches/squeeze/debian/patches/02_b3d5da01fb (added)
+++ packages/gnash/branches/squeeze/debian/patches/02_b3d5da01fb Sat Nov 6 00:17:37 2010
@@ -1,0 +1,46 @@
+Description: Use exact-size integers for WAV header (see upstream bug #30993)
+Author: Sandro Santilli <strk at keybit.net>
+
+--- a/libsound/sdl/sound_handler_sdl.cpp
++++ b/libsound/sdl/sound_handler_sdl.cpp
+@@ -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
Added: packages/gnash/branches/squeeze/debian/patches/03_c22769f0ab
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/branches/squeeze/debian/patches/03_c22769f0ab?rev=480&op=file
==============================================================================
--- packages/gnash/branches/squeeze/debian/patches/03_c22769f0ab (added)
+++ packages/gnash/branches/squeeze/debian/patches/03_c22769f0ab Sat Nov 6 00:17:37 2010
@@ -1,0 +1,71 @@
+Description: Drop assertion, handle the case instead.
+Author: Benjamin Wolsey <bwy at benjaminwolsey.de>
+
+--- a/libcore/DisplayList.cpp
++++ b/libcore/DisplayList.cpp
+@@ -45,15 +45,11 @@
+ 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 @@
+ }
+
+ 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;
+@@ -1108,13 +1110,6 @@
+ {
+ 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));
+ }
+
+ } // anonymous namespace
+
Added: packages/gnash/branches/squeeze/debian/patches/04_baseuri1
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/branches/squeeze/debian/patches/04_baseuri1?rev=480&op=file
==============================================================================
--- packages/gnash/branches/squeeze/debian/patches/04_baseuri1 (added)
+++ packages/gnash/branches/squeeze/debian/patches/04_baseuri1 Sat Nov 6 00:17:37 2010
@@ -1,0 +1,20 @@
+Description: "base" parameter is always to be considered a directory. All cases
+ in plugin/test/baseuri/ succeed now
+Author: Sandro Santilli <strk at keybit.net>
+
+--- a/gui/Player.cpp
++++ b/gui/Player.cpp
+@@ -314,9 +314,12 @@
+
+ // 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()));
+
Added: packages/gnash/branches/squeeze/debian/patches/05_baseuri2
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/branches/squeeze/debian/patches/05_baseuri2?rev=480&op=file
==============================================================================
--- packages/gnash/branches/squeeze/debian/patches/05_baseuri2 (added)
+++ packages/gnash/branches/squeeze/debian/patches/05_baseuri2 Sat Nov 6 00:17:37 2010
@@ -1,0 +1,69 @@
+Description: Use window.document.baseURI rather than
+ window.document.location.href. The former honours <base> tags, fixing bug
+ #31497 (aka easy come, easy go)
+Author: Sandro Santilli <strk at keybit.net>
+
+--- a/plugin/npapi/plugin.cpp
++++ b/plugin/npapi/plugin.cpp
+@@ -1218,6 +1218,13 @@
+ 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 @@
+ 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 @@
+ 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);
Added: packages/gnash/branches/squeeze/debian/patches/06_ytfix
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/branches/squeeze/debian/patches/06_ytfix?rev=480&op=file
==============================================================================
--- packages/gnash/branches/squeeze/debian/patches/06_ytfix (added)
+++ packages/gnash/branches/squeeze/debian/patches/06_ytfix Sat Nov 6 00:17:37 2010
@@ -1,0 +1,22 @@
+Description: Now yt videos start immediately.
+Author: Sandro Santilli <strk at keybit.net>
+
+--- squeeze~/libcore/ExternalInterface.cpp 2010-08-07 17:50:00.000000000 +0200
++++ squeeze/libcore/ExternalInterface.cpp 2010-11-04 23:39:51.000000000 +0100
+@@ -663,6 +663,8 @@
+ std::string empty;
+ // Wait for some data from the player
+ int bytes = 0;
++
++#if 0
+ fd_set fdset;
+ FD_ZERO(&fdset);
+ FD_SET(fd, &fdset);
+@@ -678,6 +680,7 @@
+ ioctlSocket(fd, FIONREAD, &bytes);
+ #endif
+ }
++#endif
+
+ // No data yet
+ if (bytes == 0) {
Copied: packages/gnash/branches/squeeze/debian/patches/fixinfodocs (from r464, packages/gnash/tags/0.8.8-5/debian/patches/fixinfodocs.patch)
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/branches/squeeze/debian/patches/fixinfodocs?rev=480&op=diff
==============================================================================
--- packages/gnash/tags/0.8.8-5/debian/patches/fixinfodocs.patch (original)
+++ packages/gnash/branches/squeeze/debian/patches/fixinfodocs Sat Nov 6 00:17:37 2010
@@ -1,5 +1,6 @@
Description: This patch fixes info docs
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
+Forwarded: https://savannah.gnu.org/patch/?7325
--- trunk~/doc/C/gnashref.xml 2010-08-08 22:46:54.000000000 +0200
+++ trunk/doc/C/gnashref.xml 2010-08-25 23:41:08.000000000 +0200
Copied: packages/gnash/branches/squeeze/debian/patches/fixtypos (from r464, packages/gnash/tags/0.8.8-5/debian/patches/fixtypos.patch)
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/branches/squeeze/debian/patches/fixtypos?rev=480&op=diff
==============================================================================
--- packages/gnash/tags/0.8.8-5/debian/patches/fixtypos.patch (original)
+++ packages/gnash/branches/squeeze/debian/patches/fixtypos Sat Nov 6 00:17:37 2010
@@ -1,6 +1,6 @@
Description: This patch fixes typos.
+Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Forwarded: https://savannah.gnu.org/bugs/index.php?30876
-Author: Gabriele Giacone <1o5g4r8o at gmail.com>
--- trunk~/cygnal/crc.cpp 2010-08-07 17:50:00.000000000 +0200
+++ trunk/cygnal/crc.cpp 2010-08-26 06:13:08.000000000 +0200
Copied: packages/gnash/branches/squeeze/debian/patches/release_version (from r464, packages/gnash/tags/0.8.8-5/debian/patches/release_version.patch)
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/branches/squeeze/debian/patches/release_version?rev=480&op=diff
==============================================================================
--- packages/gnash/tags/0.8.8-5/debian/patches/release_version.patch (original)
+++ packages/gnash/branches/squeeze/debian/patches/release_version Sat Nov 6 00:17:37 2010
@@ -1,5 +1,6 @@
Description: This patch sets release version in all shared objects
Author: Miriam Ruiz <little_miry at yahoo.es>
+Forwarded: https://savannah.gnu.org/patch/?7330
---
Index: gnash-0.8.8~bzr20100809.2250/cygnal/libnet/Makefile.am
Modified: packages/gnash/branches/squeeze/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/branches/squeeze/debian/patches/series?rev=480&op=diff
==============================================================================
--- packages/gnash/branches/squeeze/debian/patches/series (original)
+++ packages/gnash/branches/squeeze/debian/patches/series Sat Nov 6 00:17:37 2010
@@ -1,6 +1,9 @@
-disable_fvisibility-inlines-hidden
-#build_on_ia64.patch
-#sh4_support.patch
-release_version.patch
-fixinfodocs.patch
-fixtypos.patch
+release_version
+fixinfodocs
+fixtypos
+01_38be50cecc
+02_b3d5da01fb
+03_c22769f0ab
+04_baseuri1
+05_baseuri2
+06_ytfix
More information about the pkg-flash-devel
mailing list