[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash gui/fltk.cpp ChangeLog macros/agg.m4 macr...
|
From: |
Rob Savoye |
|
Subject: |
[Gnash-commit] gnash gui/fltk.cpp ChangeLog macros/agg.m4 macr... |
|
Date: |
Sat, 28 Apr 2007 00:04:27 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Rob Savoye <rsavoye> 07/04/28 00:04:26
Modified files:
gui : fltk.cpp
. : ChangeLog
macros : agg.m4 incllist libslist mysql.m4 pthreads.m4
x11.m4
server : BitmapMovieInstance.cpp Makefile.am
server/asobj : Makefile.am
server/parser : Makefile.am bitmap_character_def.cpp
sprite_definition.cpp
server/vm : Makefile.am VM.cpp
Log message:
* gui/fltk.cpp: Cast the key::code so it compiles on Darwin.
* macros/agg.m4: Don't inherit the -rpath setting fropm
pkg-config, it screws up the linux on Darwin.
* macros/incllist, libslist: Look in $with_top_level for support
packages no in the $prefix path.
* macros/pthreads.m4: Add -mthreads for mingw32.
* macros/x11.m4: If X11 is found, also add libSM and libICE if
they are found to resolve dependencies on Darwin.
* server/Makefile.am: Remove -no-undefined as it cause
dependency
problems on Darwin.
* server/vm/Makefile.am: Remove -no-undefined as it causes
inter-library dependency problems on Darwin.
* server/parser/Makefile.am: Remove -no-undefined as it causes
inter-library dependency problems on Darwin.
* server/asobjsMakefile.am: Remove -no-undefined as it causes
inter-library dependency problems on Darwin. Add libgeo to the
link line.
* server/vm/VM.cpp: Don't use the gnash:: namespace with setting
the global singleton, it won't compile on Darwin.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/fltk.cpp?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3027&r2=1.3028
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/agg.m4?cvsroot=gnash&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/incllist?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/libslist?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/mysql.m4?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/pthreads.m4?cvsroot=gnash&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/x11.m4?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/server/BitmapMovieInstance.cpp?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/server/Makefile.am?cvsroot=gnash&r1=1.110&r2=1.111
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Makefile.am?cvsroot=gnash&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/Makefile.am?cvsroot=gnash&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/bitmap_character_def.cpp?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/sprite_definition.cpp?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/Makefile.am?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/VM.cpp?cvsroot=gnash&r1=1.5&r2=1.6
Patches:
Index: gui/fltk.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/fltk.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- gui/fltk.cpp 11 Apr 2007 17:03:16 -0000 1.9
+++ gui/fltk.cpp 28 Apr 2007 00:04:25 -0000 1.10
@@ -173,7 +173,7 @@
for (int i = 0; table[i].fltkKey; i++) {
if (key == table[i].fltkKey) {
- notify_key_event(table[i].gnashKey, true);
+ notify_key_event((gnash::key::code)table[i].gnashKey, true);
break;
}
}
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3027
retrieving revision 1.3028
diff -u -b -r1.3027 -r1.3028
--- ChangeLog 27 Apr 2007 21:43:41 -0000 1.3027
+++ ChangeLog 28 Apr 2007 00:04:25 -0000 1.3028
@@ -1,3 +1,25 @@
+2007-04-26 Rob Savoye <address@hidden>
+
+ * gui/fltk.cpp: Cast the key::code so it compiles on Darwin.
+ * macros/agg.m4: Don't inherit the -rpath setting fropm
+ pkg-config, it screws up the linux on Darwin.
+ * macros/incllist, libslist: Look in $with_top_level for support
+ packages no in the $prefix path.
+ * macros/pthreads.m4: Add -mthreads for mingw32.
+ * macros/x11.m4: If X11 is found, also add libSM and libICE if
+ they are found to resolve dependencies on Darwin.
+ * server/Makefile.am: Remove -no-undefined as it cause dependency
+ problems on Darwin.
+ * server/vm/Makefile.am: Remove -no-undefined as it causes
+ inter-library dependency problems on Darwin.
+ * server/parser/Makefile.am: Remove -no-undefined as it causes
+ inter-library dependency problems on Darwin.
+ * server/asobjsMakefile.am: Remove -no-undefined as it causes
+ inter-library dependency problems on Darwin. Add libgeo to the
+ link line.
+ * server/vm/VM.cpp: Don't use the gnash:: namespace with setting
+ the global singleton, it won't compile on Darwin.
+
2007-04-27 Sandro Santilli <address@hidden>
* server/swf/PlaceObject2Tag.cpp (readPlaceActions): fix check for
Index: macros/agg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/agg.m4,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- macros/agg.m4 8 Apr 2007 23:06:17 -0000 1.26
+++ macros/agg.m4 28 Apr 2007 00:04:26 -0000 1.27
@@ -14,7 +14,7 @@
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 $Id: agg.m4,v 1.26 2007/04/08 23:06:17 rsavoye Exp $
+dnl $Id: agg.m4,v 1.27 2007/04/28 00:04:26 rsavoye Exp $
dnl agg_rasterizer_compound_aa.h is a new file included in AGG 2.4,
dnl but not in AGG 2.3. As we need AGG 2.4, we use this as
@@ -86,7 +86,8 @@
pkg=no
if test x$cross_compiling = xno; then
if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_agg_lib}" = x; then
- $PKG_CONFIG --exists libagg && ac_cv_path_agg_lib=`$PKG_CONFIG --libs
libagg`
+ $PKG_CONFIG --exists libagg && ac_cv_path_agg_lib=`$PKG_CONFIG
--libs-only-L libagg`
+ $PKG_CONFIG --exists libagg &&
ac_cv_path_agg_lib="${ac_cv_path_agg_lib}`$PKG_CONFIG --libs-only-l libagg`"
$PKG_CONFIG --exists libagg && pkg=yes
fi
fi
Index: macros/incllist
===================================================================
RCS file: /sources/gnash/gnash/macros/incllist,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- macros/incllist 10 Apr 2007 18:18:46 -0000 1.5
+++ macros/incllist 28 Apr 2007 00:04:26 -0000 1.6
@@ -1 +1 @@
-${prefix}/${host_alias}/include ${prefix}/include /sw/include
/usr/nekoware/include /usr/freeware/include /pkg/include /opt/local/include
/usr/local/include /home/latest/include /opt/include /opt/mesa/include
/opt/include /usr/X11R6/include /usr/X11/include /usr/include /usr/pkg/include
/usr/local/olpc/include .. ../..
+${with_top_level}/include ${prefix}/${host_alias}/include ${prefix}/include
/sw/include /usr/nekoware/include /usr/freeware/include /pkg/include
/opt/local/include /usr/local/include /home/latest/include /opt/include
/opt/mesa/include /opt/include /usr/X11R6/include /usr/X11/include /usr/include
/usr/pkg/include /usr/local/olpc/include .. ../..
Index: macros/libslist
===================================================================
RCS file: /sources/gnash/gnash/macros/libslist,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- macros/libslist 10 Apr 2007 18:18:46 -0000 1.7
+++ macros/libslist 28 Apr 2007 00:04:26 -0000 1.8
@@ -1 +1 @@
-${prefix}/${host_alias}/lib ${prefix}/lib64 ${prefix}/lib32 ${prefix}/lib
/usr/local/lib /lib /usr/lib64 /usr/lib32 /usr/nekoware/lib /usr/freeware/lib
/usr/lib /sw/lib /home/latest/lib /opt/lib /pkg/lib /opt/local/lib /usr/pkg/lib
/usr/X11R6/lib /usr/X11/lib /usr/lib/opengl/xorg-x11/lib
/usr/lib64/opengl/xorg-x11/lib /usr/lib64/opengl/xorg-x11/lib64 /opt/mesa/lib
/opt/mesa/lib64 .. ../..
+${with_top_level}/lib ${prefix}/${host_alias}/lib ${prefix}/lib64
${prefix}/lib32 ${prefix}/lib /usr/local/lib /lib /usr/lib64 /usr/lib32
/usr/nekoware/lib /usr/freeware/lib /usr/lib /sw/lib /home/latest/lib /opt/lib
/pkg/lib /opt/local/lib /usr/pkg/lib /usr/X11R6/lib /usr/X11/lib
/usr/lib/opengl/xorg-x11/lib /usr/lib64/opengl/xorg-x11/lib
/usr/lib64/opengl/xorg-x11/lib64 /opt/mesa/lib /opt/mesa/lib64 .. ../..
Index: macros/mysql.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/mysql.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- macros/mysql.m4 8 Apr 2007 23:06:17 -0000 1.4
+++ macros/mysql.m4 28 Apr 2007 00:04:26 -0000 1.5
@@ -14,7 +14,7 @@
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 $Id: mysql.m4,v 1.4 2007/04/08 23:06:17 rsavoye Exp $
+dnl $Id: mysql.m4,v 1.5 2007/04/28 00:04:26 rsavoye Exp $
AC_DEFUN([GNASH_PATH_MYSQL],
[
Index: macros/pthreads.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/pthreads.m4,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- macros/pthreads.m4 8 Apr 2007 23:06:17 -0000 1.28
+++ macros/pthreads.m4 28 Apr 2007 00:04:26 -0000 1.29
@@ -15,7 +15,7 @@
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
dnl Copyright (C) 2006 Steven G. Johnson <address@hidden>.
-dnl $Id: pthreads.m4,v 1.28 2007/04/08 23:06:17 rsavoye Exp $
+dnl $Id: pthreads.m4,v 1.29 2007/04/28 00:04:26 rsavoye Exp $
AC_DEFUN([GNASH_PATH_PTHREADS],
[
@@ -88,6 +88,9 @@
*darwin*)
pthread_flags="none"
;;
+ *mingw*)
+ pthread_flags="-mthreads"
+ ;;
*solaris*)
dnl On Solaris (at least, for some versions), libc contains stubbed
Index: macros/x11.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/x11.m4,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- macros/x11.m4 10 Apr 2007 18:18:46 -0000 1.5
+++ macros/x11.m4 28 Apr 2007 00:04:26 -0000 1.6
@@ -15,7 +15,7 @@
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-dnl $Id: x11.m4,v 1.5 2007/04/10 18:18:46 rsavoye Exp $
+dnl $Id: x11.m4,v 1.6 2007/04/28 00:04:26 rsavoye Exp $
AC_DEFUN([GNASH_PATH_X11],
[
@@ -95,6 +95,12 @@
if test -f $i/libXext.a -o -f $i/libXext.${shlibext}; then
ac_cv_path_x11_lib="${ac_cv_path_x11_lib} -lXext"
fi
+ if test -f $i/libSM.a -o -f $i/libSM.${shlibext}; then
+ ac_cv_path_x11_lib="${ac_cv_path_x11_lib} -lSM"
+ fi
+ if test -f $i/libICE.a -o -f $i/libICE.${shlibext}; then
+ ac_cv_path_x11_lib="${ac_cv_path_x11_lib} -lICE"
+ fi
AC_MSG_RESULT(yes)
break
fi
Index: server/BitmapMovieInstance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/BitmapMovieInstance.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- server/BitmapMovieInstance.cpp 18 Apr 2007 19:13:55 -0000 1.6
+++ server/BitmapMovieInstance.cpp 28 Apr 2007 00:04:26 -0000 1.7
@@ -14,9 +14,6 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-//
-//
-
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
Index: server/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/Makefile.am,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -b -r1.110 -r1.111
--- server/Makefile.am 27 Apr 2007 01:08:51 -0000 1.110
+++ server/Makefile.am 28 Apr 2007 00:04:26 -0000 1.111
@@ -18,7 +18,7 @@
#
#
-# $Id: Makefile.am,v 1.110 2007/04/27 01:08:51 rsavoye Exp $
+# $Id: Makefile.am,v 1.111 2007/04/28 00:04:26 rsavoye Exp $
AUTOMAKE_OPTIONS =
@@ -175,7 +175,7 @@
endif
#libserver_la_LIBDADD = address@hidden@ # $(LIBLTDL)
-libgnashserver_la_LDFLAGS = -release $(VERSION) -no-undefined -export-dynamic
+libgnashserver_la_LDFLAGS = -release $(VERSION) -export-dynamic #-no-undefined
# Rebuild with GCC 4.x Mudflap support
mudflap:
Index: server/asobj/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Makefile.am,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- server/asobj/Makefile.am 27 Apr 2007 01:08:50 -0000 1.35
+++ server/asobj/Makefile.am 28 Apr 2007 00:04:26 -0000 1.36
@@ -15,7 +15,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-# $Id: Makefile.am,v 1.35 2007/04/27 01:08:50 rsavoye Exp $
+# $Id: Makefile.am,v 1.36 2007/04/28 00:04:26 rsavoye Exp $
AUTOMAKE_OPTIONS =
@@ -117,7 +117,9 @@
libgnashasobjs_la_LIBADD = \
$(top_builddir)/libamf/libgnashamf.la \
- $(top_builddir)/libbase/libgnashbase.la
+ $(top_builddir)/libgeometry/libgnashgeo.la \
+ $(top_builddir)/libbase/libgnashbase.la \
+ $(LIBXML_LIBS)
if USE_FFMPEG_ENGINE
libgnashasobjs_la_SOURCES += NetStreamFfmpeg.cpp SoundFfmpeg.cpp
@@ -137,7 +139,7 @@
libgnashasobjs_la_LIBADD += $(MAD_LIBS)
endif
-libgnashasobjs_la_LDFLAGS = -release $(VERSION) -no-undefined -export-dynamic
+libgnashasobjs_la_LDFLAGS = -release $(VERSION) #-no-undefined -export-dynamic
# Rebuild with GCC 4.x Mudflap support
mudflap:
Index: server/parser/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/parser/Makefile.am,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- server/parser/Makefile.am 27 Apr 2007 01:08:51 -0000 1.29
+++ server/parser/Makefile.am 28 Apr 2007 00:04:26 -0000 1.30
@@ -15,7 +15,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-# $Id: Makefile.am,v 1.29 2007/04/27 01:08:51 rsavoye Exp $
+# $Id: Makefile.am,v 1.30 2007/04/28 00:04:26 rsavoye Exp $
AUTOMAKE_OPTIONS =
@@ -76,9 +76,11 @@
video_stream_def.h
libgnashparser_la_LIBADD = \
+ $(top_builddir)/libamf/libgnashamf.la \
+ $(top_builddir)/libgeometry/libgnashgeo.la \
$(top_builddir)/libbase/libgnashbase.la
-libgnashparser_la_LDFLAGS = $(BOOST_LIBS) -release $(VERSION) -no-undefined
-export-dynamic
+libgnashparser_la_LDFLAGS = $(BOOST_LIBS) -release $(VERSION) -export-dynamic
#-no-undefined
if USE_SOUND_GST
AM_CPPFLAGS += $(GSTREAMER_CFLAGS)
Index: server/parser/bitmap_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/bitmap_character_def.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- server/parser/bitmap_character_def.cpp 13 Apr 2007 07:35:56 -0000
1.5
+++ server/parser/bitmap_character_def.cpp 28 Apr 2007 00:04:26 -0000
1.6
@@ -22,7 +22,6 @@
#endif
#include "bitmap_character_def.h"
-//#include "bitmap_character_instance.h"
#include "gnash.h" // for bitmap_info
#include "render.h"
Index: server/parser/sprite_definition.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/sprite_definition.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- server/parser/sprite_definition.cpp 18 Apr 2007 14:07:32 -0000 1.13
+++ server/parser/sprite_definition.cpp 28 Apr 2007 00:04:26 -0000 1.14
@@ -15,7 +15,6 @@
// 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
-//
#ifdef HAVE_CONFIG_H
#include "config.h"
Index: server/vm/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/vm/Makefile.am,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- server/vm/Makefile.am 27 Apr 2007 01:08:51 -0000 1.10
+++ server/vm/Makefile.am 28 Apr 2007 00:04:26 -0000 1.11
@@ -15,7 +15,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-# $Id: Makefile.am,v 1.10 2007/04/27 01:08:51 rsavoye Exp $
+# $Id: Makefile.am,v 1.11 2007/04/28 00:04:26 rsavoye Exp $
AUTOMAKE_OPTIONS =
@@ -60,7 +60,7 @@
libgnashvm_la_LIBADD = \
$(top_builddir)/libbase/libgnashbase.la
-libgnashvm_la_LDFLAGS = -release $(VERSION) -no-undefined -export-dynamic
+libgnashvm_la_LDFLAGS = -release $(VERSION) -export-dynamic # -no-undefined
# Rebuild with GCC 4.x Mudflap support
mudflap:
Index: server/vm/VM.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/VM.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- server/vm/VM.cpp 15 Mar 2007 22:39:54 -0000 1.5
+++ server/vm/VM.cpp 28 Apr 2007 00:04:26 -0000 1.6
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006, 2007 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
@@ -14,9 +14,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-//
-
-/* $Id: VM.cpp,v 1.5 2007/03/15 22:39:54 strk Exp $ */
+/* $Id: VM.cpp,v 1.6 2007/04/28 00:04:26 rsavoye Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -50,7 +48,7 @@
assert(inst.get()); // or an invalid movie_definition was given
_singleton->setRoot(inst.release()); // transfer ownership
- _singleton->setGlobal(new gnash::Global(*_singleton));
+ _singleton->setGlobal(new Global(*_singleton));
assert(_singleton->getGlobal());
return *_singleton;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash gui/fltk.cpp ChangeLog macros/agg.m4 macr...,
Rob Savoye <=