[SCM] toonloop/master: Re-indent patch 0004 more similar to upstream coding style.

js at users.alioth.debian.org js at users.alioth.debian.org
Fri Apr 6 21:03:25 UTC 2012


The following commit has been merged in the master branch:
commit 7290322054cddcabacafd2bbc7407398a8dcd2c8
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Fri Apr 6 19:43:01 2012 +0200

    Re-indent patch 0004 more similar to upstream coding style.

diff --git a/debian/patches/0004-fix_arm.patch b/debian/patches/0004-fix_arm.patch
index 61813e7..3995473 100644
--- a/debian/patches/0004-fix_arm.patch
+++ b/debian/patches/0004-fix_arm.patch
@@ -17,26 +17,26 @@ Last-Update: 2012-02-09
 +#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)
-+  ]
-+)
-+  ]
++    [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)
++	    ]
++	)
++    ]
 +)
 +
  AC_SUBST(CXXFLAGS, " -O2 -Wall -Wextra -Wno-unused-result -Wfatal-errors")
@@ -50,9 +50,9 @@ Last-Update: 2012-02-09
  
 -#include <GL/glx.h>
 +#ifdef USE_GLES2
-+  #include <GLES2/gl2.h>
++#include <GLES2/gl2.h>
 +#else
-+  #include <GL/glx.h>
++#include <GL/glx.h>
 +#endif
 +
  #include <clutter/clutter.h>

-- 
toonloop packaging



More information about the pkg-multimedia-commits mailing list