r34672 - in /desktop/unstable/gnome-shell/debian: changelog patches/04_remove-glx-dependency-on-armel.patch patches/14_make-GLX-optional.patch patches/14_require_gl_directly.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Mon Apr 30 18:26:21 2012
New Revision: 34672

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=34672
Log:
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

Added:
    desktop/unstable/gnome-shell/debian/patches/14_make-GLX-optional.patch
Removed:
    desktop/unstable/gnome-shell/debian/patches/04_remove-glx-dependency-on-armel.patch
    desktop/unstable/gnome-shell/debian/patches/14_require_gl_directly.patch
Modified:
    desktop/unstable/gnome-shell/debian/changelog
    desktop/unstable/gnome-shell/debian/patches/series

Modified: desktop/unstable/gnome-shell/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/changelog?rev=34672&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/changelog [utf-8] Mon Apr 30 18:26:21 2012
@@ -1,3 +1,13 @@
+gnome-shell (3.2.2.1-4) UNRELEASED; urgency=low
+
+  * 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
+
+ -- Michael Biebl <biebl at debian.org>  Mon, 30 Apr 2012 20:18:35 +0200
+
 gnome-shell (3.2.2.1-3) unstable; urgency=low
 
   * d/p/14_require_gl_directly.patch

Added: desktop/unstable/gnome-shell/debian/patches/14_make-GLX-optional.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/patches/14_make-GLX-optional.patch?rev=34672&op=file
==============================================================================
--- desktop/unstable/gnome-shell/debian/patches/14_make-GLX-optional.patch (added)
+++ desktop/unstable/gnome-shell/debian/patches/14_make-GLX-optional.patch [utf-8] Mon Apr 30 18:26:21 2012
@@ -1,0 +1,64 @@
+Index: gnome-shell-3.2.2.1/configure.ac
+===================================================================
+--- gnome-shell-3.2.2.1.orig/configure.ac	2012-04-30 19:15:03.722083062 +0200
++++ gnome-shell-3.2.2.1/configure.ac	2012-04-30 19:16:18.270080422 +0200
+@@ -94,6 +94,14 @@
+                                telepathy-logger-0.2 >= $TELEPATHY_LOGGER_MIN_VERSION
+                                polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes)
+ 
++PKG_CHECK_MODULES(GLX, [gl], [have_glx=yes], [have_glx=no])
++if test "x$have_glx" = "xyes"; then
++   GNOME_SHELL_CFLAGS="$GNOME_SHELL_CFLAGS $GLX_CFLAGS"
++   GNOME_SHELL_LIBS="$GNOME_SHELL_LIBS $GLX_LIBS"
++   AC_DEFINE(HAVE_GLX, [1], [Define if we have GLX])
++   AC_SUBST([HAVE_GLX], [1])
++fi
++
+ ##########################
+ # Check for NetworkManager
+ ##########################
+Index: gnome-shell-3.2.2.1/src/gnome-shell-plugin.c
+===================================================================
+--- gnome-shell-3.2.2.1.orig/src/gnome-shell-plugin.c	2012-01-20 06:16:22.000000000 +0100
++++ gnome-shell-3.2.2.1/src/gnome-shell-plugin.c	2012-04-30 19:23:02.322066133 +0200
+@@ -30,8 +30,10 @@
+ 
+ #include <clutter/clutter.h>
+ #include <clutter/x11/clutter-x11.h>
++#ifdef HAVE_GLX
+ #include <GL/glx.h>
+ #include <GL/glxext.h>
++#endif
+ #include <gjs/gjs.h>
+ #include <meta/display.h>
+ #include <meta/meta-plugin.h>
+@@ -146,14 +148,19 @@
+ gnome_shell_plugin_start (MetaPlugin *plugin)
+ {
+   GnomeShellPlugin *shell_plugin = GNOME_SHELL_PLUGIN (plugin);
++#ifdef HAVE_GLX
+   MetaScreen *screen;
+   MetaDisplay *display;
+   Display *xdisplay;
++#endif
+   GError *error = NULL;
+   int status;
++#ifdef HAVE_GLX
+   const char *glx_extensions;
++#endif
+   GjsContext *gjs_context;
+ 
++#ifdef HAVE_GLX
+   screen = meta_plugin_get_screen (plugin);
+   display = meta_screen_get_display (screen);
+ 
+@@ -166,6 +173,9 @@
+   glx_extensions = glXQueryExtensionsString (xdisplay,
+                                              meta_screen_get_screen_number (screen));
+   shell_plugin->have_swap_event = strstr (glx_extensions, "GLX_INTEL_swap_event") != NULL;
++#else
++  shell_plugin->have_swap_event = 0;
++#endif
+ 
+   shell_perf_log_define_event (shell_perf_log_get_default (),
+                                "glx.swapComplete",

Modified: desktop/unstable/gnome-shell/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/patches/series?rev=34672&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/patches/series [utf-8] Mon Apr 30 18:26:21 2012
@@ -1,5 +1,4 @@
 02_rpath-bluetooth-applet.patch
-04_remove-glx-dependency-on-armel.patch
 07-NetworkMenu-fix-logic-for-updating-wifi-icon.patch
 08-polkit-Find-the-best-user-to-authenticate-as.patch
 09-respect-NoDisplay-semantics-for-app-menu.patch
@@ -7,4 +6,4 @@
 11-no-gettext.patch
 12_Replace-shell_util_icon_from_string.patch
 13_bluetooth_fix_undefined_variable.patch
-14_require_gl_directly.patch
+14_make-GLX-optional.patch