[Gnash-commit] gnash ./ChangeLog ./configure.ac backend/Makefi...

[Bastiaan Jacques]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Bastiaan Jacques <address@hidden>       06/05/02 20:51:59

Modified files:
        .              : ChangeLog configure.ac 
        backend        : Makefile.am gnash.cpp 
        server         : gnash.h 
Added files:
        backend        : render_handler_cairo.cpp 

Log message:
        Add --enable-renderer={opengl,cairo}. Compile and use Cairo if 
requested. Initial Cairo renderer backend implementation, written by Timothy 
Lee.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.255&tr2=1.256&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/configure.ac.diff?tr1=1.61&tr2=1.62&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/backend/Makefile.am.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/backend/gnash.cpp.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/backend/render_handler_cairo.cpp?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/gnash.h.diff?tr1=1.16&tr2=1.17&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.255 gnash/ChangeLog:1.256
--- gnash/ChangeLog:1.255       Sun Apr 30 21:14:23 2006
+++ gnash/ChangeLog     Tue May  2 20:51:59 2006
@@ -1,3 +1,11 @@
+2006-05-02 Bastiaan Jacques <address@hidden>
+
+       * configure.ac: Add --enable-renderer={opengl,cairo}.
+       * backend/Makefile.am, backend/gnash.cpp, server/gnash.h:
+       Compile and use Cairo if requested.
+       * render_handler_cairo.cpp: Initial Cairo renderer backend
+       implementation, written by Timothy Lee.
+
 2006-04-30 Bastiaan Jacques <address@hidden>
 
        * backend/gnash.cpp: Use the right signal name.
Index: gnash/backend/Makefile.am
diff -u gnash/backend/Makefile.am:1.20 gnash/backend/Makefile.am:1.21
--- gnash/backend/Makefile.am:1.20      Wed Apr  5 01:17:45 2006
+++ gnash/backend/Makefile.am   Tue May  2 20:51:59 2006
@@ -75,8 +75,15 @@
 #noinst_LTLIBRARIES = libgbackend.la
 lib_LTLIBRARIES = libgnashbackend.la
 
+if USE_RENDERER_CAIRO
+RENDER_SOURCES = render_handler_cairo.cpp
+endif
+if USE_RENDERER_OPENGL
+RENDER_SOURCES = render_handler_ogl.cpp
+endif
+
 libgnashbackend_la_SOURCES = \
-       render_handler_ogl.cpp  \
+       $(RENDER_SOURCES) \
        sound_handler_sdl.cpp \
        gtksup.cpp gtksup.h
 
Index: gnash/backend/gnash.cpp
diff -u gnash/backend/gnash.cpp:1.28 gnash/backend/gnash.cpp:1.29
--- gnash/backend/gnash.cpp:1.28        Sun Apr 30 21:14:23 2006
+++ gnash/backend/gnash.cpp     Tue May  2 20:51:59 2006
@@ -384,7 +384,11 @@
             gnash::set_sound_handler(sound);
 #endif
         }
+#ifdef RENDERER_OPENGL
         render = gnash::create_render_handler_ogl();
+#elif defined(RENDERER_CAIRO)
+        render = gnash::create_render_handler_cairo();
+#endif
         gnash::set_render_handler(render);
     }
     
Index: gnash/configure.ac
diff -u gnash/configure.ac:1.61 gnash/configure.ac:1.62
--- gnash/configure.ac:1.61     Thu Apr 27 15:31:18 2006
+++ gnash/configure.ac  Tue May  2 20:51:59 2006
@@ -133,6 +133,30 @@
 dnl fi
 dnl AM_CONDITIONAL(GTK2, test x$gtk2 = xyes)
 
+AC_ARG_ENABLE(
+ renderer,
+ [  --enable-renderer=engine Specify rendering engine:
+                                 OpenGL (default)
+                                 Cairo  (experimental)
+                                 SDL    (unsupported)],
+ [case "${enableval}" in
+   opengl) renderer=opengl ;;
+   cairo)  renderer=cairo  ;;
+   *)      AC_MSG_ERROR([invalid renderer ${enableval} given]) ;;
+  esac],
+ [renderer=opengl]
+)
+
+if test x$renderer = xopengl; then
+  AC_DEFINE([RENDERER_OPENGL], [], [Use OpenGL renderer])
+fi
+AM_CONDITIONAL(USE_RENDERER_OPENGL, test x$renderer = xopengl)
+
+if test x$renderer = xcairo; then
+  AC_DEFINE([RENDERER_CAIRO], [], [Use cairo renderer])
+fi
+AM_CONDITIONAL(USE_RENDERER_CAIRO, test x$renderer = xcairo)
+
 dnl Use the Dom parser from libxml2, not the xmlReader one
 dnl The default is to use the Dom parser
 AC_ARG_ENABLE(dom, [  --enable-dom            Enable support for Dom parser],
Index: gnash/server/gnash.h
diff -u gnash/server/gnash.h:1.16 gnash/server/gnash.h:1.17
--- gnash/server/gnash.h:1.16   Mon Apr 24 23:05:56 2006
+++ gnash/server/gnash.h        Tue May  2 20:51:59 2006
@@ -164,6 +164,7 @@
 // version of the library, depending on platform etc.
 render_handler*        create_render_handler_xbox();
 render_handler*        create_render_handler_ogl();
+render_handler*        create_render_handler_cairo();
 sound_handler* create_sound_handler_sdl();