← Back to branch summary

~ubuntu-branches/ubuntu/wily/mutter/wily

« back to all changes in this revision

Viewing changes to debian/patches/02_arm_include_clutter_x11.patch

  • Committer: Bazaar Package Importer
  • Author(s): Rico Tzschichholz
  • Date: 2011-04-10 22:27:59 UTC
  • mfrom: (0.7.1 upstream) (0.3.20 experimental)
  • Revision ID: james.westby@ubuntu.com-20110410222759-o6n1i5p0unsti44n
Tags: 3.0.0-0ubuntu1
https://launchpad.net/bugs/742458
* New upstream release

* Merge with debian experimental (LP: #742458), remaining changes:
  + debian/patches/03_link_gles2.patch: Link to clutter-glx-1.0
    explicitily at the end of link flags, to bring in libGLESv2 on armel.
* debian/control.in:
  + rename gir package to gir1.2-mutter-3.0
* debian/libmutter0.symbols:
  + updated
* debian/patches:
  + fix 03_link_gles2.patch 

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/02_arm_include_clutter_x11.patch
1
 
## Description: add some description
2
 
## Origin/Author: add some origin or author
3
 
## Bug: bug URL
4
 
Index: mutter-2.91.90/src/compositor/meta-shaped-texture.h
5
 
===================================================================
6
 
--- mutter-2.91.90.orig/src/compositor/meta-shaped-texture.h    2011-03-02 15:43:25.450657070 +0200
7
 
+++ mutter-2.91.90/src/compositor/meta-shaped-texture.h 2011-03-02 15:43:23.834649059 +0200
8
 
@@ -31,6 +31,8 @@
9
 
 #include <clutter/clutter.h>
10
 
 #ifdef HAVE_GLX_TEXTURE_PIXMAP
11
 
 #include <clutter/glx/clutter-glx.h>
12
 
+#else
13
 
+#include <clutter/x11/clutter-x11.h>
14
 
 #endif /* HAVE_GLX_TEXTURE_PIXMAP */
15
 
 
16
 
 G_BEGIN_DECLS