r29192 - in /packages/experimental/cogl/debian: changelog patches/check_gl2_h_in_gl_cogl_defines.patch patches/defining-correct-shader-precision-gles.patch patches/series

[ricotz-guest at users.alioth.debian.org]

Author: ricotz-guest
Date: Fri Jul 29 11:56:53 2011
New Revision: 29192

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=29192
Log:
cogl: add 2 armel patches from ubuntu

Added:
    packages/experimental/cogl/debian/patches/check_gl2_h_in_gl_cogl_defines.patch
    packages/experimental/cogl/debian/patches/defining-correct-shader-precision-gles.patch
Modified:
    packages/experimental/cogl/debian/changelog
    packages/experimental/cogl/debian/patches/series

Modified: packages/experimental/cogl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/cogl/debian/changelog?rev=29192&op=diff
==============================================================================
--- packages/experimental/cogl/debian/changelog [utf-8] (original)
+++ packages/experimental/cogl/debian/changelog [utf-8] Fri Jul 29 11:56:53 2011
@@ -3,5 +3,7 @@
   * Initial upload.
   * debian/patches:
     - add 02_disable_armv5t_specific_optimization.patch from clutter-1.0
+    - add check_gl2_h_in_gl_cogl_defines.patch,
+      defining-correct-shader-precision-gles.patch from ubuntu
 
  -- Rico Tzschichholz <ricotz at ubuntu.com>  Thu, 28 Jul 2011 14:57:41 +0200

Added: packages/experimental/cogl/debian/patches/check_gl2_h_in_gl_cogl_defines.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/cogl/debian/patches/check_gl2_h_in_gl_cogl_defines.patch?rev=29192&op=file
==============================================================================
--- packages/experimental/cogl/debian/patches/check_gl2_h_in_gl_cogl_defines.patch (added)
+++ packages/experimental/cogl/debian/patches/check_gl2_h_in_gl_cogl_defines.patch [utf-8] Fri Jul 29 11:56:53 2011
@@ -1,0 +1,22 @@
+Description: cogl-defines from gl breaks cross gles2 builds;
+ needs to guard the GL/gl.h include if gl2.h from gles2 was already included
+Bug-Ubuntu: https://launchpad.net/bugs/623376
+Author: Alexander Sack <asac at linaro.org>
+Forwarded: ?
+
+Index: cogl-1.7.4/cogl/cogl-defines.h.in
+===================================================================
+--- cogl-1.7.4.orig/cogl/cogl-defines.h.in
++++ cogl-1.7.4/cogl/cogl-defines.h.in
+@@ -29,7 +29,11 @@
+ #define __COGL_DEFINES_H__
+ 
+ #include <glib.h>
++#ifndef __gl_h_
++#ifndef __gl2_h_
+ @COGL_GL_HEADER_INCLUDES@
++#endif
++#endif
+ 
+ G_BEGIN_DECLS
+ 

Added: packages/experimental/cogl/debian/patches/defining-correct-shader-precision-gles.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/cogl/debian/patches/defining-correct-shader-precision-gles.patch?rev=29192&op=file
==============================================================================
--- packages/experimental/cogl/debian/patches/defining-correct-shader-precision-gles.patch (added)
+++ packages/experimental/cogl/debian/patches/defining-correct-shader-precision-gles.patch [utf-8] Fri Jul 29 11:56:53 2011
@@ -1,0 +1,21 @@
+From: Ricardo Salveti de Araujo <ricardo.salveti at canonical.com>
+Date: Thu, 10 Feb 2011 23:42:18 -0200
+Subject: [PATCH] Defining correct shader precision for GLES.
+
+Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti at canonical.com>
+---
+ clutter/cogl/cogl/cogl-shader-boilerplate.h |    4 +---
+ 1 files changed, 1 insertions(+), 3 deletions(-)
+
+Index: cogl-1.7.4/cogl/cogl-shader-boilerplate.h
+===================================================================
+--- cogl-1.7.4.orig/cogl/cogl-shader-boilerplate.h
++++ cogl-1.7.4/cogl/cogl-shader-boilerplate.h
+@@ -77,6 +77,7 @@
+ #define _COGL_COMMON_SHADER_BOILERPLATE_GLES2 \
+   "#define COGL_VERSION 100\n" \
+   "\n" \
++  "precision highp float;\n" \
+   "uniform mat4 cogl_modelview_matrix;\n" \
+   "uniform mat4 cogl_modelview_projection_matrix;\n"  \
+   "uniform mat4 cogl_projection_matrix;\n" \

Modified: packages/experimental/cogl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/cogl/debian/patches/series?rev=29192&op=diff
==============================================================================
--- packages/experimental/cogl/debian/patches/series [utf-8] (original)
+++ packages/experimental/cogl/debian/patches/series [utf-8] Fri Jul 29 11:56:53 2011
@@ -1,1 +1,3 @@
 02_disable_armv5t_specific_optimization.patch
+check_gl2_h_in_gl_cogl_defines.patch
+defining-correct-shader-precision-gles.patch