[Gnash-commit] gnash ChangeLog Makefile.am backend/Makefile.am...

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    06/08/13 15:54:16

Modified files:
        .              : ChangeLog Makefile.am 
        backend        : Makefile.am 
        gui            : Makefile.am 
        libamf         : Makefile.am 
        libbase        : Makefile.am 
        macros         : gtkglext.m4 kde.m4 
        server         : Makefile.am 
        server/asobj   : Makefile.am 

Log message:
                * Makefile.am: Build klash if it's snabled, but the plugijn
                isn't.
                * backend/Makefile.am: Add lib dependancies for libgnashbase and
                libgnashserver.
                * gui/Makefile.am: Spell DEPENDANCIES right.
                * libamf/Makefile.am: Make amftest only build for testing.
                * libbase/Makefile.am: Add mor dependent libraries, add ogl.h to
                the package.
                * macros/kde.m4: Fix how KDE_LDFLAGS gets set.
                * server/Makefile.am: Add lib dependancies for libgnashbase and
                libgnashasobjs.
                * server/asobj/Makefile.am: Add lib dependancies for 
libgnashbase and
                libgnashamf.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.633&r2=1.634
http://cvs.savannah.gnu.org/viewcvs/gnash/Makefile.am?cvsroot=gnash&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/Makefile.am?cvsroot=gnash&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/Makefile.am?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/Makefile.am?cvsroot=gnash&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gtkglext.m4?cvsroot=gnash&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/kde.m4?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/server/Makefile.am?cvsroot=gnash&r1=1.56&r2=1.57
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Makefile.am?cvsroot=gnash&r1=1.3&r2=1.4

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.633
retrieving revision 1.634
diff -u -b -r1.633 -r1.634
--- ChangeLog   13 Aug 2006 13:39:31 -0000      1.633
+++ ChangeLog   13 Aug 2006 15:54:16 -0000      1.634
@@ -1,3 +1,38 @@
+2006-08-12 Rob Savoye  <address@hidden>
+
+       * Makefile.am: Build klash if it's snabled, but the plugijn
+       isn't.
+       * backend/Makefile.am: Add lib dependancies for libgnashbase and
+       libgnashserver.
+       * gui/Makefile.am: Spell DEPENDANCIES right.
+       * libamf/Makefile.am: Make amftest only build for testing.
+       * libbase/Makefile.am: Add mor dependent libraries, add ogl.h to
+       the package.
+       * macros/kde.m4: Fix how KDE_LDFLAGS gets set.
+       * server/Makefile.am: Add lib dependancies for libgnashbase and
+       libgnashasobjs.
+       * server/asobj/Makefile.am: Add lib dependancies for libgnashbase and
+       libgnashamf.
+
+
+2006-08-10  Rob Savoye  <address@hidden>
+
+       * gui/Makefile.am: Add more libraries to AM_LDFLAGS.
+       * libamf/Makefile.am: Remove the rest of the amftest.
+       * libamf/amf.cpp, amf.h, rtmp.cpp, rtmp.h: Much rearranging of
+       code, plus additional code till libamf actually works now.
+       * libamf/rtmp.h: Use gnash namespace instead of rtmp one.
+       * libbase/log.h, log.cpp: Add support to hexify to optionally
+       print ascii characters in a hex dump.
+       * libbase/network.cpp: Add WriteNet().
+       * libbase/utility.h: Include math.h for Darwin.
+       * macros/gtkglext.m4: Use pkg-config if it exists.
+       * macros/kde.m4: Add -L to KDE_LDFLAGS.
+       * plugin/klash/klash.cpp: External variables are now defined
+       here.
+       * macros/pango.m4: Work around PPC Linux bug (YDL) with gtkglext
+       and pango library dependancies.
+
 2006-08-13 Sandro Santilli  <address@hidden>
 
        * gui/gnash.cpp (fs_callback): removed unused parameter warning,
@@ -15,6 +50,7 @@
        safely handle ActionScript code referencing '..' 
        from the root character.
 
+>>>>>>> 1.633
 2006-08-12  Sandro Santilli  <address@hidden>
 
        * server/Makefile.am, server/thread.h: removed duplicated code
