[SCM] toonloop/master: Refresh patch 0005-fix_arm.patch

[fsateler at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 36de2ad4afcdc574495ebadbf8d38c1ffd2061f5
Author: Felipe Sateler <fsateler at debian.org>
Date:   Thu Mar 6 17:20:09 2014 -0300

    Refresh patch 0005-fix_arm.patch

diff --git a/debian/patches/0004-fix_arm.patch b/debian/patches/0004-fix_arm.patch
index 637d30a..57283aa 100644
--- a/debian/patches/0004-fix_arm.patch
+++ b/debian/patches/0004-fix_arm.patch
@@ -4,11 +4,11 @@ Bug-Debian: http://bugs.debian.org/657814
 Forwarded: no
 Reviewed-By: Alessio Treglia <alessio at debian.org>
 Reviewed-By: Jonas Smedegaard <dr at jones.dk>
-Last-Update: 2012-04-06
+Last-Update: 2014-03-06
 
 --- a/configure.ac
 +++ b/configure.ac
-@@ -157,6 +157,34 @@
+@@ -147,6 +147,35 @@ AC_MSG_NOTICE(Storing pixmaps files in $
  AC_DEFINE_UNQUOTED([DATADIR], "${DATADIR}", "Data dir")
  AC_DEFINE_UNQUOTED([PIXMAPS_DIR], "${PIXMAPS_DIR}", "Pixmaps dir")
  
@@ -40,7 +40,8 @@ Last-Update: 2012-04-06
 +    ]
 +)
 +
- AC_SUBST(CXXFLAGS, " -O2 -Wall -Wextra -Wno-unused-result -Wfatal-errors")
++
+ AC_SUBST(CXXFLAGS, " -O2 -Wall -Wextra -Wno-unused-result -Wfatal-errors") dnl -Werror 
  AC_CONFIG_FILES([
      Makefile
 --- a/src/gui.h
@@ -49,11 +50,10 @@ Last-Update: 2012-04-06
  #ifndef __GUI_H__
  #define __GUI_H__
  
--#include <GL/glx.h>
 +#ifdef USE_GLES2
 +#include <GLES2/gl2.h>
 +#else
-+#include <GL/glx.h>
+ #include <GL/glx.h>
 +#endif
 +
  #include <clutter/clutter.h>
@@ -61,10 +61,10 @@ Last-Update: 2012-04-06
  #include <vector>
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -86,7 +86,8 @@
+@@ -86,7 +86,8 @@ toonloop_CXXFLAGS = \
  	$(RAW1394_CFLAGS) \
  	$(AVC1394_CFLAGS) \
- 	$(STK_CXXFLAGS) \
+ 	$(RTMIDI_CFLAGS) \
 -	$(LIBXML_XFLAGS)
 +	$(LIBXML_XFLAGS) \
 +	$(CUSTOM_CFLAGS)

-- 
toonloop packaging