diff options
author | Cliff Brake <cbrake@bec-systems.com> | 2010-09-13 14:15:35 -0400 |
---|---|---|
committer | Cliff Brake <cbrake@bec-systems.com> | 2010-09-13 14:15:35 -0400 |
commit | 4ee358534793381d2e87b01781079a3354fd5c1c (patch) | |
tree | 729f8b0ce4bdbcd8a16f561fb68da0d66c3a3eb8 /recipes/clutter | |
parent | beb17e26ee9b4bc0cf334c3b30560c6eb66b1299 (diff) | |
parent | eda06ec3dde6169a46797f876a82499c4fff8f62 (diff) | |
download | openembedded-324a7c75ac7f591e950836686bfe14332ce6586b.tar.gz |
Merge branch 'org.openembedded.dev' into testing-nexttesting_2010-09-13
Diffstat (limited to 'recipes/clutter')
-rw-r--r-- | recipes/clutter/clutter-box2d_git.bb (renamed from recipes/clutter/clutter-box2d_0.10.0_git.bb) | 1 | ||||
-rw-r--r-- | recipes/clutter/clutter/workaround-broken-mipmaps.patch | 13 | ||||
-rw-r--r-- | recipes/clutter/clutter_1.2.12.bb | 1 |
3 files changed, 15 insertions, 0 deletions
diff --git a/recipes/clutter/clutter-box2d_0.10.0_git.bb b/recipes/clutter/clutter-box2d_git.bb index 4696a01c79..c503f81977 100644 --- a/recipes/clutter/clutter-box2d_0.10.0_git.bb +++ b/recipes/clutter/clutter-box2d_git.bb @@ -2,6 +2,7 @@ require clutter-box2d.inc SRCREV = "4e72b9c135a9439b82d801c62422531db611f98b" +PV = 0.10.0 PR = "${INC_PR}.0" PR_append = "+git${SRCREV}" diff --git a/recipes/clutter/clutter/workaround-broken-mipmaps.patch b/recipes/clutter/clutter/workaround-broken-mipmaps.patch new file mode 100644 index 0000000000..f2a2915958 --- /dev/null +++ b/recipes/clutter/clutter/workaround-broken-mipmaps.patch @@ -0,0 +1,13 @@ +--- a/clutter/cogl/pango/cogl-pango-fontmap.c.old 2010-06-08 16:19:26.000000000 +0200 ++++ b/clutter/cogl/pango/cogl-pango-fontmap.c 2010-09-06 14:26:07.000000000 +0200 +@@ -173,7 +173,9 @@ + + renderer = COGL_PANGO_RENDERER (cogl_pango_font_map_get_renderer (fm)); + +- _cogl_pango_renderer_set_use_mipmapping (renderer, value); ++ /* disable mipmaps until they are fixed */ ++ /* _cogl_pango_renderer_set_use_mipmapping (renderer, value); */ ++ _cogl_pango_renderer_set_use_mipmapping (renderer, FALSE); + } + + /** diff --git a/recipes/clutter/clutter_1.2.12.bb b/recipes/clutter/clutter_1.2.12.bb index a454544c67..fd6247fc5f 100644 --- a/recipes/clutter/clutter_1.2.12.bb +++ b/recipes/clutter/clutter_1.2.12.bb @@ -3,6 +3,7 @@ require clutter.inc PR = "${INC_PR}.1" SRC_URI = "http://source.clutter-project.org/sources/clutter/1.2/clutter-${PV}.tar.bz2 \ + file://workaround-broken-mipmaps.patch \ ${INC_SRC_URI} \ " |