@@ -37,11 +73,13 @@
 2006-08-11 Vitaly Alexeev <address@hidden>
        
        * server\swf\ASHandlers.cpp: removed assert(0),
-       no actionscript operation should lead to crash player, including "x=new 
MyClass();".
+       no actionscript operation should lead to crash player, including
+       "x=new MyClass();". 
 
 2006-08-10 Vitaly Alexeev <address@hidden>
        
-       * gui\sdl.cpp, sdlsup.h: added key events handler and removed 
showlogo(useless)
+       * gui\sdl.cpp, sdlsup.h: added key events handler and removed
+       showlogo(useless) 
        
 2006-08-10 Bastiaan Jacques <address@hidden>
 

Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/Makefile.am,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- Makefile.am 1 Aug 2006 16:57:35 -0000       1.32
+++ Makefile.am 13 Aug 2006 15:54:16 -0000      1.33
@@ -54,10 +54,14 @@
 DOC_DIRS = doc
 endif
 
-SUBDIRS      = $(STD_DIRS) $(DOC_DIRS) $(PLUGIN_DIRS)
+if KLASH
+KLASH_DIRS = plugin/klash
+endif
+
+SUBDIRS      = $(STD_DIRS) $(DOC_DIRS) $(PLUGIN_DIRS) $(KLASH_DIRS)
 
 # libamf isn't used yet, but we still want it in the distribution
-DIST_SUBDIRS = $(STD_DIRS) doc testsuite libamf plugin
+DIST_SUBDIRS = $(STD_DIRS) doc testsuite plugin
 
 #EXTRA_DIST = macros
 # if HTTP

Index: backend/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/backend/Makefile.am,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- backend/Makefile.am 31 Jul 2006 21:49:43 -0000      1.30
+++ backend/Makefile.am 13 Aug 2006 15:54:16 -0000      1.31
@@ -98,6 +98,10 @@
 endif
 endif
 
+libgnashbackend_la_LIBADD = \
+       ../libbase/libgnashbase.la \
+       ../server/libgnashserver.la 
+
 libgnashbackend_la_SOURCES = \
        $(RENDER_SOURCES) \
        $(SOUND_SOURCES)

Index: gui/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- gui/Makefile.am     12 Aug 2006 15:11:52 -0000      1.13
+++ gui/Makefile.am     13 Aug 2006 15:54:16 -0000      1.14
@@ -154,7 +154,6 @@
 
 libgnashgui_la_LIBADD = \
        ../server/libgnashserver.la \
-       ../libamf/libgnashamf.la \
        ../backend/libgnashbackend.la \
        $(AM_LDFLAGS)
 
@@ -187,7 +186,7 @@
        $(LIB_KDEUI) \
        $(GNASH_LIBS)
 
-klash_DEPENDANCIES = klash.moc libgnashgui.la
+klash_DEPENDENCIES = klash.moc libgnashgui.la
 
 CLEANFILES = klash.moc
 klash.moc: $(srcdir)/kdesup.h

Index: libamf/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/libamf/Makefile.am,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- libamf/Makefile.am  12 Aug 2006 15:11:53 -0000      1.10
+++ libamf/Makefile.am  13 Aug 2006 15:54:16 -0000      1.11
@@ -65,11 +65,11 @@
        -I$(top_srcdir)/libbase \
         $(LIBXML_CFLAGS)
 
-noinst_HEADERS = amfutf8.h amf.h rtmp.h
+noinst_HEADERS = amfutf8.h amf.h rtmp.h protocol.h
 
-# noinst_PROGRAMS = amftest
-# amftest_SOURCES = amftest.cpp
-# amftest_LDADD = $(AM_LDFLAGS) libgnashamf.la
+check_PROGRAMS = amftest
+amftest_SOURCES = amftest.cpp
+amftest_LDADD = $(AM_LDFLAGS) libgnashamf.la
 
 # Rebuild with GCC 4.x Mudflap support
 mudflap:

Index: libbase/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/libbase/Makefile.am,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- libbase/Makefile.am 30 Jul 2006 15:54:00 -0000      1.33
+++ libbase/Makefile.am 13 Aug 2006 15:54:16 -0000      1.34
@@ -103,8 +103,8 @@
        $(JPEG_LIBS) \
        $(ZLIB_LIBS) \
        $(CURL_LIBS) \
