← Back to branch summary

~tkluck/ubuntu/precise/gnome-shell/bluetooth-fix-connection-from-gs-menu

« back to all changes in this revision

Viewing changes to debian/patches/03_remove-glx-dependency-on-armel.patch

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2011-12-20 02:25:09 UTC
  • mfrom: (18.1.6 sid)
  • Revision ID: package-import@ubuntu.com-20111220022509-cr6e714zs2ukw9t2
Tags: 3.2.1-8ubuntu1
https://launchpad.net/bugs/877135
* Sync with Debian (LP: #877135). Remaining changes:
* debian/control.in: Recommend gnome-user-guide
* debian/gnome-shell.gsettings-override: Update for Ubuntu defaults
* Watch for unstable releases

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/03_remove-glx-dependency-on-armel.patch
1
 
From: Robert Bragg <robert@linux.intel.com>
2
 
Date: Wed, 13 Jul 2011 12:20:43 +0100
3
 
Subject: [PATCH] Remove GLX dependency
4
 
 
5
 
Index: oneiric/configure.ac
6
 
===================================================================
7
 
--- oneiric.orig/configure.ac   2011-09-04 05:00:13.588412915 -0400
8
 
+++ oneiric/configure.ac        2011-09-06 11:20:47.183195196 -0400
9
 
@@ -89,7 +89,6 @@
10
 
                               libgnome-menu-3.0 $recorder_modules gconf-2.0
11
 
                                gdk-x11-3.0 libsoup-2.4
12
 
                               clutter-x11-1.0 >= $CLUTTER_MIN_VERSION
13
 
-                              clutter-glx-1.0 >= $CLUTTER_MIN_VERSION
14
 
                                libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_MIN_VERSION
15
 
                                gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_MIN_VERSION
16
 
                               libcanberra
17
 
Index: oneiric/configure
18
 
===================================================================
19
 
--- oneiric.orig/configure      2011-09-04 04:02:38.658585000 -0400
20
 
+++ oneiric/configure   2011-09-06 11:20:47.223195252 -0400
21
 
@@ -14882,7 +14882,6 @@
22
 
                               libgnome-menu-3.0 \$recorder_modules gconf-2.0
23
 
                                gdk-x11-3.0 libsoup-2.4
24
 
                               clutter-x11-1.0 >= \$CLUTTER_MIN_VERSION
25
 
-                              clutter-glx-1.0 >= \$CLUTTER_MIN_VERSION
26
 
                                libstartup-notification-1.0 >= \$STARTUP_NOTIFICATION_MIN_VERSION
27
 
                                gobject-introspection-1.0 >= \$GOBJECT_INTROSPECTION_MIN_VERSION
28
 
                               libcanberra
29
 
@@ -14899,7 +14898,6 @@
30
 
                               libgnome-menu-3.0 $recorder_modules gconf-2.0
31
 
                                gdk-x11-3.0 libsoup-2.4
32
 
                               clutter-x11-1.0 >= $CLUTTER_MIN_VERSION
33
 
-                              clutter-glx-1.0 >= $CLUTTER_MIN_VERSION
34
 
                                libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_MIN_VERSION
35
 
                                gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_MIN_VERSION
36
 
                               libcanberra
37
 
@@ -14919,7 +14917,6 @@
38
 
                               libgnome-menu-3.0 $recorder_modules gconf-2.0
39
 
                                gdk-x11-3.0 libsoup-2.4
40
 
                               clutter-x11-1.0 >= $CLUTTER_MIN_VERSION
41
 
-                              clutter-glx-1.0 >= $CLUTTER_MIN_VERSION
42
 
                                libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_MIN_VERSION
43
 
                                gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_MIN_VERSION
44
 
                               libcanberra
45
 
@@ -14946,7 +14943,6 @@
46
 
                               libgnome-menu-3.0 \$recorder_modules gconf-2.0
47
 
                                gdk-x11-3.0 libsoup-2.4
48
 
                               clutter-x11-1.0 >= \$CLUTTER_MIN_VERSION
49
 
-                              clutter-glx-1.0 >= \$CLUTTER_MIN_VERSION
50
 
                                libstartup-notification-1.0 >= \$STARTUP_NOTIFICATION_MIN_VERSION
51
 
                                gobject-introspection-1.0 >= \$GOBJECT_INTROSPECTION_MIN_VERSION
52
 
                               libcanberra
53
 
@@ -14963,7 +14959,6 @@
54
 
                               libgnome-menu-3.0 $recorder_modules gconf-2.0
55
 
                                gdk-x11-3.0 libsoup-2.4
56
 
                               clutter-x11-1.0 >= $CLUTTER_MIN_VERSION
57
 
-                              clutter-glx-1.0 >= $CLUTTER_MIN_VERSION
58
 
                                libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_MIN_VERSION
59
 
                                gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_MIN_VERSION
60
 
                               libcanberra
61
 
@@ -14983,7 +14978,6 @@
62
 
                               libgnome-menu-3.0 $recorder_modules gconf-2.0
63
 
                                gdk-x11-3.0 libsoup-2.4
64
 
                               clutter-x11-1.0 >= $CLUTTER_MIN_VERSION
65
 
-                              clutter-glx-1.0 >= $CLUTTER_MIN_VERSION
66
 
                                libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_MIN_VERSION
67
 
                                gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_MIN_VERSION
68
 
                               libcanberra
69
 
@@ -15019,7 +15013,6 @@
70
 
                               libgnome-menu-3.0 $recorder_modules gconf-2.0
71
 
                                gdk-x11-3.0 libsoup-2.4
72
 
                               clutter-x11-1.0 >= $CLUTTER_MIN_VERSION
73
 
-                              clutter-glx-1.0 >= $CLUTTER_MIN_VERSION
74
 
                                libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_MIN_VERSION
75
 
                                gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_MIN_VERSION
76
 
                               libcanberra
77
 
@@ -15037,7 +15030,6 @@
78
 
                               libgnome-menu-3.0 $recorder_modules gconf-2.0
79
 
                                gdk-x11-3.0 libsoup-2.4
80
 
                               clutter-x11-1.0 >= $CLUTTER_MIN_VERSION
81
 
-                              clutter-glx-1.0 >= $CLUTTER_MIN_VERSION
82
 
                                libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_MIN_VERSION
83
 
                                gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_MIN_VERSION
84
 
                               libcanberra
85
 
@@ -15058,7 +15050,6 @@
86
 
                               libgnome-menu-3.0 $recorder_modules gconf-2.0
87
 
                                gdk-x11-3.0 libsoup-2.4
88
 
                               clutter-x11-1.0 >= $CLUTTER_MIN_VERSION
89
 
-                              clutter-glx-1.0 >= $CLUTTER_MIN_VERSION
90
 
                                libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_MIN_VERSION
91
 
                                gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_MIN_VERSION
92
 
                               libcanberra
93
 
Index: oneiric/src/gnome-shell-plugin.c
94
 
===================================================================
95
 
--- oneiric.orig/src/gnome-shell-plugin.c       2011-09-04 04:01:43.713265027 -0400
96
 
+++ oneiric/src/gnome-shell-plugin.c    2011-09-06 11:20:47.243195279 -0400
97
 
@@ -30,8 +30,11 @@
98
 
 
99
 
 #include <clutter/clutter.h>
100
 
 #include <clutter/x11/clutter-x11.h>
101
 
+#if defined (__arm__)
102
 
+#else
103
 
 #include <GL/glx.h>
104
 
 #include <GL/glxext.h>
105
 
+#endif
106
 
 #include <gjs/gjs.h>
107
 
 #include <meta/display.h>
108
 
 #include <meta/meta-plugin.h>
109
 
@@ -146,14 +149,23 @@
110
 
 gnome_shell_plugin_start (MetaPlugin *plugin)
111
 
 {
112
 
   GnomeShellPlugin *shell_plugin = GNOME_SHELL_PLUGIN (plugin);
113
 
+#if defined (__arm__)
114
 
+#else
115
 
   MetaScreen *screen;
116
 
   MetaDisplay *display;
117
 
   Display *xdisplay;
118
 
+#endif
119
 
   GError *error = NULL;
120
 
   int status;
121
 
+#if defined (__arm__)
122
 
+#else
123
 
   const char *glx_extensions;
124
 
+#endif
125
 
   GjsContext *gjs_context;
126
 
 
127
 
+#if defined (__arm__)
128
 
+  shell_plugin->have_swap_event = 0;
129
 
+#else
130
 
   screen = meta_plugin_get_screen (plugin);
131
 
   display = meta_screen_get_display (screen);
132
 
 
133
 
@@ -166,6 +178,7 @@
134
 
   glx_extensions = glXQueryExtensionsString (xdisplay,
135
 
                                              meta_screen_get_screen_number (screen));
136
 
   shell_plugin->have_swap_event = strstr (glx_extensions, "GLX_INTEL_swap_event") != NULL;
137
 
+#endif
138
 
 
139
 
   shell_perf_log_define_event (shell_perf_log_get_default (),
140
 
                                "glx.swapComplete",