[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ./COPYING ./ChangeLog ./Makefile.am ./aut...
|
From: |
Rob Savoye |
|
Subject: |
[Gnash-commit] gnash ./COPYING ./ChangeLog ./Makefile.am ./aut... |
|
Date: |
Thu, 09 Mar 2006 19:29:08 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Branch:
Changes by: Rob Savoye <address@hidden> 06/03/09 19:29:07
Modified files:
. : COPYING ChangeLog Makefile.am autogen.sh
configure.ac
backend : gnash.cpp
doc/C : plugin.xml
libamf : Makefile.am amf.cpp amf.h amftest.cpp amfutf8.h
libbase : Makefile.am container.h tu_types.h utility.cpp
libgeometry : Makefile.am kd_tree_dynamic.cpp
macros : atk.m4 cairo.m4 dmalloc.m4 docbook.m4
firefox.m4 ghelp.m4 glib.m4 glibmm.m4 gtk2.m4
gtkglext.m4 hashmap.m4 jpeg.m4 kde.m4
libXML++.m4 libXML.m4 libexe.m4 libtool.m4
mad.m4 ming.m4 ogg.m4 opengl.m4 pango.m4 png.m4
pthreads.m4 sdl.m4 zlib.m4
plugin : Makefile.am player.cpp player.h plugin.cpp
plugin.h
plugin/klash : Makefile.am klash_part.cpp klash_part.h
server : Boolean.cpp Boolean.h Camera.cpp Camera.h
Color.cpp Color.h ContextMenu.cpp ContextMenu.h
CustomActions.cpp CustomActions.h Error.cpp
Error.h Function.cpp Function.h LoadVars.cpp
LoadVars.h LocalConnection.cpp
LocalConnection.h Makefile.am Microphone.cpp
Microphone.h Mouse.cpp Mouse.h Movie.cpp
Movie.h MovieClipLoader.cpp MovieClipLoader.h
NetConnection.cpp NetConnection.h NetStream.cpp
NetStream.h Object.cpp Object.h Selection.cpp
Selection.h SharedObject.cpp SharedObject.h
Sprite.cpp Sprite.h Stage.cpp Stage.h
System.cpp System.h TextSnapshot.cpp
TextSnapshot.h Video.cpp Video.h action.h
array.cpp array.h gnash.h gstring.h impl.cpp
impl.h network.cpp network.h shm.cpp shm.h
string.cpp swf.h text.h textformat.cpp
textformat.h thread.h timers.cpp timers.h
xml.cpp xml.h xmlattrs.cpp xmlattrs.h
xmlnode.cpp xmlnode.h xmlsocket.cpp xmlsocket.h
Log message:
* All GPL'd files: Updated the copyright message in all GPL'd
files with the new Mozilla exemption as crafted by the FSF. This
enables Gnash to be used in Mozilla without requiring all the
other plugins to be GPL'd.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/COPYING.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.180&tr2=1.181&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/Makefile.am.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/autogen.sh.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/configure.ac.diff?tr1=1.47&tr2=1.48&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/backend/gnash.cpp.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/doc/C/plugin.xml.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libamf/Makefile.am.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libamf/amf.cpp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libamf/amf.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libamf/amftest.cpp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libamf/amfutf8.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libbase/Makefile.am.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libbase/container.h.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libbase/tu_types.h.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libbase/utility.cpp.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libgeometry/Makefile.am.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libgeometry/kd_tree_dynamic.cpp.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/atk.m4.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/cairo.m4.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/dmalloc.m4.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/docbook.m4.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/firefox.m4.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/ghelp.m4.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/glib.m4.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/glibmm.m4.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/gtk2.m4.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/gtkglext.m4.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/hashmap.m4.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/jpeg.m4.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/kde.m4.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/libXML++.m4.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/libXML.m4.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/libexe.m4.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/libtool.m4.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/mad.m4.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/ming.m4.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/ogg.m4.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/opengl.m4.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/pango.m4.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/png.m4.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/pthreads.m4.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/sdl.m4.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/zlib.m4.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/Makefile.am.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/player.cpp.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/player.h.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/plugin.cpp.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/plugin.h.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/klash/Makefile.am.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/klash/klash_part.cpp.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/klash/klash_part.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Boolean.cpp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Boolean.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Camera.cpp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Camera.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Color.cpp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Color.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/ContextMenu.cpp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/ContextMenu.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/CustomActions.cpp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/CustomActions.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Error.cpp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Error.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Function.cpp.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Function.h.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/LoadVars.cpp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/LoadVars.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/LocalConnection.cpp.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/LocalConnection.h.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Makefile.am.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Microphone.cpp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Microphone.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Mouse.cpp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Mouse.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Movie.cpp.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Movie.h.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/MovieClipLoader.cpp.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/MovieClipLoader.h.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/NetConnection.cpp.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/NetConnection.h.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/NetStream.cpp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/NetStream.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Object.cpp.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Object.h.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Selection.cpp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Selection.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/SharedObject.cpp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/SharedObject.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Sprite.cpp.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Sprite.h.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Stage.cpp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Stage.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/System.cpp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/System.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/TextSnapshot.cpp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/TextSnapshot.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Video.cpp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Video.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/action.h.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/array.cpp.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/array.h.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/gnash.h.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/gstring.h.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/impl.cpp.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/impl.h.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/network.cpp.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/network.h.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/shm.cpp.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/shm.h.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/string.cpp.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/swf.h.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/text.h.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/textformat.cpp.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/textformat.h.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/thread.h.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/timers.cpp.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/timers.h.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/xml.cpp.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/xml.h.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/xmlattrs.cpp.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/xmlattrs.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/xmlnode.cpp.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/xmlnode.h.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/xmlsocket.cpp.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/xmlsocket.h.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
Patches:
Index: gnash/COPYING
diff -u gnash/COPYING:1.1 gnash/COPYING:1.2
--- gnash/COPYING:1.1 Tue Dec 20 21:03:23 2005
+++ gnash/COPYING Thu Mar 9 19:29:05 2006
@@ -338,3 +338,25 @@
consider it more useful to permit linking proprietary applications with the
library. If this is what you want to do, use the GNU Library General
Public License instead of this License.
+
+===============================================================
+Linking Gnash statically or dynamically with other modules is making
+a combined work based on Gnash. Thus, the terms and conditions of
+the GNU General Public License cover the whole combination.
+
+In addition, as a special exception, the copyright holders of Gnash give
+you permission to combine Gnash with free software programs or
+libraries that are released under the GNU LGPL and/or with Mozilla,
+so long as the linking with Mozilla, or any variant of Mozilla, is
+through its standard plug-in interface. You may copy and distribute
+such a system following the terms of the GNU GPL for Gnash and the
+licenses of the other code concerned, provided that you include the
+source code of that other code when and as the GNU GPL requires
+distribution of source code.
+
+Note that people who make modified versions of Gnash are not obligated
+to grant this special exception for their modified versions; it is
+their choice whether to do so. The GNU General Public License gives
+permission to release a modified version without this exception; this
+exception also makes it possible to release a modified version which
+carries forward this exception.
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.180 gnash/ChangeLog:1.181
--- gnash/ChangeLog:1.180 Thu Mar 9 13:42:30 2006
+++ gnash/ChangeLog Thu Mar 9 19:29:05 2006
@@ -1,3 +1,10 @@
+2006-03-09 Rob Savoye <address@hidden>
+
+ * All GPL'd files: Updated the copyright message in all GPL'd
+ files with the new Mozilla exemption as crafted by the FSF. This
+ enables Gnash to be used in Mozilla without requiring all the
+ other plugins to be GPL'd.
+
2006-03-09 Michael Carlson <address@hidden>
* server/Date.cpp: Implement all Date::getUTC functions, convert
@@ -6,6 +13,10 @@
* server/Date.h: Add Date::convertUTC function for internal use,
convert to tab indenting
+2006-03-08 Rob Savoye <address@hidden>
+
+ * configure.ac: Make using XML the default.
+
2006-03-08 Michael Carlson <address@hidden>
* backend/gnash.cpp: Fix typo in and add newline to error message
@@ -18,6 +29,13 @@
rename set() to setDate()
* server/array.cpp: Add some constants related to sorting
+2006-03-07 Rob Savoye <address@hidden>
+
+ * doc/C/plugin.xml: New file for internals on writing Mozilla
+ plugins.
+ * doc/C/internals.xml: Include new plugin section.
+ * doc/C/Makefile.in: Add plugin.xml to the list of doc chapters.
+
2006-03-06 Rob Savoye <address@hidden>
* server/shm.cpp: Clear up ifdef mess... Both shm_open() and
@@ -193,7 +211,7 @@
malloc.h.
* libbase/tu_swap.h: OpenBSD defines swap macros with the same
name as these functions, so use our implementation intead.
- * macros/pthread.h: Reqwrite to handle weird NetBSD pth versus
+ * macros/pthread.h: Reqwrite to handle weird NetBSD Pth versus
Pthread problem.
* macros/sdl.m4: Throw out compile test for something simpler and
more portable.
@@ -538,7 +556,7 @@
2006-02-11 Rob Savoye <address@hidden>
* server/xmlnode.{h,cpp): Implement nodeType property.
- * testsuite/actionscript.all/XMLNode.as: add test for
+ * testsuite/actionscript.all/XMLNode.as: Add test for
XMLNode::nodeType property.
* doc/C/xmlnode.xml: New file for accidentally skipped class.
* doc/C/internals.xml: Update section on using as_value
@@ -583,7 +601,7 @@
destructor.
* server/action.cpp: Define virtual destructor for
as_property_interface.
- * server/gnash.h: Define virutal destructor for import_visitor.
+ * server/gnash.h: Define virtual destructor for import_visitor.
* server/shape.{h,cpp}: Define destructor for tesselating_shape.
* server/styles.h: Define destructors for base_fill_style and
base_line_style.
Index: gnash/Makefile.am
diff -u gnash/Makefile.am:1.15 gnash/Makefile.am:1.16
--- gnash/Makefile.am:1.15 Sun Mar 5 01:57:08 2006
+++ gnash/Makefile.am Thu Mar 9 19:29:05 2006
@@ -1,14 +1,41 @@
#
-# Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
+# Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Linking Gnash statically or dynamically with other modules is making
+# a combined work based on Gnash. Thus, the terms and conditions of
+# the GNU General Public License cover the whole combination.
+#
+# In addition, as a special exception, the copyright holders of Gnash give
+# you permission to combine Gnash with free software programs or
+# libraries that are released under the GNU LGPL and/or with Mozilla,
+# so long as the linking with Mozilla, or any variant of Mozilla, is
+# through its standard plug-in interface. You may copy and distribute
+# such a system following the terms of the GNU GPL for Gnash and the
+# licenses of the other code concerned, provided that you include the
+# source code of that other code when and as the GNU GPL requires
+# distribution of source code.
+#
+# Note that people who make modified versions of Gnash are not obligated
+# to grant this special exception for their modified versions; it is
+# their choice whether to do so. The GNU General Public License gives
+# permission to release a modified version without this exception; this
+# exception also makes it possible to release a modified version which
+# carries forward this exception.
+#
+
## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS = dejagnu
ACLOCAL_AMFLAGS = -I macros
Index: gnash/autogen.sh
diff -u gnash/autogen.sh:1.4 gnash/autogen.sh:1.5
--- gnash/autogen.sh:1.4 Thu Feb 9 02:33:53 2006
+++ gnash/autogen.sh Thu Mar 9 19:29:05 2006
@@ -1,21 +1,43 @@
#!/bin/sh
+
#
# Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Linking Gnash statically or dynamically with other modules is making
+# a combined work based on Gnash. Thus, the terms and conditions of
+# the GNU General Public License cover the whole combination.
+#
+# In addition, as a special exception, the copyright holders of Gnash give
+# you permission to combine Gnash with free software programs or
+# libraries that are released under the GNU LGPL and/or with Mozilla,
+# so long as the linking with Mozilla, or any variant of Mozilla, is
+# through its standard plug-in interface. You may copy and distribute
+# such a system following the terms of the GNU GPL for Gnash and the
+# licenses of the other code concerned, provided that you include the
+# source code of that other code when and as the GNU GPL requires
+# distribution of source code.
+#
+# Note that people who make modified versions of Gnash are not obligated
+# to grant this special exception for their modified versions; it is
+# their choice whether to do so. The GNU General Public License gives
+# permission to release a modified version without this exception; this
+# exception also makes it possible to release a modified version which
+# carries forward this exception.
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-#
+
# Run this to generate all the initial makefiles, etc.
srcdir=`dirname $0`
Index: gnash/backend/gnash.cpp
diff -u gnash/backend/gnash.cpp:1.14 gnash/backend/gnash.cpp:1.15
--- gnash/backend/gnash.cpp:1.14 Wed Mar 8 12:53:36 2006
+++ gnash/backend/gnash.cpp Thu Mar 9 19:29:05 2006
@@ -580,23 +580,24 @@
break;
}
- bool ret = true;
if (do_render) {
SDL_Event event;
// Handle input.
+ bool ret = true;
while (ret) {
- //printf("xml_fd is %d, gofast is %d, s_start_waiting is %d\n" ,
xml_fd, gofast, s_start_waiting);
+// printf("xml_fd is %d, gofast is %d, s_start_waiting is %d,
s_event_thread is %d\n",
+// xml_fd, gofast, s_start_waiting, s_event_thread);
#ifdef HAVE_LIBXML
if (s_event_thread && s_start_waiting && (xml_fd > 0) && !gofast) {
- // if (s_event_thread && (xml_fd > 0)) {
- //printf("SDL_WaitEvent!\n");
+ // if (s_event_thread && (xml_fd >
0)) {
+// printf("SDL_WaitEvent!\n");
ret = SDL_WaitEvent(&event);
} else {
- if (gofast) {
- //printf("SDL_PollEvent GOFAST!\n");
- } else {
- //printf("SDL_PollEvent!\n");
- }
+// if (gofast) {
+// printf("SDL_PollEvent GOFAST!\n");
+// } else {
+// printf("SDL_PollEvent!\n");
+// }
ret = SDL_PollEvent(&event) ? true : false;
}
#else
@@ -607,10 +608,13 @@
ret = SDL_WaitEvent(&event);
#endif
- //printf("EVENT Type is %d\n", event.type);
+// printf("EVENT Type is %d\n", event.type);
switch (event.type) {
+ case SDL_NOEVENT:
+ ret = false;
+ break;
case SDL_USEREVENT:
- //printf("SDL_USER_EVENT at %s, code %d%d\n", __FUNCTION__,
__LINE__, event.user.code);
+// printf("SDL_USER_EVENT at %s, code %d%d\n", __FUNCTION__,
__LINE__, event.user.code);
ret = false;
break;
case SDL_KEYDOWN:
@@ -721,7 +725,9 @@
}
}
}
-
+
+// printf("%s(%d): Frame count is %d\n", __PRETTY_FUNCTION__, __LINE__,
+// md->get_frame_count());
m = gnash::get_current_root();
gnash::delete_unused_root();
@@ -740,7 +746,7 @@
frame_counter++;
if (do_render) {
- SDL_GL_SwapBuffers();
+ SDL_GL_SwapBuffers();
//glPopAttrib ();
if (s_measure_performance == false) {
Index: gnash/configure.ac
diff -u gnash/configure.ac:1.47 gnash/configure.ac:1.48
--- gnash/configure.ac:1.47 Mon Mar 6 20:13:00 2006
+++ gnash/configure.ac Thu Mar 9 19:29:05 2006
@@ -1,21 +1,40 @@
-dnl Process this file with autoconf to produce a configure script.
-dnl
-dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-dnl
+dnl
+dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+dnl
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
dnl the Free Software Foundation; either version 2 of the License, or
dnl (at your option) any later version.
-dnl
+dnl
dnl This program is distributed in the hope that it will be useful,
dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
dnl GNU General Public License for more details.
-dnl
dnl You should have received a copy of the GNU General Public License
dnl along with this program; if not, write to the Free Software
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
+dnl
+dnl Linking Gnash statically or dynamically with other modules is making
+dnl a combined work based on Gnash. Thus, the terms and conditions of
+dnl the GNU General Public License cover the whole combination.
+dnl
+dnl In addition, as a special exception, the copyright holders of Gnash give
+dnl you permission to combine Gnash with free software programs or
+dnl libraries that are released under the GNU LGPL and/or with Mozilla,
+dnl so long as the linking with Mozilla, or any variant of Mozilla, is
+dnl through its standard plug-in interface. You may copy and distribute
+dnl such a system following the terms of the GNU GPL for Gnash and the
+dnl licenses of the other code concerned, provided that you include the
+dnl source code of that other code when and as the GNU GPL requires
+dnl distribution of source code.
+dnl
+dnl Note that people who make modified versions of Gnash are not obligated
+dnl to grant this special exception for their modified versions; it is
+dnl their choice whether to do so. The GNU General Public License gives
+dnl permission to release a modified version without this exception; this
+dnl exception also makes it possible to release a modified version which
+dnl carries forward this exception.
+dnl
AC_PREREQ(2.50)
AC_INIT(server/gnash.h)
AM_CONFIG_HEADER(config.h)
@@ -49,7 +68,7 @@
yes) xml=yes ;;
no) xml=no ;;
*) AC_MSG_ERROR([bad value ${enableval} for disable-xml option]) ;;
-esac],xml=no)
+esac],xml=yes)
if test x$xml != xno; then
AM_PATH_LIBXML2
Index: gnash/doc/C/plugin.xml
diff -u gnash/doc/C/plugin.xml:1.1 gnash/doc/C/plugin.xml:1.2
--- gnash/doc/C/plugin.xml:1.1 Wed Mar 8 02:48:55 2006
+++ gnash/doc/C/plugin.xml Thu Mar 9 19:29:05 2006
@@ -1,4 +1,4 @@
-<sect4 id="plugin">
+<sect4 id="mozplugin">
<title>Mozilla/Firefox Plugin</title>
<para>
@@ -18,7 +18,6 @@
create the plugin, and to send it data.
</para>
-
<para>
When initializing or destroying a plugin, no matter how many
instances are being used, the C API is used. These functions are
@@ -334,10 +333,10 @@
</para>
<para>
- Rather than directly the X11 event system, Gnash uses SDL from
- within the player main loop itself to process events. Optional
- Gnash can use a separete thread to process user events by
- pushing them into the SDL event queue quicker.
+ Rather than directly hook into the X11 event system, Gnash uses
+ SDL from within the player main loop itself to process
+ events. Optional Gnash can use a separete thread to process user
+ events by pushing them into the SDL event queue quicker.
</para>
</sect5>
Index: gnash/libamf/Makefile.am
diff -u gnash/libamf/Makefile.am:1.3 gnash/libamf/Makefile.am:1.4
--- gnash/libamf/Makefile.am:1.3 Sun Feb 26 15:49:29 2006
+++ gnash/libamf/Makefile.am Thu Mar 9 19:29:05 2006
@@ -1,20 +1,40 @@
## Process this file with automake to generate Makefile.in
#
# Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Linking Gnash statically or dynamically with other modules is making
+# a combined work based on Gnash. Thus, the terms and conditions of
+# the GNU General Public License cover the whole combination.
+#
+# In addition, as a special exception, the copyright holders of Gnash give
+# you permission to combine Gnash with free software programs or
+# libraries that are released under the GNU LGPL and/or with Mozilla,
+# so long as the linking with Mozilla, or any variant of Mozilla, is
+# through its standard plug-in interface. You may copy and distribute
+# such a system following the terms of the GNU GPL for Gnash and the
+# licenses of the other code concerned, provided that you include the
+# source code of that other code when and as the GNU GPL requires
+# distribution of source code.
+#
+# Note that people who make modified versions of Gnash are not obligated
+# to grant this special exception for their modified versions; it is
+# their choice whether to do so. The GNU General Public License gives
+# permission to release a modified version without this exception; this
+# exception also makes it possible to release a modified version which
+# carries forward this exception.
#
AUTOMAKE_OPTIONS =
Index: gnash/libamf/amf.cpp
diff -u gnash/libamf/amf.cpp:1.2 gnash/libamf/amf.cpp:1.3
--- gnash/libamf/amf.cpp:1.2 Mon Feb 13 17:48:28 2006
+++ gnash/libamf/amf.cpp Thu Mar 9 19:29:06 2006
@@ -1,19 +1,39 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
//
#ifdef HAVE_CONFIG_H
Index: gnash/libamf/amf.h
diff -u gnash/libamf/amf.h:1.1 gnash/libamf/amf.h:1.2
--- gnash/libamf/amf.h:1.1 Mon Feb 13 01:15:59 2006
+++ gnash/libamf/amf.h Thu Mar 9 19:29:06 2006
@@ -1,20 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-//python setup.py develop
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
#ifndef _AMF_H_
#define _AMF_H_
Index: gnash/libamf/amftest.cpp
diff -u gnash/libamf/amftest.cpp:1.2 gnash/libamf/amftest.cpp:1.3
--- gnash/libamf/amftest.cpp:1.2 Mon Feb 13 17:48:28 2006
+++ gnash/libamf/amftest.cpp Thu Mar 9 19:29:06 2006
@@ -1,19 +1,39 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
//
#ifdef HAVE_CONFIG_H
Index: gnash/libamf/amfutf8.h
diff -u gnash/libamf/amfutf8.h:1.1 gnash/libamf/amfutf8.h:1.2
--- gnash/libamf/amfutf8.h:1.1 Mon Feb 13 01:15:59 2006
+++ gnash/libamf/amfutf8.h Thu Mar 9 19:29:06 2006
@@ -1,20 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-//python setup.py develop
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
#ifndef _AMFUTF8_H_
#define _AMFUTF8_H_
Index: gnash/libbase/Makefile.am
diff -u gnash/libbase/Makefile.am:1.15 gnash/libbase/Makefile.am:1.16
--- gnash/libbase/Makefile.am:1.15 Mon Mar 6 01:43:26 2006
+++ gnash/libbase/Makefile.am Thu Mar 9 19:29:06 2006
@@ -1,20 +1,41 @@
## Process this file with automake to generate Makefile.in
+
#
# Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Linking Gnash statically or dynamically with other modules is making
+# a combined work based on Gnash. Thus, the terms and conditions of
+# the GNU General Public License cover the whole combination.
+#
+# In addition, as a special exception, the copyright holders of Gnash give
+# you permission to combine Gnash with free software programs or
+# libraries that are released under the GNU LGPL and/or with Mozilla,
+# so long as the linking with Mozilla, or any variant of Mozilla, is
+# through its standard plug-in interface. You may copy and distribute
+# such a system following the terms of the GNU GPL for Gnash and the
+# licenses of the other code concerned, provided that you include the
+# source code of that other code when and as the GNU GPL requires
+# distribution of source code.
+#
+# Note that people who make modified versions of Gnash are not obligated
+# to grant this special exception for their modified versions; it is
+# their choice whether to do so. The GNU General Public License gives
+# permission to release a modified version without this exception; this
+# exception also makes it possible to release a modified version which
+# carries forward this exception.
#
AUTOMAKE_OPTIONS =
Index: gnash/libbase/container.h
diff -u gnash/libbase/container.h:1.10 gnash/libbase/container.h:1.11
--- gnash/libbase/container.h:1.10 Mon Mar 6 01:43:26 2006
+++ gnash/libbase/container.h Thu Mar 9 19:29:06 2006
@@ -1,21 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
//
-
#ifndef __CONTAINER_H__
#define __CONTAINER_H__
Index: gnash/libbase/tu_types.h
diff -u gnash/libbase/tu_types.h:1.3 gnash/libbase/tu_types.h:1.4
--- gnash/libbase/tu_types.h:1.3 Fri Jan 27 06:21:09 2006
+++ gnash/libbase/tu_types.h Thu Mar 9 19:29:06 2006
@@ -1,20 +1,40 @@
+//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
//
-
#ifndef TU_TYPES_H
#define TU_TYPES_H
Index: gnash/libbase/utility.cpp
diff -u gnash/libbase/utility.cpp:1.4 gnash/libbase/utility.cpp:1.5
--- gnash/libbase/utility.cpp:1.4 Thu Mar 2 17:34:36 2006
+++ gnash/libbase/utility.cpp Thu Mar 9 19:29:06 2006
@@ -1,20 +1,40 @@
+//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
//
-
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Index: gnash/libgeometry/Makefile.am
diff -u gnash/libgeometry/Makefile.am:1.10 gnash/libgeometry/Makefile.am:1.11
--- gnash/libgeometry/Makefile.am:1.10 Sun Feb 26 15:49:30 2006
+++ gnash/libgeometry/Makefile.am Thu Mar 9 19:29:06 2006
@@ -1,20 +1,40 @@
## Process this file with automake to generate Makefile.in
#
# Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Linking Gnash statically or dynamically with other modules is making
+# a combined work based on Gnash. Thus, the terms and conditions of
+# the GNU General Public License cover the whole combination.
+#
+# In addition, as a special exception, the copyright holders of Gnash give
+# you permission to combine Gnash with free software programs or
+# libraries that are released under the GNU LGPL and/or with Mozilla,
+# so long as the linking with Mozilla, or any variant of Mozilla, is
+# through its standard plug-in interface. You may copy and distribute
+# such a system following the terms of the GNU GPL for Gnash and the
+# licenses of the other code concerned, provided that you include the
+# source code of that other code when and as the GNU GPL requires
+# distribution of source code.
+#
+# Note that people who make modified versions of Gnash are not obligated
+# to grant this special exception for their modified versions; it is
+# their choice whether to do so. The GNU General Public License gives
+# permission to release a modified version without this exception; this
+# exception also makes it possible to release a modified version which
+# carries forward this exception.
#
AUTOMAKE_OPTIONS =
Index: gnash/libgeometry/kd_tree_dynamic.cpp
diff -u gnash/libgeometry/kd_tree_dynamic.cpp:1.5
gnash/libgeometry/kd_tree_dynamic.cpp:1.6
--- gnash/libgeometry/kd_tree_dynamic.cpp:1.5 Sun Feb 26 15:49:30 2006
+++ gnash/libgeometry/kd_tree_dynamic.cpp Thu Mar 9 19:29:06 2006
@@ -6,7 +6,8 @@
// Utility kd-tree structure, for building kd-trees from triangle
// soup.
-
+// #include <wctype.h>
+// #include <wchar.h>
#include <stdio.h>
#include "kd_tree_dynamic.h"
Index: gnash/macros/atk.m4
diff -u gnash/macros/atk.m4:1.1 gnash/macros/atk.m4:1.2
--- gnash/macros/atk.m4:1.1 Fri Feb 24 00:06:21 2006
+++ gnash/macros/atk.m4 Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
-dnl
-dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-dnl
+dnl
+dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+dnl
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
dnl the Free Software Foundation; either version 2 of the License, or
dnl (at your option) any later version.
-dnl
+dnl
dnl This program is distributed in the hope that it will be useful,
dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
dnl GNU General Public License for more details.
-dnl
dnl You should have received a copy of the GNU General Public License
dnl along with this program; if not, write to the Free Software
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+dnl
+dnl Linking Gnash statically or dynamically with other modules is making
+dnl a combined work based on Gnash. Thus, the terms and conditions of
+dnl the GNU General Public License cover the whole combination.
+dnl
+dnl In addition, as a special exception, the copyright holders of Gnash give
+dnl you permission to combine Gnash with free software programs or
+dnl libraries that are released under the GNU LGPL and/or with Mozilla,
+dnl so long as the linking with Mozilla, or any variant of Mozilla, is
+dnl through its standard plug-in interface. You may copy and distribute
+dnl such a system following the terms of the GNU GPL for Gnash and the
+dnl licenses of the other code concerned, provided that you include the
+dnl source code of that other code when and as the GNU GPL requires
+dnl distribution of source code.
+dnl
+dnl Note that people who make modified versions of Gnash are not obligated
+dnl to grant this special exception for their modified versions; it is
+dnl their choice whether to do so. The GNU General Public License gives
+dnl permission to release a modified version without this exception; this
+dnl exception also makes it possible to release a modified version which
+dnl carries forward this exception.
+dnl
AC_DEFUN([GNASH_PATH_ATK],
[
Index: gnash/macros/cairo.m4
diff -u gnash/macros/cairo.m4:1.1 gnash/macros/cairo.m4:1.2
--- gnash/macros/cairo.m4:1.1 Fri Feb 24 00:06:21 2006
+++ gnash/macros/cairo.m4 Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
-dnl
-dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-dnl
+dnl
+dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+dnl
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
dnl the Free Software Foundation; either version 2 of the License, or
dnl (at your option) any later version.
-dnl
+dnl
dnl This program is distributed in the hope that it will be useful,
dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
dnl GNU General Public License for more details.
-dnl
dnl You should have received a copy of the GNU General Public License
dnl along with this program; if not, write to the Free Software
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+dnl
+dnl Linking Gnash statically or dynamically with other modules is making
+dnl a combined work based on Gnash. Thus, the terms and conditions of
+dnl the GNU General Public License cover the whole combination.
+dnl
+dnl In addition, as a special exception, the copyright holders of Gnash give
+dnl you permission to combine Gnash with free software programs or
+dnl libraries that are released under the GNU LGPL and/or with Mozilla,
+dnl so long as the linking with Mozilla, or any variant of Mozilla, is
+dnl through its standard plug-in interface. You may copy and distribute
+dnl such a system following the terms of the GNU GPL for Gnash and the
+dnl licenses of the other code concerned, provided that you include the
+dnl source code of that other code when and as the GNU GPL requires
+dnl distribution of source code.
+dnl
+dnl Note that people who make modified versions of Gnash are not obligated
+dnl to grant this special exception for their modified versions; it is
+dnl their choice whether to do so. The GNU General Public License gives
+dnl permission to release a modified version without this exception; this
+dnl exception also makes it possible to release a modified version which
+dnl carries forward this exception.
+dnl
AC_DEFUN([GNASH_PATH_CAIRO],
[
Index: gnash/macros/dmalloc.m4
diff -u gnash/macros/dmalloc.m4:1.4 gnash/macros/dmalloc.m4:1.5
--- gnash/macros/dmalloc.m4:1.4 Mon Feb 20 17:05:34 2006
+++ gnash/macros/dmalloc.m4 Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
-dnl
-dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-dnl
+dnl
+dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+dnl
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
dnl the Free Software Foundation; either version 2 of the License, or
dnl (at your option) any later version.
-dnl
+dnl
dnl This program is distributed in the hope that it will be useful,
dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
dnl GNU General Public License for more details.
-dnl
dnl You should have received a copy of the GNU General Public License
dnl along with this program; if not, write to the Free Software
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+dnl
+dnl Linking Gnash statically or dynamically with other modules is making
+dnl a combined work based on Gnash. Thus, the terms and conditions of
+dnl the GNU General Public License cover the whole combination.
+dnl
+dnl In addition, as a special exception, the copyright holders of Gnash give
+dnl you permission to combine Gnash with free software programs or
+dnl libraries that are released under the GNU LGPL and/or with Mozilla,
+dnl so long as the linking with Mozilla, or any variant of Mozilla, is
+dnl through its standard plug-in interface. You may copy and distribute
+dnl such a system following the terms of the GNU GPL for Gnash and the
+dnl licenses of the other code concerned, provided that you include the
+dnl source code of that other code when and as the GNU GPL requires
+dnl distribution of source code.
+dnl
+dnl Note that people who make modified versions of Gnash are not obligated
+dnl to grant this special exception for their modified versions; it is
+dnl their choice whether to do so. The GNU General Public License gives
+dnl permission to release a modified version without this exception; this
+dnl exception also makes it possible to release a modified version which
+dnl carries forward this exception.
+dnl
AC_DEFUN([GNASH_PATH_DMALLOC],
[
Index: gnash/macros/docbook.m4
diff -u gnash/macros/docbook.m4:1.12 gnash/macros/docbook.m4:1.13
--- gnash/macros/docbook.m4:1.12 Sat Mar 4 16:32:24 2006
+++ gnash/macros/docbook.m4 Thu Mar 9 19:29:06 2006
@@ -1,20 +1,40 @@
-dnl Process this file with autoconf to produce a configure script.
-dnl
-dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-dnl
+dnl
+dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+dnl
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
dnl the Free Software Foundation; either version 2 of the License, or
dnl (at your option) any later version.
-dnl
+dnl
dnl This program is distributed in the hope that it will be useful,
dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
dnl GNU General Public License for more details.
-dnl
dnl You should have received a copy of the GNU General Public License
dnl along with this program; if not, write to the Free Software
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+dnl
+dnl Linking Gnash statically or dynamically with other modules is making
+dnl a combined work based on Gnash. Thus, the terms and conditions of
+dnl the GNU General Public License cover the whole combination.
+dnl
+dnl In addition, as a special exception, the copyright holders of Gnash give
+dnl you permission to combine Gnash with free software programs or
+dnl libraries that are released under the GNU LGPL and/or with Mozilla,
+dnl so long as the linking with Mozilla, or any variant of Mozilla, is
+dnl through its standard plug-in interface. You may copy and distribute
+dnl such a system following the terms of the GNU GPL for Gnash and the
+dnl licenses of the other code concerned, provided that you include the
+dnl source code of that other code when and as the GNU GPL requires
+dnl distribution of source code.
+dnl
+dnl Note that people who make modified versions of Gnash are not obligated
+dnl to grant this special exception for their modified versions; it is
+dnl their choice whether to do so. The GNU General Public License gives
+dnl permission to release a modified version without this exception; this
+dnl exception also makes it possible to release a modified version which
+dnl carries forward this exception.
+dnl
AC_DEFUN([GNASH_DOCBOOK], [
Index: gnash/macros/firefox.m4
diff -u gnash/macros/firefox.m4:1.12 gnash/macros/firefox.m4:1.13
--- gnash/macros/firefox.m4:1.12 Sun Mar 5 01:57:08 2006
+++ gnash/macros/firefox.m4 Thu Mar 9 19:29:06 2006
@@ -1,20 +1,40 @@
-dnl Process this file with autoconf to produce a configure script.
-dnl
-dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-dnl
+dnl
+dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+dnl
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
dnl the Free Software Foundation; either version 2 of the License, or
dnl (at your option) any later version.
-dnl
+dnl
dnl This program is distributed in the hope that it will be useful,
dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
dnl GNU General Public License for more details.
-dnl
dnl You should have received a copy of the GNU General Public License
dnl along with this program; if not, write to the Free Software
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+dnl
+dnl Linking Gnash statically or dynamically with other modules is making
+dnl a combined work based on Gnash. Thus, the terms and conditions of
+dnl the GNU General Public License cover the whole combination.
+dnl
+dnl In addition, as a special exception, the copyright holders of Gnash give
+dnl you permission to combine Gnash with free software programs or
+dnl libraries that are released under the GNU LGPL and/or with Mozilla,
+dnl so long as the linking with Mozilla, or any variant of Mozilla, is
+dnl through its standard plug-in interface. You may copy and distribute
+dnl such a system following the terms of the GNU GPL for Gnash and the
+dnl licenses of the other code concerned, provided that you include the
+dnl source code of that other code when and as the GNU GPL requires
+dnl distribution of source code.
+dnl
+dnl Note that people who make modified versions of Gnash are not obligated
+dnl to grant this special exception for their modified versions; it is
+dnl their choice whether to do so. The GNU General Public License gives
+dnl permission to release a modified version without this exception; this
+dnl exception also makes it possible to release a modified version which
+dnl carries forward this exception.
+dnl
dnl Configure paths for Firefox. We used to run firefox-config, but that
dnl got too messy. Then with a little experimentation we determined
@@ -173,4 +193,4 @@
AC_SUBST(FIREFOX_DEFS)
AC_SUBST(FIREFOX_PLUGINS)
])
-dnl end of GNASH_PATH_FIREFO
\ No newline at end of file
+dnl end of GNASH_PATH_FIREFO
Index: gnash/macros/ghelp.m4
diff -u gnash/macros/ghelp.m4:1.5 gnash/macros/ghelp.m4:1.6
--- gnash/macros/ghelp.m4:1.5 Thu Feb 9 15:15:28 2006
+++ gnash/macros/ghelp.m4 Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
-dnl
-dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-dnl
+dnl
+dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+dnl
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
dnl the Free Software Foundation; either version 2 of the License, or
dnl (at your option) any later version.
-dnl
+dnl
dnl This program is distributed in the hope that it will be useful,
dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
dnl GNU General Public License for more details.
-dnl
dnl You should have received a copy of the GNU General Public License
dnl along with this program; if not, write to the Free Software
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+dnl
+dnl Linking Gnash statically or dynamically with other modules is making
+dnl a combined work based on Gnash. Thus, the terms and conditions of
+dnl the GNU General Public License cover the whole combination.
+dnl
+dnl In addition, as a special exception, the copyright holders of Gnash give
+dnl you permission to combine Gnash with free software programs or
+dnl libraries that are released under the GNU LGPL and/or with Mozilla,
+dnl so long as the linking with Mozilla, or any variant of Mozilla, is
+dnl through its standard plug-in interface. You may copy and distribute
+dnl such a system following the terms of the GNU GPL for Gnash and the
+dnl licenses of the other code concerned, provided that you include the
+dnl source code of that other code when and as the GNU GPL requires
+dnl distribution of source code.
+dnl
+dnl Note that people who make modified versions of Gnash are not obligated
+dnl to grant this special exception for their modified versions; it is
+dnl their choice whether to do so. The GNU General Public License gives
+dnl permission to release a modified version without this exception; this
+dnl exception also makes it possible to release a modified version which
+dnl carries forward this exception.
+dnl
AC_DEFUN([GNASH_PATH_GHELP],
[
Index: gnash/macros/glib.m4
diff -u gnash/macros/glib.m4:1.1 gnash/macros/glib.m4:1.2
--- gnash/macros/glib.m4:1.1 Fri Feb 24 00:06:21 2006
+++ gnash/macros/glib.m4 Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
-dnl
-dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-dnl
+dnl
+dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+dnl
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
dnl the Free Software Foundation; either version 2 of the License, or
dnl (at your option) any later version.
-dnl
+dnl
dnl This program is distributed in the hope that it will be useful,
dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
dnl GNU General Public License for more details.
-dnl
dnl You should have received a copy of the GNU General Public License
dnl along with this program; if not, write to the Free Software
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+dnl
+dnl Linking Gnash statically or dynamically with other modules is making
+dnl a combined work based on Gnash. Thus, the terms and conditions of
+dnl the GNU General Public License cover the whole combination.
+dnl
+dnl In addition, as a special exception, the copyright holders of Gnash give
+dnl you permission to combine Gnash with free software programs or
+dnl libraries that are released under the GNU LGPL and/or with Mozilla,
+dnl so long as the linking with Mozilla, or any variant of Mozilla, is
+dnl through its standard plug-in interface. You may copy and distribute
+dnl such a system following the terms of the GNU GPL for Gnash and the
+dnl licenses of the other code concerned, provided that you include the
+dnl source code of that other code when and as the GNU GPL requires
+dnl distribution of source code.
+dnl
+dnl Note that people who make modified versions of Gnash are not obligated
+dnl to grant this special exception for their modified versions; it is
+dnl their choice whether to do so. The GNU General Public License gives
+dnl permission to release a modified version without this exception; this
+dnl exception also makes it possible to release a modified version which
+dnl carries forward this exception.
+dnl
AC_DEFUN([GNASH_PATH_GLIB],
[
Index: gnash/macros/glibmm.m4
diff -u gnash/macros/glibmm.m4:1.3 gnash/macros/glibmm.m4:1.4
--- gnash/macros/glibmm.m4:1.3 Wed Feb 1 23:58:31 2006
+++ gnash/macros/glibmm.m4 Thu Mar 9 19:29:06 2006
@@ -1,20 +1,40 @@
-dnl Process this file with autoconf to produce a configure script.
-dnl
-dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-dnl
+dnl
+dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+dnl
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
dnl the Free Software Foundation; either version 2 of the License, or
dnl (at your option) any later version.
-dnl
+dnl
dnl This program is distributed in the hope that it will be useful,
dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
dnl GNU General Public License for more details.
-dnl
dnl You should have received a copy of the GNU General Public License
dnl along with this program; if not, write to the Free Software
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+dnl
+dnl Linking Gnash statically or dynamically with other modules is making
+dnl a combined work based on Gnash. Thus, the terms and conditions of
+dnl the GNU General Public License cover the whole combination.
+dnl
+dnl In addition, as a special exception, the copyright holders of Gnash give
+dnl you permission to combine Gnash with free software programs or
+dnl libraries that are released under the GNU LGPL and/or with Mozilla,
+dnl so long as the linking with Mozilla, or any variant of Mozilla, is
+dnl through its standard plug-in interface. You may copy and distribute
+dnl such a system following the terms of the GNU GPL for Gnash and the
+dnl licenses of the other code concerned, provided that you include the
+dnl source code of that other code when and as the GNU GPL requires
+dnl distribution of source code.
+dnl
+dnl Note that people who make modified versions of Gnash are not obligated
+dnl to grant this special exception for their modified versions; it is
+dnl their choice whether to do so. The GNU General Public License gives
+dnl permission to release a modified version without this exception; this
+dnl exception also makes it possible to release a modified version which
+dnl carries forward this exception.
+dnl
AC_DEFUN([AM_PATH_GLIBMM],
[dnl
Index: gnash/macros/gtk2.m4
diff -u gnash/macros/gtk2.m4:1.1 gnash/macros/gtk2.m4:1.2
--- gnash/macros/gtk2.m4:1.1 Fri Feb 24 00:06:21 2006
+++ gnash/macros/gtk2.m4 Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
-dnl
-dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-dnl
+dnl
+dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+dnl
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
dnl the Free Software Foundation; either version 2 of the License, or
dnl (at your option) any later version.
-dnl
+dnl
dnl This program is distributed in the hope that it will be useful,
dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
dnl GNU General Public License for more details.
-dnl
dnl You should have received a copy of the GNU General Public License
dnl along with this program; if not, write to the Free Software
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+dnl
+dnl Linking Gnash statically or dynamically with other modules is making
+dnl a combined work based on Gnash. Thus, the terms and conditions of
+dnl the GNU General Public License cover the whole combination.
+dnl
+dnl In addition, as a special exception, the copyright holders of Gnash give
+dnl you permission to combine Gnash with free software programs or
+dnl libraries that are released under the GNU LGPL and/or with Mozilla,
+dnl so long as the linking with Mozilla, or any variant of Mozilla, is
+dnl through its standard plug-in interface. You may copy and distribute
+dnl such a system following the terms of the GNU GPL for Gnash and the
+dnl licenses of the other code concerned, provided that you include the
+dnl source code of that other code when and as the GNU GPL requires
+dnl distribution of source code.
+dnl
+dnl Note that people who make modified versions of Gnash are not obligated
+dnl to grant this special exception for their modified versions; it is
+dnl their choice whether to do so. The GNU General Public License gives
+dnl permission to release a modified version without this exception; this
+dnl exception also makes it possible to release a modified version which
+dnl carries forward this exception.
+dnl
AC_DEFUN([GNASH_PATH_GTK2],
[
Index: gnash/macros/gtkglext.m4
diff -u gnash/macros/gtkglext.m4:1.1 gnash/macros/gtkglext.m4:1.2
--- gnash/macros/gtkglext.m4:1.1 Fri Feb 24 00:06:21 2006
+++ gnash/macros/gtkglext.m4 Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
-dnl
-dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-dnl
+dnl
+dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+dnl
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
dnl the Free Software Foundation; either version 2 of the License, or
dnl (at your option) any later version.
-dnl
+dnl
dnl This program is distributed in the hope that it will be useful,
dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
dnl GNU General Public License for more details.
-dnl
dnl You should have received a copy of the GNU General Public License
dnl along with this program; if not, write to the Free Software
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+dnl
+dnl Linking Gnash statically or dynamically with other modules is making
+dnl a combined work based on Gnash. Thus, the terms and conditions of
+dnl the GNU General Public License cover the whole combination.
+dnl
+dnl In addition, as a special exception, the copyright holders of Gnash give
+dnl you permission to combine Gnash with free software programs or
+dnl libraries that are released under the GNU LGPL and/or with Mozilla,
+dnl so long as the linking with Mozilla, or any variant of Mozilla, is
+dnl through its standard plug-in interface. You may copy and distribute
+dnl such a system following the terms of the GNU GPL for Gnash and the
+dnl licenses of the other code concerned, provided that you include the
+dnl source code of that other code when and as the GNU GPL requires
+dnl distribution of source code.
+dnl
+dnl Note that people who make modified versions of Gnash are not obligated
+dnl to grant this special exception for their modified versions; it is
+dnl their choice whether to do so. The GNU General Public License gives
+dnl permission to release a modified version without this exception; this
+dnl exception also makes it possible to release a modified version which
+dnl carries forward this exception.
+dnl
AC_DEFUN([GNASH_PATH_GLEXT],
[
Index: gnash/macros/hashmap.m4
diff -u gnash/macros/hashmap.m4:1.1 gnash/macros/hashmap.m4:1.2
--- gnash/macros/hashmap.m4:1.1 Thu Mar 2 17:34:36 2006
+++ gnash/macros/hashmap.m4 Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
-dnl
-dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-dnl
+dnl
+dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+dnl
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
dnl the Free Software Foundation; either version 2 of the License, or
dnl (at your option) any later version.
-dnl
+dnl
dnl This program is distributed in the hope that it will be useful,
dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
dnl GNU General Public License for more details.
-dnl
dnl You should have received a copy of the GNU General Public License
dnl along with this program; if not, write to the Free Software
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+dnl
+dnl Linking Gnash statically or dynamically with other modules is making
+dnl a combined work based on Gnash. Thus, the terms and conditions of
+dnl the GNU General Public License cover the whole combination.
+dnl
+dnl In addition, as a special exception, the copyright holders of Gnash give
+dnl you permission to combine Gnash with free software programs or
+dnl libraries that are released under the GNU LGPL and/or with Mozilla,
+dnl so long as the linking with Mozilla, or any variant of Mozilla, is
+dnl through its standard plug-in interface. You may copy and distribute
+dnl such a system following the terms of the GNU GPL for Gnash and the
+dnl licenses of the other code concerned, provided that you include the
+dnl source code of that other code when and as the GNU GPL requires
+dnl distribution of source code.
+dnl
+dnl Note that people who make modified versions of Gnash are not obligated
+dnl to grant this special exception for their modified versions; it is
+dnl their choice whether to do so. The GNU General Public License gives
+dnl permission to release a modified version without this exception; this
+dnl exception also makes it possible to release a modified version which
+dnl carries forward this exception.
+dnl
AC_DEFUN([GNASH_HASHMAP],
[
Index: gnash/macros/jpeg.m4
diff -u gnash/macros/jpeg.m4:1.8 gnash/macros/jpeg.m4:1.9
--- gnash/macros/jpeg.m4:1.8 Sun Feb 26 15:49:30 2006
+++ gnash/macros/jpeg.m4 Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
-dnl
-dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-dnl
+dnl
+dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+dnl
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
dnl the Free Software Foundation; either version 2 of the License, or
dnl (at your option) any later version.
-dnl
+dnl
dnl This program is distributed in the hope that it will be useful,
dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
dnl GNU General Public License for more details.
-dnl
dnl You should have received a copy of the GNU General Public License
dnl along with this program; if not, write to the Free Software
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+dnl
+dnl Linking Gnash statically or dynamically with other modules is making
+dnl a combined work based on Gnash. Thus, the terms and conditions of
+dnl the GNU General Public License cover the whole combination.
+dnl
+dnl In addition, as a special exception, the copyright holders of Gnash give
+dnl you permission to combine Gnash with free software programs or
+dnl libraries that are released under the GNU LGPL and/or with Mozilla,
+dnl so long as the linking with Mozilla, or any variant of Mozilla, is
+dnl through its standard plug-in interface. You may copy and distribute
+dnl such a system following the terms of the GNU GPL for Gnash and the
+dnl licenses of the other code concerned, provided that you include the
+dnl source code of that other code when and as the GNU GPL requires
+dnl distribution of source code.
+dnl
+dnl Note that people who make modified versions of Gnash are not obligated
+dnl to grant this special exception for their modified versions; it is
+dnl their choice whether to do so. The GNU General Public License gives
+dnl permission to release a modified version without this exception; this
+dnl exception also makes it possible to release a modified version which
+dnl carries forward this exception.
+dnl
AC_DEFUN([GNASH_PATH_JPEG],
[
Index: gnash/macros/kde.m4
diff -u gnash/macros/kde.m4:1.4 gnash/macros/kde.m4:1.5
--- gnash/macros/kde.m4:1.4 Mon Mar 6 01:43:25 2006
+++ gnash/macros/kde.m4 Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
-dnl
-dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-dnl
+dnl
+dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+dnl
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
dnl the Free Software Foundation; either version 2 of the License, or
dnl (at your option) any later version.
-dnl
+dnl
dnl This program is distributed in the hope that it will be useful,
dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
dnl GNU General Public License for more details.
-dnl
dnl You should have received a copy of the GNU General Public License
dnl along with this program; if not, write to the Free Software
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+dnl
+dnl Linking Gnash statically or dynamically with other modules is making
+dnl a combined work based on Gnash. Thus, the terms and conditions of
+dnl the GNU General Public License cover the whole combination.
+dnl
+dnl In addition, as a special exception, the copyright holders of Gnash give
+dnl you permission to combine Gnash with free software programs or
+dnl libraries that are released under the GNU LGPL and/or with Mozilla,
+dnl so long as the linking with Mozilla, or any variant of Mozilla, is
+dnl through its standard plug-in interface. You may copy and distribute
+dnl such a system following the terms of the GNU GPL for Gnash and the
+dnl licenses of the other code concerned, provided that you include the
+dnl source code of that other code when and as the GNU GPL requires
+dnl distribution of source code.
+dnl
+dnl Note that people who make modified versions of Gnash are not obligated
+dnl to grant this special exception for their modified versions; it is
+dnl their choice whether to do so. The GNU General Public License gives
+dnl permission to release a modified version without this exception; this
+dnl exception also makes it possible to release a modified version which
+dnl carries forward this exception.
+dnl
# KDE_PATH_X_DIRECT
dnl Internal subroutine of AC_PATH_X.
Index: gnash/macros/libXML++.m4
diff -u gnash/macros/libXML++.m4:1.3 gnash/macros/libXML++.m4:1.4
--- gnash/macros/libXML++.m4:1.3 Wed Feb 1 23:58:31 2006
+++ gnash/macros/libXML++.m4 Thu Mar 9 19:29:06 2006
@@ -1,20 +1,40 @@
-dnl Process this file with autoconf to produce a configure script.
-dnl
-dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-dnl
+dnl
+dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+dnl
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
dnl the Free Software Foundation; either version 2 of the License, or
dnl (at your option) any later version.
-dnl
+dnl
dnl This program is distributed in the hope that it will be useful,
dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
dnl GNU General Public License for more details.
-dnl
dnl You should have received a copy of the GNU General Public License
dnl along with this program; if not, write to the Free Software
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+dnl
+dnl Linking Gnash statically or dynamically with other modules is making
+dnl a combined work based on Gnash. Thus, the terms and conditions of
+dnl the GNU General Public License cover the whole combination.
+dnl
+dnl In addition, as a special exception, the copyright holders of Gnash give
+dnl you permission to combine Gnash with free software programs or
+dnl libraries that are released under the GNU LGPL and/or with Mozilla,
+dnl so long as the linking with Mozilla, or any variant of Mozilla, is
+dnl through its standard plug-in interface. You may copy and distribute
+dnl such a system following the terms of the GNU GPL for Gnash and the
+dnl licenses of the other code concerned, provided that you include the
+dnl source code of that other code when and as the GNU GPL requires
+dnl distribution of source code.
+dnl
+dnl Note that people who make modified versions of Gnash are not obligated
+dnl to grant this special exception for their modified versions; it is
+dnl their choice whether to do so. The GNU General Public License gives
+dnl permission to release a modified version without this exception; this
+dnl exception also makes it possible to release a modified version which
+dnl carries forward this exception.
+dnl
AC_DEFUN([AM_PATH_LIBXMLCPP],
[dnl
Index: gnash/macros/libXML.m4
diff -u gnash/macros/libXML.m4:1.13 gnash/macros/libXML.m4:1.14
--- gnash/macros/libXML.m4:1.13 Sat Mar 4 16:32:24 2006
+++ gnash/macros/libXML.m4 Thu Mar 9 19:29:06 2006
@@ -1,20 +1,40 @@
-dnl Process this file with autoconf to produce a configure script.
-dnl
-dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-dnl
+dnl
+dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+dnl
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
dnl the Free Software Foundation; either version 2 of the License, or
dnl (at your option) any later version.
-dnl
+dnl
dnl This program is distributed in the hope that it will be useful,
dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
dnl GNU General Public License for more details.
-dnl
dnl You should have received a copy of the GNU General Public License
dnl along with this program; if not, write to the Free Software
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+dnl
+dnl Linking Gnash statically or dynamically with other modules is making
+dnl a combined work based on Gnash. Thus, the terms and conditions of
+dnl the GNU General Public License cover the whole combination.
+dnl
+dnl In addition, as a special exception, the copyright holders of Gnash give
+dnl you permission to combine Gnash with free software programs or
+dnl libraries that are released under the GNU LGPL and/or with Mozilla,
+dnl so long as the linking with Mozilla, or any variant of Mozilla, is
+dnl through its standard plug-in interface. You may copy and distribute
+dnl such a system following the terms of the GNU GPL for Gnash and the
+dnl licenses of the other code concerned, provided that you include the
+dnl source code of that other code when and as the GNU GPL requires
+dnl distribution of source code.
+dnl
+dnl Note that people who make modified versions of Gnash are not obligated
+dnl to grant this special exception for their modified versions; it is
+dnl their choice whether to do so. The GNU General Public License gives
+dnl permission to release a modified version without this exception; this
+dnl exception also makes it possible to release a modified version which
+dnl carries forward this exception.
+dnl
AC_DEFUN([AM_PATH_LIBXML2],
[dnl
Index: gnash/macros/libexe.m4
diff -u gnash/macros/libexe.m4:1.3 gnash/macros/libexe.m4:1.4
--- gnash/macros/libexe.m4:1.3 Wed Feb 1 23:58:31 2006
+++ gnash/macros/libexe.m4 Thu Mar 9 19:29:06 2006
@@ -1,20 +1,41 @@
dnl Process this file with autoconf to produce a configure script.
-dnl
-dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-dnl
+dnl
+dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+dnl
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
dnl the Free Software Foundation; either version 2 of the License, or
dnl (at your option) any later version.
-dnl
+dnl
dnl This program is distributed in the hope that it will be useful,
dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
dnl GNU General Public License for more details.
-dnl
dnl You should have received a copy of the GNU General Public License
dnl along with this program; if not, write to the Free Software
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+dnl
+dnl Linking Gnash statically or dynamically with other modules is making
+dnl a combined work based on Gnash. Thus, the terms and conditions of
+dnl the GNU General Public License cover the whole combination.
+dnl
+dnl In addition, as a special exception, the copyright holders of Gnash give
+dnl you permission to combine Gnash with free software programs or
+dnl libraries that are released under the GNU LGPL and/or with Mozilla,
+dnl so long as the linking with Mozilla, or any variant of Mozilla, is
+dnl through its standard plug-in interface. You may copy and distribute
+dnl such a system following the terms of the GNU GPL for Gnash and the
+dnl licenses of the other code concerned, provided that you include the
+dnl source code of that other code when and as the GNU GPL requires
+dnl distribution of source code.
+dnl
+dnl Note that people who make modified versions of Gnash are not obligated
+dnl to grant this special exception for their modified versions; it is
+dnl their choice whether to do so. The GNU General Public License gives
+dnl permission to release a modified version without this exception; this
+dnl exception also makes it possible to release a modified version which
+dnl carries forward this exception.
+dnl
dnl FIXME: This should really do tests for this data, and not
dnl just hardcode it based on the OS. This currently depends on
Index: gnash/macros/libtool.m4
diff -u gnash/macros/libtool.m4:1.3 gnash/macros/libtool.m4:1.4
--- gnash/macros/libtool.m4:1.3 Mon Feb 20 17:05:34 2006
+++ gnash/macros/libtool.m4 Thu Mar 9 19:29:06 2006
@@ -1,26 +1,46 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+
## Copyright 1996, 1997, 1998, 1999, 2000, 2001
## Free Software Foundation, Inc.
## Originally by Gordon Matzigkeit <address@hidden>, 1996
##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful, but
-## WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-## General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-##
-## As a special exception to the GNU General Public License, if you
-## distribute this file as part of a program that contains a
-## configuration script generated by Autoconf, you may include it under
-## the same distribution terms that you use for the rest of that program.
+dnl
+dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+dnl GNU General Public License for more details.
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+dnl
+dnl Linking Gnash statically or dynamically with other modules is making
+dnl a combined work based on Gnash. Thus, the terms and conditions of
+dnl the GNU General Public License cover the whole combination.
+dnl
+dnl In addition, as a special exception, the copyright holders of Gnash give
+dnl you permission to combine Gnash with free software programs or
+dnl libraries that are released under the GNU LGPL and/or with Mozilla,
+dnl so long as the linking with Mozilla, or any variant of Mozilla, is
+dnl through its standard plug-in interface. You may copy and distribute
+dnl such a system following the terms of the GNU GPL for Gnash and the
+dnl licenses of the other code concerned, provided that you include the
+dnl source code of that other code when and as the GNU GPL requires
+dnl distribution of source code.
+dnl
+dnl Note that people who make modified versions of Gnash are not obligated
+dnl to grant this special exception for their modified versions; it is
+dnl their choice whether to do so. The GNU General Public License gives
+dnl permission to release a modified version without this exception; this
+dnl exception also makes it possible to release a modified version which
+dnl carries forward this exception.
+dnl
# serial 47 AC_PROG_LIBTOOL
# Debian $Rev: 214 $
Index: gnash/macros/mad.m4
diff -u gnash/macros/mad.m4:1.7 gnash/macros/mad.m4:1.8
--- gnash/macros/mad.m4:1.7 Fri Feb 24 00:06:21 2006
+++ gnash/macros/mad.m4 Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
-dnl
-dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-dnl
+dnl
+dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+dnl
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
dnl the Free Software Foundation; either version 2 of the License, or
dnl (at your option) any later version.
-dnl
+dnl
dnl This program is distributed in the hope that it will be useful,
dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
dnl GNU General Public License for more details.
-dnl
dnl You should have received a copy of the GNU General Public License
dnl along with this program; if not, write to the Free Software
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+dnl
+dnl Linking Gnash statically or dynamically with other modules is making
+dnl a combined work based on Gnash. Thus, the terms and conditions of
+dnl the GNU General Public License cover the whole combination.
+dnl
+dnl In addition, as a special exception, the copyright holders of Gnash give
+dnl you permission to combine Gnash with free software programs or
+dnl libraries that are released under the GNU LGPL and/or with Mozilla,
+dnl so long as the linking with Mozilla, or any variant of Mozilla, is
+dnl through its standard plug-in interface. You may copy and distribute
+dnl such a system following the terms of the GNU GPL for Gnash and the
+dnl licenses of the other code concerned, provided that you include the
+dnl source code of that other code when and as the GNU GPL requires
+dnl distribution of source code.
+dnl
+dnl Note that people who make modified versions of Gnash are not obligated
+dnl to grant this special exception for their modified versions; it is
+dnl their choice whether to do so. The GNU General Public License gives
+dnl permission to release a modified version without this exception; this
+dnl exception also makes it possible to release a modified version which
+dnl carries forward this exception.
+dnl
AC_DEFUN([GNASH_PATH_MP3],
[
Index: gnash/macros/ming.m4
diff -u gnash/macros/ming.m4:1.4 gnash/macros/ming.m4:1.5
--- gnash/macros/ming.m4:1.4 Fri Feb 24 00:06:21 2006
+++ gnash/macros/ming.m4 Thu Mar 9 19:29:06 2006
@@ -1,3 +1,41 @@
+dnl
+dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+dnl GNU General Public License for more details.
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+dnl
+dnl Linking Gnash statically or dynamically with other modules is making
+dnl a combined work based on Gnash. Thus, the terms and conditions of
+dnl the GNU General Public License cover the whole combination.
+dnl
+dnl In addition, as a special exception, the copyright holders of Gnash give
+dnl you permission to combine Gnash with free software programs or
+dnl libraries that are released under the GNU LGPL and/or with Mozilla,
+dnl so long as the linking with Mozilla, or any variant of Mozilla, is
+dnl through its standard plug-in interface. You may copy and distribute
+dnl such a system following the terms of the GNU GPL for Gnash and the
+dnl licenses of the other code concerned, provided that you include the
+dnl source code of that other code when and as the GNU GPL requires
+dnl distribution of source code.
+dnl
+dnl Note that people who make modified versions of Gnash are not obligated
+dnl to grant this special exception for their modified versions; it is
+dnl their choice whether to do so. The GNU General Public License gives
+dnl permission to release a modified version without this exception; this
+dnl exception also makes it possible to release a modified version which
+dnl carries forward this exception.
+dnl
+
# Configure paths for Ming
# Sandro Santilli 2006-01-24
#
Index: gnash/macros/ogg.m4
diff -u gnash/macros/ogg.m4:1.6 gnash/macros/ogg.m4:1.7
--- gnash/macros/ogg.m4:1.6 Fri Feb 24 00:06:21 2006
+++ gnash/macros/ogg.m4 Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
-dnl
-dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-dnl
+dnl
+dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+dnl
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
dnl the Free Software Foundation; either version 2 of the License, or
dnl (at your option) any later version.
-dnl
+dnl
dnl This program is distributed in the hope that it will be useful,
dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
dnl GNU General Public License for more details.
-dnl
dnl You should have received a copy of the GNU General Public License
dnl along with this program; if not, write to the Free Software
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+dnl
+dnl Linking Gnash statically or dynamically with other modules is making
+dnl a combined work based on Gnash. Thus, the terms and conditions of
+dnl the GNU General Public License cover the whole combination.
+dnl
+dnl In addition, as a special exception, the copyright holders of Gnash give
+dnl you permission to combine Gnash with free software programs or
+dnl libraries that are released under the GNU LGPL and/or with Mozilla,
+dnl so long as the linking with Mozilla, or any variant of Mozilla, is
+dnl through its standard plug-in interface. You may copy and distribute
+dnl such a system following the terms of the GNU GPL for Gnash and the
+dnl licenses of the other code concerned, provided that you include the
+dnl source code of that other code when and as the GNU GPL requires
+dnl distribution of source code.
+dnl
+dnl Note that people who make modified versions of Gnash are not obligated
+dnl to grant this special exception for their modified versions; it is
+dnl their choice whether to do so. The GNU General Public License gives
+dnl permission to release a modified version without this exception; this
+dnl exception also makes it possible to release a modified version which
+dnl carries forward this exception.
+dnl
AC_DEFUN([GNASH_PATH_OGG],
[
Index: gnash/macros/opengl.m4
diff -u gnash/macros/opengl.m4:1.12 gnash/macros/opengl.m4:1.13
--- gnash/macros/opengl.m4:1.12 Mon Mar 6 01:43:25 2006
+++ gnash/macros/opengl.m4 Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
-dnl
-dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-dnl
+dnl
+dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+dnl
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
dnl the Free Software Foundation; either version 2 of the License, or
dnl (at your option) any later version.
-dnl
+dnl
dnl This program is distributed in the hope that it will be useful,
dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
dnl GNU General Public License for more details.
-dnl
dnl You should have received a copy of the GNU General Public License
dnl along with this program; if not, write to the Free Software
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+dnl
+dnl Linking Gnash statically or dynamically with other modules is making
+dnl a combined work based on Gnash. Thus, the terms and conditions of
+dnl the GNU General Public License cover the whole combination.
+dnl
+dnl In addition, as a special exception, the copyright holders of Gnash give
+dnl you permission to combine Gnash with free software programs or
+dnl libraries that are released under the GNU LGPL and/or with Mozilla,
+dnl so long as the linking with Mozilla, or any variant of Mozilla, is
+dnl through its standard plug-in interface. You may copy and distribute
+dnl such a system following the terms of the GNU GPL for Gnash and the
+dnl licenses of the other code concerned, provided that you include the
+dnl source code of that other code when and as the GNU GPL requires
+dnl distribution of source code.
+dnl
+dnl Note that people who make modified versions of Gnash are not obligated
+dnl to grant this special exception for their modified versions; it is
+dnl their choice whether to do so. The GNU General Public License gives
+dnl permission to release a modified version without this exception; this
+dnl exception also makes it possible to release a modified version which
+dnl carries forward this exception.
+dnl
AC_DEFUN([GNASH_PATH_OPENGL],
[
Index: gnash/macros/pango.m4
diff -u gnash/macros/pango.m4:1.1 gnash/macros/pango.m4:1.2
--- gnash/macros/pango.m4:1.1 Fri Feb 24 00:06:21 2006
+++ gnash/macros/pango.m4 Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
-dnl
-dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-dnl
+dnl
+dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+dnl
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
dnl the Free Software Foundation; either version 2 of the License, or
dnl (at your option) any later version.
-dnl
+dnl
dnl This program is distributed in the hope that it will be useful,
dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
dnl GNU General Public License for more details.
-dnl
dnl You should have received a copy of the GNU General Public License
dnl along with this program; if not, write to the Free Software
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+dnl
+dnl Linking Gnash statically or dynamically with other modules is making
+dnl a combined work based on Gnash. Thus, the terms and conditions of
+dnl the GNU General Public License cover the whole combination.
+dnl
+dnl In addition, as a special exception, the copyright holders of Gnash give
+dnl you permission to combine Gnash with free software programs or
+dnl libraries that are released under the GNU LGPL and/or with Mozilla,
+dnl so long as the linking with Mozilla, or any variant of Mozilla, is
+dnl through its standard plug-in interface. You may copy and distribute
+dnl such a system following the terms of the GNU GPL for Gnash and the
+dnl licenses of the other code concerned, provided that you include the
+dnl source code of that other code when and as the GNU GPL requires
+dnl distribution of source code.
+dnl
+dnl Note that people who make modified versions of Gnash are not obligated
+dnl to grant this special exception for their modified versions; it is
+dnl their choice whether to do so. The GNU General Public License gives
+dnl permission to release a modified version without this exception; this
+dnl exception also makes it possible to release a modified version which
+dnl carries forward this exception.
+dnl
AC_DEFUN([GNASH_PATH_PANGO],
[
Index: gnash/macros/png.m4
diff -u gnash/macros/png.m4:1.10 gnash/macros/png.m4:1.11
--- gnash/macros/png.m4:1.10 Sun Feb 26 15:49:30 2006
+++ gnash/macros/png.m4 Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
-dnl
-dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-dnl
+dnl
+dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+dnl
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
dnl the Free Software Foundation; either version 2 of the License, or
dnl (at your option) any later version.
-dnl
+dnl
dnl This program is distributed in the hope that it will be useful,
dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
dnl GNU General Public License for more details.
-dnl
dnl You should have received a copy of the GNU General Public License
dnl along with this program; if not, write to the Free Software
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+dnl
+dnl Linking Gnash statically or dynamically with other modules is making
+dnl a combined work based on Gnash. Thus, the terms and conditions of
+dnl the GNU General Public License cover the whole combination.
+dnl
+dnl In addition, as a special exception, the copyright holders of Gnash give
+dnl you permission to combine Gnash with free software programs or
+dnl libraries that are released under the GNU LGPL and/or with Mozilla,
+dnl so long as the linking with Mozilla, or any variant of Mozilla, is
+dnl through its standard plug-in interface. You may copy and distribute
+dnl such a system following the terms of the GNU GPL for Gnash and the
+dnl licenses of the other code concerned, provided that you include the
+dnl source code of that other code when and as the GNU GPL requires
+dnl distribution of source code.
+dnl
+dnl Note that people who make modified versions of Gnash are not obligated
+dnl to grant this special exception for their modified versions; it is
+dnl their choice whether to do so. The GNU General Public License gives
+dnl permission to release a modified version without this exception; this
+dnl exception also makes it possible to release a modified version which
+dnl carries forward this exception.
+dnl
AC_DEFUN([GNASH_PATH_PNG],
[
Index: gnash/macros/pthreads.m4
diff -u gnash/macros/pthreads.m4:1.7 gnash/macros/pthreads.m4:1.8
--- gnash/macros/pthreads.m4:1.7 Mon Mar 6 01:43:25 2006
+++ gnash/macros/pthreads.m4 Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
-dnl
-dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-dnl
+dnl
+dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+dnl
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
dnl the Free Software Foundation; either version 2 of the License, or
dnl (at your option) any later version.
-dnl
+dnl
dnl This program is distributed in the hope that it will be useful,
dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
dnl GNU General Public License for more details.
-dnl
dnl You should have received a copy of the GNU General Public License
dnl along with this program; if not, write to the Free Software
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+dnl
+dnl Linking Gnash statically or dynamically with other modules is making
+dnl a combined work based on Gnash. Thus, the terms and conditions of
+dnl the GNU General Public License cover the whole combination.
+dnl
+dnl In addition, as a special exception, the copyright holders of Gnash give
+dnl you permission to combine Gnash with free software programs or
+dnl libraries that are released under the GNU LGPL and/or with Mozilla,
+dnl so long as the linking with Mozilla, or any variant of Mozilla, is
+dnl through its standard plug-in interface. You may copy and distribute
+dnl such a system following the terms of the GNU GPL for Gnash and the
+dnl licenses of the other code concerned, provided that you include the
+dnl source code of that other code when and as the GNU GPL requires
+dnl distribution of source code.
+dnl
+dnl Note that people who make modified versions of Gnash are not obligated
+dnl to grant this special exception for their modified versions; it is
+dnl their choice whether to do so. The GNU General Public License gives
+dnl permission to release a modified version without this exception; this
+dnl exception also makes it possible to release a modified version which
+dnl carries forward this exception.
+dnl
AC_DEFUN([GNASH_PATH_PTHREADS],
[
Index: gnash/macros/sdl.m4
diff -u gnash/macros/sdl.m4:1.11 gnash/macros/sdl.m4:1.12
--- gnash/macros/sdl.m4:1.11 Mon Mar 6 01:43:25 2006
+++ gnash/macros/sdl.m4 Thu Mar 9 19:29:06 2006
@@ -1,19 +1,41 @@
-dnl
-dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-dnl
+dnl
+dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+dnl
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
dnl the Free Software Foundation; either version 2 of the License, or
dnl (at your option) any later version.
-dnl
+dnl
dnl This program is distributed in the hope that it will be useful,
dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
dnl GNU General Public License for more details.
-dnl
dnl You should have received a copy of the GNU General Public License
dnl along with this program; if not, write to the Free Software
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+dnl
+dnl Linking Gnash statically or dynamically with other modules is making
+dnl a combined work based on Gnash. Thus, the terms and conditions of
+dnl the GNU General Public License cover the whole combination.
+dnl
+dnl In addition, as a special exception, the copyright holders of Gnash give
+dnl you permission to combine Gnash with free software programs or
+dnl libraries that are released under the GNU LGPL and/or with Mozilla,
+dnl so long as the linking with Mozilla, or any variant of Mozilla, is
+dnl through its standard plug-in interface. You may copy and distribute
+dnl such a system following the terms of the GNU GPL for Gnash and the
+dnl licenses of the other code concerned, provided that you include the
+dnl source code of that other code when and as the GNU GPL requires
+dnl distribution of source code.
+dnl
+dnl Note that people who make modified versions of Gnash are not obligated
+dnl to grant this special exception for their modified versions; it is
+dnl their choice whether to do so. The GNU General Public License gives
+dnl permission to release a modified version without this exception; this
+dnl exception also makes it possible to release a modified version which
+dnl carries forward this exception.
+dnl
+
AC_DEFUN([GNASH_PATH_SDL],
[dnl
dnl Lool for the header
Index: gnash/macros/zlib.m4
diff -u gnash/macros/zlib.m4:1.5 gnash/macros/zlib.m4:1.6
--- gnash/macros/zlib.m4:1.5 Fri Feb 24 00:06:21 2006
+++ gnash/macros/zlib.m4 Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
-dnl
-dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-dnl
+dnl
+dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+dnl
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
dnl the Free Software Foundation; either version 2 of the License, or
dnl (at your option) any later version.
-dnl
+dnl
dnl This program is distributed in the hope that it will be useful,
dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
dnl GNU General Public License for more details.
-dnl
dnl You should have received a copy of the GNU General Public License
dnl along with this program; if not, write to the Free Software
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+dnl
+dnl Linking Gnash statically or dynamically with other modules is making
+dnl a combined work based on Gnash. Thus, the terms and conditions of
+dnl the GNU General Public License cover the whole combination.
+dnl
+dnl In addition, as a special exception, the copyright holders of Gnash give
+dnl you permission to combine Gnash with free software programs or
+dnl libraries that are released under the GNU LGPL and/or with Mozilla,
+dnl so long as the linking with Mozilla, or any variant of Mozilla, is
+dnl through its standard plug-in interface. You may copy and distribute
+dnl such a system following the terms of the GNU GPL for Gnash and the
+dnl licenses of the other code concerned, provided that you include the
+dnl source code of that other code when and as the GNU GPL requires
+dnl distribution of source code.
+dnl
+dnl Note that people who make modified versions of Gnash are not obligated
+dnl to grant this special exception for their modified versions; it is
+dnl their choice whether to do so. The GNU General Public License gives
+dnl permission to release a modified version without this exception; this
+dnl exception also makes it possible to release a modified version which
+dnl carries forward this exception.
+dnl
AC_DEFUN([GNASH_PATH_ZLIB],
[
Index: gnash/plugin/Makefile.am
diff -u gnash/plugin/Makefile.am:1.14 gnash/plugin/Makefile.am:1.15
--- gnash/plugin/Makefile.am:1.14 Sun Mar 5 01:57:08 2006
+++ gnash/plugin/Makefile.am Thu Mar 9 19:29:06 2006
@@ -1,20 +1,40 @@
## Process this file with automake to generate Makefile.in
#
# Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Linking Gnash statically or dynamically with other modules is making
+# a combined work based on Gnash. Thus, the terms and conditions of
+# the GNU General Public License cover the whole combination.
+#
+# In addition, as a special exception, the copyright holders of Gnash give
+# you permission to combine Gnash with free software programs or
+# libraries that are released under the GNU LGPL and/or with Mozilla,
+# so long as the linking with Mozilla, or any variant of Mozilla, is
+# through its standard plug-in interface. You may copy and distribute
+# such a system following the terms of the GNU GPL for Gnash and the
+# licenses of the other code concerned, provided that you include the
+# source code of that other code when and as the GNU GPL requires
+# distribution of source code.
+#
+# Note that people who make modified versions of Gnash are not obligated
+# to grant this special exception for their modified versions; it is
+# their choice whether to do so. The GNU General Public License gives
+# permission to release a modified version without this exception; this
+# exception also makes it possible to release a modified version which
+# carries forward this exception.
#
AUTOMAKE_OPTIONS = dejagnu
Index: gnash/plugin/klash/Makefile.am
diff -u gnash/plugin/klash/Makefile.am:1.2 gnash/plugin/klash/Makefile.am:1.3
--- gnash/plugin/klash/Makefile.am:1.2 Sun Mar 5 15:26:08 2006
+++ gnash/plugin/klash/Makefile.am Thu Mar 9 19:29:06 2006
@@ -1,22 +1,41 @@
## Process this file with automake to generate Makefile.in
#
# Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Linking Gnash statically or dynamically with other modules is making
+# a combined work based on Gnash. Thus, the terms and conditions of
+# the GNU General Public License cover the whole combination.
+#
+# In addition, as a special exception, the copyright holders of Gnash give
+# you permission to combine Gnash with free software programs or
+# libraries that are released under the GNU LGPL and/or with Mozilla,
+# so long as the linking with Mozilla, or any variant of Mozilla, is
+# through its standard plug-in interface. You may copy and distribute
+# such a system following the terms of the GNU GPL for Gnash and the
+# licenses of the other code concerned, provided that you include the
+# source code of that other code when and as the GNU GPL requires
+# distribution of source code.
+#
+# Note that people who make modified versions of Gnash are not obligated
+# to grant this special exception for their modified versions; it is
+# their choice whether to do so. The GNU General Public License gives
+# permission to release a modified version without this exception; this
+# exception also makes it possible to release a modified version which
+# carries forward this exception.
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-#
-
AUTOMAKE_OPTIONS =
AM_CPPFLAGS= -I$(kde_includes)/kio $(all_includes)
@@ -25,9 +44,10 @@
kde_module_LTLIBRARIES= libklashpart.la
-libklashpart_la_SOURCES= klash_part.cpp
-libklashpart_la_LDFLAGS= -avoid-version $(all_libraries) $(KDE_RPATH)
-libklashpart_la_DEPENDANCIES=klash_part.moc
+libklashpart_la_SOURCES = klash_part.cpp
+nodist_libklashpart_la_SOURCES= klash_part.moc
+libklashpart_la_LDFLAGS = -avoid-version $(all_libraries) $(KDE_RPATH)
+libklashpart_la_DEPENDANCIES = klash_part.moc
#EXTRA_PROGRAMS = klashplayer
#klashplayer_app = klashplayer
Index: gnash/plugin/klash/klash_part.cpp
diff -u gnash/plugin/klash/klash_part.cpp:1.1
gnash/plugin/klash/klash_part.cpp:1.2
--- gnash/plugin/klash/klash_part.cpp:1.1 Sat Mar 4 04:52:24 2006
+++ gnash/plugin/klash/klash_part.cpp Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
// Written by Koos Vriezen <koos ! vriezen ? xs4all ! nl>
Index: gnash/plugin/klash/klash_part.h
diff -u gnash/plugin/klash/klash_part.h:1.1 gnash/plugin/klash/klash_part.h:1.2
--- gnash/plugin/klash/klash_part.h:1.1 Sat Mar 4 04:52:24 2006
+++ gnash/plugin/klash/klash_part.h Thu Mar 9 19:29:06 2006
@@ -1,19 +1,39 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
//
// Written by Koos Vriezen <koos ! vriezen ? xs4all ! nl>
Index: gnash/plugin/player.cpp
diff -u gnash/plugin/player.cpp:1.8 gnash/plugin/player.cpp:1.9
--- gnash/plugin/player.cpp:1.8 Sat Mar 4 15:56:51 2006
+++ gnash/plugin/player.cpp Thu Mar 9 19:29:06 2006
@@ -1,19 +1,39 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
//
#ifdef HAVE_CONFIG_H
@@ -43,6 +63,9 @@
#include "xmlsocket.h"
#include "Movie.h"
+// Define is you just want a hard coded OpenGL graphic
+#define TEST_GRAPHIC
+
#ifdef HAVE_LIBXML
bool gofast = false; // FIXME: this flag gets set based on
// an XML message written using
@@ -64,7 +87,7 @@
bool GLinitialized = false;
bool processing = false;
-extern Display *gxDisplay;
+//extern Display *gxDisplay;
extern SDL_mutex *glMutex;
extern SDL_cond *gCond;
extern SDL_mutex *playerMutex;
@@ -133,9 +156,8 @@
assert(tu_types_validate());
float exit_timeout = 0;
bool do_sound = false;
- bool do_loop = true;
- bool sdl_abort = false;
- int delay = 31;
+// bool do_loop = true;
+ int delay = 5;
float tex_lod_bias;
Pmutex = SDL_CreateMutex();
@@ -178,14 +200,14 @@
}
#endif
// Grab control of the display
- inst->lockGL();
+// inst->lockGL();
inst->lockX();
inst->setGL();
render = gnash::create_render_handler_ogl();
gnash::set_render_handler(render);
// Release control of the display
inst->freeX();
- inst->freeGL();
+ // inst->freeGL();
// Get info about the width & height of the movie.
int movie_version = 0;
@@ -224,8 +246,8 @@
// Mouse state.
- int mouse_x = 0;
- int mouse_y = 0;
+ int mouse_x = 0;
+ int mouse_y = 0;
int mouse_buttons = 0;
float speed_scale = 1.0f;
@@ -245,15 +267,12 @@
// Check auto timeout counter.
if (exit_timeout > 0
&& ticks - start_ticks > (Uint32) (exit_timeout * 1000)) {
+ printf("Auto exiting now...\n");
// Auto exit now.
break;
}
-#ifdef TEST_GRAPHIC
- inst->drawTestScene();
-#else
m = gnash::get_current_root();
gnash::delete_unused_root();
-
m->set_display_viewport(0, 0, width, height);
// m->set_background_alpha(s_background ? 1.0f : 0.05f);
m->notify_mouse_state(mouse_x, mouse_y, mouse_buttons);
@@ -263,19 +282,29 @@
// glDrawBuffer(GL_BACK);
// }
+
+#ifdef TEST_GRAPHIC
+ printf("We made it!!!\n");
+ inst->drawTestScene();
+#else
+ printf("Display rendered graphic!!!\n");
// Grab control of the display
inst->lockGL();
inst->lockX();
inst->setGL();
m->display();
+ inst->swapBuffers();
// Release control of the display
+ inst->unsetGL();
inst->freeX();
inst->freeGL();
#endif
+
frame_counter++;
// See if we should exit
if (m->get_current_frame() + 1 == md->get_frame_count()) {
+ printf("Reached the end of the movie...\n");
// We're reached the end of the movie; exit.
break;
}
@@ -283,7 +312,8 @@
//glPopAttrib ();
// Don't hog the CPU.
- sleep(delay);
+ printf("About to sleep for %d seconds...!!!\n", delay);
+ SDL_Delay(delay);
}
// SDL_KillThread(thread); // kill the network read thread
// SDL_Quit();
@@ -373,16 +403,7 @@
SDL_CondWait(gCond, playerMutex);
-#ifdef TEST_GRAPHIC
- while (retries++ < 10) {
- inst->drawTestScene();
- printf("%s: Loop #%d... %s\n", __PRETTY_FUNCTION__, retries,
- inst->getFilename());
- sleep(1+retries);
- }
-#else
main_loop(inst);
-#endif
printf("%s: Done this = %p...\n", __PRETTY_FUNCTION__, inst);
Index: gnash/plugin/player.h
diff -u gnash/plugin/player.h:1.3 gnash/plugin/player.h:1.4
--- gnash/plugin/player.h:1.3 Thu Mar 2 21:21:55 2006
+++ gnash/plugin/player.h Thu Mar 9 19:29:06 2006
@@ -1,19 +1,39 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
//
#ifndef __GNASH_PLAYER_H__
Index: gnash/plugin/plugin.cpp
diff -u gnash/plugin/plugin.cpp:1.17 gnash/plugin/plugin.cpp:1.18
--- gnash/plugin/plugin.cpp:1.17 Fri Mar 3 00:57:36 2006
+++ gnash/plugin/plugin.cpp Thu Mar 9 19:29:06 2006
@@ -1,18 +1,39 @@
+//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
//
#ifdef HAVE_CONFIG_H
@@ -61,6 +82,10 @@
// Static members. We have to share this data amongst all
NPBool nsPluginInstance::_plugInitialized = FALSE;
+Display *nsPluginInstance::_xDisplay = NULL;
+SDL_mutex *nsPluginInstance::_glMutex = NULL;
+SDL_cond *nsPluginInstance::_gCond = NULL;
+SDL_mutex *nsPluginInstance::_playerMutex = NULL;
// These aren't static members of the class because we have to
// call these from the C callback for the Mozilla SDK.
@@ -142,6 +167,7 @@
playerMutex = NULL;
SDL_DestroyCond(gCond);
gCond = NULL;
+// SDL_Quit();
}
/// \brief Retrieve values from the plugin for the Browser
@@ -276,7 +302,7 @@
_plugInitialized = TRUE;
- mThread = SDL_CreateThread(playerThread3, this);
+// mThread = SDL_CreateThread(playerThread3, this);
// char SDL_windowhack[32];
// sprintf (SDL_windowhack,"SDL_WINDOWID=%d", aWindow->window);
@@ -338,8 +364,8 @@
return TRUE;
}
- lockX();
lockGL();
+ lockX();
mX = aWindow->x;
mY = aWindow->y;
@@ -354,9 +380,10 @@
} else {
mWindow = (Window) aWindow->window;
NPSetWindowCallbackStruct *ws_info = (NPSetWindowCallbackStruct
*)aWindow->ws_info;
- mVisual = ws_info->visual;
+ mVisual = ws_info->visual;
mDepth = ws_info->depth;
mColormap = ws_info->colormap;
+// _xDisplay = ws_info->display;
if (!mFontInfo) {
if (!(mFontInfo = XLoadQueryFont(gxDisplay, "9x15")))
@@ -379,25 +406,14 @@
printf("%s: ERROR: Couldn't get new glxContext!\n",
__PRETTY_FUNCTION__);
}
-#if 0
- // add xt event handler
- Widget xtwidget = XtWindowToWidget(gxDisplay, mWindow);
- printf("After XtWindowToWidget!\n");
- if (xtwidget && mXtwidget != xtwidget) {
- mXtwidget = xtwidget;
- // mask values are:
- // KeyPress, KeyRelease, ButtonPress, ButtonRelease,
- // PointerMotion, Button1Motion, Button2Motion, Button3Motion,
- // Button4Motion, Button5Motion
- long event_mask =
ExposureMask|KeyPress|KeyRelease|ButtonPress|ButtonRelease;
- XSelectInput(gxDisplay, mWindow, event_mask);
- printf("After XSelectInput!\n");
- XtAddEventHandler(xtwidget, event_mask, False,
(XtEventHandler)xt_event_handler, this);
- printf("After XtAddEventHandler!\n");
- }
-#endif
+ // add xt event handler#
+ long event_mask =
ExposureMask|KeyPress|KeyRelease|ButtonPress|ButtonRelease; Widget
xtwidget;
+
+// xtwidget = XtWindowToWidget((Display *) gxdisplay,
+// (Window) aWindow->window);
+// XtAddEventHandler(xtwidget, event_mask, FALSE,
+// (XtEventHandler) xt_event_handler, this);
}
- freeGL();
freeX();
resizeWindow(mWidth,mHeight);
@@ -569,13 +585,9 @@
}
}
-#if 0 // def TEST_GRAPHIC
- drawTestScene();
-#else
printf("%s: Starting player Thread for this = %p\n",
__PRETTY_FUNCTION__, (void *)this);
mThread = SDL_CreateThread(playerThread, this);
-#endif
SDL_mutexP(playerMutex);
SDL_CondBroadcast(gCond);
@@ -753,6 +765,13 @@
{
printf("%s: for instance %p\n", __PRETTY_FUNCTION__, this);
+ static SDL_mutex *mutant = NULL;
+
+ if (!mutant) {
+ mutant = SDL_CreateMutex();
+ }
+
+ SDL_mutexP(mutant);
// Grab control of the display
lockGL();
lockX();
@@ -791,6 +810,7 @@
unsetGL();
freeX();
freeGL();
+ SDL_mutexP(mutant);
}
/// \brief Handle X events
Index: gnash/plugin/plugin.h
diff -u gnash/plugin/plugin.h:1.7 gnash/plugin/plugin.h:1.8
--- gnash/plugin/plugin.h:1.7 Thu Mar 2 21:21:55 2006
+++ gnash/plugin/plugin.h Thu Mar 9 19:29:06 2006
@@ -1,26 +1,44 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
//
#ifndef __PLUGIN_H__
#define __PLUGIN_H__
-#define TEST_GRAPHIC
-
/* Xlib/Xt stuff */
#include <X11/Xlib.h>
#include <X11/Intrinsic.h>
@@ -133,12 +151,15 @@
SDL_Thread *mThread;
GLXContext mContext;
Window mWindow;
-// Display *_xdisplay;
int _streamfd;
NPBool _glInitialized;
// This data is shared amongst all instantiations of this class
static NPBool _plugInitialized;
+ static Display *_xDisplay;
+ static SDL_mutex *_glMutex;
+ static SDL_cond *_gCond;
+ static SDL_mutex *_playerMutex;
// static XtAppContext _xContext;
// static int _instantiations;
};
Index: gnash/server/Boolean.cpp
diff -u gnash/server/Boolean.cpp:1.2 gnash/server/Boolean.cpp:1.3
--- gnash/server/Boolean.cpp:1.2 Mon Feb 13 10:44:11 2006
+++ gnash/server/Boolean.cpp Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
#ifdef HAVE_CONFIG_H
Index: gnash/server/Boolean.h
diff -u gnash/server/Boolean.h:1.1 gnash/server/Boolean.h:1.2
--- gnash/server/Boolean.h:1.1 Wed Feb 1 23:52:44 2006
+++ gnash/server/Boolean.h Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
#ifndef __BOOLEAN_H__
Index: gnash/server/Camera.cpp
diff -u gnash/server/Camera.cpp:1.2 gnash/server/Camera.cpp:1.3
--- gnash/server/Camera.cpp:1.2 Mon Feb 13 10:44:11 2006
+++ gnash/server/Camera.cpp Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
#ifdef HAVE_CONFIG_H
Index: gnash/server/Camera.h
diff -u gnash/server/Camera.h:1.1 gnash/server/Camera.h:1.2
--- gnash/server/Camera.h:1.1 Wed Feb 1 23:52:44 2006
+++ gnash/server/Camera.h Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
#ifndef __CAMERA_H__
Index: gnash/server/Color.cpp
diff -u gnash/server/Color.cpp:1.2 gnash/server/Color.cpp:1.3
--- gnash/server/Color.cpp:1.2 Mon Feb 13 10:44:12 2006
+++ gnash/server/Color.cpp Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
#ifdef HAVE_CONFIG_H
Index: gnash/server/Color.h
diff -u gnash/server/Color.h:1.1 gnash/server/Color.h:1.2
--- gnash/server/Color.h:1.1 Wed Feb 1 23:52:44 2006
+++ gnash/server/Color.h Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
#ifndef __COLOR_H__
Index: gnash/server/ContextMenu.cpp
diff -u gnash/server/ContextMenu.cpp:1.2 gnash/server/ContextMenu.cpp:1.3
--- gnash/server/ContextMenu.cpp:1.2 Mon Feb 13 10:44:12 2006
+++ gnash/server/ContextMenu.cpp Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
#ifdef HAVE_CONFIG_H
Index: gnash/server/ContextMenu.h
diff -u gnash/server/ContextMenu.h:1.1 gnash/server/ContextMenu.h:1.2
--- gnash/server/ContextMenu.h:1.1 Wed Feb 1 23:52:44 2006
+++ gnash/server/ContextMenu.h Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
#ifndef __CONTEXTMENU_H__
Index: gnash/server/CustomActions.cpp
diff -u gnash/server/CustomActions.cpp:1.2 gnash/server/CustomActions.cpp:1.3
--- gnash/server/CustomActions.cpp:1.2 Mon Feb 13 10:44:12 2006
+++ gnash/server/CustomActions.cpp Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
#ifdef HAVE_CONFIG_H
Index: gnash/server/CustomActions.h
diff -u gnash/server/CustomActions.h:1.1 gnash/server/CustomActions.h:1.2
--- gnash/server/CustomActions.h:1.1 Wed Feb 1 23:52:44 2006
+++ gnash/server/CustomActions.h Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
#ifndef __CUSTOMACTIONS_H__
Index: gnash/server/Error.cpp
diff -u gnash/server/Error.cpp:1.2 gnash/server/Error.cpp:1.3
--- gnash/server/Error.cpp:1.2 Mon Feb 13 10:44:12 2006
+++ gnash/server/Error.cpp Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
#ifdef HAVE_CONFIG_H
Index: gnash/server/Error.h
diff -u gnash/server/Error.h:1.1 gnash/server/Error.h:1.2
--- gnash/server/Error.h:1.1 Wed Feb 1 23:52:44 2006
+++ gnash/server/Error.h Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
#ifndef __ERROR_H__
Index: gnash/server/Function.cpp
diff -u gnash/server/Function.cpp:1.8 gnash/server/Function.cpp:1.9
--- gnash/server/Function.cpp:1.8 Sun Feb 26 21:44:53 2006
+++ gnash/server/Function.cpp Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
#ifdef HAVE_CONFIG_H
Index: gnash/server/Function.h
diff -u gnash/server/Function.h:1.5 gnash/server/Function.h:1.6
--- gnash/server/Function.h:1.5 Sat Feb 25 03:54:03 2006
+++ gnash/server/Function.h Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
#ifndef __FUNCTION_H__
Index: gnash/server/LoadVars.cpp
diff -u gnash/server/LoadVars.cpp:1.2 gnash/server/LoadVars.cpp:1.3
--- gnash/server/LoadVars.cpp:1.2 Mon Feb 13 10:44:12 2006
+++ gnash/server/LoadVars.cpp Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
#ifdef HAVE_CONFIG_H
Index: gnash/server/LoadVars.h
diff -u gnash/server/LoadVars.h:1.1 gnash/server/LoadVars.h:1.2
--- gnash/server/LoadVars.h:1.1 Wed Feb 1 23:52:44 2006
+++ gnash/server/LoadVars.h Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
#ifndef __LOADVARS_H__
Index: gnash/server/LocalConnection.cpp
diff -u gnash/server/LocalConnection.cpp:1.4
gnash/server/LocalConnection.cpp:1.5
--- gnash/server/LocalConnection.cpp:1.4 Mon Feb 13 10:44:12 2006
+++ gnash/server/LocalConnection.cpp Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
#ifdef HAVE_CONFIG_H
Index: gnash/server/LocalConnection.h
diff -u gnash/server/LocalConnection.h:1.3 gnash/server/LocalConnection.h:1.4
--- gnash/server/LocalConnection.h:1.3 Sun Feb 5 05:42:02 2006
+++ gnash/server/LocalConnection.h Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
#ifndef __LOCALCONNECTION_H__
Index: gnash/server/Makefile.am
diff -u gnash/server/Makefile.am:1.22 gnash/server/Makefile.am:1.23
--- gnash/server/Makefile.am:1.22 Sun Feb 26 15:49:30 2006
+++ gnash/server/Makefile.am Thu Mar 9 19:29:06 2006
@@ -1,20 +1,40 @@
## Process this file with automake to generate Makefile.in
#
# Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Linking Gnash statically or dynamically with other modules is making
+# a combined work based on Gnash. Thus, the terms and conditions of
+# the GNU General Public License cover the whole combination.
+#
+# In addition, as a special exception, the copyright holders of Gnash give
+# you permission to combine Gnash with free software programs or
+# libraries that are released under the GNU LGPL and/or with Mozilla,
+# so long as the linking with Mozilla, or any variant of Mozilla, is
+# through its standard plug-in interface. You may copy and distribute
+# such a system following the terms of the GNU GPL for Gnash and the
+# licenses of the other code concerned, provided that you include the
+# source code of that other code when and as the GNU GPL requires
+# distribution of source code.
+#
+# Note that people who make modified versions of Gnash are not obligated
+# to grant this special exception for their modified versions; it is
+# their choice whether to do so. The GNU General Public License gives
+# permission to release a modified version without this exception; this
+# exception also makes it possible to release a modified version which
+# carries forward this exception.
#
AUTOMAKE_OPTIONS =
Index: gnash/server/Microphone.cpp
diff -u gnash/server/Microphone.cpp:1.2 gnash/server/Microphone.cpp:1.3
--- gnash/server/Microphone.cpp:1.2 Mon Feb 13 10:44:12 2006
+++ gnash/server/Microphone.cpp Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
#ifdef HAVE_CONFIG_H
Index: gnash/server/Microphone.h
diff -u gnash/server/Microphone.h:1.1 gnash/server/Microphone.h:1.2
--- gnash/server/Microphone.h:1.1 Wed Feb 1 23:52:44 2006
+++ gnash/server/Microphone.h Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
#ifndef __MICROPHONE_H__
Index: gnash/server/Mouse.cpp
diff -u gnash/server/Mouse.cpp:1.2 gnash/server/Mouse.cpp:1.3
--- gnash/server/Mouse.cpp:1.2 Mon Feb 13 10:44:12 2006
+++ gnash/server/Mouse.cpp Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
#ifdef HAVE_CONFIG_H
Index: gnash/server/Mouse.h
diff -u gnash/server/Mouse.h:1.1 gnash/server/Mouse.h:1.2
--- gnash/server/Mouse.h:1.1 Wed Feb 1 23:52:44 2006
+++ gnash/server/Mouse.h Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
#ifndef __MOUSE_H__
Index: gnash/server/Movie.cpp
diff -u gnash/server/Movie.cpp:1.9 gnash/server/Movie.cpp:1.10
--- gnash/server/Movie.cpp:1.9 Mon Feb 27 03:58:03 2006
+++ gnash/server/Movie.cpp Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
+//
+// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
//
-
-// Implementation for Movie object
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-// This needs to be included first for NetBSD systems or we get a weird
-// problem with pthread_t being defined too many times if we use any
-// STL containers.
#ifdef HAVE_PTHREADS
#include <pthread.h>
#endif
Index: gnash/server/Movie.h
diff -u gnash/server/Movie.h:1.8 gnash/server/Movie.h:1.9
--- gnash/server/Movie.h:1.8 Mon Feb 27 03:58:03 2006
+++ gnash/server/Movie.h Thu Mar 9 19:29:06 2006
@@ -1,18 +1,39 @@
+//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
//
// Implementation for Movie object
Index: gnash/server/MovieClipLoader.cpp
diff -u gnash/server/MovieClipLoader.cpp:1.11
gnash/server/MovieClipLoader.cpp:1.12
--- gnash/server/MovieClipLoader.cpp:1.11 Wed Mar 1 00:54:43 2006
+++ gnash/server/MovieClipLoader.cpp Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
// Implementation of ActionScript MovieClipLoader class.
Index: gnash/server/MovieClipLoader.h
diff -u gnash/server/MovieClipLoader.h:1.4 gnash/server/MovieClipLoader.h:1.5
--- gnash/server/MovieClipLoader.h:1.4 Fri Feb 3 21:33:39 2006
+++ gnash/server/MovieClipLoader.h Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
// Implementation of ActionScript MovieClipLoader class.
Index: gnash/server/NetConnection.cpp
diff -u gnash/server/NetConnection.cpp:1.5 gnash/server/NetConnection.cpp:1.6
--- gnash/server/NetConnection.cpp:1.5 Mon Feb 13 10:44:12 2006
+++ gnash/server/NetConnection.cpp Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
#ifdef HAVE_CONFIG_H
Index: gnash/server/NetConnection.h
diff -u gnash/server/NetConnection.h:1.4 gnash/server/NetConnection.h:1.5
--- gnash/server/NetConnection.h:1.4 Sun Feb 5 01:10:58 2006
+++ gnash/server/NetConnection.h Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
#ifndef __NETCONNECTION_H__
Index: gnash/server/NetStream.cpp
diff -u gnash/server/NetStream.cpp:1.2 gnash/server/NetStream.cpp:1.3
--- gnash/server/NetStream.cpp:1.2 Mon Feb 13 10:44:12 2006
+++ gnash/server/NetStream.cpp Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
#ifdef HAVE_CONFIG_H
Index: gnash/server/NetStream.h
diff -u gnash/server/NetStream.h:1.1 gnash/server/NetStream.h:1.2
--- gnash/server/NetStream.h:1.1 Wed Feb 1 23:52:44 2006
+++ gnash/server/NetStream.h Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
#ifndef __NETSTREAM_H__
Index: gnash/server/Object.cpp
diff -u gnash/server/Object.cpp:1.7 gnash/server/Object.cpp:1.8
--- gnash/server/Object.cpp:1.7 Mon Feb 27 03:58:03 2006
+++ gnash/server/Object.cpp Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
#ifdef HAVE_CONFIG_H
Index: gnash/server/Object.h
diff -u gnash/server/Object.h:1.4 gnash/server/Object.h:1.5
--- gnash/server/Object.h:1.4 Sun Mar 5 01:57:08 2006
+++ gnash/server/Object.h Thu Mar 9 19:29:06 2006
@@ -1,18 +1,39 @@
+//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
//
#ifndef GNASH_OBJECT_H
Index: gnash/server/Selection.cpp
diff -u gnash/server/Selection.cpp:1.2 gnash/server/Selection.cpp:1.3
--- gnash/server/Selection.cpp:1.2 Mon Feb 13 10:44:12 2006
+++ gnash/server/Selection.cpp Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
#ifdef HAVE_CONFIG_H
Index: gnash/server/Selection.h
diff -u gnash/server/Selection.h:1.1 gnash/server/Selection.h:1.2
--- gnash/server/Selection.h:1.1 Wed Feb 1 23:52:44 2006
+++ gnash/server/Selection.h Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
#ifndef __SELECTION_H__
Index: gnash/server/SharedObject.cpp
diff -u gnash/server/SharedObject.cpp:1.2 gnash/server/SharedObject.cpp:1.3
--- gnash/server/SharedObject.cpp:1.2 Mon Feb 13 10:44:12 2006
+++ gnash/server/SharedObject.cpp Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
#ifdef HAVE_CONFIG_H
Index: gnash/server/SharedObject.h
diff -u gnash/server/SharedObject.h:1.1 gnash/server/SharedObject.h:1.2
--- gnash/server/SharedObject.h:1.1 Wed Feb 1 23:52:44 2006
+++ gnash/server/SharedObject.h Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
#ifndef __SHAREDOBJECT_H__
Index: gnash/server/Sprite.cpp
diff -u gnash/server/Sprite.cpp:1.16 gnash/server/Sprite.cpp:1.17
--- gnash/server/Sprite.cpp:1.16 Wed Mar 1 00:54:43 2006
+++ gnash/server/Sprite.cpp Thu Mar 9 19:29:06 2006
@@ -1,18 +1,39 @@
+//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
//
// Implementation for MovieClip object.
Index: gnash/server/Sprite.h
diff -u gnash/server/Sprite.h:1.10 gnash/server/Sprite.h:1.11
--- gnash/server/Sprite.h:1.10 Mon Feb 27 03:58:03 2006
+++ gnash/server/Sprite.h Thu Mar 9 19:29:06 2006
@@ -1,18 +1,39 @@
+//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
//
// Implementation for ActionScript MovieClip object.
Index: gnash/server/Stage.cpp
diff -u gnash/server/Stage.cpp:1.2 gnash/server/Stage.cpp:1.3
--- gnash/server/Stage.cpp:1.2 Mon Feb 13 10:44:12 2006
+++ gnash/server/Stage.cpp Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
#ifdef HAVE_CONFIG_H
Index: gnash/server/Stage.h
diff -u gnash/server/Stage.h:1.1 gnash/server/Stage.h:1.2
--- gnash/server/Stage.h:1.1 Wed Feb 1 23:52:44 2006
+++ gnash/server/Stage.h Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
#ifndef __STAGE_H__
Index: gnash/server/System.cpp
diff -u gnash/server/System.cpp:1.2 gnash/server/System.cpp:1.3
--- gnash/server/System.cpp:1.2 Mon Feb 13 10:44:12 2006
+++ gnash/server/System.cpp Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
#ifdef HAVE_CONFIG_H
Index: gnash/server/System.h
diff -u gnash/server/System.h:1.1 gnash/server/System.h:1.2
--- gnash/server/System.h:1.1 Wed Feb 1 23:52:44 2006
+++ gnash/server/System.h Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
#ifndef __SYSTEM_H__
Index: gnash/server/TextSnapshot.cpp
diff -u gnash/server/TextSnapshot.cpp:1.2 gnash/server/TextSnapshot.cpp:1.3
--- gnash/server/TextSnapshot.cpp:1.2 Mon Feb 13 10:44:12 2006
+++ gnash/server/TextSnapshot.cpp Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
#ifdef HAVE_CONFIG_H
Index: gnash/server/TextSnapshot.h
diff -u gnash/server/TextSnapshot.h:1.1 gnash/server/TextSnapshot.h:1.2
--- gnash/server/TextSnapshot.h:1.1 Wed Feb 1 23:52:44 2006
+++ gnash/server/TextSnapshot.h Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
#ifndef __TEXTSNAPSHOT_H__
Index: gnash/server/Video.cpp
diff -u gnash/server/Video.cpp:1.2 gnash/server/Video.cpp:1.3
--- gnash/server/Video.cpp:1.2 Mon Feb 13 10:44:12 2006
+++ gnash/server/Video.cpp Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
#ifdef HAVE_CONFIG_H
Index: gnash/server/Video.h
diff -u gnash/server/Video.h:1.1 gnash/server/Video.h:1.2
--- gnash/server/Video.h:1.1 Wed Feb 1 23:52:44 2006
+++ gnash/server/Video.h Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
#ifndef __VIDEO_H__
Index: gnash/server/action.h
diff -u gnash/server/action.h:1.23 gnash/server/action.h:1.24
--- gnash/server/action.h:1.23 Sun Feb 26 21:44:53 2006
+++ gnash/server/action.h Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
// Implementation and helpers for SWF actions.
Index: gnash/server/array.cpp
diff -u gnash/server/array.cpp:1.13 gnash/server/array.cpp:1.14
--- gnash/server/array.cpp:1.13 Wed Mar 8 16:50:17 2006
+++ gnash/server/array.cpp Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
//
-// Copyright (C) 2006 Free Software Foundation, Inc.
-//
+// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
#ifdef HAVE_CONFIG_H
Index: gnash/server/array.h
diff -u gnash/server/array.h:1.3 gnash/server/array.h:1.4
--- gnash/server/array.h:1.3 Wed Feb 1 23:52:44 2006
+++ gnash/server/array.h Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
#ifndef GNASH_ARRAY_H
Index: gnash/server/gnash.h
diff -u gnash/server/gnash.h:1.13 gnash/server/gnash.h:1.14
--- gnash/server/gnash.h:1.13 Sun Feb 26 21:44:53 2006
+++ gnash/server/gnash.h Thu Mar 9 19:29:06 2006
@@ -1,18 +1,39 @@
+//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
//
/// \mainpage
Index: gnash/server/gstring.h
diff -u gnash/server/gstring.h:1.2 gnash/server/gstring.h:1.3
--- gnash/server/gstring.h:1.2 Thu Jan 19 23:50:11 2006
+++ gnash/server/gstring.h Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
// Implementation for ActionScript String object.
Index: gnash/server/impl.cpp
diff -u gnash/server/impl.cpp:1.21 gnash/server/impl.cpp:1.22
--- gnash/server/impl.cpp:1.21 Sun Feb 26 21:44:53 2006
+++ gnash/server/impl.cpp Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
#ifdef HAVE_CONFIG_H
Index: gnash/server/impl.h
diff -u gnash/server/impl.h:1.14 gnash/server/impl.h:1.15
--- gnash/server/impl.h:1.14 Mon Feb 27 03:58:03 2006
+++ gnash/server/impl.h Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
#ifndef GNASH_IMPL_H
@@ -506,6 +527,8 @@
virtual void display()
{
+// printf("%s(%d): Entering\n", __PRETTY_FUNCTION__,
__LINE__);
+
m_def->display(this); // pass in transform info
do_display_callback();
}
Index: gnash/server/network.cpp
diff -u gnash/server/network.cpp:1.4 gnash/server/network.cpp:1.5
--- gnash/server/network.cpp:1.4 Mon Mar 6 01:43:25 2006
+++ gnash/server/network.cpp Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
-//
+//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
#ifdef HAVE_CONFIG_H
Index: gnash/server/network.h
diff -u gnash/server/network.h:1.3 gnash/server/network.h:1.4
--- gnash/server/network.h:1.3 Mon Mar 6 01:43:25 2006
+++ gnash/server/network.h Thu Mar 9 19:29:06 2006
@@ -1,11 +1,11 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
@@ -13,6 +13,27 @@
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
//
#ifndef __NETWORK_H__
Index: gnash/server/shm.cpp
diff -u gnash/server/shm.cpp:1.7 gnash/server/shm.cpp:1.8
--- gnash/server/shm.cpp:1.7 Mon Mar 6 18:03:30 2006
+++ gnash/server/shm.cpp Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
#ifdef HAVE_CONFIG_H
Index: gnash/server/shm.h
diff -u gnash/server/shm.h:1.4 gnash/server/shm.h:1.5
--- gnash/server/shm.h:1.4 Mon Mar 6 01:43:26 2006
+++ gnash/server/shm.h Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
#ifndef __SHM_H__
Index: gnash/server/string.cpp
diff -u gnash/server/string.cpp:1.4 gnash/server/string.cpp:1.5
--- gnash/server/string.cpp:1.4 Mon Feb 13 10:44:12 2006
+++ gnash/server/string.cpp Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
// Implementation of ActionScript String class.
Index: gnash/server/swf.h
diff -u gnash/server/swf.h:1.11 gnash/server/swf.h:1.12
--- gnash/server/swf.h:1.11 Mon Mar 6 01:43:26 2006
+++ gnash/server/swf.h Thu Mar 9 19:29:06 2006
@@ -1,18 +1,39 @@
+//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
//
#ifndef GNASH_SWF_H
Index: gnash/server/text.h
diff -u gnash/server/text.h:1.4 gnash/server/text.h:1.5
--- gnash/server/text.h:1.4 Sun Feb 26 21:44:53 2006
+++ gnash/server/text.h Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
// Code for the text tags.
Index: gnash/server/textformat.cpp
diff -u gnash/server/textformat.cpp:1.6 gnash/server/textformat.cpp:1.7
--- gnash/server/textformat.cpp:1.6 Sat Feb 25 03:54:03 2006
+++ gnash/server/textformat.cpp Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
#include "log.h"
Index: gnash/server/textformat.h
diff -u gnash/server/textformat.h:1.3 gnash/server/textformat.h:1.4
--- gnash/server/textformat.h:1.3 Tue Jan 31 16:45:38 2006
+++ gnash/server/textformat.h Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
#ifndef __TEXTFORMAT_H__
Index: gnash/server/thread.h
diff -u gnash/server/thread.h:1.2 gnash/server/thread.h:1.3
--- gnash/server/thread.h:1.2 Thu Jan 19 23:50:11 2006
+++ gnash/server/thread.h Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
#ifndef __G_PTHREAD_H__
Index: gnash/server/timers.cpp
diff -u gnash/server/timers.cpp:1.5 gnash/server/timers.cpp:1.6
--- gnash/server/timers.cpp:1.5 Sat Feb 25 03:54:03 2006
+++ gnash/server/timers.cpp Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
#include "log.h"
Index: gnash/server/timers.h
diff -u gnash/server/timers.h:1.4 gnash/server/timers.h:1.5
--- gnash/server/timers.h:1.4 Sat Feb 25 03:54:03 2006
+++ gnash/server/timers.h Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
#ifndef __TIMERS_H__
Index: gnash/server/xml.cpp
diff -u gnash/server/xml.cpp:1.14 gnash/server/xml.cpp:1.15
--- gnash/server/xml.cpp:1.14 Wed Mar 1 00:54:43 2006
+++ gnash/server/xml.cpp Thu Mar 9 19:29:06 2006
@@ -1,19 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
#ifdef HAVE_CONFIG_H
Index: gnash/server/xml.h
diff -u gnash/server/xml.h:1.13 gnash/server/xml.h:1.14
--- gnash/server/xml.h:1.13 Wed Feb 15 23:35:53 2006
+++ gnash/server/xml.h Thu Mar 9 19:29:07 2006
@@ -1,19 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
#ifndef __XML_H__
Index: gnash/server/xmlattrs.cpp
diff -u gnash/server/xmlattrs.cpp:1.1 gnash/server/xmlattrs.cpp:1.2
--- gnash/server/xmlattrs.cpp:1.1 Thu Feb 9 02:33:53 2006
+++ gnash/server/xmlattrs.cpp Thu Mar 9 19:29:07 2006
@@ -1,19 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
#ifdef HAVE_CONFIG_H
Index: gnash/server/xmlattrs.h
diff -u gnash/server/xmlattrs.h:1.1 gnash/server/xmlattrs.h:1.2
--- gnash/server/xmlattrs.h:1.1 Thu Feb 9 02:33:53 2006
+++ gnash/server/xmlattrs.h Thu Mar 9 19:29:07 2006
@@ -1,19 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
#ifndef __XML_ATTRS_H__
Index: gnash/server/xmlnode.cpp
diff -u gnash/server/xmlnode.cpp:1.6 gnash/server/xmlnode.cpp:1.7
--- gnash/server/xmlnode.cpp:1.6 Sat Feb 25 03:15:51 2006
+++ gnash/server/xmlnode.cpp Thu Mar 9 19:29:07 2006
@@ -1,19 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
#ifdef HAVE_CONFIG_H
Index: gnash/server/xmlnode.h
diff -u gnash/server/xmlnode.h:1.4 gnash/server/xmlnode.h:1.5
--- gnash/server/xmlnode.h:1.4 Wed Feb 15 23:35:53 2006
+++ gnash/server/xmlnode.h Thu Mar 9 19:29:07 2006
@@ -1,19 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
#ifndef __XML_NODE_H__
Index: gnash/server/xmlsocket.cpp
diff -u gnash/server/xmlsocket.cpp:1.9 gnash/server/xmlsocket.cpp:1.10
--- gnash/server/xmlsocket.cpp:1.9 Wed Mar 1 00:54:44 2006
+++ gnash/server/xmlsocket.cpp Thu Mar 9 19:29:07 2006
@@ -1,19 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
#ifdef HAVE_CONFIG_H
Index: gnash/server/xmlsocket.h
diff -u gnash/server/xmlsocket.h:1.6 gnash/server/xmlsocket.h:1.7
--- gnash/server/xmlsocket.h:1.6 Sat Feb 25 03:54:03 2006
+++ gnash/server/xmlsocket.h Thu Mar 9 19:29:07 2006
@@ -1,19 +1,40 @@
//
// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// Linking Gnash statically or dynamically with other modules is making
+// a combined work based on Gnash. Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+// In addition, as a special exception, the copyright holders of Gnash give
+// you permission to combine Gnash with free software programs or
+// libraries that are released under the GNU LGPL and/or with Mozilla,
+// so long as the linking with Mozilla, or any variant of Mozilla, is
+// through its standard plug-in interface. You may copy and distribute
+// such a system following the terms of the GNU GPL for Gnash and the
+// licenses of the other code concerned, provided that you include the
+// source code of that other code when and as the GNU GPL requires
+// distribution of source code.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is
+// their choice whether to do so. The GNU General Public License gives
+// permission to release a modified version without this exception; this
+// exception also makes it possible to release a modified version which
+// carries forward this exception.
+//
//
#ifndef __XMLSOCKET_H__
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ./COPYING ./ChangeLog ./Makefile.am ./aut...,
Rob Savoye <=