-       $(SDL_LIBS)
-#      $(OPENGL_LIBS)
+       $(SDL_LIBS) \
+       $(OPENGL_LIBS)
 
 noinst_HEADERS = \
        container.h \
@@ -117,6 +117,7 @@
        membuf.h \
        network.h \
        log.h \
+       ogl.h \
        postscript.h \
        rc.h \
        smart_ptr.h \

Index: macros/gtkglext.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gtkglext.m4,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- macros/gtkglext.m4  29 May 2006 12:58:49 -0000      1.18
+++ macros/gtkglext.m4  13 Aug 2006 15:54:16 -0000      1.19
@@ -63,12 +63,19 @@
       fi
      ])
 
+     pkg=no
+     if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_glext_incl}" = x; then
+       ac_cv_path_glext_incl=`$PKG_CONFIG --cflags gtkglext-1.0`
+       gnash_glext_version="1.0"
+       pkg=yes
+     fi
+
 dnl Attempt to find the top level directory, which unfortunately has a
 dnl version number attached. At least on Debain based systems, this
 dnl doesn't seem to get a directory that is unversioned.
     if test x"${gnash_glext_version}" = x ; then
       AC_MSG_CHECKING([for the Gtk GL Extensions Version])
-      pathlist="${prefix}/include /sw/include /usr/local/include 
/usr/X11R6/include /home/latest/include /opt/include /usr/include 
/usr/pkg/include .. ../.."
+      pathlist="${prefix}/include /sw/include /opt/local/include 
/usr/local/include /usr/X11R6/include /home/latest/include /opt/include 
/usr/include /usr/pkg/include .. ../.."
 
       gnash_glext_topdir=""
       gnash_glext_version=""
@@ -87,15 +94,12 @@
       else
         AC_MSG_RESULT([${gnash_glext_version}])
       fi
-
     fi
 
-
     dnl If the path hasn't been specified, go look for it.
     if test x"${ac_cv_path_glext_incl}" = x; then
-
         AC_MSG_CHECKING([for gtk/gtkgl.h])
-        incllist="${prefix}/include /sw/include /usr/local/include 
/usr/X11R6/include /home/latest/include /opt/include /usr/include 
/usr/pkg/include .. ../.."
+        incllist="${prefix}/include /sw/include /opt/local/include 
/usr/local/include /usr/X11R6/include /home/latest/include /opt/include 
/usr/include /usr/pkg/include .. ../.."
 
        ac_cv_path_glext_incl=""
         for i in $incllist; do
@@ -117,11 +121,10 @@
         else
           AC_MSG_RESULT([${ac_cv_path_glext_incl}])
         fi
-
     fi
 
       dnl Look for the library
-      AC_ARG_WITH(glext_lib, [  --with-glext-lib         directory where glext 
library is], with_glext_lib=${withval})
+     AC_ARG_WITH(glext_lib, [  --with-glext-lib         directory where 
gtkglext library is], with_glext_lib=${withval})
       AC_CACHE_VAL(ac_cv_path_glext_lib,[
       if test x"${with_glext_lib}" != x ; then
         if test -f ${with_glext_lib}/libgtkglext-x11-${gnash_glext_version}.a 
-o -f ${with_glext_lib}/libgtkglext-x11-${gnash_glext_version}.so; then
@@ -132,12 +135,15 @@
       fi
       ])
 
