gnash-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: Sandro Santilli
Subject: [Gnash-commit] gnash ChangeLog server/Makefile.am server/Strea... [release_0_7_2]
Date: Mon, 13 Nov 2006 17:10:44 +0000

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

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&only_with_tag=release_0_7_2&r1=1.1412.2.164&r2=1.1412.2.165
http://cvs.savannah.gnu.org/viewcvs/gnash/server/Makefile.am?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.80.2.4&r2=1.80.2.5
http://cvs.savannah.gnu.org/viewcvs/gnash/server/StreamProvider.cpp?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.11.2.1&r2=1.11.2.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/impl.cpp?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.64.2.3&r2=1.64.2.4
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.h?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.21.2.1&r2=1.21.2.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Makefile.am?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.12.2.2&r2=1.12.2.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/Makefile.am?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.10.2.2&r2=1.10.2.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.53.2.1&r2=1.53.2.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1412.2.164
retrieving revision 1.1412.2.165
diff -u -b -r1.1412.2.164 -r1.1412.2.165
--- ChangeLog   13 Nov 2006 14:39:18 -0000      1.1412.2.164
+++ ChangeLog   13 Nov 2006 17:10:43 -0000      1.1412.2.165
@@ -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.80.2.4
retrieving revision 1.80.2.5
diff -u -b -r1.80.2.4 -r1.80.2.5
--- server/Makefile.am  10 Nov 2006 22:01:42 -0000      1.80.2.4
+++ server/Makefile.am  13 Nov 2006 17:10:44 -0000      1.80.2.5
@@ -18,7 +18,7 @@
 # 
 #
 
-# $Id: Makefile.am,v 1.80.2.4 2006/11/10 22:01:42 nihilus Exp $
+# $Id: Makefile.am,v 1.80.2.5 2006/11/13 17:10:44 strk Exp $
 
 AUTOMAKE_OPTIONS = 
 
@@ -39,20 +39,22 @@
         -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) \
-       $(CURL_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) \
+#      $(CURL_CFLAGS) \
+#
+
 libgnashserver_la_SOURCES = \
        as_object.cpp   \
        as_value.cpp     \
@@ -164,9 +166,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.11.2.1
retrieving revision 1.11.2.2
diff -u -b -r1.11.2.1 -r1.11.2.2
--- server/StreamProvider.cpp   30 Oct 2006 14:28:48 -0000      1.11.2.1
+++ server/StreamProvider.cpp   13 Nov 2006 17:10:44 -0000      1.11.2.2
@@ -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.64.2.3
retrieving revision 1.64.2.4
diff -u -b -r1.64.2.3 -r1.64.2.4
--- server/impl.cpp     7 Nov 2006 16:24:04 -0000       1.64.2.3
+++ server/impl.cpp     13 Nov 2006 17:10:44 -0000      1.64.2.4
@@ -18,7 +18,7 @@
 //
 //
 
-/* $Id: impl.cpp,v 1.64.2.3 2006/11/07 16:24:04 strk Exp $ */
+/* $Id: impl.cpp,v 1.64.2.4 2006/11/13 17:10:44 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.21.2.1
retrieving revision 1.21.2.2
diff -u -b -r1.21.2.1 -r1.21.2.2
--- server/movie_root.h 30 Oct 2006 14:28:49 -0000      1.21.2.1
+++ server/movie_root.h 13 Nov 2006 17:10:44 -0000      1.21.2.2
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: movie_root.h,v 1.21.2.1 2006/10/30 14:28:49 rsavoye Exp $ */
+/* $Id: movie_root.h,v 1.21.2.2 2006/11/13 17:10:44 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.12.2.2
retrieving revision 1.12.2.3
diff -u -b -r1.12.2.2 -r1.12.2.3
--- server/asobj/Makefile.am    10 Nov 2006 22:01:42 -0000      1.12.2.2
+++ server/asobj/Makefile.am    13 Nov 2006 17:10:44 -0000      1.12.2.3
@@ -18,7 +18,7 @@
 # 
 #
 
-# $Id: Makefile.am,v 1.12.2.2 2006/11/10 22:01:42 nihilus Exp $
+# $Id: Makefile.am,v 1.12.2.3 2006/11/13 17:10:44 strk Exp $
 
 AUTOMAKE_OPTIONS = 
 
@@ -35,19 +35,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.10.2.2
retrieving revision 1.10.2.3
diff -u -b -r1.10.2.2 -r1.10.2.3
--- server/parser/Makefile.am   10 Nov 2006 22:01:42 -0000      1.10.2.2
+++ server/parser/Makefile.am   13 Nov 2006 17:10:44 -0000      1.10.2.3
@@ -18,7 +18,7 @@
 # 
 #
 
-# $Id: Makefile.am,v 1.10.2.2 2006/11/10 22:01:42 nihilus Exp $
+# $Id: Makefile.am,v 1.10.2.3 2006/11/13 17:10:44 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.53.2.1
retrieving revision 1.53.2.2
diff -u -b -r1.53.2.1 -r1.53.2.2
--- server/swf/tag_loaders.cpp  30 Oct 2006 14:28:55 -0000      1.53.2.1
+++ server/swf/tag_loaders.cpp  13 Nov 2006 17:10:44 -0000      1.53.2.2
@@ -18,7 +18,7 @@
 //
 //
 
-/* $Id: tag_loaders.cpp,v 1.53.2.1 2006/10/30 14:28:55 rsavoye Exp $ */
+/* $Id: tag_loaders.cpp,v 1.53.2.2 2006/11/13 17:10:44 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"




reply via email to

[Prev in Thread] Current Thread [Next in Thread]