cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=940f2e72f934ba1987b3326b7b8655b66d41af9d
commit 940f2e72f934ba1987b3326b7b8655b66d41af9d Author: Nicolas Aguirre <[email protected]> Date: Thu Mar 26 18:08:14 2015 +0100 evas: fix gl_cocoa build after recent changes in evas_common_draw_context_font_ext_set. Now evas_common_draw_context_font_ext_set takes 3 more parameters, fix the build by adding NULL for the function pointers. We really need to switch to gl_generic here, it would avoid this kind of problems. Signed-off-by: Cedric BAIL <[email protected]> --- src/modules/evas/engines/gl_cocoa/evas_engine.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/modules/evas/engines/gl_cocoa/evas_engine.c b/src/modules/evas/engines/gl_cocoa/evas_engine.c index fc660b6..4acca80 100644 --- a/src/modules/evas/engines/gl_cocoa/evas_engine.c +++ b/src/modules/evas/engines/gl_cocoa/evas_engine.c @@ -1046,14 +1046,20 @@ eng_font_draw(void *data, void *context, void *surface, Evas_Font_Set *font EINA re->win->gl_context, evas_gl_font_texture_new, evas_gl_font_texture_free, - evas_gl_font_texture_draw); + evas_gl_font_texture_draw, + NULL, + NULL, + NULL); evas_common_font_draw_prepare(intl_props); evas_common_font_draw(im, context, x, y, intl_props->glyphs); evas_common_draw_context_font_ext_set(context, NULL, NULL, NULL, - NULL); + NULL, + NULL, + NULL, + NULL); } return EINA_FALSE; --
