From b658b6803fff863e3964d963865416418900ef1f87b469c973aeeefa8a7fff62 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 3 Dec 2009 01:50:16 +0000 Subject: [PATCH 1/5] Accepting request 25382 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/mutter via accept of submit request 25382 revision 2. Request was accepted with message: Accepting... OBS-URL: https://build.opensuse.org/request/show/25382 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/mutter?expand=0&rev=16 --- mutter.changes | 6 ++++++ mutter.spec | 11 +++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/mutter.changes b/mutter.changes index 0fd3fcb..36bbfcb 100644 --- a/mutter.changes +++ b/mutter.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Dec 2 12:04:17 CET 2009 - vuntz@opensuse.org + +- Update the way we remove the ha, la, ig locales for old versions + of openSUSE. + ------------------------------------------------------------------- Thu Oct 8 18:47:29 CEST 2009 - vuntz@opensuse.org diff --git a/mutter.spec b/mutter.spec index 76437e8..01b7875 100644 --- a/mutter.spec +++ b/mutter.spec @@ -73,6 +73,11 @@ to develop applications that require these. %install %makeinstall +%if 0%{?suse_version} <= 1110 +%{__rm} %{buildroot}%{_datadir}/locale/ha/LC_MESSAGES/* +%{__rm} %{buildroot}%{_datadir}/locale/la/LC_MESSAGES/* +%{__rm} %{buildroot}%{_datadir}/locale/ig/LC_MESSAGES/* +%endif %{__rm} %{buildroot}/%{_libdir}/*.la %suse_update_desktop_file %{name} %find_lang %{name} @@ -107,12 +112,6 @@ rm -rf %{buildroot} %doc %{_mandir}/man*/* %files lang -f %{name}.lang -%if %suse_version <= 1110 -# exclude locales which don't exist on old versions of openSUSE -%exclude %{_datadir}/locale/ha/LC_MESSAGES/* -%exclude %{_datadir}/locale/ig/LC_MESSAGES/* -%exclude %{_datadir}/locale/la/LC_MESSAGES/* -%endif %files devel %defattr (-, root, root) From 8f89e53346cd86cc4758825642c9091f7549af70d2ab683c38637172d05d2bc2 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 8 Dec 2009 11:00:54 +0000 Subject: [PATCH 2/5] checked in OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/mutter?expand=0&rev=17 --- mutter.changes | 6 ------ mutter.spec | 11 ++++++----- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/mutter.changes b/mutter.changes index 36bbfcb..0fd3fcb 100644 --- a/mutter.changes +++ b/mutter.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Wed Dec 2 12:04:17 CET 2009 - vuntz@opensuse.org - -- Update the way we remove the ha, la, ig locales for old versions - of openSUSE. - ------------------------------------------------------------------- Thu Oct 8 18:47:29 CEST 2009 - vuntz@opensuse.org diff --git a/mutter.spec b/mutter.spec index 01b7875..76437e8 100644 --- a/mutter.spec +++ b/mutter.spec @@ -73,11 +73,6 @@ to develop applications that require these. %install %makeinstall -%if 0%{?suse_version} <= 1110 -%{__rm} %{buildroot}%{_datadir}/locale/ha/LC_MESSAGES/* -%{__rm} %{buildroot}%{_datadir}/locale/la/LC_MESSAGES/* -%{__rm} %{buildroot}%{_datadir}/locale/ig/LC_MESSAGES/* -%endif %{__rm} %{buildroot}/%{_libdir}/*.la %suse_update_desktop_file %{name} %find_lang %{name} @@ -112,6 +107,12 @@ rm -rf %{buildroot} %doc %{_mandir}/man*/* %files lang -f %{name}.lang +%if %suse_version <= 1110 +# exclude locales which don't exist on old versions of openSUSE +%exclude %{_datadir}/locale/ha/LC_MESSAGES/* +%exclude %{_datadir}/locale/ig/LC_MESSAGES/* +%exclude %{_datadir}/locale/la/LC_MESSAGES/* +%endif %files devel %defattr (-, root, root) From efe0dcab3bd65fd490a1d0bb7dae0d6f224ed07d0343feca19d5ebde15a787a5 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 4 Feb 2010 16:20:38 +0000 Subject: [PATCH 3/5] Accepting request 31516 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/mutter via accept of submit request 31516 revision 2. Request was accepted with message: ok OBS-URL: https://build.opensuse.org/request/show/31516 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/mutter?expand=0&rev=18 --- mutter-fix-build.patch | 36 ++++++++++++++++++++++++++++++++++++ mutter-gl-no-cgl.patch | 41 +++++++++++++++++++++++++++++++++++++++++ mutter.changes | 12 ++++++++++++ mutter.spec | 23 ++++++++++++++--------- 4 files changed, 103 insertions(+), 9 deletions(-) create mode 100644 mutter-fix-build.patch create mode 100644 mutter-gl-no-cgl.patch diff --git a/mutter-fix-build.patch b/mutter-fix-build.patch new file mode 100644 index 0000000..62a1a05 --- /dev/null +++ b/mutter-fix-build.patch @@ -0,0 +1,36 @@ +From e14132b8269e4b2ff1194e2d3412198e7d8168f1 Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Wed, 3 Feb 2010 14:17:10 -0500 +Subject: [PATCH] [introspection] Include xlib.gir + +We need this for KeySym at least. + +https://bugzilla.gnome.org/show_bug.cgi?id=607125 +--- + src/Makefile.am | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +Index: mutter-2.28.0/src/Makefile.am +=================================================================== +--- mutter-2.28.0.orig/src/Makefile.am ++++ mutter-2.28.0/src/Makefile.am +@@ -212,6 +212,7 @@ Meta-$(api_version).gir: $(G_IR_SCANNER) + --include=Clutter-1.0 \ + --pkg=clutter-1.0 \ + --pkg=gtk+-2.0 \ ++ --include=xlib-2.0 \ + --include=xfixes-4.0 \ + --program=$$pwd/mutter \ + $(filter %.c,$(mutter_SOURCES)) \ +Index: mutter-2.28.0/src/Makefile.in +=================================================================== +--- mutter-2.28.0.orig/src/Makefile.in ++++ mutter-2.28.0/src/Makefile.in +@@ -2242,6 +2242,7 @@ uninstall-am: uninstall-binPROGRAMS unin + @WITH_INTROSPECTION_TRUE@ --include=Clutter-1.0 \ + @WITH_INTROSPECTION_TRUE@ --pkg=clutter-1.0 \ + @WITH_INTROSPECTION_TRUE@ --pkg=gtk+-2.0 \ ++@WITH_INTROSPECTION_TRUE@ --include=xlib-2.0 \ + @WITH_INTROSPECTION_TRUE@ --include=xfixes-4.0 \ + @WITH_INTROSPECTION_TRUE@ --program=$$pwd/mutter \ + @WITH_INTROSPECTION_TRUE@ $(filter %.c,$(mutter_SOURCES)) \ diff --git a/mutter-gl-no-cgl.patch b/mutter-gl-no-cgl.patch new file mode 100644 index 0000000..3a00c35 --- /dev/null +++ b/mutter-gl-no-cgl.patch @@ -0,0 +1,41 @@ +Index: mutter-2.28.0/src/compositor/mutter-shaped-texture.c +=================================================================== +--- mutter-2.28.0.orig/src/compositor/mutter-shaped-texture.c ++++ mutter-2.28.0/src/compositor/mutter-shaped-texture.c +@@ -151,7 +151,7 @@ mutter_shaped_texture_dirty_mask (Mutter + cogl_texture_get_gl_texture (priv->mask_texture, + &mask_gl_tex, &mask_gl_target); + +- if (mask_gl_target == CGL_TEXTURE_RECTANGLE_ARB) ++ if (mask_gl_target == GL_TEXTURE_RECTANGLE_ARB) + glDeleteTextures (1, &mask_gl_tex); + + cogl_texture_unref (priv->mask_texture); +@@ -214,23 +214,23 @@ mutter_shaped_texture_ensure_mask (Mutte + + cogl_texture_get_gl_texture (paint_tex, NULL, &paint_gl_target); + +- if (paint_gl_target == CGL_TEXTURE_RECTANGLE_ARB) ++ if (paint_gl_target == GL_TEXTURE_RECTANGLE_ARB) + { + GLuint tex; + + glGenTextures (1, &tex); +- glBindTexture (CGL_TEXTURE_RECTANGLE_ARB, tex); ++ glBindTexture (GL_TEXTURE_RECTANGLE_ARB, tex); + glPixelStorei (GL_UNPACK_ROW_LENGTH, tex_width); + glPixelStorei (GL_UNPACK_ALIGNMENT, 1); + glPixelStorei (GL_UNPACK_SKIP_ROWS, 0); + glPixelStorei (GL_UNPACK_SKIP_PIXELS, 0); +- glTexImage2D (CGL_TEXTURE_RECTANGLE_ARB, 0, ++ glTexImage2D (GL_TEXTURE_RECTANGLE_ARB, 0, + GL_ALPHA, tex_width, tex_height, + 0, GL_ALPHA, GL_UNSIGNED_BYTE, mask_data); + + priv->mask_texture + = cogl_texture_new_from_foreign (tex, +- CGL_TEXTURE_RECTANGLE_ARB, ++ GL_TEXTURE_RECTANGLE_ARB, + tex_width, tex_height, + 0, 0, + COGL_PIXEL_FORMAT_A_8); diff --git a/mutter.changes b/mutter.changes index 0fd3fcb..34fc6cb 100644 --- a/mutter.changes +++ b/mutter.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Wed Feb 3 20:31:43 CET 2010 - vuntz@opensuse.org + +- Add mutter-fix-build.patch and mutter-gl-no-cgl.patch to fix the + build with recent introspection data and with recent clutter. + +------------------------------------------------------------------- +Wed Dec 2 12:04:17 CET 2009 - vuntz@opensuse.org + +- Update the way we remove the ha, la, ig locales for old versions + of openSUSE. + ------------------------------------------------------------------- Thu Oct 8 18:47:29 CEST 2009 - vuntz@opensuse.org diff --git a/mutter.spec b/mutter.spec index 76437e8..760e1f9 100644 --- a/mutter.spec +++ b/mutter.spec @@ -30,12 +30,16 @@ BuildRequires: intltool BuildRequires: startup-notification-devel BuildRequires: update-desktop-files BuildRequires: zenity -License: GPL v2 or later +License: GPLv2+ Group: System/GUI/GNOME Version: 2.28.0 -Release: 1 +Release: 2 Summary: Window and compositing manager based on Clutter Source: %{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM mutter-fix-build.patch bgo607125 vuntz@opensuse.org -- Fix build with latest introspection data +Patch0: mutter-fix-build.patch +# PATCH-FIX-UPSTREAM mutter-gl-no-cgl.patch vuntz@opensuse.org -- Fix build with latest clutter, taken from upstream +Patch1: mutter-gl-no-cgl.patch Url: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: zenity @@ -48,7 +52,7 @@ Mutter is a window and compositing manager based on Clutter, forked from Metacity. %package devel -License: GPL v2 or later +License: GPLv2+ Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/GNOME Requires: %{name} = %{version} @@ -63,6 +67,8 @@ to develop applications that require these. %lang_package %prep %setup -q +%patch0 -p1 +%patch1 -p1 %build %configure \ @@ -73,6 +79,11 @@ to develop applications that require these. %install %makeinstall +%if 0%{?suse_version} <= 1110 +%{__rm} %{buildroot}%{_datadir}/locale/ha/LC_MESSAGES/* +%{__rm} %{buildroot}%{_datadir}/locale/la/LC_MESSAGES/* +%{__rm} %{buildroot}%{_datadir}/locale/ig/LC_MESSAGES/* +%endif %{__rm} %{buildroot}/%{_libdir}/*.la %suse_update_desktop_file %{name} %find_lang %{name} @@ -107,12 +118,6 @@ rm -rf %{buildroot} %doc %{_mandir}/man*/* %files lang -f %{name}.lang -%if %suse_version <= 1110 -# exclude locales which don't exist on old versions of openSUSE -%exclude %{_datadir}/locale/ha/LC_MESSAGES/* -%exclude %{_datadir}/locale/ig/LC_MESSAGES/* -%exclude %{_datadir}/locale/la/LC_MESSAGES/* -%endif %files devel %defattr (-, root, root) From 47f7a3c0401f59ee271134cff8576b56f502b467f8ca0b7d281a2582f5fc00a6 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Thu, 11 Feb 2010 19:59:10 +0000 Subject: [PATCH 4/5] checked in (request 32291) OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/mutter?expand=0&rev=19 --- mutter-fix-build.patch | 36 ------------------------------------ mutter-gl-no-cgl.patch | 41 ----------------------------------------- mutter.changes | 6 ------ mutter.spec | 6 ------ 4 files changed, 89 deletions(-) delete mode 100644 mutter-fix-build.patch delete mode 100644 mutter-gl-no-cgl.patch diff --git a/mutter-fix-build.patch b/mutter-fix-build.patch deleted file mode 100644 index 62a1a05..0000000 --- a/mutter-fix-build.patch +++ /dev/null @@ -1,36 +0,0 @@ -From e14132b8269e4b2ff1194e2d3412198e7d8168f1 Mon Sep 17 00:00:00 2001 -From: Colin Walters -Date: Wed, 3 Feb 2010 14:17:10 -0500 -Subject: [PATCH] [introspection] Include xlib.gir - -We need this for KeySym at least. - -https://bugzilla.gnome.org/show_bug.cgi?id=607125 ---- - src/Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -Index: mutter-2.28.0/src/Makefile.am -=================================================================== ---- mutter-2.28.0.orig/src/Makefile.am -+++ mutter-2.28.0/src/Makefile.am -@@ -212,6 +212,7 @@ Meta-$(api_version).gir: $(G_IR_SCANNER) - --include=Clutter-1.0 \ - --pkg=clutter-1.0 \ - --pkg=gtk+-2.0 \ -+ --include=xlib-2.0 \ - --include=xfixes-4.0 \ - --program=$$pwd/mutter \ - $(filter %.c,$(mutter_SOURCES)) \ -Index: mutter-2.28.0/src/Makefile.in -=================================================================== ---- mutter-2.28.0.orig/src/Makefile.in -+++ mutter-2.28.0/src/Makefile.in -@@ -2242,6 +2242,7 @@ uninstall-am: uninstall-binPROGRAMS unin - @WITH_INTROSPECTION_TRUE@ --include=Clutter-1.0 \ - @WITH_INTROSPECTION_TRUE@ --pkg=clutter-1.0 \ - @WITH_INTROSPECTION_TRUE@ --pkg=gtk+-2.0 \ -+@WITH_INTROSPECTION_TRUE@ --include=xlib-2.0 \ - @WITH_INTROSPECTION_TRUE@ --include=xfixes-4.0 \ - @WITH_INTROSPECTION_TRUE@ --program=$$pwd/mutter \ - @WITH_INTROSPECTION_TRUE@ $(filter %.c,$(mutter_SOURCES)) \ diff --git a/mutter-gl-no-cgl.patch b/mutter-gl-no-cgl.patch deleted file mode 100644 index 3a00c35..0000000 --- a/mutter-gl-no-cgl.patch +++ /dev/null @@ -1,41 +0,0 @@ -Index: mutter-2.28.0/src/compositor/mutter-shaped-texture.c -=================================================================== ---- mutter-2.28.0.orig/src/compositor/mutter-shaped-texture.c -+++ mutter-2.28.0/src/compositor/mutter-shaped-texture.c -@@ -151,7 +151,7 @@ mutter_shaped_texture_dirty_mask (Mutter - cogl_texture_get_gl_texture (priv->mask_texture, - &mask_gl_tex, &mask_gl_target); - -- if (mask_gl_target == CGL_TEXTURE_RECTANGLE_ARB) -+ if (mask_gl_target == GL_TEXTURE_RECTANGLE_ARB) - glDeleteTextures (1, &mask_gl_tex); - - cogl_texture_unref (priv->mask_texture); -@@ -214,23 +214,23 @@ mutter_shaped_texture_ensure_mask (Mutte - - cogl_texture_get_gl_texture (paint_tex, NULL, &paint_gl_target); - -- if (paint_gl_target == CGL_TEXTURE_RECTANGLE_ARB) -+ if (paint_gl_target == GL_TEXTURE_RECTANGLE_ARB) - { - GLuint tex; - - glGenTextures (1, &tex); -- glBindTexture (CGL_TEXTURE_RECTANGLE_ARB, tex); -+ glBindTexture (GL_TEXTURE_RECTANGLE_ARB, tex); - glPixelStorei (GL_UNPACK_ROW_LENGTH, tex_width); - glPixelStorei (GL_UNPACK_ALIGNMENT, 1); - glPixelStorei (GL_UNPACK_SKIP_ROWS, 0); - glPixelStorei (GL_UNPACK_SKIP_PIXELS, 0); -- glTexImage2D (CGL_TEXTURE_RECTANGLE_ARB, 0, -+ glTexImage2D (GL_TEXTURE_RECTANGLE_ARB, 0, - GL_ALPHA, tex_width, tex_height, - 0, GL_ALPHA, GL_UNSIGNED_BYTE, mask_data); - - priv->mask_texture - = cogl_texture_new_from_foreign (tex, -- CGL_TEXTURE_RECTANGLE_ARB, -+ GL_TEXTURE_RECTANGLE_ARB, - tex_width, tex_height, - 0, 0, - COGL_PIXEL_FORMAT_A_8); diff --git a/mutter.changes b/mutter.changes index 34fc6cb..36bbfcb 100644 --- a/mutter.changes +++ b/mutter.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Wed Feb 3 20:31:43 CET 2010 - vuntz@opensuse.org - -- Add mutter-fix-build.patch and mutter-gl-no-cgl.patch to fix the - build with recent introspection data and with recent clutter. - ------------------------------------------------------------------- Wed Dec 2 12:04:17 CET 2009 - vuntz@opensuse.org diff --git a/mutter.spec b/mutter.spec index 760e1f9..7b90419 100644 --- a/mutter.spec +++ b/mutter.spec @@ -36,10 +36,6 @@ Version: 2.28.0 Release: 2 Summary: Window and compositing manager based on Clutter Source: %{name}-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM mutter-fix-build.patch bgo607125 vuntz@opensuse.org -- Fix build with latest introspection data -Patch0: mutter-fix-build.patch -# PATCH-FIX-UPSTREAM mutter-gl-no-cgl.patch vuntz@opensuse.org -- Fix build with latest clutter, taken from upstream -Patch1: mutter-gl-no-cgl.patch Url: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: zenity @@ -67,8 +63,6 @@ to develop applications that require these. %lang_package %prep %setup -q -%patch0 -p1 -%patch1 -p1 %build %configure \ From 46f1c787f05d3c71c6e9122ec3d1d3a5cd9e00e30a1397dbc610c6c859ed65ce Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 11 Feb 2010 19:59:11 +0000 Subject: [PATCH 5/5] Updating link to change in openSUSE:Factory/mutter revision 10.0 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/mutter?expand=0&rev=b46f80c817ef7772ced0e69a41082a44 --- mutter-fix-build.patch | 36 ++++++++++++++++++++++++++++++++++++ mutter-gl-no-cgl.patch | 41 +++++++++++++++++++++++++++++++++++++++++ mutter.changes | 6 ++++++ mutter.spec | 10 ++++++++-- 4 files changed, 91 insertions(+), 2 deletions(-) create mode 100644 mutter-fix-build.patch create mode 100644 mutter-gl-no-cgl.patch diff --git a/mutter-fix-build.patch b/mutter-fix-build.patch new file mode 100644 index 0000000..62a1a05 --- /dev/null +++ b/mutter-fix-build.patch @@ -0,0 +1,36 @@ +From e14132b8269e4b2ff1194e2d3412198e7d8168f1 Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Wed, 3 Feb 2010 14:17:10 -0500 +Subject: [PATCH] [introspection] Include xlib.gir + +We need this for KeySym at least. + +https://bugzilla.gnome.org/show_bug.cgi?id=607125 +--- + src/Makefile.am | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +Index: mutter-2.28.0/src/Makefile.am +=================================================================== +--- mutter-2.28.0.orig/src/Makefile.am ++++ mutter-2.28.0/src/Makefile.am +@@ -212,6 +212,7 @@ Meta-$(api_version).gir: $(G_IR_SCANNER) + --include=Clutter-1.0 \ + --pkg=clutter-1.0 \ + --pkg=gtk+-2.0 \ ++ --include=xlib-2.0 \ + --include=xfixes-4.0 \ + --program=$$pwd/mutter \ + $(filter %.c,$(mutter_SOURCES)) \ +Index: mutter-2.28.0/src/Makefile.in +=================================================================== +--- mutter-2.28.0.orig/src/Makefile.in ++++ mutter-2.28.0/src/Makefile.in +@@ -2242,6 +2242,7 @@ uninstall-am: uninstall-binPROGRAMS unin + @WITH_INTROSPECTION_TRUE@ --include=Clutter-1.0 \ + @WITH_INTROSPECTION_TRUE@ --pkg=clutter-1.0 \ + @WITH_INTROSPECTION_TRUE@ --pkg=gtk+-2.0 \ ++@WITH_INTROSPECTION_TRUE@ --include=xlib-2.0 \ + @WITH_INTROSPECTION_TRUE@ --include=xfixes-4.0 \ + @WITH_INTROSPECTION_TRUE@ --program=$$pwd/mutter \ + @WITH_INTROSPECTION_TRUE@ $(filter %.c,$(mutter_SOURCES)) \ diff --git a/mutter-gl-no-cgl.patch b/mutter-gl-no-cgl.patch new file mode 100644 index 0000000..3a00c35 --- /dev/null +++ b/mutter-gl-no-cgl.patch @@ -0,0 +1,41 @@ +Index: mutter-2.28.0/src/compositor/mutter-shaped-texture.c +=================================================================== +--- mutter-2.28.0.orig/src/compositor/mutter-shaped-texture.c ++++ mutter-2.28.0/src/compositor/mutter-shaped-texture.c +@@ -151,7 +151,7 @@ mutter_shaped_texture_dirty_mask (Mutter + cogl_texture_get_gl_texture (priv->mask_texture, + &mask_gl_tex, &mask_gl_target); + +- if (mask_gl_target == CGL_TEXTURE_RECTANGLE_ARB) ++ if (mask_gl_target == GL_TEXTURE_RECTANGLE_ARB) + glDeleteTextures (1, &mask_gl_tex); + + cogl_texture_unref (priv->mask_texture); +@@ -214,23 +214,23 @@ mutter_shaped_texture_ensure_mask (Mutte + + cogl_texture_get_gl_texture (paint_tex, NULL, &paint_gl_target); + +- if (paint_gl_target == CGL_TEXTURE_RECTANGLE_ARB) ++ if (paint_gl_target == GL_TEXTURE_RECTANGLE_ARB) + { + GLuint tex; + + glGenTextures (1, &tex); +- glBindTexture (CGL_TEXTURE_RECTANGLE_ARB, tex); ++ glBindTexture (GL_TEXTURE_RECTANGLE_ARB, tex); + glPixelStorei (GL_UNPACK_ROW_LENGTH, tex_width); + glPixelStorei (GL_UNPACK_ALIGNMENT, 1); + glPixelStorei (GL_UNPACK_SKIP_ROWS, 0); + glPixelStorei (GL_UNPACK_SKIP_PIXELS, 0); +- glTexImage2D (CGL_TEXTURE_RECTANGLE_ARB, 0, ++ glTexImage2D (GL_TEXTURE_RECTANGLE_ARB, 0, + GL_ALPHA, tex_width, tex_height, + 0, GL_ALPHA, GL_UNSIGNED_BYTE, mask_data); + + priv->mask_texture + = cogl_texture_new_from_foreign (tex, +- CGL_TEXTURE_RECTANGLE_ARB, ++ GL_TEXTURE_RECTANGLE_ARB, + tex_width, tex_height, + 0, 0, + COGL_PIXEL_FORMAT_A_8); diff --git a/mutter.changes b/mutter.changes index 36bbfcb..34fc6cb 100644 --- a/mutter.changes +++ b/mutter.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Feb 3 20:31:43 CET 2010 - vuntz@opensuse.org + +- Add mutter-fix-build.patch and mutter-gl-no-cgl.patch to fix the + build with recent introspection data and with recent clutter. + ------------------------------------------------------------------- Wed Dec 2 12:04:17 CET 2009 - vuntz@opensuse.org diff --git a/mutter.spec b/mutter.spec index 7b90419..afdcc4c 100644 --- a/mutter.spec +++ b/mutter.spec @@ -1,7 +1,7 @@ # # spec file for package mutter (Version 2.28.0) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -33,9 +33,13 @@ BuildRequires: zenity License: GPLv2+ Group: System/GUI/GNOME Version: 2.28.0 -Release: 2 +Release: 3 Summary: Window and compositing manager based on Clutter Source: %{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM mutter-fix-build.patch bgo607125 vuntz@opensuse.org -- Fix build with latest introspection data +Patch0: mutter-fix-build.patch +# PATCH-FIX-UPSTREAM mutter-gl-no-cgl.patch vuntz@opensuse.org -- Fix build with latest clutter, taken from upstream +Patch1: mutter-gl-no-cgl.patch Url: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: zenity @@ -63,6 +67,8 @@ to develop applications that require these. %lang_package %prep %setup -q +%patch0 -p1 +%patch1 -p1 %build %configure \