-dnl If the header doesn't exist, there is no point looking for
-dnl the library. 
-      if test x"${ac_cv_path_glext_incl}" != x; then
+      dnl Try with pkg-config
+      if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_glext_lib}" = x; then
+        ac_cv_path_glext_lib=`$PKG_CONFIG --libs gtkglext-1.0`
+      fi
+
+      if test x"${ac_cv_path_glext_lib}" != x; then
         AC_CHECK_LIB(gtkglext-x11-${gnash_glext_version}, gtk_gl_init, 
[ac_cv_path_glext_lib="-lgtkglext-x11-${gnash_glext_version} 
-lgdkglext-x11-${gnash_glext_version}"],[
           AC_MSG_CHECKING([for libglext library])
-          libslist="${prefix}/lib64 ${prefix}/lib /usr/X11R6/lib64 
/usr/X11R6/lib /usr/lib /usr/lib64 /sw/lib /usr/local/lib /home/latest/lib 
/opt/lib /usr/pkg/lib .. ../.."
+          libslist="${prefix}/lib64 ${prefix}/lib /opt/local/lib 
/usr/X11R6/lib64 /usr/X11R6/lib /usr/lib /usr/lib64 /sw/lib /usr/local/lib 
/home/latest/lib /opt/lib /usr/pkg/lib .. ../.."
           for i in $libslist; do
            if test -f $i/libgtkglext-x11-${gnash_glext_version}.a -o -f 
$i/libgtkglext-x11-${gnash_glext_version}.so; then
              if test x"$i" != x"/usr/lib"; then
@@ -166,7 +172,7 @@
 
   if test x"${ac_cv_path_glext_incl}" != x ; then
     AC_DEFINE(HAVE_GTK_GTKGL_H, [1], [GTKGLExt header])
-    libslist="${prefix}/lib64 ${prefix}/lib /usr/lib /usr/lib64 /sw/lib 
/usr/local/lib /home/latest/lib /opt/lib /usr/pkg/lib .. ../.."
+    libslist="${prefix}/lib64 ${prefix}/lib /usr/lib /usr/lib64 /opt/local/lib 
/sw/lib /usr/local/lib /home/latest/lib /opt/lib /usr/pkg/lib .. ../.."
 
     libslist="${prefix}/lib64 ${prefix}/lib /usr/X11R6/lib64 /usr/X11R6/lib 
/usr/lib /usr/lib64 /sw/lib /usr/local/lib /home/latest/lib /opt/lib 
/usr/pkg/lib .. ../.."
     ac_cv_path_glext_incl="${ac_cv_path_glext_incl}"
@@ -194,3 +200,4 @@
   AC_SUBST(GLEXT_CFLAGS)
   AC_SUBST(GLEXT_LIBS)
 ])
+

Index: macros/kde.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/kde.m4,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- macros/kde.m4       6 Aug 2006 02:00:54 -0000       1.12
+++ macros/kde.m4       13 Aug 2006 15:54:16 -0000      1.13
@@ -1869,7 +1869,12 @@
 
 KDE_DEFAULT_CXXFLAGS="-DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST -DQT_NO_STL 
-DQT_NO_COMPAT -DQT_NO_TRANSLATION"
  
-KDE_LDFLAGS=`echo $kde_libraries | sed -e 's:/usr/lib64::;s:/usr/lib::'`
+dnl We don't want the default system path as it screws up specify directories.
+if test x"${kde_libraries}" = x"/usr/lib" -o x"${kde_libraries}" = 
x"/usr/lib64"; then
+  KDE_LDFLAGS=""
+else
+  KDE_LDFLAGS="-L${kde_libraries}"
+fi
 
 if test ! "$kde_libraries" = "$x_libraries" && test ! "$kde_libraries" = 
"$qt_libraries" ; then 
  all_libraries="$KDE_LDFLAGS $all_libraries"

Index: server/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/Makefile.am,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- server/Makefile.am  12 Aug 2006 22:24:53 -0000      1.56
+++ server/Makefile.am  13 Aug 2006 15:54:16 -0000      1.57
@@ -182,6 +182,8 @@
        fn_call.h
 
 libgnashserver_la_LIBADD = \
+       ../libbase/libgnashbase.la \
+       asobj/libgnashasobjs.la \
        $(ZLIB_LIBS) \
        $(LIBXML_LIBS) \
        $(LIBXML_LIBS) \

Index: server/asobj/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- server/asobj/Makefile.am    9 Aug 2006 01:59:07 -0000       1.3
+++ server/asobj/Makefile.am    13 Aug 2006 15:54:16 -0000      1.4
@@ -116,6 +116,10 @@
        TextSnapshot.h  \
        Video.h
 
+libgnashasobjs_la_LIBADD = \
+       ../../libamf/libgnashamf.la \
+       ../../libbase/libgnashbase.la
+
 # Rebuild with GCC 4.x Mudflap support
 mudflap:
        @echo "Rebuilding with GCC Mudflap support"