Merge ssh://gitserver@git.pokylinux.org/poky

4 files changed, 145 insertions, 0 deletions

diff --git a/meta/packages/mutter/mutter/crosscompile.patch b/meta/packages/mutter/mutter/crosscompile.patch
new file mode 100644
index 000000000..b27383b09
--- /dev/null
+++ b/meta/packages/mutter/mutter/crosscompile.patch
@@ -0,0 +1,55 @@
+Index: git/configure.in
+===================================================================
+--- git.orig/configure.in	2009-01-27 14:49:10.000000000 +0000
++++ git/configure.in	2009-01-27 15:29:41.000000000 +0000
+@@ -46,6 +46,32 @@
+ AC_LIBTOOL_WIN32_DLL
+ AM_PROG_LIBTOOL
+ 
++if test x"$CC_FOR_BUILD" = x; then
++	if test x"$cross_compiling" = xyes; then
++	       AC_CHECK_PROGS(CC_FOR_BUILD, gcc cc)
++	else
++	       CC_FOR_BUILD="$CC"
++	fi
++fi
++AC_SUBST([CC_FOR_BUILD])
++if test x"$CFLAGS_FOR_BUILD" = x; then
++	if test x"$cross_compiling" = xyes; then
++	       AC_CHECK_PROGS(CFLAGS_FOR_BUILD, gcc cc)
++	else
++	       CFLAGS_FOR_BUILD="$CFLAGS"
++	fi
++fi
++AC_SUBST([CFLAGS_FOR_BUILD])
++if test x"$LDFLAGS_FOR_BUILD" = x; then
++	if test x"$cross_compiling" = xyes; then
++	       AC_CHECK_PROGS(LDFLAGS_FOR_BUILD, gcc cc)
++	else
++	       LDFLAGS_FOR_BUILD="$LDFLAGS"
++	fi
++fi
++AC_SUBST([LDFLAGS_FOR_BUILD])
++
++
+ #### Integer sizes
+ 
+ AC_CHECK_SIZEOF(char)
+Index: git/src/Makefile.am
+===================================================================
+--- git.orig/src/Makefile.am	2009-01-27 15:25:31.000000000 +0000
++++ git/src/Makefile.am	2009-01-27 15:39:54.000000000 +0000
+@@ -168,11 +168,9 @@
+ metacity_dialog_SOURCES= 	\
+ 	ui/metacity-dialog.c
+ 
+-schema_bindings_SOURCES =       \
+-        core/schema-bindings.c			\
+-	metacity.schemas.in.in
++schema_bindings:
++	@CC_FOR_BUILD@ core/schema-bindings.c -I./include -I ../ @CFLAGS_FOR_BUILD@ @LDFLAGS_FOR_BUILD@ -o schema_bindings
+ 
+-schema_bindings_LDADD = @METACITY_LIBS@
+ metacity.schemas.in: schema_bindings ${srcdir}/metacity.schemas.in.in
+ 	@echo Generating keybinding schemas... ${srcdir}/metacity.schemas.in.in
+ 	${builddir}/schema_bindings ${srcdir}/metacity.schemas.in.in ${builddir}/metacity.schemas.in
diff --git a/meta/packages/mutter/mutter/fix_pkgconfig.patch b/meta/packages/mutter/mutter/fix_pkgconfig.patch
new file mode 100644
index 000000000..3714383bc
--- /dev/null
+++ b/meta/packages/mutter/mutter/fix_pkgconfig.patch
@@ -0,0 +1,10 @@
+Index: git/src/metacity-plugins.pc.in
+===================================================================
+--- git.orig/src/metacity-plugins.pc.in	2008-12-17 22:42:19.000000000 +0000
++++ git/src/metacity-plugins.pc.in	2008-12-17 22:42:25.000000000 +0000
+@@ -14,4 +14,4 @@
+ Requires: @CLUTTER_PACKAGE@
+ Version: @VERSION@
+ Libs: @CLUTTER_LIBS@
+-Cflags: @CLUTTER_CFLAGS@ -DWITH_CLUTTER -I${includedir}/metacity-1/metacity-private -DMETACITY_MAJOR_VERSION=${metacity_major_version} -DMETACITY_MINOR_VERSION=${metacity_minor_version} -DMETACITY_MICRO_VERSION=${metacity_micro_version} -DMETACITY_CLUTTER_PLUGIN_API_VERSION=${metacity_clutter_plugin_api_version} -DMUTTER_PLUGIN_DIR=\"${mutterplugindir}\"
++Cflags: -DWITH_CLUTTER -I${includedir}/metacity-1/metacity-private -DMETACITY_MAJOR_VERSION=${metacity_major_version} -DMETACITY_MINOR_VERSION=${metacity_minor_version} -DMETACITY_MICRO_VERSION=${metacity_micro_version} -DMETACITY_CLUTTER_PLUGIN_API_VERSION=${metacity_clutter_plugin_api_version} -DMUTTER_PLUGIN_DIR=\"${mutterplugindir}\"
diff --git a/meta/packages/mutter/mutter/nodocs.patch b/meta/packages/mutter/mutter/nodocs.patch
new file mode 100644
index 000000000..98f43be5e
--- /dev/null
+++ b/meta/packages/mutter/mutter/nodocs.patch
@@ -0,0 +1,29 @@
+Index: git/Makefile.am
+===================================================================
+--- git.orig/Makefile.am	2009-01-27 13:26:12.000000000 +0000
++++ git/Makefile.am	2009-01-27 14:07:13.000000000 +0000
+@@ -1,5 +1,5 @@
+ 
+-SUBDIRS=src po doc
++SUBDIRS=src po
+ 
+ EXTRA_DIST = HACKING MAINTAINERS rationales.txt \
+ 	intltool-extract.in intltool-merge.in intltool-update.in
+Index: git/configure.in
+===================================================================
+--- git.orig/configure.in	2009-01-27 13:26:12.000000000 +0000
++++ git/configure.in	2009-01-27 14:11:16.000000000 +0000
+@@ -538,12 +538,9 @@
+ 
+ # Warnings are there for a reason
+ if test "x$GCC" = "xyes"; then
+-  CFLAGS="$CFLAGS -Wall -Werror -ansi"
++  CFLAGS="$CFLAGS -Wall -ansi"
+ fi
+ 
+-# Use gnome-doc-utils:
+-GNOME_DOC_INIT([0.8.0])
+-
+ AC_CONFIG_FILES([
+ Makefile
+ doc/Makefile
diff --git a/meta/packages/mutter/mutter_git.bb b/meta/packages/mutter/mutter_git.bb
new file mode 100644
index 000000000..7d3a3b8c4
--- /dev/null
+++ b/meta/packages/mutter/mutter_git.bb
@@ -0,0 +1,51 @@
+SECTION = "x11/wm"
+DESCRIPTION = "Metacity is the boring window manager for the adult in you. Mutter is metacity + clutter."
+LICENSE = "GPL"
+DEPENDS = "startup-notification gtk+ gconf clutter gdk-pixbuf-csource-native intltool glib-2.0-native"
+PR = "r8"
+PV = "2.25.1+git${SRCREV}"
+inherit gnome update-alternatives
+
+SRC_URI = "git://git.gnome.org/mutter.git;protocol=git;branch=master \
+           file://nodocs.patch;patch=1 \
+	   file://crosscompile.patch;patch=1 \
+           file://fix_pkgconfig.patch;patch=1"
+S = "${WORKDIR}/git"
+
+ALTERNATIVE_NAME = "x-window-manager"
+ALTERNATIVE_LINK = "${bindir}/x-window-manager"
+ALTERNATIVE_PATH = "${bindir}/metacity"
+ALTERNATIVE_PRIORITY = "11"
+
+EXTRA_OECONF += "--disable-verbose	\
+	         --disable-xinerama	\
+		 --with-clutter"
+
+FILES_${PN} += "${datadir}/themes ${libdir}/metacity/plugins/clutter/*.so"
+FILES_${PN}-dbg += "${libdir}/metacity/plugins/clutter/.debug/*"
+
+export CC_FOR_BUILD = "${BUILD_CC}"
+export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE}/glib-2.0 -I${STAGING_INCDIR_NATIVE}/glib-2.0/include"
+export LDFLAGS_FOR_BUILD = "${BUILD_LDFLAGS} -L${STAGING_LIBDIR_NATIVE} -lglib-2.0"
+
+do_configure_prepend () {
+        echo "EXTRA_DIST=" > ${S}/gnome-doc-utils.make
+}		
+
+do_stage () {
+	 autotools_stage_all
+}
+
+pkg_postinst_${PN} () {
+#!/bin/sh -e
+if [ "x$D" != "x" ]; then
+    exit 1
+fi
+
+. ${sysconfdir}/init.d/functions
+
+gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type list --list-type string --set /apps/metacity/general/clutter_plugins '[default]'
+
+gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type bool --set /apps/metacity/general/compositing_manager true
+}
+