mutter: Switch to moblin repository, drop zenity requirement as its not used

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

diff --git a/meta/packages/mutter/mutter/nozenity.patch b/meta/packages/mutter/mutter/nozenity.patch
new file mode 100644 (file)
index 0000000..06f5909
--- /dev/null
+++ b/meta/packages/mutter/mutter/nozenity.patch
@@ -0,0 +1,16 @@
+Index: git/configure.in
+===================================================================
+--- git.orig/configure.in      2009-06-16 13:12:17.000000000 +0100
++++ git/configure.in   2009-06-16 13:12:33.000000000 +0100
+@@ -575,11 +575,6 @@
+   GCONF_SCHEMAS_INSTALL_FALSE=
+ fi
+ 
+-AC_PATH_PROG(ZENITY, zenity, no)
+-if test x"$ZENITY" = xno; then
+-  AC_MSG_ERROR([zenity not found in your path - needed for dialogs])
+-fi
+-
+ AC_ARG_ENABLE(debug,
+       [  --enable-debug               enable debugging],,
+       enable_debug=no)

diff --git a/meta/packages/mutter/mutter_git.bb b/meta/packages/mutter/mutter_git.bb
index f98725d2bb9b082713f8a15e7bdbfaa45f41ae3e..4615874ecaff6a47740bded552ac854558afd826 100644 (file)
--- a/meta/packages/mutter/mutter_git.bb
+++ b/meta/packages/mutter/mutter_git.bb
@@ -1,15 +1,19 @@
 SECTION = "x11/wm"
 DESCRIPTION = "Metacity is the boring window manager for the adult in you. Mutter is metacity + clutter."
-LICENSE = "GPL"
+LICENSE = "GPLv2"
 DEPENDS = "startup-notification gtk+ gconf clutter gdk-pixbuf-csource-native intltool glib-2.0-native"
 # gobject-introspection
-PR = "r8"
-PV = "2.25.1+git${SRCREV}"
+PR = "r9"
+PV = "2.25.1+git${SRCPV}"
 inherit gnome update-alternatives
 
-SRC_URI = "git://git.gnome.org/mutter.git;protocol=git;branch=master \
+# Gnome is the upstream but moblin is under more active development atm
+# git://git.gnome.org/mutter.git;protocol=git;branch=master
+#
+SRC_URI = "git://git.moblin.org/mutter.git;protocol=git;branch=master \
            file://nodocs.patch;patch=1 \
-          file://crosscompile.patch;patch=1 \
+           file://nozenity.patch;patch=1 \
+           file://crosscompile.patch;patch=1 \
            file://fix_pkgconfig.patch;patch=1"
 S = "${WORKDIR}/git"