[Gnash-commit] gnash ChangeLog server/Makefile.am server/Strea...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/11/13 17:10:58

Modified files:
        .              : ChangeLog 
        server         : Makefile.am StreamProvider.cpp impl.cpp 
                         movie_root.h 
        server/asobj   : Makefile.am 
        server/parser  : Makefile.am 
        server/swf     : tag_loaders.cpp 

Log message:
        Patch by Patrice Dumas <address@hidden>:
        
                * server/: Makefile.am, StreamProvider.cpp, impl.cpp, 
movie_root.h,
                  asobj/Makefile.am, parser/Makefile.am, swf/tag_loaders.cpp:
                  remove lot of CFLAGS, some LIBS and #include.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1608&r2=1.1609
http://cvs.savannah.gnu.org/viewcvs/gnash/server/Makefile.am?cvsroot=gnash&r1=1.85&r2=1.86
http://cvs.savannah.gnu.org/viewcvs/gnash/server/StreamProvider.cpp?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/server/impl.cpp?cvsroot=gnash&r1=1.70&r2=1.71
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.h?cvsroot=gnash&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Makefile.am?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/Makefile.am?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.56&r2=1.57

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1608
retrieving revision 1.1609
diff -u -b -r1.1608 -r1.1609
--- ChangeLog   13 Nov 2006 14:39:04 -0000      1.1608
+++ ChangeLog   13 Nov 2006 17:10:57 -0000      1.1609
@@ -1,3 +1,9 @@
+2006-11-13 Patrice Dumas <address@hidden>
+
+        * server/: Makefile.am, StreamProvider.cpp, impl.cpp, movie_root.h,
+          asobj/Makefile.am, parser/Makefile.am, swf/tag_loaders.cpp:
+          remove lot of CFLAGS, some LIBS and #include.
+
 2006-11-13 Sandro Santilli <address@hidden>
 
        * server/edit_text_character.cpp (registerTextVariable): 

Index: server/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/Makefile.am,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -b -r1.85 -r1.86
--- server/Makefile.am  10 Nov 2006 23:07:47 -0000      1.85
+++ server/Makefile.am  13 Nov 2006 17:10:57 -0000      1.86
@@ -18,7 +18,7 @@
 # 
 #
 
-# $Id: Makefile.am,v 1.85 2006/11/10 23:07:47 nihilus Exp $
+# $Id: Makefile.am,v 1.86 2006/11/13 17:10:57 strk Exp $
 
 AUTOMAKE_OPTIONS = 
 
@@ -39,16 +39,6 @@
         -I$(top_srcdir)/libbase \
         -I$(top_srcdir)        \
        $(PTHREAD_CFLAGS) \
-        $(ZLIB_CFLAGS) \
-        $(OGG_CFLAGS) \
-        $(JPEG_CFLAGS) \
-        $(SDL_CFLAGS) \
-        $(OPENGL_CFLAGS) \
-       $(GTK2_CFLAGS) \
-       $(PANGO_CFLAGS) \
-       $(GLIB_CFLAGS) \
-       $(CAIRO_CFLAGS) \
-       $(ATK_CFLAGS) \
        $(DMALLOC_CFLAGS) \
         $(LIBXML_CFLAGS)
 
@@ -166,9 +156,10 @@
        $(top_builddir)/libbase/libgnashbase.la \
        $(top_builddir)/server/asobj/libgnashasobjs.la \
        $(top_builddir)/server/parser/libgnashparser.la \
-       $(ZLIB_LIBS) \
-       $(LIBXML_LIBS) \
-       $(OPENGL_LIBS)
+       $(LIBXML_LIBS)
+
+#      $(ZLIB_LIBS) \
+#      $(OPENGL_LIBS)
 
 #libserver_la_LDFLAGS = -module -avoid-version -no-undefined
 #libserver_la_LIBDADD =  address@hidden@  # $(LIBLTDL)

Index: server/StreamProvider.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/StreamProvider.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- server/StreamProvider.cpp   29 Oct 2006 18:34:11 -0000      1.12
+++ server/StreamProvider.cpp   13 Nov 2006 17:10:57 -0000      1.13
@@ -30,7 +30,7 @@
 #include "URL.h"
 #include "tu_file.h"
 #ifdef USE_CURL
-# include <curl/curl.h>
+//# include <curl/curl.h>
 # include "curl_adapter.h"
 #include "URLAccessManager.h"
 #endif

Index: server/impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/impl.cpp,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -b -r1.70 -r1.71
--- server/impl.cpp     11 Nov 2006 22:44:54 -0000      1.70
+++ server/impl.cpp     13 Nov 2006 17:10:57 -0000      1.71
@@ -18,7 +18,7 @@
 //
 //
 
-/* $Id: impl.cpp,v 1.70 2006/11/11 22:44:54 strk Exp $ */
+/* $Id: impl.cpp,v 1.71 2006/11/13 17:10:57 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -31,7 +31,7 @@
 #include <pthread.h>
 #endif
 
-#include <zlib.h>
+//#include <zlib.h>
 
 #include "tu_file.h"
 #include "utility.h"
@@ -49,7 +49,7 @@
 #include "dlist.h"
 #include "timers.h"
 #include "image.h"
-#include "jpeg.h"
+//#include "jpeg.h"
 #include "zlib_adapter.h"
 #include "sprite_definition.h"
 #include "movie_def_impl.h"

Index: server/movie_root.h
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- server/movie_root.h 11 Nov 2006 22:44:54 -0000      1.24
+++ server/movie_root.h 13 Nov 2006 17:10:57 -0000      1.25
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: movie_root.h,v 1.24 2006/11/11 22:44:54 strk Exp $ */
+/* $Id: movie_root.h,v 1.25 2006/11/13 17:10:57 strk Exp $ */
 
 #ifndef GNASH_MOVIE_ROOT_H
 #define GNASH_MOVIE_ROOT_H
