r30043 - in /packages/experimental/gnome-shell/debian: changelog patches/04_remove-glx-dependency-on-armel.patch patches/series

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

Author: ricotz-guest
Date: Thu Oct  6 06:57:40 2011
New Revision: 30043

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=30043
Log:
Avoid the usage of GLX symbols on arm

Added:
    packages/experimental/gnome-shell/debian/patches/04_remove-glx-dependency-on-armel.patch
Modified:
    packages/experimental/gnome-shell/debian/changelog
    packages/experimental/gnome-shell/debian/patches/series

Modified: packages/experimental/gnome-shell/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-shell/debian/changelog?rev=30043&op=diff
==============================================================================
--- packages/experimental/gnome-shell/debian/changelog [utf-8] (original)
+++ packages/experimental/gnome-shell/debian/changelog [utf-8] Thu Oct  6 06:57:40 2011
@@ -1,8 +1,12 @@
 gnome-shell (3.0.2-4) UNRELEASED; urgency=low
 
+  [ Josselin Mouette ]
   * Break gnome-session < 3.
 
- -- Josselin Mouette <joss at debian.org>  Mon, 26 Sep 2011 12:33:53 +0200
+  [ Rico Tzschichholz ]
+  * Add 04_remove-glx-dependency-on-armel.patch to fix FTBFS on arm
+
+ -- Rico Tzschichholz <ricotz at ubuntu.com>  Thu, 06 Oct 2011 08:42:54 +0200
 
 gnome-shell (3.0.2-3) experimental; urgency=low
 

Added: packages/experimental/gnome-shell/debian/patches/04_remove-glx-dependency-on-armel.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-shell/debian/patches/04_remove-glx-dependency-on-armel.patch?rev=30043&op=file
==============================================================================
--- packages/experimental/gnome-shell/debian/patches/04_remove-glx-dependency-on-armel.patch (added)
+++ packages/experimental/gnome-shell/debian/patches/04_remove-glx-dependency-on-armel.patch [utf-8] Thu Oct  6 06:57:40 2011
@@ -1,0 +1,52 @@
+From: Robert Bragg <robert at linux.intel.com>
+Date: Wed, 13 Jul 2011 12:20:43 +0100
+Subject: [PATCH] Remove GLX dependency
+
+Index: oneiric/src/gnome-shell-plugin.c
+===================================================================
+--- oneiric.orig/src/gnome-shell-plugin.c	2011-09-04 04:01:43.713265027 -0400
++++ oneiric/src/gnome-shell-plugin.c	2011-09-06 11:20:47.243195279 -0400
+@@ -30,8 +30,11 @@
+ 
+ #include <clutter/clutter.h>
+ #include <clutter/x11/clutter-x11.h>
++#if defined (__arm__)
++#else
+ #include <GL/glx.h>
+ #include <GL/glxext.h>
++#endif
+ #include <gjs/gjs.h>
+ #include <meta/display.h>
+ #include <meta/meta-plugin.h>
+@@ -146,14 +149,23 @@
+ gnome_shell_plugin_start (MetaPlugin *plugin)
+ {
+   GnomeShellPlugin *shell_plugin = GNOME_SHELL_PLUGIN (plugin);
++#if defined (__arm__)
++#else
+   MetaScreen *screen;
+   MetaDisplay *display;
+   Display *xdisplay;
++#endif
+   GError *error = NULL;
+   int status;
++#if defined (__arm__)
++#else
+   const char *glx_extensions;
++#endif
+   GjsContext *gjs_context;
+ 
++#if defined (__arm__)
++  shell_plugin->have_swap_event = 0;
++#else
+   screen = meta_plugin_get_screen (plugin);
+   display = meta_screen_get_display (screen);
+ 
+@@ -166,6 +178,7 @@
+   glx_extensions = glXQueryExtensionsString (xdisplay,
+                                              meta_screen_get_screen_number (screen));
+   shell_plugin->have_swap_event = strstr (glx_extensions, "GLX_INTEL_swap_event") != NULL;
++#endif
+ 
+   shell_perf_log_define_event (shell_perf_log_get_default (),
+                                "glx.swapComplete",

Modified: packages/experimental/gnome-shell/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-shell/debian/patches/series?rev=30043&op=diff
==============================================================================
--- packages/experimental/gnome-shell/debian/patches/series [utf-8] (original)
+++ packages/experimental/gnome-shell/debian/patches/series [utf-8] Thu Oct  6 06:57:40 2011
@@ -1,2 +1,3 @@
 02_rpath-bluetooth-applet.patch
 03_hidden_applications.patch
+04_remove-glx-dependency-on-armel.patch