summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-12-17 16:26:52 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-19 17:54:56 +0000
commit4bb14875e17e99f8b79a1b874ac956388d9c69d3 (patch)
tree59f73f134a0369d0cdbb933cbcf60faba600f7eb
parent6dbd1a3d654ccdcf699aefec51fcdbd82657ff91 (diff)
downloadpoky-4bb14875e17e99f8b79a1b874ac956388d9c69d3.tar.gz
mutter: remove
This recipe was never used in oe-core or meta-oe, and is very old. (From OE-Core rev: fdfee428db3a91c17618277d24b558d31a17d266) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/mutter/mutter.inc42
-rw-r--r--meta/recipes-graphics/mutter/mutter/crosscompile.patch57
-rw-r--r--meta/recipes-graphics/mutter/mutter/fix_CGL_TEXTURE_RECTANGLE_ARB.patch47
-rw-r--r--meta/recipes-graphics/mutter/mutter/fix_pkgconfig-7adb574bb3fa3880eb85dbc86e580cf3452d57c4.patch12
-rw-r--r--meta/recipes-graphics/mutter/mutter/fix_pkgconfig.patch12
-rw-r--r--meta/recipes-graphics/mutter/mutter/nodocs.patch31
-rw-r--r--meta/recipes-graphics/mutter/mutter/nozenity.patch18
-rw-r--r--meta/recipes-graphics/mutter/mutter_2.29.1.bb13
-rw-r--r--meta/recipes-graphics/mutter/mutter_git.bb21
9 files changed, 0 insertions, 253 deletions
diff --git a/meta/recipes-graphics/mutter/mutter.inc b/meta/recipes-graphics/mutter/mutter.inc
deleted file mode 100644
index 942349f95b..0000000000
--- a/meta/recipes-graphics/mutter/mutter.inc
+++ /dev/null
@@ -1,42 +0,0 @@
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.8 gdk-pixbuf-native intltool glib-2.0-native"
5# gobject-introspection
6inherit gnome update-alternatives
7
8ALTERNATIVE_${PN} = "x-window-manager"
9ALTERNATIVE_TARGET[x-window-manager] = "${bindir}/mutter"
10ALTERNATIVE_PRIORITY = "11"
11
12EXTRA_OECONF += "--disable-verbose \
13 --disable-xinerama \
14 --without-introspection \
15 --without-libcanberra \
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
23CFLAGS_FOR_BUILD += "-I${STAGING_INCDIR_NATIVE}/glib-2.0 -I${STAGING_INCDIR_NATIVE}/glib-2.0/include"
24LDFLAGS_FOR_BUILD += "-L${STAGING_LIBDIR_NATIVE} -lglib-2.0"
25
26do_configure_prepend () {
27 echo "EXTRA_DIST=" > ${S}/gnome-doc-utils.make
28}
29
30pkg_postinst_${PN} () {
31#!/bin/sh -e
32if [ "x$D" != "x" ]; then
33 exit 1
34fi
35
36. ${sysconfdir}/init.d/functions
37
38gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type list --list-type string --set /apps/mutter/general/clutter_plugins '[default]'
39
40gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type bool --set /apps/mutter/general/compositing_manager true
41}
42
diff --git a/meta/recipes-graphics/mutter/mutter/crosscompile.patch b/meta/recipes-graphics/mutter/mutter/crosscompile.patch
deleted file mode 100644
index da73e7b287..0000000000
--- a/meta/recipes-graphics/mutter/mutter/crosscompile.patch
+++ /dev/null
@@ -1,57 +0,0 @@
1Upstream-Status: Inappropriate [embedded specific]
2
3Index: git/configure.in
4===================================================================
5--- git.orig/configure.in 2009-01-27 14:49:10.000000000 +0000
6+++ git/configure.in 2009-01-27 15:29:41.000000000 +0000
7@@ -46,6 +46,32 @@
8 AC_LIBTOOL_WIN32_DLL
9 AM_PROG_LIBTOOL
10
11+if test x"$CC_FOR_BUILD" = x; then
12+ if test x"$cross_compiling" = xyes; then
13+ AC_CHECK_PROGS(CC_FOR_BUILD, gcc cc)
14+ else
15+ CC_FOR_BUILD="$CC"
16+ fi
17+fi
18+AC_SUBST([CC_FOR_BUILD])
19+if test x"$CFLAGS_FOR_BUILD" = x; then
20+ if test x"$cross_compiling" = xyes; then
21+ AC_CHECK_PROGS(CFLAGS_FOR_BUILD, gcc cc)
22+ else
23+ CFLAGS_FOR_BUILD="$CFLAGS"
24+ fi
25+fi
26+AC_SUBST([CFLAGS_FOR_BUILD])
27+if test x"$LDFLAGS_FOR_BUILD" = x; then
28+ if test x"$cross_compiling" = xyes; then
29+ AC_CHECK_PROGS(LDFLAGS_FOR_BUILD, gcc cc)
30+ else
31+ LDFLAGS_FOR_BUILD="$LDFLAGS"
32+ fi
33+fi
34+AC_SUBST([LDFLAGS_FOR_BUILD])
35+
36+
37 #### Integer sizes
38
39 AC_CHECK_SIZEOF(char)
40Index: git/src/Makefile.am
41===================================================================
42--- git.orig/src/Makefile.am 2009-01-27 15:25:31.000000000 +0000
43+++ git/src/Makefile.am 2009-01-27 15:39:54.000000000 +0000
44@@ -168,11 +168,9 @@
45 metacity_dialog_SOURCES= \
46 ui/metacity-dialog.c
47
48-schema_bindings_SOURCES = \
49- core/schema-bindings.c \
50- metacity.schemas.in.in
51+schema_bindings:
52+ @CC_FOR_BUILD@ core/schema-bindings.c -I./include -I ../ @CFLAGS_FOR_BUILD@ @LDFLAGS_FOR_BUILD@ -o schema_bindings
53
54-schema_bindings_LDADD = @METACITY_LIBS@
55 metacity.schemas.in: schema_bindings ${srcdir}/metacity.schemas.in.in
56 @echo Generating keybinding schemas... ${srcdir}/metacity.schemas.in.in
57 ${builddir}/schema_bindings ${srcdir}/metacity.schemas.in.in ${builddir}/metacity.schemas.in
diff --git a/meta/recipes-graphics/mutter/mutter/fix_CGL_TEXTURE_RECTANGLE_ARB.patch b/meta/recipes-graphics/mutter/mutter/fix_CGL_TEXTURE_RECTANGLE_ARB.patch
deleted file mode 100644
index 13197e5703..0000000000
--- a/meta/recipes-graphics/mutter/mutter/fix_CGL_TEXTURE_RECTANGLE_ARB.patch
+++ /dev/null
@@ -1,47 +0,0 @@
1Update the usage of CGL_TEXTURE_RECTANGLE_ARB to GL_TEXTURE_RECTANGLE_ARB
2
3Upstream-Status: Pending
4
5Signed-off-by: Saul Wold <sgw@linux.intel.com>
6
7Index: mutter-2.28.1_0.0/src/compositor/mutter-shaped-texture.c
8===================================================================
9--- mutter-2.28.1_0.0.orig/src/compositor/mutter-shaped-texture.c
10+++ mutter-2.28.1_0.0/src/compositor/mutter-shaped-texture.c
11@@ -151,7 +151,7 @@ mutter_shaped_texture_dirty_mask (Mutter
12 cogl_texture_get_gl_texture (priv->mask_texture,
13 &mask_gl_tex, &mask_gl_target);
14
15- if (mask_gl_target == CGL_TEXTURE_RECTANGLE_ARB)
16+ if (mask_gl_target == GL_TEXTURE_RECTANGLE_ARB)
17 glDeleteTextures (1, &mask_gl_tex);
18
19 cogl_texture_unref (priv->mask_texture);
20@@ -214,23 +214,23 @@ mutter_shaped_texture_ensure_mask (Mutte
21
22 cogl_texture_get_gl_texture (paint_tex, NULL, &paint_gl_target);
23
24- if (paint_gl_target == CGL_TEXTURE_RECTANGLE_ARB)
25+ if (paint_gl_target == GL_TEXTURE_RECTANGLE_ARB)
26 {
27 GLuint tex;
28
29 glGenTextures (1, &tex);
30- glBindTexture (CGL_TEXTURE_RECTANGLE_ARB, tex);
31+ glBindTexture (GL_TEXTURE_RECTANGLE_ARB, tex);
32 glPixelStorei (GL_UNPACK_ROW_LENGTH, tex_width);
33 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
34 glPixelStorei (GL_UNPACK_SKIP_ROWS, 0);
35 glPixelStorei (GL_UNPACK_SKIP_PIXELS, 0);
36- glTexImage2D (CGL_TEXTURE_RECTANGLE_ARB, 0,
37+ glTexImage2D (GL_TEXTURE_RECTANGLE_ARB, 0,
38 GL_ALPHA, tex_width, tex_height,
39 0, GL_ALPHA, GL_UNSIGNED_BYTE, mask_data);
40
41 priv->mask_texture
42 = cogl_texture_new_from_foreign (tex,
43- CGL_TEXTURE_RECTANGLE_ARB,
44+ GL_TEXTURE_RECTANGLE_ARB,
45 tex_width, tex_height,
46 0, 0,
47 COGL_PIXEL_FORMAT_A_8);
diff --git a/meta/recipes-graphics/mutter/mutter/fix_pkgconfig-7adb574bb3fa3880eb85dbc86e580cf3452d57c4.patch b/meta/recipes-graphics/mutter/mutter/fix_pkgconfig-7adb574bb3fa3880eb85dbc86e580cf3452d57c4.patch
deleted file mode 100644
index 695f94c629..0000000000
--- a/meta/recipes-graphics/mutter/mutter/fix_pkgconfig-7adb574bb3fa3880eb85dbc86e580cf3452d57c4.patch
+++ /dev/null
@@ -1,12 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3Index: git/src/metacity-plugins.pc.in
4===================================================================
5--- git.orig/src/metacity-plugins.pc.in 2008-12-17 22:42:19.000000000 +0000
6+++ git/src/metacity-plugins.pc.in 2008-12-17 22:42:25.000000000 +0000
7@@ -14,4 +14,4 @@
8 Requires: @CLUTTER_PACKAGE@
9 Version: @VERSION@
10 Libs: @CLUTTER_LIBS@
11-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}\"
12+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
deleted file mode 100644
index de0dded95f..0000000000
--- a/meta/recipes-graphics/mutter/mutter/fix_pkgconfig.patch
+++ /dev/null
@@ -1,12 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3Index: git/src/mutter-plugins.pc.in
4===================================================================
5--- git.orig/src/mutter-plugins.pc.in 2009-07-03 17:30:39.000000000 +0100
6+++ git/src/mutter-plugins.pc.in 2009-07-03 18:03:09.000000000 +0100
7@@ -14,4 +14,4 @@
8 Requires: @CLUTTER_PACKAGE@
9 Version: @VERSION@
10 Libs: @CLUTTER_LIBS@
11-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}\"
12+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
deleted file mode 100644
index ceb06090b4..0000000000
--- a/meta/recipes-graphics/mutter/mutter/nodocs.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3Index: git/Makefile.am
4===================================================================
5--- git.orig/Makefile.am 2009-01-27 13:26:12.000000000 +0000
6+++ git/Makefile.am 2009-01-27 14:07:13.000000000 +0000
7@@ -1,5 +1,5 @@
8
9-SUBDIRS=src po doc
10+SUBDIRS=src po
11
12 EXTRA_DIST = HACKING MAINTAINERS rationales.txt \
13 intltool-extract.in intltool-merge.in intltool-update.in
14Index: git/configure.in
15===================================================================
16--- git.orig/configure.in 2009-01-27 13:26:12.000000000 +0000
17+++ git/configure.in 2009-01-27 14:11:16.000000000 +0000
18@@ -538,12 +538,9 @@
19
20 # Warnings are there for a reason
21 if test "x$GCC" = "xyes"; then
22- CFLAGS="$CFLAGS -Wall -Werror -ansi"
23+ CFLAGS="$CFLAGS -Wall -ansi"
24 fi
25
26-# Use gnome-doc-utils:
27-GNOME_DOC_INIT([0.8.0])
28-
29 AC_CONFIG_FILES([
30 Makefile
31 doc/Makefile
diff --git a/meta/recipes-graphics/mutter/mutter/nozenity.patch b/meta/recipes-graphics/mutter/mutter/nozenity.patch
deleted file mode 100644
index fa32b6346a..0000000000
--- a/meta/recipes-graphics/mutter/mutter/nozenity.patch
+++ /dev/null
@@ -1,18 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3Index: git/configure.in
4===================================================================
5--- git.orig/configure.in 2009-06-16 13:12:17.000000000 +0100
6+++ git/configure.in 2009-06-16 13:12:33.000000000 +0100
7@@ -575,11 +575,6 @@
8 GCONF_SCHEMAS_INSTALL_FALSE=
9 fi
10
11-AC_PATH_PROG(ZENITY, zenity, no)
12-if test x"$ZENITY" = xno; then
13- AC_MSG_ERROR([zenity not found in your path - needed for dialogs])
14-fi
15-
16 AC_ARG_ENABLE(debug,
17 [ --enable-debug enable debugging],,
18 enable_debug=no)
diff --git a/meta/recipes-graphics/mutter/mutter_2.29.1.bb b/meta/recipes-graphics/mutter/mutter_2.29.1.bb
deleted file mode 100644
index aefd2c7f5a..0000000000
--- a/meta/recipes-graphics/mutter/mutter_2.29.1.bb
+++ /dev/null
@@ -1,13 +0,0 @@
1require mutter.inc
2
3PR = "r1"
4
5LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
6
7SRC_URI += "file://nodocs.patch \
8 file://nozenity.patch \
9 file://fix_pkgconfig.patch \
10 "
11SRC_URI[archive.md5sum] = "ebe3c04751741fb2a028a3c6c4f1c2d7"
12SRC_URI[archive.sha256sum] = "175f3adcc5ad5c6f23772ca15c862f275fc3d9a9c3104e9146cf265847a4a10a"
13
diff --git a/meta/recipes-graphics/mutter/mutter_git.bb b/meta/recipes-graphics/mutter/mutter_git.bb
deleted file mode 100644
index 94cb17d336..0000000000
--- a/meta/recipes-graphics/mutter/mutter_git.bb
+++ /dev/null
@@ -1,21 +0,0 @@
1require mutter.inc
2
3SRCREV = "01d3bebe24d2a56bdf2d82c4a71923e1573f7b7c"
4PV = "2.29.1+git${SRCPV}"
5PR = "r0"
6
7LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
8
9# Gnome is the upstream but moblin is under more active development atm
10# git://git.gnome.org/mutter.git;protocol=git;branch=master
11#
12SRC_URI = "git://git.moblin.org/mutter.git;protocol=git;branch=master \
13 file://nodocs.patch \
14 file://nozenity.patch \
15 file://crosscompile.patch;rev=7adb574bb3fa3880eb85dbc86e580cf3452d57c4 \
16 file://fix_pkgconfig-7adb574bb3fa3880eb85dbc86e580cf3452d57c4.patch;rev=7adb574bb3fa3880eb85dbc86e580cf3452d57c4 \
17 file://fix_pkgconfig.patch;notrev=7adb574bb3fa3880eb85dbc86e580cf3452d57c4 \
18 "
19S = "${WORKDIR}/git"
20
21DEFAULT_PREFERENCE = "-1"