diff --git a/Use-a-native-format-for-atlas-textures.patch b/Use-a-native-format-for-atlas-textures.patch index ebceb86..983f620 100644 --- a/Use-a-native-format-for-atlas-textures.patch +++ b/Use-a-native-format-for-atlas-textures.patch @@ -13,17 +13,11 @@ can't be rendered to. On other hardware, this is probably pretty much neutral for efficiency.) http://bugzilla.openedhand.com/show_bug.cgi?id=2100 ---- - clutter/cogl/cogl/cogl-atlas-texture.c | 11 ++++++++++- - 1 files changed, 10 insertions(+), 1 deletions(-) - -diff --git a/clutter/cogl/cogl/cogl-atlas-texture.c b/clutter/cogl/cogl/cogl-atlas-texture.c -index b9219e4..3fafb58 100644 ---- a/clutter/cogl/cogl/cogl-atlas-texture.c -+++ b/clutter/cogl/cogl/cogl-atlas-texture.c -@@ -70,6 +70,15 @@ - #define GL_FRAMEBUFFER_COMPLETE 0x8CD5 - #endif +--- clutter/cogl/cogl/cogl-atlas-texture.c~ 2010-08-12 07:30:06.000000000 -0400 ++++ clutter/cogl/cogl/cogl-atlas-texture.c 2010-08-31 10:53:50.000000000 -0400 +@@ -114,6 +114,15 @@ + NULL); + } +/* Best guess at native frame buffer formats; using these makes the + * Mesa framebuffer support happier on Radeon cards that can't @@ -34,18 +28,15 @@ index b9219e4..3fafb58 100644 +#define NATIVE_PIXEL_FORMAT COGL_PIXEL_FORMAT_ARGB_8888_PRE +#endif + - static void _cogl_atlas_texture_free (CoglAtlasTexture *sub_tex); + CoglAtlas * + _cogl_atlas_texture_get_atlas (void) + { +@@ -121,7 +130,7 @@ - COGL_HANDLE_DEFINE (AtlasTexture, atlas_texture); -@@ -868,7 +877,7 @@ _cogl_atlas_texture_reserve_space (CoglAtlasTexture *new_sub_tex, - _cogl_texture_2d_new_with_size (_cogl_atlas_get_width (new_atlas), - _cogl_atlas_get_height (new_atlas), - COGL_TEXTURE_NONE, -- COGL_PIXEL_FORMAT_RGBA_8888)) == -+ NATIVE_PIXEL_FORMAT)) == - COGL_INVALID_HANDLE) + if (ctx->atlas == COGL_INVALID_HANDLE) { - COGL_NOTE (ATLAS, "Could not create a CoglTexture2D"); --- -1.7.0.1 - +- ctx->atlas = _cogl_atlas_new (COGL_PIXEL_FORMAT_RGBA_8888, ++ ctx->atlas = _cogl_atlas_new (NATIVE_PIXEL_FORMAT, + 0, + _cogl_atlas_texture_update_position_cb); + diff --git a/clutter.spec b/clutter.spec index 19125d5..dd535bc 100644 --- a/clutter.spec +++ b/clutter.spec @@ -1,6 +1,6 @@ Name: clutter -Version: 1.2.10 -Release: 3%{?dist} +Version: 1.3.12 +Release: 1%{?dist} Summary: Open Source software library for creating rich graphical user interfaces Group: Development/Libraries @@ -57,7 +57,7 @@ This package contains documentation for clutter. %prep %setup -q -%patch0 -p1 -b .atlas-textures +%patch0 -p0 -b .atlas-textures %build (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; CONFIGFLAGS=--enable-gtk-doc; fi; @@ -79,6 +79,8 @@ make install DESTDIR=%{buildroot} INSTALL='install -p' #Remove libtool archives. find %{buildroot} -name '*.la' -exec rm -f {} ';' +%find_lang clutter-1.0 + %clean rm -rf %{buildroot} @@ -86,7 +88,7 @@ rm -rf %{buildroot} %postun -p /sbin/ldconfig -%files +%files -f clutter-1.0.lang %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README %{_libdir}/*.so.0 @@ -105,8 +107,12 @@ rm -rf %{buildroot} %defattr(-, root, root) %{_datadir}/gtk-doc/html/clutter %{_datadir}/gtk-doc/html/cogl +%{_datadir}/gtk-doc/html/cally %changelog +* Tue Aug 31 2010 Colin Walters - 1.3.12-1 +- New upstream + * Thu Jul 15 2010 Colin Walters - 1.2.10-3 - Rebuild with new gobject-introspection