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

[biebl at users.alioth.debian.org]

Author: biebl
Date: Sat May 19 06:19:02 2012
New Revision: 35032

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35032
Log:
Merge changes from unstable branch

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

Modified: desktop/experimental/gnome-shell/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/changelog?rev=35032&op=diff
==============================================================================
--- desktop/experimental/gnome-shell/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-shell/debian/changelog [utf-8] Sat May 19 06:19:02 2012
@@ -11,10 +11,7 @@
   * debian/gnome-shell-common.install:
     - No more gconf schemas to install
     - Install gtk-docs
-  * Drop patches that have been applied upstream. Remaining patches:
-    - 04_remove-glx-dependency-on-armel.patch
-    - 10-make-NetworkManager-optional.patch (Refreshed)
-    - 11-no-gettext.patch
+  * Drop patches that have been applied upstream.
 
   [ Sjoerd Simons ]
   * debian/control.in: Add build-depend on libgcr-3-dev (> 3.3.90)
@@ -23,6 +20,25 @@
   * debian/control.in: Add depends on gir1.2-gcr-3
 
  -- Sjoerd Simons <sjoerd at debian.org>  Sat, 19 May 2012 00:30:19 +0200
+
+gnome-shell (3.2.2.1-4) unstable; 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:37:44 +0200
+
+gnome-shell (3.2.2.1-3) unstable; urgency=low
+
+  * d/p/14_require_gl_directly.patch
+    + Added. gnome-shell uses glXQuery* API so it needs a direct link against
+      libGL. Causes build failure with upcoming clutter/cogl as they don't
+      expose a directly link to libGL anymore
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Sun, 01 Apr 2012 16:07:26 +0200
 
 gnome-shell (3.2.2.1-2) unstable; urgency=low
 

Added: desktop/experimental/gnome-shell/debian/patches/14_make-GLX-optional.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/patches/14_make-GLX-optional.patch?rev=35032&op=file
==============================================================================
--- desktop/experimental/gnome-shell/debian/patches/14_make-GLX-optional.patch (added)
+++ desktop/experimental/gnome-shell/debian/patches/14_make-GLX-optional.patch [utf-8] Sat May 19 06:19:02 2012
@@ -1,0 +1,64 @@
+Index: gnome-shell-3.4.1/configure.ac
+===================================================================
+--- gnome-shell-3.4.1.orig/configure.ac	2012-05-19 04:06:00.000000000 +0200
++++ gnome-shell-3.4.1/configure.ac	2012-05-19 04:07:47.286341139 +0200
+@@ -100,6 +100,14 @@
+ 
+ PKG_CHECK_MODULES(BROWSER_PLUGIN, gio-2.0 >= $GIO_MIN_VERSION json-glib-1.0 >= 0.13.2)
+ 
++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
++
+ GJS_VERSION=`$PKG_CONFIG --modversion gjs-internals-1.0`
+ AC_DEFINE_UNQUOTED([GJS_VERSION], ["$GJS_VERSION"], [The version of GJS we're linking to])
+ AC_SUBST([GJS_VERSION], ["$GJS_VERSION"])
+Index: gnome-shell-3.4.1/src/gnome-shell-plugin.c
+===================================================================
+--- gnome-shell-3.4.1.orig/src/gnome-shell-plugin.c	2012-05-19 04:05:27.000000000 +0200
++++ gnome-shell-3.4.1/src/gnome-shell-plugin.c	2012-05-19 04:06:13.126344472 +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/experimental/gnome-shell/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/patches/series?rev=35032&op=diff
==============================================================================
--- desktop/experimental/gnome-shell/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gnome-shell/debian/patches/series [utf-8] Sat May 19 06:19:02 2012
@@ -1,3 +1,3 @@
-04_remove-glx-dependency-on-armel.patch
 #10-make-NetworkManager-optional.patch
 11-no-gettext.patch
+14_make-GLX-optional.patch