[SCM] toonloop/master: Add patch from Peter Green to fix FTBFS on those architectures where clutter uses OpenGL ES.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 938beef772ca8676cebb22c23d6b307d3ffb0af1
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Feb 9 02:23:12 2012 +0100

    Add patch from Peter Green to fix FTBFS on those architectures where clutter uses OpenGL ES.
    
    Closes: #657814

diff --git a/debian/patches/0004-fix_arm.patch b/debian/patches/0004-fix_arm.patch
new file mode 100644
index 0000000..99dd289
--- /dev/null
+++ b/debian/patches/0004-fix_arm.patch
@@ -0,0 +1,77 @@
+Description: fix build on architectures where clutter uses opengl es
+Author: Peter Green <plugwash at p10link.net>
+Bug-Debian: http://bugs.debian.org/657814
+Forwarded: no
+Reviewed-By: Alessio Treglia <alessio at debian.org>
+---
+ configure.ac    |   29 +++++++++++++++++++++++++++++
+ src/Makefile.am |    3 ++-
+ src/gui.h       |    7 ++++++-
+ 3 files changed, 37 insertions(+), 2 deletions(-)
+
+--- toonloop.orig/configure.ac
++++ toonloop/configure.ac
+@@ -157,6 +157,35 @@ AC_MSG_NOTICE(Storing pixmaps files in $
+ AC_DEFINE_UNQUOTED([DATADIR], "${DATADIR}", "Data dir")
+ AC_DEFINE_UNQUOTED([PIXMAPS_DIR], "${PIXMAPS_DIR}", "Pixmaps dir")
+ 
++#test to see whether clutter is build against opengl or opengl es
++AC_LANG(C++)
++AC_MSG_CHECKING([if we can include GL/glx.h and clutter/clutter.h together])
++#setup CXXFLAGS for clutter/opengl compatibility test
++export CXXFLAGS=$CLUTTER_CFLAGS
++AC_COMPILE_IFELSE(
++  [AC_LANG_PROGRAM([[#include <GL/glx.h>
++  #include <clutter/clutter.h>]],[[]])],
++  [
++    AC_MSG_RESULT([yes])
++    AC_SUBST(CUSTOM_CFLAGS,"-dUSE_GLES2")
++  ],[
++    AC_MSG_RESULT([no])
++    AC_MSG_CHECKING([if we can include GLES2/gl2.h and clutter/clutter.h together])
++    AC_COMPILE_IFELSE(
++      [AC_LANG_PROGRAM([[#include <GLES2/gl2.h>
++      #include <clutter/clutter.h>]],[[]])],
++      [
++        AC_MSG_RESULT([yes])
++        AC_SUBST(CUSTOM_CFLAGS,"-DUSE_GLES2")
++      ],[
++        AC_MSG_RESULT([no])
++        AC_MSG_ERROR(cannot find a clutter compatible opengl header)
++  ]
++)
++  ]
++)
++
++#this doesn't appear to actually get used....
+ AC_SUBST(CXXFLAGS, " -O2 -Wall -Wextra -Werror -Wno-unused-result -Wfatal-errors") 
+ AC_CONFIG_FILES([
+     Makefile
+--- toonloop.orig/src/gui.h
++++ toonloop/src/gui.h
+@@ -21,7 +21,12 @@
+ #ifndef __GUI_H__
+ #define __GUI_H__
+ 
+-#include <GL/glx.h>
++#ifdef USE_GLES2
++  #include <GLES2/gl2.h>
++#else
++  #include <GL/glx.h>
++#endif
++
+ #include <clutter/clutter.h>
+ #include <tr1/memory> // for shared_ptr
+ #include <vector>
+--- toonloop.orig/src/Makefile.am
++++ toonloop/src/Makefile.am
+@@ -86,7 +86,8 @@ toonloop_CXXFLAGS = \
+ 	$(RAW1394_CFLAGS) \
+ 	$(AVC1394_CFLAGS) \
+ 	$(STK_CXXFLAGS) \
+-	$(LIBXML_XFLAGS)
++	$(LIBXML_XFLAGS) \
++	$(CUSTOM_CFLAGS)
+  
+ toonloop_LDADD = \
+ 	$(BOOST_FILESYSTEM_LIB) \
diff --git a/debian/patches/series b/debian/patches/series
index dc5ed01..aacb049 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0002-help2man.patch
 0003-rtmidi.patch
+0004-fix_arm.patch

-- 
toonloop packaging