@@ -27,7 +27,7 @@
 #include "timers.h" // for Timer
 #include "fontlib.h"
 #include "font.h"
-#include "jpeg.h"
+//#include "jpeg.h"
 #include "tu_file.h"
 #include "movie_def_impl.h"
 #include "tu_config.h"

Index: server/asobj/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Makefile.am,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- server/asobj/Makefile.am    10 Nov 2006 23:07:47 -0000      1.15
+++ server/asobj/Makefile.am    13 Nov 2006 17:10:57 -0000      1.16
@@ -18,7 +18,7 @@
 # 
 #
 
-# $Id: Makefile.am,v 1.15 2006/11/10 23:07:47 nihilus Exp $
+# $Id: Makefile.am,v 1.16 2006/11/13 17:10:57 strk Exp $
 
 AUTOMAKE_OPTIONS = 
 
@@ -36,19 +36,21 @@
         -I$(top_srcdir)/libamf \
         -I$(top_srcdir)        \
        $(PTHREAD_CFLAGS) \
-        $(ZLIB_CFLAGS) \
-        $(OGG_CFLAGS) \
-        $(JPEG_CFLAGS) \
-        $(SDL_CFLAGS) \
-        $(OPENGL_CFLAGS) \
-       $(GTK2_CFLAGS) \
-       $(PANGO_CFLAGS) \
-       $(GLIB_CFLAGS) \
-       $(CAIRO_CFLAGS) \
-       $(ATK_CFLAGS) \
        $(DMALLOC_CFLAGS) \
         $(LIBXML_CFLAGS)
 
+#        $(ZLIB_CFLAGS) \
+#        $(OGG_CFLAGS) \
+#        $(JPEG_CFLAGS) \
+#        $(SDL_CFLAGS) \
+#        $(OPENGL_CFLAGS) \
+#      $(GTK2_CFLAGS) \
+#      $(PANGO_CFLAGS) \
+#      $(GLIB_CFLAGS) \
+#      $(CAIRO_CFLAGS) \
+#      $(ATK_CFLAGS) \
+#
+
 libgnashasobjs_la_SOURCES = \
        Boolean.cpp     \
        Camera.cpp      \

Index: server/parser/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/parser/Makefile.am,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- server/parser/Makefile.am   10 Nov 2006 23:07:47 -0000      1.13
+++ server/parser/Makefile.am   13 Nov 2006 17:10:57 -0000      1.14
@@ -18,7 +18,7 @@
 # 
 #
 
-# $Id: Makefile.am,v 1.13 2006/11/10 23:07:47 nihilus Exp $
+# $Id: Makefile.am,v 1.14 2006/11/13 17:10:57 strk Exp $
 
 AUTOMAKE_OPTIONS = 
 
@@ -40,18 +40,20 @@
         -I$(top_srcdir)/libamf \
         -I$(top_srcdir)        \
        $(PTHREAD_CFLAGS) \
-        $(ZLIB_CFLAGS) \
-        $(OGG_CFLAGS) \
-        $(JPEG_CFLAGS) \
-        $(SDL_CFLAGS) \
-        $(OPENGL_CFLAGS) \
-       $(GTK2_CFLAGS) \
-       $(PANGO_CFLAGS) \
-       $(GLIB_CFLAGS) \
-       $(CAIRO_CFLAGS) \
-       $(ATK_CFLAGS) \
-       $(DMALLOC_CFLAGS) \
-        $(LIBXML_CFLAGS)
+       $(DMALLOC_CFLAGS)
+
+#        $(LIBXML_CFLAGS)
+#        $(ZLIB_CFLAGS) \
+#        $(OGG_CFLAGS) \
+#        $(JPEG_CFLAGS) \
+#        $(SDL_CFLAGS) \
+#        $(OPENGL_CFLAGS) \
+#      $(GTK2_CFLAGS) \
+#      $(PANGO_CFLAGS) \
+#      $(GLIB_CFLAGS) \
+#      $(CAIRO_CFLAGS) \
+#      $(ATK_CFLAGS) \
+#
 
 libgnashparser_la_SOURCES = \
        action_buffer.cpp \

Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- server/swf/tag_loaders.cpp  11 Nov 2006 22:44:54 -0000      1.56
+++ server/swf/tag_loaders.cpp  13 Nov 2006 17:10:58 -0000      1.57
@@ -18,7 +18,7 @@
 //
 //
 
-/* $Id: tag_loaders.cpp,v 1.56 2006/11/11 22:44:54 strk Exp $ */
+/* $Id: tag_loaders.cpp,v 1.57 2006/11/13 17:10:58 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -43,7 +43,7 @@
 #include "dlist.h"
 #include "timers.h"
 #include "image.h"
-#include "jpeg.h"
+//#include "jpeg.h"
 #include "zlib_adapter.h"
 //#include "Sprite.h"
 #include "sprite_definition.h"