diff -Nru mutter-3.22.3/debian/changelog mutter-3.22.3/debian/changelog --- mutter-3.22.3/debian/changelog 2017-03-10 17:06:30.000000000 +0000 +++ mutter-3.22.3/debian/changelog 2017-03-23 22:22:20.000000000 +0000 @@ -1,3 +1,23 @@ +mutter (3.22.3-2+rpi1) stretch-staging; urgency=medium + + [changes brought forward from 3.14.4-2+rpi1 by Peter Michael Green at Mon, 25 May 2015 01:53:01 +0000] + * Move libsystemd-dev from build-depends to build-conflicts and add + libsystemd-login-dev to build-conflicts to prevent build of native backend + which fails with non-egl clutter. + [changes introduced in 3.21.92-1+rpi1 by Peter Michael Green] + * Modify debian/rules to Use wayland disabling settings (as used + by non-linux ports of debian) + * fix clean target. + * Move wayland related build-dependencies to build-conflicts. + * Add --disable-xlib-egl-platform to configure flags + * Comment out #include in + cogl/cogl/cogl-mutter.h + * Make further hacks to make non-egl build succeed (and probablly break egl builds in the process). + [changes introduced in 3.22.1-2+rpi1 by Peter Michael Green] + * Remove build-dependency on libegl1-mesa-dev + + -- Raspbian forward porter Thu, 23 Mar 2017 22:22:20 +0000 + mutter (3.22.3-2) unstable; urgency=medium * debian/patches/clutter-clone-Unset-source-when-source-actor-is-dest.patch diff -Nru mutter-3.22.3/debian/control mutter-3.22.3/debian/control --- mutter-3.22.3/debian/control 2017-03-10 17:06:30.000000000 +0000 +++ mutter-3.22.3/debian/control 2017-03-23 22:22:20.000000000 +0000 @@ -22,12 +22,10 @@ libcairo2-dev (>= 1.10.0), libgl1-mesa-dev (>= 7.1~rc3-1~), libdrm-dev [!hurd-any], - libegl1-mesa-dev, libgnome-desktop-3-dev (>= 3.21.2), libgudev-1.0-dev [linux-any], libinput-dev [linux-any], libstartup-notification0-dev (>= 0.7), - libsystemd-dev (>= 212) [linux-any], libupower-glib-dev (>= 0.99.0), libwacom-dev (>= 0.13) [linux-any], libxcb-randr0-dev, @@ -50,10 +48,13 @@ libsm-dev, libice-dev, libpam0g-dev, - libwayland-dev (>= 1.5.90) [linux-any], - wayland-protocols (>= 1.7) [linux-any], xkb-data, zenity +Build-conflicts: + libwayland-dev (>= 1.5.90) [linux-any], + wayland-protocols (>= 1.7) [linux-any], + libsystemd-login-dev, + libsystemd-dev Standards-Version: 3.9.8 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/mutter Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/mutter diff -Nru mutter-3.22.3/debian/control.in mutter-3.22.3/debian/control.in --- mutter-3.22.3/debian/control.in 2016-12-30 00:09:06.000000000 +0000 +++ mutter-3.22.3/debian/control.in 2017-03-23 22:22:20.000000000 +0000 @@ -18,12 +18,10 @@ libcairo2-dev (>= 1.10.0), libgl1-mesa-dev (>= 7.1~rc3-1~), libdrm-dev [!hurd-any], - libegl1-mesa-dev, libgnome-desktop-3-dev (>= 3.21.2), libgudev-1.0-dev [linux-any], libinput-dev [linux-any], libstartup-notification0-dev (>= 0.7), - libsystemd-dev (>= 212) [linux-any], libupower-glib-dev (>= 0.99.0), libwacom-dev (>= 0.13) [linux-any], libxcb-randr0-dev, @@ -46,10 +44,13 @@ libsm-dev, libice-dev, libpam0g-dev, - libwayland-dev (>= 1.5.90) [linux-any], - wayland-protocols (>= 1.7) [linux-any], xkb-data, zenity +Build-conflicts: + libwayland-dev (>= 1.5.90) [linux-any], + wayland-protocols (>= 1.7) [linux-any], + libsystemd-login-dev, + libsystemd-dev Standards-Version: 3.9.8 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/mutter Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/mutter diff -Nru mutter-3.22.3/debian/patches/raspbian.diff mutter-3.22.3/debian/patches/raspbian.diff --- mutter-3.22.3/debian/patches/raspbian.diff 1970-01-01 00:00:00.000000000 +0000 +++ mutter-3.22.3/debian/patches/raspbian.diff 2017-03-23 22:22:20.000000000 +0000 @@ -0,0 +1,64 @@ +Description: Raspbian related hacks + * Comment out #include in + cogl/cogl/cogl-mutter.h + * Make further hacks to make non-egl build succeed (and probablly break egl builds in the process). +Author: Peter Michael Green + +Index: mutter-3.21.92/cogl/cogl/cogl-mutter.h +=================================================================== +--- mutter-3.21.92.orig/cogl/cogl/cogl-mutter.h ++++ mutter-3.21.92/cogl/cogl/cogl-mutter.h +@@ -39,7 +39,7 @@ + #include + #include + #include +-#include ++//#include + #include + + void cogl_renderer_set_custom_winsys (CoglRenderer *renderer, +Index: mutter-3.21.92/src/backends/meta-barrier.c +=================================================================== +--- mutter-3.21.92.orig/src/backends/meta-barrier.c ++++ mutter-3.21.92/src/backends/meta-barrier.c +@@ -12,8 +12,8 @@ + + #include + #include +-#include "backends/native/meta-backend-native.h" +-#include "backends/native/meta-barrier-native.h" ++//#include "backends/native/meta-backend-native.h" ++//#include "backends/native/meta-barrier-native.h" + #include "backends/x11/meta-backend-x11.h" + #include "backends/x11/meta-barrier-x11.h" + #include +Index: mutter-3.21.92/src/backends/x11/meta-renderer-x11.c +=================================================================== +--- mutter-3.21.92.orig/src/backends/x11/meta-renderer-x11.c ++++ mutter-3.21.92/src/backends/x11/meta-renderer-x11.c +@@ -49,9 +49,9 @@ G_DEFINE_TYPE (MetaRendererX11, meta_ren + static const CoglWinsysVtable * + get_x11_cogl_winsys_vtable (void) + { +- if (meta_is_wayland_compositor ()) +- return _cogl_winsys_egl_xlib_get_vtable (); +- else ++ //if (meta_is_wayland_compositor ()) ++ //return _cogl_winsys_egl_xlib_get_vtable (); ++ //else + return _cogl_winsys_glx_get_vtable (); + } + +Index: mutter-3.21.92/src/core/display.c +=================================================================== +--- mutter-3.21.92.orig/src/core/display.c ++++ mutter-3.21.92/src/core/display.c +@@ -50,7 +50,7 @@ + #include "meta-idle-monitor-dbus.h" + #include "meta-cursor-tracker-private.h" + #include +-#include "backends/native/meta-backend-native.h" ++//#include "backends/native/meta-backend-native.h" + #include "backends/x11/meta-backend-x11.h" + #include "backends/meta-stage.h" + #include "backends/meta-input-settings-private.h" diff -Nru mutter-3.22.3/debian/patches/series mutter-3.22.3/debian/patches/series --- mutter-3.22.3/debian/patches/series 2017-03-10 16:45:06.000000000 +0000 +++ mutter-3.22.3/debian/patches/series 2017-03-23 22:22:20.000000000 +0000 @@ -1,2 +1,3 @@ bgo768531_workaround-startup-notifications.patch clutter-clone-Unset-source-when-source-actor-is-dest.patch +raspbian.diff diff -Nru mutter-3.22.3/debian/rules mutter-3.22.3/debian/rules --- mutter-3.22.3/debian/rules 2016-09-14 16:50:02.000000000 +0000 +++ mutter-3.22.3/debian/rules 2017-03-23 22:22:20.000000000 +0000 @@ -10,7 +10,7 @@ override_dh_autoreconf: dh_autoreconf --as-needed -ifeq ($(DEB_HOST_ARCH_OS),linux) +ifeq ($(DEB_HOST_ARCH_OS),willnotmatch) CONFFLAGS = \ --enable-wayland \ --enable-native-backend @@ -23,6 +23,8 @@ --disable-native-backend endif +CONFFLAGS += --disable-xlib-egl-platform + override_dh_auto_configure: dh_auto_configure -- \ --libexecdir="\$${prefix}/lib/mutter" \ @@ -42,3 +44,13 @@ override_dh_strip: dh_strip --dbgsym-migration='mutter-dbg (<< 3.18.3-2~)' +override_dh_auto_clean: + dh_auto_clean + rm -f Makefile cogl/config.log cogl/config.lt cogl/libtool + rm -f confdefs.h config.h config.log config.status libtool stamp-h1 + rm -f data/Makefile doc/Makefile doc/man/Makefile + rm -f po/Makefile po/Makefile.in po/POTFILES + rm -f src/Makefile src/compositor/plugins/Makefile src/libmutter.pc src/meta/meta-version.h + rm -rf cogl/test-fixtures/.libs + rm -rf cogl/cogl/.libs +