r35213 - in /desktop/unstable/gnome-shell/debian: changelog control control.in patches/14_make-GLX-optional.patch
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Wed May 30 18:56:22 UTC 2012
Author: biebl
Date: Wed May 30 18:56:22 2012
New Revision: 35213
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35213
Log:
Disabling the screen recorder on arm{el,hf} was not sufficient to make it
build everywhere since the screen grabber is also used for making
screenshots. Update debian/patches/14_make-GLX-optional.patch instead and
only use pixel buffers in the screen grabber if we have GL/GLX support.
This means we can re-enable the screen recorder on arm{el,hf} as it will
use the slow, cogl-based path there.
Modified:
desktop/unstable/gnome-shell/debian/changelog
desktop/unstable/gnome-shell/debian/control
desktop/unstable/gnome-shell/debian/control.in
desktop/unstable/gnome-shell/debian/patches/14_make-GLX-optional.patch
Modified: desktop/unstable/gnome-shell/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/changelog?rev=35213&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/changelog [utf-8] Wed May 30 18:56:22 2012
@@ -1,3 +1,14 @@
+gnome-shell (3.4.1-5) UNRELEASED; urgency=low
+
+ * Disabling the screen recorder on arm{el,hf} was not sufficient to make it
+ build everywhere since the screen grabber is also used for making
+ screenshots. Update debian/patches/14_make-GLX-optional.patch instead and
+ only use pixel buffers in the screen grabber if we have GL/GLX support.
+ This means we can re-enable the screen recorder on arm{el,hf} as it will
+ use the slow, cogl-based path there.
+
+ -- Michael Biebl <biebl at debian.org> Wed, 30 May 2012 14:45:58 +0200
+
gnome-shell (3.4.1-4) unstable; urgency=low
* debian/patches/14_make-GLX-optional.patch:
Modified: desktop/unstable/gnome-shell/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/control?rev=35213&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/control [utf-8] Wed May 30 18:56:22 2012
@@ -33,7 +33,7 @@
libgnome-desktop-3-dev (>= 2.90.0),
libgnome-keyring-dev,
libgnome-menu-3-dev,
- libgstreamer0.10-dev (>= 0.10.16) [!armel !armhf],
+ libgstreamer0.10-dev (>= 0.10.16),
libgtk-3-dev (>= 3.3.9),
libmutter-dev (>= 3.4.1),
libnm-glib-dev (>= 0.9) [linux-any],
Modified: desktop/unstable/gnome-shell/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/control.in?rev=35213&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/control.in [utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/control.in [utf-8] Wed May 30 18:56:22 2012
@@ -28,7 +28,7 @@
libgnome-desktop-3-dev (>= 2.90.0),
libgnome-keyring-dev,
libgnome-menu-3-dev,
- libgstreamer0.10-dev (>= 0.10.16) [!armel !armhf],
+ libgstreamer0.10-dev (>= 0.10.16),
libgtk-3-dev (>= 3.3.9),
libmutter-dev (>= 3.4.1),
libnm-glib-dev (>= 0.9) [linux-any],
Modified: 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=35213&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/patches/14_make-GLX-optional.patch [utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/patches/14_make-GLX-optional.patch [utf-8] Wed May 30 18:56:22 2012
@@ -4,8 +4,17 @@
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=670850
Index: gnome-shell-3.4.1/configure.ac
===================================================================
---- gnome-shell-3.4.1.orig/configure.ac 2012-05-30 14:28:01.846358885 +0200
-+++ gnome-shell-3.4.1/configure.ac 2012-05-30 14:28:31.070357778 +0200
+--- gnome-shell-3.4.1.orig/configure.ac 2012-05-30 20:30:08.173590415 +0200
++++ gnome-shell-3.4.1/configure.ac 2012-05-30 20:30:08.741590395 +0200
+@@ -50,7 +50,7 @@
+ AC_MSG_RESULT(yes)
+ build_recorder=true
+ recorder_modules="gstreamer-0.10 gstreamer-base-0.10 x11"
+- PKG_CHECK_MODULES(TEST_SHELL_RECORDER, $recorder_modules clutter-1.0 xfixes gl)
++ PKG_CHECK_MODULES(TEST_SHELL_RECORDER, $recorder_modules clutter-1.0 xfixes)
+ else
+ AC_MSG_RESULT(no)
+ fi
@@ -82,7 +82,6 @@
gjs-internals-1.0 >= $GJS_MIN_VERSION
libgnome-menu-3.0 $recorder_modules
@@ -14,7 +23,7 @@
clutter-x11-1.0 >= $CLUTTER_MIN_VERSION
clutter-glx-1.0 >= $CLUTTER_MIN_VERSION
libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_MIN_VERSION
-@@ -133,6 +132,14 @@
+@@ -133,6 +132,16 @@
PKG_CHECK_MODULES(BROWSER_PLUGIN, gio-2.0 >= $GIO_MIN_VERSION json-glib-1.0 >= 0.13.2)
@@ -22,6 +31,8 @@
+if test "x$have_glx" = "xyes"; then
+ GNOME_SHELL_CFLAGS="$GNOME_SHELL_CFLAGS $GLX_CFLAGS"
+ GNOME_SHELL_LIBS="$GNOME_SHELL_LIBS $GLX_LIBS"
++ TEST_SHELL_RECORDER_CFLAGS="$TEST_SHELL_RECORDER_CFLAGS $GLX_CFLAGS"
++ TEST_SHELL_RECORDER_LIBS="$TEST_SHELL_RECORDER_LIBS $GLX_LIBS"
+ AC_DEFINE(HAVE_GLX, [1], [Define if we have GLX])
+ AC_SUBST([HAVE_GLX], [1])
+fi
@@ -31,8 +42,8 @@
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-30 14:27:55.946359089 +0200
-+++ gnome-shell-3.4.1/src/gnome-shell-plugin.c 2012-05-30 14:28:12.710358506 +0200
+--- gnome-shell-3.4.1.orig/src/gnome-shell-plugin.c 2012-03-09 22:42:49.000000000 +0100
++++ gnome-shell-3.4.1/src/gnome-shell-plugin.c 2012-05-30 20:30:08.741590395 +0200
@@ -30,8 +30,10 @@
#include <clutter/clutter.h>
@@ -44,7 +55,7 @@
#include <gjs/gjs.h>
#include <meta/display.h>
#include <meta/meta-plugin.h>
-@@ -146,14 +148,19 @@
+@@ -146,14 +148,17 @@
gnome_shell_plugin_start (MetaPlugin *plugin)
{
GnomeShellPlugin *shell_plugin = GNOME_SHELL_PLUGIN (plugin);
@@ -52,19 +63,18 @@
MetaScreen *screen;
MetaDisplay *display;
Display *xdisplay;
++ const char *glx_extensions;
+#endif
GError *error = NULL;
int status;
-+#ifdef HAVE_GLX
- const char *glx_extensions;
-+#endif
+- const char *glx_extensions;
GjsContext *gjs_context;
+#ifdef HAVE_GLX
screen = meta_plugin_get_screen (plugin);
display = meta_screen_get_display (screen);
-@@ -166,6 +173,9 @@
+@@ -166,6 +171,9 @@
glx_extensions = glXQueryExtensionsString (xdisplay,
meta_screen_get_screen_number (screen));
shell_plugin->have_swap_event = strstr (glx_extensions, "GLX_INTEL_swap_event") != NULL;
@@ -74,3 +84,62 @@
shell_perf_log_define_event (shell_perf_log_get_default (),
"glx.swapComplete",
+Index: gnome-shell-3.4.1/src/shell-screen-grabber.c
+===================================================================
+--- gnome-shell-3.4.1.orig/src/shell-screen-grabber.c 2012-03-02 13:28:41.000000000 +0100
++++ gnome-shell-3.4.1/src/shell-screen-grabber.c 2012-05-30 20:30:55.781588732 +0200
+@@ -1,21 +1,27 @@
+ /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
++#include "config.h"
++
+ #include <string.h>
+
+ #include <clutter/clutter.h>
+ #include <cogl/cogl.h>
++#ifdef HAVE_GLX
+ #include <GL/gl.h>
+ #include <GL/glx.h>
+ #include <GL/glext.h>
++#endif
+
+ #include "shell-screen-grabber.h"
+
++#ifdef HAVE_GLX
+ PFNGLBINDBUFFERARBPROC pf_glBindBufferARB;
+ PFNGLBUFFERDATAARBPROC pf_glBufferDataARB;
+ PFNGLDELETEBUFFERSARBPROC pf_glDeleteBuffersARB;
+ PFNGLGENBUFFERSARBPROC pf_glGenBuffersARB;
+ PFNGLMAPBUFFERARBPROC pf_glMapBufferARB;
+ PFNGLUNMAPBUFFERARBPROC pf_glUnmapBufferARB;
++#endif
+
+ struct _ShellScreenGrabberClass
+ {
+@@ -39,8 +45,10 @@
+ {
+ ShellScreenGrabber *grabber = SHELL_SCREEN_GRABBER (gobject);
+
++#ifdef HAVE_GLX
+ if (grabber->pixel_buffer != 0)
+ pf_glDeleteBuffersARB (1, &grabber->pixel_buffer);
++#endif
+ }
+
+ static void
+@@ -95,6 +103,7 @@
+ data_size = row_bytes * height;
+ data = g_malloc (data_size);
+
++#ifdef HAVE_GLX
+ if (grabber->have_pixel_buffers == -1)
+ {
+ const GLubyte* extensions = glGetString (GL_EXTENSIONS);
+@@ -198,6 +207,7 @@
+ glPixelStorei (GL_PACK_INVERT_MESA, old_pack_invert);
+ }
+ else
++#endif /* HAVE_GLX */
+ {
+ cogl_read_pixels (x, y,
+ width, height,
More information about the pkg-gnome-commits
mailing list