r288 - in /packages/gnash/trunk/debian: control patches/disable_fvisibility-inlines-hidden patches/do-not-delete-gmo-files patches/fix_byte_size.patch patches/kde_include_types.patch patches/series
miriam at users.alioth.debian.org
miriam at users.alioth.debian.org
Wed Oct 15 12:39:12 UTC 2008
Author: miriam
Date: Wed Oct 15 12:39:11 2008
New Revision: 288
URL: http://svn.debian.org/wsvn/pkg-flash/?sc=1&rev=288
Log:
Fix patches
Added:
packages/gnash/trunk/debian/patches/fix_byte_size.patch
Removed:
packages/gnash/trunk/debian/patches/do-not-delete-gmo-files
Modified:
packages/gnash/trunk/debian/control
packages/gnash/trunk/debian/patches/disable_fvisibility-inlines-hidden
packages/gnash/trunk/debian/patches/kde_include_types.patch
packages/gnash/trunk/debian/patches/series
Modified: packages/gnash/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/trunk/debian/control?rev=288&op=diff
==============================================================================
--- packages/gnash/trunk/debian/control (original)
+++ packages/gnash/trunk/debian/control Wed Oct 15 12:39:11 2008
@@ -25,8 +25,8 @@
Recommends: gstreamer0.10-fluendo-mp3, gstreamer0.10-ffmpeg, gstreamer0.10-gnomevfs
Conflicts: libgnash0 (<< 0.8.1~), gnash (<< 0.8.1~), libklash0 (<< 0.8.1~), gnash-common-opengl
Replaces: libgnash0 (<< 0.8.1~), gnash (<< 0.8.1~), libklash0 (<< 0.8.1~)
-Description: free Flash movie player - common files/libraries
- Gnash is a free Flash movie player, which works either standalone, or as
+Description: free SWF movie player - common files/libraries
+ Gnash is a free SWF movie player, which works either standalone, or as
plugin for Firefox/Mozilla or Konqueror.
.
This package includes the common files/libraries that use AGG (Antigrain)
@@ -41,8 +41,8 @@
Recommends: gstreamer0.10-fluendo-mp3, gstreamer0.10-ffmpeg, gstreamer0.10-gnomevfs
Conflicts: libgnash0 (<< 0.8.1~), gnash (<< 0.8.1~), libklash0 (<< 0.8.1~), gnash-common
Replaces: libgnash0 (<< 0.8.1~), gnash (<< 0.8.1~), libklash0 (<< 0.8.1~)
-Description: free Flash movie player - common files/libraries
- Gnash is a free Flash movie player, which works either standalone, or as
+Description: free SWF movie player - common files/libraries
+ Gnash is a free SWF movie player, which works either standalone, or as
plugin for Firefox/Mozilla or Konqueror.
.
This package includes the common files/libraries that use OpenGL
@@ -54,16 +54,16 @@
Depends: gnash-common (= ${binary:Version}),
${shlibs:Depends}, ${misc:Depends}
Conflicts: gnash-opengl
-Description: free Flash movie player
- Gnash is a free GPL'd Flash movie player, which works either standalone, or as
+Description: free SWF movie player
+ Gnash is a free GPL'd SWF movie player, which works either standalone, or as
browser plugin for Firefox, Mozilla, and Konqueror.
.
Gnash supports the majority of Flash opcodes up to SWF version 7, and
- a wide sampling of ActionScript 2 classes for SWF version 8.5. Flash
+ a wide sampling of ActionScript 2 classes for SWF version 8.5. SWF
version 9 and ActionScript 3 support is being worked on.
.
Included in the Gnash is an XML based messaging system, as specified in
- the Flash specification. This lets a flash movie communicate over a TCP/IP
+ the SWF specification. This lets a SWF movie communicate over a TCP/IP
socket, and parse the incoming XML message. This lets a movie be a remote
control for other devices or applications.
.
@@ -76,16 +76,16 @@
Depends: gnash-common-opengl (= ${binary:Version}),
${shlibs:Depends}, ${misc:Depends}
Conflicts: gnash
-Description: free Flash movie player
- Gnash is a free GPL'd Flash movie player, which works either standalone, or as
+Description: free SWF movie player
+ Gnash is a free GPL'd SWF movie player, which works either standalone, or as
browser plugin for Firefox, Mozilla, and Konqueror.
.
Gnash supports the majority of Flash opcodes up to SWF version 7, and
- a wide sampling of ActionScript 2 classes for SWF version 8.5. Flash
+ a wide sampling of ActionScript 2 classes for SWF version 8.5. SWF
version 9 and ActionScript 3 support is being worked on.
.
Included in the Gnash is an XML based messaging system, as specified in
- the Flash specification. This lets a flash movie communicate over a TCP/IP
+ the SWF specification. This lets a SWF movie communicate over a TCP/IP
socket, and parse the incoming XML message. This lets a movie be a remote
control for other devices or applications.
.
@@ -98,8 +98,8 @@
Depends: gnash-common (= ${binary:Version}),
libqt3-mt (>= 3:3.3.8), ${shlibs:Depends}, ${misc:Depends}
Conflicts: klash-opengl
-Description: free Flash movie player - standalone player for KDE
- Gnash is a free GPL'd Flash movie player, which works either standalone, or as
+Description: free SWF movie player - standalone player for KDE
+ Gnash is a free GPL'd SWF movie player, which works either standalone, or as
browser plugin for Firefox, Mozilla, and Konqueror.
.
Gnash supports the majority of Flash opcodes up to SWF version 7, and
@@ -108,11 +108,11 @@
missing some of their methods.
.
Included in the Gnash is an XML based messaging system, as specified in
- the Flash specification. This lets a flash movie communicate over a TCP/IP
+ the SWF specification. This lets a SWF movie communicate over a TCP/IP
socket, and parse the incoming XML message. This lets a movie be a remote
control for other devices or applications.
.
- Klash is a free standalone Flash movie player for KDE that use AGG
+ Klash is a free standalone SWF movie player for KDE that use AGG
as the rendering backend.
Package: klash-opengl
@@ -121,8 +121,8 @@
Depends: gnash-common-opengl (= ${binary:Version}),
libqt3-mt (>= 3:3.3.8), ${shlibs:Depends}, ${misc:Depends}
Conflicts: klash
-Description: free Flash movie player - standalone player for KDE
- Gnash is a free GPL'd Flash movie player, which works either standalone, or as
+Description: free SWF movie player - standalone player for KDE
+ Gnash is a free GPL'd SWF movie player, which works either standalone, or as
browser plugin for Firefox, Mozilla, and Konqueror.
.
Gnash supports the majority of Flash opcodes up to SWF version 7, and
@@ -131,11 +131,11 @@
missing some of their methods.
.
Included in the Gnash is an XML based messaging system, as specified in
- the Flash specification. This lets a flash movie communicate over a TCP/IP
+ the SWF specification. This lets a SWF movie communicate over a TCP/IP
socket, and parse the incoming XML message. This lets a movie be a remote
control for other devices or applications.
.
- Klash is the free standalone Flash movie player for KDE that use OpenGL
+ Klash is the free standalone SWF movie player for KDE that use OpenGL
as the rendering backend.
Package: gnash-tools
@@ -143,8 +143,8 @@
Architecture: any
Depends: gnash-common (= ${binary:Version}) | gnash-common-opengl (= ${binary:Version}),
${shlibs:Depends}, ${misc:Depends}
-Description: free Flash movie player - Command-line Tools
- Gnash is a free GPL'd Flash movie player, which works either standalone, or as
+Description: free SWF movie player - Command-line Tools
+ Gnash is a free GPL'd SWF movie player, which works either standalone, or as
browser plugin for Firefox, Mozilla, and Konqueror.
.
This package includes command-line utilities based in gnash.
@@ -154,8 +154,8 @@
Architecture: any
Depends: gnash-common (= ${binary:Version}) | gnash-common-opengl (= ${binary:Version}),
${shlibs:Depends}, ${misc:Depends}
-Description: free Flash movie player - Media server
- Gnash is a free GPL'd Flash movie player, which works either standalone, or as
+Description: free SWF movie player - Media server
+ Gnash is a free GPL'd SWF movie player, which works either standalone, or as
browser plugin for Firefox, Mozilla, and Konqueror.
.
Cygnal is Gnash's media server.
@@ -165,8 +165,8 @@
Architecture: any
Depends: gnash (= ${binary:Version}) | gnash-opengl (= ${binary:Version}),
${shlibs:Depends}, ${misc:Depends}
-Description: free Flash movie player - Plugin for Mozilla and derivatives
- Gnash is a free GPL'd Flash movie player, which works either standalone, or as
+Description: free SWF movie player - Plugin for Mozilla and derivatives
+ Gnash is a free GPL'd SWF movie player, which works either standalone, or as
browser plugin for Firefox, Mozilla, and Konqueror.
.
This package includes the plugin for Firefox/Mozilla Web Browser. The plugin
@@ -178,8 +178,8 @@
Architecture: any
Depends: klash (= ${binary:Version}) | klash-opengl (= ${binary:Version}),
${shlibs:Depends}, ${misc:Depends}
-Description: free Flash movie player - Plugin for Konqueror
- Gnash is a free GPL'd Flash movie player, which works either standalone, or as
+Description: free SWF movie player - Plugin for Konqueror
+ Gnash is a free GPL'd SWF movie player, which works either standalone, or as
browser plugin for Firefox, Mozilla, and Konqueror.
.
This package includes the plugin for Konqueror.
Modified: packages/gnash/trunk/debian/patches/disable_fvisibility-inlines-hidden
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/trunk/debian/patches/disable_fvisibility-inlines-hidden?rev=288&op=diff
==============================================================================
--- packages/gnash/trunk/debian/patches/disable_fvisibility-inlines-hidden (original)
+++ packages/gnash/trunk/debian/patches/disable_fvisibility-inlines-hidden Wed Oct 15 12:39:11 2008
@@ -5,9 +5,11 @@
Thanks to Sylvain Beucler for finding the problem.
---- dummy/configure.ac~ 2008-06-12 16:58:28.000000000 +0200
-+++ dummy/configure.ac 2008-07-01 18:34:09.000000000 +0200
-@@ -1994,7 +1994,7 @@
+Index: gnash-0.8.4/configure.ac
+===================================================================
+--- gnash-0.8.4.orig/configure.ac 2008-10-15 14:28:58.000000000 +0200
++++ gnash-0.8.4/configure.ac 2008-10-15 14:29:04.000000000 +0200
+@@ -2046,7 +2046,7 @@
]
)
Added: packages/gnash/trunk/debian/patches/fix_byte_size.patch
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/trunk/debian/patches/fix_byte_size.patch?rev=288&op=file
==============================================================================
--- packages/gnash/trunk/debian/patches/fix_byte_size.patch (added)
+++ packages/gnash/trunk/debian/patches/fix_byte_size.patch Wed Oct 15 12:39:11 2008
@@ -1,0 +1,104 @@
+http://lists.gnu.org/archive/html/gnash-dev/2008-10/msg00093.html
+
+From: Andreas Schwab <schwab at suse.de>
+Subject: [Gnash-dev] Gnash 0.8.4 bug fixes
+Date: Tue, 14 Oct 2008 19:19:09 +0200
+
+This patch fixes a few bugs in gnash 0.8.4:
+
+amf::Buffer::copy(Network::byte_t): sizeof(bool) has no connection to
+the size of a byte.
+
+amf::RTMPServer::encodePing(rtmp_ping_e, boost::uint32_t) and
+amf::RTMP::encodeHeader(int, rtmp_headersize_e, size_t, content_types_e,
+RTMPMsg::rtmp_source_e): do correct byte swapping (fixes strict
+alignment violation)
+
+amf::RTMP::decodeHeader(Network::byte_t *): remove spurious 4 bits of
+padding.
+
+Andreas.
+
+Index: gnash-0.8.4/libamf/buffer.cpp
+===================================================================
+--- gnash-0.8.4.orig/libamf/buffer.cpp 2008-10-15 14:29:55.000000000 +0200
++++ gnash-0.8.4/libamf/buffer.cpp 2008-10-15 14:30:55.000000000 +0200
+@@ -169,7 +169,7 @@
+ {
+ GNASH_REPORT_FUNCTION;
+ *_ptr = val;
+- _seekptr = _ptr + sizeof(bool);
++ _seekptr = _ptr + sizeof(Network::byte_t);
+ }
+
+ #if 0
+Index: gnash-0.8.4/libnet/rtmp.cpp
+===================================================================
+--- gnash-0.8.4.orig/libnet/rtmp.cpp 2008-10-15 14:31:29.000000000 +0200
++++ gnash-0.8.4/libnet/rtmp.cpp 2008-10-15 14:37:09.000000000 +0200
+@@ -260,7 +260,7 @@
+
+ if (_header.head_size >= 4) {
+ _mystery_word = *tmpptr++;
+- _mystery_word = (_mystery_word << 12) + *tmpptr++;
++ _mystery_word = (_mystery_word << 8) + *tmpptr++;
+ _mystery_word = (_mystery_word << 8) + *tmpptr++;
+
+ log_debug(_("The mystery word is: %d"), _mystery_word);
+@@ -268,7 +268,7 @@
+
+ if (_header.head_size >= 8) {
+ _header.bodysize = *tmpptr++;
+- _header.bodysize = (_header.bodysize << 12) + *tmpptr++;
++ _header.bodysize = (_header.bodysize << 8) + *tmpptr++;
+ _header.bodysize = (_header.bodysize << 8) + *tmpptr++;
+ _header.bodysize = _header.bodysize & 0xffffff;
+ log_debug(_("The body size is: %d"), _header.bodysize);
+@@ -381,17 +381,9 @@
+ // and add the type of the object if the header size is 8 or more.
+ // length is a 3 byte field
+ if ((head_size == HEADER_8) || (head_size == HEADER_12)) {
+-#ifdef BOOST_BIG_ENDIAN
+- boost::uint32_t length = total_size << 8;
+-#else
+- boost::uint32_t length = (htonl(*reinterpret_cast<boost::uint32_t *>(&total_size))) >> 8;
+-#endif
+- memcpy(ptr, &length, 3);
+-// #else
+-// #error "No Endianess specified!"
+-// #endif
+-//#endif
+- ptr += 3;
++ *ptr++ = (total_size >> 16) & 0xff;
++ *ptr++ = (total_size >> 8) & 0xff;
++ *ptr++ = total_size & 0xff;
+ // The type is a one byte field
+ *ptr = type;
+ ptr++;
+@@ -399,7 +391,8 @@
+
+ // Add the routing of the message if the header size is 12, the maximum.
+ if (head_size == HEADER_12) {
+- memcpy(ptr, &routing, 4);
++ boost::uint32_t swapped = htonl(routing);
++ memcpy(ptr, &swapped, 4);
+ ptr += 4;
+ }
+
+Index: gnash-0.8.4/libnet/rtmp_server.cpp
+===================================================================
+--- gnash-0.8.4.orig/libnet/rtmp_server.cpp 2008-10-15 14:37:23.000000000 +0200
++++ gnash-0.8.4/libnet/rtmp_server.cpp 2008-10-15 14:38:18.000000000 +0200
+@@ -628,11 +628,7 @@
+ Network::byte_t *ptr = buf->reference();
+ buf->clear(); // default everything to zeros, real data gets optionally added.
+
+- boost::uint32_t field = htonl(*reinterpret_cast<boost::uint32_t *>(&type));
+-#ifdef BOOST_LITTLE_ENDIAN
+- field = field >> 16;
+-#endif
+- boost::uint16_t typefield = static_cast<boost::uint16_t>(field);
++ boost::uint16_t typefield = htons(type);
+ ptr += sizeof(boost::uint16_t); // go past the first short
+
+ boost::uint32_t swapped = 0;
Modified: packages/gnash/trunk/debian/patches/kde_include_types.patch
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/trunk/debian/patches/kde_include_types.patch?rev=288&op=diff
==============================================================================
--- packages/gnash/trunk/debian/patches/kde_include_types.patch (original)
+++ packages/gnash/trunk/debian/patches/kde_include_types.patch Wed Oct 15 12:39:11 2008
@@ -1,7 +1,7 @@
-Index: gnash-0.8.3~cvs20080604.1501/gui/kde.cpp
+Index: gnash-0.8.4/gui/kde.cpp
===================================================================
---- gnash-0.8.3~cvs20080604.1501.orig/gui/kde.cpp 2008-06-04 16:41:14.000000000 +0000
-+++ gnash-0.8.3~cvs20080604.1501/gui/kde.cpp 2008-06-04 16:41:53.000000000 +0000
+--- gnash-0.8.4.orig/gui/kde.cpp 2008-10-15 14:28:58.000000000 +0200
++++ gnash-0.8.4/gui/kde.cpp 2008-10-15 14:29:04.000000000 +0200
@@ -36,6 +36,7 @@
#endif
#include "Range2d.h"
Modified: packages/gnash/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/trunk/debian/patches/series?rev=288&op=diff
==============================================================================
--- packages/gnash/trunk/debian/patches/series (original)
+++ packages/gnash/trunk/debian/patches/series Wed Oct 15 12:39:11 2008
@@ -1,6 +1,6 @@
-do-not-delete-gmo-files
#fix-upstream-manpage.patch
kde_include_types.patch
disable_fvisibility-inlines-hidden
-netstreamgst_free.patch
+#netstreamgst_free.patch
+fix_byte_size.patch
libgnashserver.patch
More information about the pkg-flash-devel
mailing list