diff -u libunity-misc-0.1.1/debian/changelog libunity-misc-0.1.1/debian/changelog --- libunity-misc-0.1.1/debian/changelog +++ libunity-misc-0.1.1/debian/changelog @@ -1,7 +1,9 @@ -libunity-misc (0.1.1-0ubuntu1~lucidubuntu1) lucid; urgency=low +libunity-misc (0.1.1-0ubuntu1~lucid.armel1) lucid; urgency=low * build depend on libclutter-eglx-es20-1.0-dev instead of libclutter-1.0-dev for armel1 egl/gles test ppa + * unity-misc/shell-gtk-embed.c,h: + + use ClutterX11Pixmap instead of GLX to make this more GLES compatible -- Alexander Sack Tue, 15 Jun 2010 01:24:35 +0200 only in patch2: unchanged: --- libunity-misc-0.1.1.orig/unity-misc/shell-gtk-embed.c +++ libunity-misc-0.1.1/unity-misc/shell-gtk-embed.c @@ -21,7 +21,9 @@ #include "shell-embedded-window-private.h" +#if 0 #include +#endif #include #include @@ -41,14 +43,14 @@ */ struct _ShellGtkEmbed { - ClutterGLXTexturePixmap parent; + ClutterX11TexturePixmap parent; ShellGtkEmbedPrivate *priv; }; struct _ShellGtkEmbedClass { - ClutterGLXTexturePixmapClass parent_class; + ClutterX11TexturePixmapClass parent_class; }; struct _ShellGtkEmbedPrivate @@ -56,7 +58,7 @@ ShellEmbeddedWindow *window; }; -G_DEFINE_TYPE (ShellGtkEmbed, shell_gtk_embed, CLUTTER_GLX_TYPE_TEXTURE_PIXMAP); +G_DEFINE_TYPE (ShellGtkEmbed, shell_gtk_embed, CLUTTER_X11_TYPE_TEXTURE_PIXMAP); static void shell_gtk_embed_set_window (ShellGtkEmbed *embed, ShellEmbeddedWindow *window); only in patch2: unchanged: --- libunity-misc-0.1.1.orig/unity-misc/shell-gtk-embed.h +++ libunity-misc-0.1.1/unity-misc/shell-gtk-embed.h @@ -20,7 +20,7 @@ #ifndef __SHELL_GTK_EMBED_H__ #define __SHELL_GTK_EMBED_H__ -#include +#include #include "shell-embedded-window.h"