diff -Nru clutter-gst-1.4.2/debian/changelog clutter-gst-1.4.2/debian/changelog --- clutter-gst-1.4.2/debian/changelog 2011-10-06 18:03:38.000000000 +0300 +++ clutter-gst-1.4.2/debian/changelog 2011-11-09 19:27:20.000000000 +0200 @@ -1,3 +1,12 @@ +clutter-gst (1.4.2-1.1) oneiric-proposed; urgency=low + + * debian/patches/fix_gles_shader_linking.patch: + Fix GLES shader code to avoid linking error that prevents + Cheese working on ARM. (LP: #888168) + Patch picked from clutter-gst git master branch. + + -- Jani Monoses Wed, 09 Nov 2011 19:05:46 +0200 + clutter-gst (1.4.2-1) unstable; urgency=low * New upstream release diff -Nru clutter-gst-1.4.2/debian/control clutter-gst-1.4.2/debian/control --- clutter-gst-1.4.2/debian/control 2011-10-06 18:24:47.000000000 +0300 +++ clutter-gst-1.4.2/debian/control 2011-11-09 19:27:24.000000000 +0200 @@ -7,7 +7,7 @@ Section: libs Priority: optional Maintainer: Ross Burton -Uploaders: Debian GNOME Maintainers , Emilio Pozuelo Monfort , Laurent Bigonville , Rob Bradford , Sjoerd Simons +Uploaders: Debian GNOME Maintainers , Emilio Pozuelo Monfort , Laurent Bigonville , Sjoerd Simons Build-Depends: debhelper (>= 5), cdbs, dh-autoreconf (>= 4), diff -Nru clutter-gst-1.4.2/debian/patches/fix_gles_shader_linking.patch clutter-gst-1.4.2/debian/patches/fix_gles_shader_linking.patch --- clutter-gst-1.4.2/debian/patches/fix_gles_shader_linking.patch 1970-01-01 02:00:00.000000000 +0200 +++ clutter-gst-1.4.2/debian/patches/fix_gles_shader_linking.patch 2011-11-09 19:18:10.000000000 +0200 @@ -0,0 +1,22 @@ +## Description: Fix vertex shader to work with GLES2 +## Origin/Author: Damien Lespiau +## Bug: https://bugzilla.gnome.org/show_bug.cgi?id=661071 +Index: clutter-gst-1.4.2/clutter-gst/clutter-gst-shaders.h +=================================================================== +--- clutter-gst-1.4.2.orig/clutter-gst/clutter-gst-shaders.h 2011-04-10 18:08:16.000000000 +0300 ++++ clutter-gst-1.4.2/clutter-gst/clutter-gst-shaders.h 2011-11-09 19:05:42.420902864 +0200 +@@ -11,11 +11,9 @@ + #ifdef COGL_HAS_GLES + + #define GLES2_VARS \ +- "precision mediump float;\n" \ +- "varying vec2 tex_coord;\n" \ +- "varying vec4 frag_color;\n" +-#define TEX_COORD "tex_coord" +-#define COLOR_VAR "frag_color" ++ "precision mediump float;\n" ++#define TEX_COORD "cogl_tex_coord_in[0]" ++#define COLOR_VAR "cogl_color_in" + + #else /* COGL_HAS_GLES */ + diff -Nru clutter-gst-1.4.2/debian/patches/series clutter-gst-1.4.2/debian/patches/series --- clutter-gst-1.4.2/debian/patches/series 2011-10-06 17:06:01.000000000 +0300 +++ clutter-gst-1.4.2/debian/patches/series 2011-11-09 19:04:31.000000000 +0200 @@ -1 +1,2 @@ 01_fix_dolt_m4.patch +fix_gles_shader_linking.patch