r35184 - in /desktop/experimental/gnome-shell/debian: ./ patches/

Wed May 30 10:01:52 UTC 2012

Author: biebl
Date: Wed May 30 10:01:51 2012
New Revision: 35184

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35184
Log:
Revert r35179. The performance of the cogl based screen recorder is not yet
sufficient. This change can be revisited once the performance problems
have been solved.

Added:
    desktop/experimental/gnome-shell/debian/patches/14_make-GLX-optional.patch
Removed:
    desktop/experimental/gnome-shell/debian/patches/30-remove-shell-screen-grabber.patch
    desktop/experimental/gnome-shell/debian/patches/31-don-t-try-to-use-GLX-if-Cogl-isn-t-using-that-Winsys.patch
    desktop/experimental/gnome-shell/debian/patches/32-don-t-link-directly-to-libGL.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=35184&op=diff
==============================================================================

--- desktop/experimental/gnome-shell/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-shell/debian/changelog [utf-8] Wed May 30 10:01:51 2012
@@ -3,16 +3,6 @@
   * debian/patches/22-remove-online-accounts-from-user-menu.patch: Remove
     "Online Accounts" from user menu. It can be easily accessed via
     "System Settings" so there is no need to clutter up the user menu.
-  * Pull patches from upstream wip/wayland branch which make it possible to
-    build gnome-shell on arm{el,hf} where we use GLES instead of GL.
-  * debian/patches/30-remove-shell-screen-grabber.patch: The screen grabber
-    was a workaround for a slow path in Mesa which has been fixed with 8.0.
-  * debian/patches/31-don-t-try-to-use-GLX-if-Cogl-isn-t-using-that-Winsys.patch:
-    Use Cogl to query for available GLX extensions.
-  * debian/patches/32-don-t-link-directly-to-libGL.patch: Don't link directly
-    to libGL since nothing in gnome-shell uses any symbols from libGL anymore.
-  * debian/patches/14_make-GLX-optional.patch: The above three patches make
-    this one obsolete, so remove it.
   * Tighten Depends on gir1.2-clutter-1.0. Closes: #673929
   * Change Recommends: gnome-themes-standard to Depends. Adwaita is the
     prefererred window manager theme and without a theme installed gnome-shell

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=35184&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] Wed May 30 10:01:51 2012
@@ -1,0 +1,64 @@
+Index: gnome-shell-3.4.1/configure.ac
+===================================================================
+--- gnome-shell-3.4.1.orig/configure.ac	2012-05-19 09:44:28.863666178 +0200
++++ gnome-shell-3.4.1/configure.ac	2012-05-19 09:44:30.099666166 +0200
+@@ -133,6 +133,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 09:44:06.747666394 +0200
++++ gnome-shell-3.4.1/src/gnome-shell-plugin.c	2012-05-19 09:44:30.099666166 +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=35184&op=diff
==============================================================================
--- desktop/experimental/gnome-shell/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gnome-shell/debian/patches/series [utf-8] Wed May 30 10:01:51 2012
@@ -1,8 +1,6 @@
 09-respect-NoDisplay-semantics-for-app-menu.patch
 10-make-NetworkManager-optional.patch
 11-no-gettext.patch
+14_make-GLX-optional.patch
 21_revert_evolution_gsettings.patch
 22-remove-online-accounts-from-user-menu.patch
-30-remove-shell-screen-grabber.patch
-31-don-t-try-to-use-GLX-if-Cogl-isn-t-using-that-Winsys.patch
-32-don-t-link-directly-to-libGL.patch


