summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/mutter
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-graphics/mutter')
-rw-r--r--meta/recipes-graphics/mutter/mutter.inc43
-rw-r--r--meta/recipes-graphics/mutter/mutter/crosscompile.patch55
-rw-r--r--meta/recipes-graphics/mutter/mutter/fix_pkgconfig-7adb574bb3fa3880eb85dbc86e580cf3452d57c4.patch10
-rw-r--r--meta/recipes-graphics/mutter/mutter/fix_pkgconfig.patch10
-rw-r--r--meta/recipes-graphics/mutter/mutter/nodocs.patch29
-rw-r--r--meta/recipes-graphics/mutter/mutter/nozenity.patch16
-rw-r--r--meta/recipes-graphics/mutter/mutter_2.28.1.bb9
-rw-r--r--meta/recipes-graphics/mutter/mutter_git.bb17
8 files changed, 189 insertions, 0 deletions
diff --git a/meta/recipes-graphics/mutter/mutter.inc b/meta/recipes-graphics/mutter/mutter.inc
new file mode 100644
index 0000000000..456348754f
--- /dev/null
+++ b/meta/recipes-graphics/mutter/mutter.inc
@@ -0,0 +1,43 @@
1SECTION = "x11/wm"
2DESCRIPTION = "Metacity is the boring window manager for the adult in you. Mutter is metacity + clutter."
3LICENSE = "GPLv2"
4DEPENDS = "startup-notification gtk+ gconf clutter-1.0 gdk-pixbuf-csource-native intltool glib-2.0-native"
5# gobject-introspection
6inherit gnome update-alternatives
7
8ALTERNATIVE_NAME = "x-window-manager"
9ALTERNATIVE_LINK = "${bindir}/x-window-manager"
10ALTERNATIVE_PATH = "${bindir}/mutter"
11ALTERNATIVE_PRIORITY = "11"
12
13EXTRA_OECONF += "--disable-verbose \
14 --disable-xinerama \
15 --without-introspection \
16 --with-clutter"
17
18#RDEPENDS_${PN} = "zenity"
19
20FILES_${PN} += "${datadir}/themes ${libdir}/mutter/plugins/*.so ${datadir}/gnome/wm-properties/"
21FILES_${PN}-dbg += "${libdir}/mutter/plugins/.debug/*"
22
23export CC_FOR_BUILD = "${BUILD_CC}"
24export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE}/glib-2.0 -I${STAGING_INCDIR_NATIVE}/glib-2.0/include"
25export LDFLAGS_FOR_BUILD = "${BUILD_LDFLAGS} -L${STAGING_LIBDIR_NATIVE} -lglib-2.0"
26
27do_configure_prepend () {
28 echo "EXTRA_DIST=" > ${S}/gnome-doc-utils.make
29}
30
31pkg_postinst_${PN} () {
32#!/bin/sh -e
33if [ "x$D" != "x" ]; then
34 exit 1
35fi
36
37. ${sysconfdir}/init.d/functions
38
39gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type list --list-type string --set /apps/mutter/general/clutter_plugins '[default]'
40
41gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type bool --set /apps/mutter/general/compositing_manager true
42}
43
diff --git a/meta/recipes-graphics/mutter/mutter/crosscompile.patch b/meta/recipes-graphics/mutter/mutter/crosscompile.patch
new file mode 100644
index 0000000000..b27383b09a
--- /dev/null
+++ b/meta/recipes-graphics/mutter/mutter/crosscompile.patch
@@ -0,0 +1,55 @@
1Index: git/configure.in
2===================================================================
3--- git.orig/configure.in 2009-01-27 14:49:10.000000000 +0000
4+++ git/configure.in 2009-01-27 15:29:41.000000000 +0000
5@@ -46,6 +46,32 @@
6 AC_LIBTOOL_WIN32_DLL
7 AM_PROG_LIBTOOL
8
9+if test x"$CC_FOR_BUILD" = x; then
10+ if test x"$cross_compiling" = xyes; then
11+ AC_CHECK_PROGS(CC_FOR_BUILD, gcc cc)
12+ else
13+ CC_FOR_BUILD="$CC"
14+ fi
15+fi
16+AC_SUBST([CC_FOR_BUILD])
17+if test x"$CFLAGS_FOR_BUILD" = x; then
18+ if test x"$cross_compiling" = xyes; then
19+ AC_CHECK_PROGS(CFLAGS_FOR_BUILD, gcc cc)
20+ else
21+ CFLAGS_FOR_BUILD="$CFLAGS"
22+ fi
23+fi
24+AC_SUBST([CFLAGS_FOR_BUILD])
25+if test x"$LDFLAGS_FOR_BUILD" = x; then
26+ if test x"$cross_compiling" = xyes; then
27+ AC_CHECK_PROGS(LDFLAGS_FOR_BUILD, gcc cc)
28+ else
29+ LDFLAGS_FOR_BUILD="$LDFLAGS"
30+ fi
31+fi
32+AC_SUBST([LDFLAGS_FOR_BUILD])
33+
34+
35 #### Integer sizes
36
37 AC_CHECK_SIZEOF(char)
38Index: git/src/Makefile.am
39===================================================================
40--- git.orig/src/Makefile.am 2009-01-27 15:25:31.000000000 +0000
41+++ git/src/Makefile.am 2009-01-27 15:39:54.000000000 +0000
42@@ -168,11 +168,9 @@
43 metacity_dialog_SOURCES= \
44 ui/metacity-dialog.c
45
46-schema_bindings_SOURCES = \
47- core/schema-bindings.c \
48- metacity.schemas.in.in
49+schema_bindings:
50+ @CC_FOR_BUILD@ core/schema-bindings.c -I./include -I ../ @CFLAGS_FOR_BUILD@ @LDFLAGS_FOR_BUILD@ -o schema_bindings
51
52-schema_bindings_LDADD = @METACITY_LIBS@
53 metacity.schemas.in: schema_bindings ${srcdir}/metacity.schemas.in.in
54 @echo Generating keybinding schemas... ${srcdir}/metacity.schemas.in.in
55 ${builddir}/schema_bindings ${srcdir}/metacity.schemas.in.in ${builddir}/metacity.schemas.in
diff --git a/meta/recipes-graphics/mutter/mutter/fix_pkgconfig-7adb574bb3fa3880eb85dbc86e580cf3452d57c4.patch b/meta/recipes-graphics/mutter/mutter/fix_pkgconfig-7adb574bb3fa3880eb85dbc86e580cf3452d57c4.patch
new file mode 100644
index 0000000000..3714383bc1
--- /dev/null
+++ b/meta/recipes-graphics/mutter/mutter/fix_pkgconfig-7adb574bb3fa3880eb85dbc86e580cf3452d57c4.patch
@@ -0,0 +1,10 @@
1Index: git/src/metacity-plugins.pc.in
2===================================================================
3--- git.orig/src/metacity-plugins.pc.in 2008-12-17 22:42:19.000000000 +0000
4+++ git/src/metacity-plugins.pc.in 2008-12-17 22:42:25.000000000 +0000
5@@ -14,4 +14,4 @@
6 Requires: @CLUTTER_PACKAGE@
7 Version: @VERSION@
8 Libs: @CLUTTER_LIBS@
9-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}\"
10+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/recipes-graphics/mutter/mutter/fix_pkgconfig.patch b/meta/recipes-graphics/mutter/mutter/fix_pkgconfig.patch
new file mode 100644
index 0000000000..5ac5ecc609
--- /dev/null
+++ b/meta/recipes-graphics/mutter/mutter/fix_pkgconfig.patch
@@ -0,0 +1,10 @@
1Index: git/src/mutter-plugins.pc.in
2===================================================================
3--- git.orig/src/mutter-plugins.pc.in 2009-07-03 17:30:39.000000000 +0100
4+++ git/src/mutter-plugins.pc.in 2009-07-03 18:03:09.000000000 +0100
5@@ -14,4 +14,4 @@
6 Requires: @CLUTTER_PACKAGE@
7 Version: @VERSION@
8 Libs: @CLUTTER_LIBS@
9-Cflags: @CLUTTER_CFLAGS@ -DWITH_CLUTTER -I${includedir}/mutter/mutter-private -DMUTTER_MAJOR_VERSION=${mutter_major_version} -DMUTTER_MINOR_VERSION=${mutter_minor_version} -DMUTTER_MICRO_VERSION=${mutter_micro_version} -DMUTTER_PLUGIN_API_VERSION=${mutter_plugin_api_version} -DMUTTER_PLUGIN_DIR=\"${plugindir}\"
10+Cflags: -DWITH_CLUTTER -I${includedir}/mutter/mutter-private -DMUTTER_MAJOR_VERSION=${mutter_major_version} -DMUTTER_MINOR_VERSION=${mutter_minor_version} -DMUTTER_MICRO_VERSION=${mutter_micro_version} -DMUTTER_PLUGIN_API_VERSION=${mutter_plugin_api_version} -DMUTTER_PLUGIN_DIR=\"${plugindir}\"
diff --git a/meta/recipes-graphics/mutter/mutter/nodocs.patch b/meta/recipes-graphics/mutter/mutter/nodocs.patch
new file mode 100644
index 0000000000..98f43be5e8
--- /dev/null
+++ b/meta/recipes-graphics/mutter/mutter/nodocs.patch
@@ -0,0 +1,29 @@
1Index: git/Makefile.am
2===================================================================
3--- git.orig/Makefile.am 2009-01-27 13:26:12.000000000 +0000
4+++ git/Makefile.am 2009-01-27 14:07:13.000000000 +0000
5@@ -1,5 +1,5 @@
6
7-SUBDIRS=src po doc
8+SUBDIRS=src po
9
10 EXTRA_DIST = HACKING MAINTAINERS rationales.txt \
11 intltool-extract.in intltool-merge.in intltool-update.in
12Index: git/configure.in
13===================================================================
14--- git.orig/configure.in 2009-01-27 13:26:12.000000000 +0000
15+++ git/configure.in 2009-01-27 14:11:16.000000000 +0000
16@@ -538,12 +538,9 @@
17
18 # Warnings are there for a reason
19 if test "x$GCC" = "xyes"; then
20- CFLAGS="$CFLAGS -Wall -Werror -ansi"
21+ CFLAGS="$CFLAGS -Wall -ansi"
22 fi
23
24-# Use gnome-doc-utils:
25-GNOME_DOC_INIT([0.8.0])
26-
27 AC_CONFIG_FILES([
28 Makefile
29 doc/Makefile
diff --git a/meta/recipes-graphics/mutter/mutter/nozenity.patch b/meta/recipes-graphics/mutter/mutter/nozenity.patch
new file mode 100644
index 0000000000..06f5909533
--- /dev/null
+++ b/meta/recipes-graphics/mutter/mutter/nozenity.patch
@@ -0,0 +1,16 @@
1Index: git/configure.in
2===================================================================
3--- git.orig/configure.in 2009-06-16 13:12:17.000000000 +0100
4+++ git/configure.in 2009-06-16 13:12:33.000000000 +0100
5@@ -575,11 +575,6 @@
6 GCONF_SCHEMAS_INSTALL_FALSE=
7 fi
8
9-AC_PATH_PROG(ZENITY, zenity, no)
10-if test x"$ZENITY" = xno; then
11- AC_MSG_ERROR([zenity not found in your path - needed for dialogs])
12-fi
13-
14 AC_ARG_ENABLE(debug,
15 [ --enable-debug enable debugging],,
16 enable_debug=no)
diff --git a/meta/recipes-graphics/mutter/mutter_2.28.1.bb b/meta/recipes-graphics/mutter/mutter_2.28.1.bb
new file mode 100644
index 0000000000..c4b8107899
--- /dev/null
+++ b/meta/recipes-graphics/mutter/mutter_2.28.1.bb
@@ -0,0 +1,9 @@
1require mutter.inc
2
3SRC_URI = "http://download.moblin.org/sources/mutter/2.28/mutter-2.28.1_0.0.tar.bz2 \
4 file://nodocs.patch;patch=1 \
5 file://nozenity.patch;patch=1 \
6 file://fix_pkgconfig.patch;patch=1 \
7 "
8
9S = "${WORKDIR}/mutter-2.28.1_0.0" \ No newline at end of file
diff --git a/meta/recipes-graphics/mutter/mutter_git.bb b/meta/recipes-graphics/mutter/mutter_git.bb
new file mode 100644
index 0000000000..b41bf1e505
--- /dev/null
+++ b/meta/recipes-graphics/mutter/mutter_git.bb
@@ -0,0 +1,17 @@
1require mutter.inc
2
3PV = "2.28.1+git${SRCPV}"
4PR = "r18"
5
6# Gnome is the upstream but moblin is under more active development atm
7# git://git.gnome.org/mutter.git;protocol=git;branch=master
8#
9SRC_URI = "git://git.moblin.org/mutter.git;protocol=git;branch=master \
10 file://nodocs.patch;patch=1 \
11 file://nozenity.patch;patch=1 \
12 file://crosscompile.patch;patch=1;rev=7adb574bb3fa3880eb85dbc86e580cf3452d57c4 \
13 file://fix_pkgconfig-7adb574bb3fa3880eb85dbc86e580cf3452d57c4.patch;patch=1;rev=7adb574bb3fa3880eb85dbc86e580cf3452d57c4 \
14 file://fix_pkgconfig.patch;patch=1;notrev=7adb574bb3fa3880eb85dbc86e580cf3452d57c4 \
15 "
16S = "${WORKDIR}/git"
17
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-15 20:36:07 +0000