[Gnash-commit] /srv/bzr/gnash/trunk r12053: add libgnashrender.la and libltdl where needed. Add more missing headers.

[Rob Savoye]

------------------------------------------------------------
revno: 12053
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Sun 2010-03-14 17:13:09 -0600
message:
  add libgnashrender.la and libltdl where needed. Add more missing headers.
modified:
  librender/Renderer_agg.cpp
  librender/Renderer_cairo.cpp
  testsuite/libbase.all/TCXXRc.cpp
  testsuite/misc-swfc.all/Makefile.am
  testsuite/misc-swfmill.all/Makefile.am
  testsuite/movies.all/Makefile.am

=== modified file 'librender/Renderer_agg.cpp'
--- a/librender/Renderer_agg.cpp        2010-03-14 06:02:38 +0000
+++ b/librender/Renderer_agg.cpp        2010-03-14 23:13:09 +0000
@@ -133,6 +133,7 @@
 #include "GnashVaapiImageProxy.h"
 #endif
 
+#include <climits>
 #include <agg_rendering_buffer.h>
 #include <agg_renderer_base.h>
 #include <agg_pixfmt_rgb.h>
@@ -173,9 +174,8 @@
 
 #include <boost/scoped_array.hpp>
 #include <boost/bind.hpp>
-
 #ifndef round
-       #define round(x) rint(x)
+#  define round(x) rint(x)
 #endif
 
 // Print a debugging warning when rendering of a whole character

=== modified file 'librender/Renderer_cairo.cpp'
--- a/librender/Renderer_cairo.cpp      2010-03-14 21:23:43 +0000
+++ b/librender/Renderer_cairo.cpp      2010-03-14 23:13:09 +0000
@@ -50,8 +50,6 @@
 
 namespace gnash {
 
-
-
 // Converts from RGB image to 32-bit pixels in CAIRO_FORMAT_RGB24 format
 static void
 rgb_to_cairo_rgb24(boost::uint8_t* dst, const GnashImage* im)

=== modified file 'testsuite/libbase.all/TCXXRc.cpp'
--- a/testsuite/libbase.all/TCXXRc.cpp  2010-03-14 22:06:02 +0000
+++ b/testsuite/libbase.all/TCXXRc.cpp  2010-03-14 23:13:09 +0000
@@ -304,11 +304,6 @@
             }
         }
 
-        if (rc.useXv() == true) {
-            runtest.pass ("Xvideo on by local.rc");
-        } else {
-            runtest.fail ("Xvideo on by local.rc");
-        }
     }
 
     if (rc.getURLOpenerFormat() == "lynx %u") {

=== modified file 'testsuite/misc-swfc.all/Makefile.am'
--- a/testsuite/misc-swfc.all/Makefile.am       2010-03-14 02:26:46 +0000
+++ b/testsuite/misc-swfc.all/Makefile.am       2010-03-14 23:13:09 +0000
@@ -72,12 +72,18 @@
        $(top_builddir)/libbase/libgnashbase.la \
        $(NULL)
 
+if LIBLTDL2
+GNASH_LIBS += $(top_builddir)/libltdl/libltdlc.la
+endif
+if LIBLTDL1
+GNASH_LIBS += $(top_builddir)/libbase/libltdlc.la
+endif
+
 # These will get compiled to SWFs just as above, but will not be executed as a 
test
 # They are for secondary movies to be loaded by the above tests.
 AUXMOVIES = \
            $(NULL)
 
-
 EXTRA_DIST = $(SANE_SCTESTS) $(BOGO_SCTESTS) $(AUXMOVIES) 
$(INTERACTIVE_SCTESTS) check.sc Dejagnu.sc hello.sc
 
 check_PROGRAMS = \

=== modified file 'testsuite/misc-swfmill.all/Makefile.am'
--- a/testsuite/misc-swfmill.all/Makefile.am    2010-03-14 22:06:02 +0000
+++ b/testsuite/misc-swfmill.all/Makefile.am    2010-03-14 23:13:09 +0000
@@ -39,12 +39,12 @@
        $(NULL)
 
 ## Self-contained XML tests
-SC_AS2_XMLTESTS =                      \
-       mixed-bytecode-as2.xml  \
-       hello.xml               \
-       jump_after_end.xml      \
-       jump_to_prev_block.xml  \
-       dict_override.xml       \
+SC_AS2_XMLTESTS = \
+       mixed-bytecode-as2.xml \
+       hello.xml \
+       jump_after_end.xml \
+       jump_to_prev_block.xml \
+       dict_override.xml \
        initaction_in_definesprite.xml \
        zeroframe_definesprite.xml \
        background.xml \
@@ -68,7 +68,7 @@
        -I$(top_srcdir)/libmedia \
        -I$(top_srcdir)/libsound \
        -I$(top_srcdir)/librender \
-       -I$(top_srcdir)/libcore  \
+       -I$(top_srcdir)/libcore \
        -I$(top_srcdir)/libcore/swf \
        -I$(top_srcdir)/libcore/parser  \
        -I$(top_srcdir)/libcore/vm \
@@ -93,12 +93,12 @@
 $(SC_XMLTESTS_OUT) : 
 
 check_SCRIPTS = \
-       mixed-bytecode-as2-runner       \
-       jump_after_end-runner   \
-       jump_to_prev_block-runner       \
-       dict_override-runner    \
-       initaction_in_definesprite-runner       \
-       zeroframe_definesprite-runner   \
+       mixed-bytecode-as2-runner \
+       jump_after_end-runner \
+       jump_to_prev_block-runner \
+       dict_override-runner \
+       initaction_in_definesprite-runner \
+       zeroframe_definesprite-runner \
        registers-runner \
        Try-without-jump-runner \
        $(NULL)
@@ -143,7 +143,6 @@
        sh $< -r 50 -c "END OF TEST" $(top_builddir) Try-without-jump.swf > $@
        chmod 755 $@
 
-
 backgroundTestRunner_SOURCES = \
        backgroundTestRunner.cpp \
        $(NULL)
@@ -153,6 +152,7 @@
        $(NULL)
 backgroundTestRunner_LDADD = \
        $(top_builddir)/testsuite/libtestsuite.la \
+       $(AM_LDFLAGS) \
        $(NULL)
 backgroundTestRunner_DEPENDENCIES = \
        $(top_builddir)/testsuite/libtestsuite.la \

=== modified file 'testsuite/movies.all/Makefile.am'
--- a/testsuite/movies.all/Makefile.am  2010-03-10 02:05:23 +0000
+++ b/testsuite/movies.all/Makefile.am  2010-03-14 23:13:09 +0000
@@ -52,11 +52,19 @@
        $(OPENGL_LIBS) \
        $(NULL)
 
+if LIBLTDL2
+AM_LDFLAGS += $(top_builddir)/libltdl/libltdlc.la
+endif
+if LIBLTDL1
+AM_LDFLAGS += $(top_builddir)/libbase/libltdlc.la
+endif
+
 gravity_embedded_TestRunner_SOURCES = \
        gravity_embedded-TestRunner.cpp \
        $(NULL)
 gravity_embedded_TestRunner_LDADD = \
        $(top_builddir)/testsuite/libtestsuite.la \
+       $(AM_LDFLAGS) \
        $(NULL)
 gravity_embedded_TestRunner_CXXFLAGS = \
        -DSRCDIR='"$(srcdir)"' \