← Back to branch summary

~ubuntu-branches/debian/sid/gnome-shell/sid

« back to all changes in this revision

Viewing changes to debian/patches/04_remove-glx-dependency-on-armel.patch

  • Committer: Package Import Robot
  • Author(s): Michael Biebl
  • Date: 2012-04-30 20:37:44 UTC
  • Revision ID: package-import@ubuntu.com-20120430203744-bv9x3ydt4t3dkk85
Tags: 3.2.2.1-4
http://bugs.debian.org/670850
Fold 04_remove-glx-dependency-on-armel.patch and
14_require_gl_directly.patch into a new patch named
14_make-GLX-optional.patch. Use pkg-config to check if gl.pc is available
and build the GLX/GL bits conditionally. This fixes a build failure on
arm{el,hf} where clutter/cogl uses GLES. Closes: #670850

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/04_remove-glx-dependency-on-armel.patch
1
 
From: Robert Bragg <robert@linux.intel.com>
2
 
Date: Wed, 13 Jul 2011 12:20:43 +0100
3
 
Subject: [PATCH] Remove GLX dependency
4
 
 
5
 
Index: oneiric/src/gnome-shell-plugin.c
6
 
===================================================================
7
 
--- oneiric.orig/src/gnome-shell-plugin.c       2011-09-04 04:01:43.713265027 -0400
8
 
+++ oneiric/src/gnome-shell-plugin.c    2011-09-06 11:20:47.243195279 -0400
9
 
@@ -30,8 +30,11 @@
10
 
 
11
 
 #include <clutter/clutter.h>
12
 
 #include <clutter/x11/clutter-x11.h>
13
 
+#if defined (__arm__)
14
 
+#else
15
 
 #include <GL/glx.h>
16
 
 #include <GL/glxext.h>
17
 
+#endif
18
 
 #include <gjs/gjs.h>
19
 
 #include <meta/display.h>
20
 
 #include <meta/meta-plugin.h>
21
 
@@ -146,14 +149,23 @@
22
 
 gnome_shell_plugin_start (MetaPlugin *plugin)
23
 
 {
24
 
   GnomeShellPlugin *shell_plugin = GNOME_SHELL_PLUGIN (plugin);
25
 
+#if defined (__arm__)
26
 
+#else
27
 
   MetaScreen *screen;
28
 
   MetaDisplay *display;
29
 
   Display *xdisplay;
30
 
+#endif
31
 
   GError *error = NULL;
32
 
   int status;
33
 
+#if defined (__arm__)
34
 
+#else
35
 
   const char *glx_extensions;
36
 
+#endif
37
 
   GjsContext *gjs_context;
38
 
 
39
 
+#if defined (__arm__)
40
 
+  shell_plugin->have_swap_event = 0;
41
 
+#else
42
 
   screen = meta_plugin_get_screen (plugin);
43
 
   display = meta_screen_get_display (screen);
44
 
 
45
 
@@ -166,6 +178,7 @@
46
 
   glx_extensions = glXQueryExtensionsString (xdisplay,
47
 
                                              meta_screen_get_screen_number (screen));
48
 
   shell_plugin->have_swap_event = strstr (glx_extensions, "GLX_INTEL_swap_event") != NULL;
49
 
+#endif
50
 
 
51
 
   shell_perf_log_define_event (shell_perf_log_get_default (),
52
 
                                "glx.swapComplete",