Sync with the latest tizen 2.4

Update GL engine checking code

Change-Id: Ie85ce445cd7e605a40bcc09ddebb7491d6f02ab5

diff --git a/include/binder.h b/include/binder.h
index a9bb94e..d211f62 100644 (file)
--- a/include/binder.h
+++ b/include/binder.h
@@ -54,6 +54,7 @@ extern const char *binder_widget_find_pkgname(const char *uri);
 extern Ecore_Evas *binder_ecore_evas_new(vwin_info_t info);
 extern int binder_widget_auto_align(void);
 
-#define GL_ENGINE "opengl_x11"
+#define GL_ENGINE_X11 "opengl_x11"
+#define GL_ENGINE     "opengl"
 
 /* End of a file */

diff --git a/packaging/libwidget.spec b/packaging/libwidget.spec
index 256a9f0..d2e4df7 100644 (file)
--- a/packaging/libwidget.spec
+++ b/packaging/libwidget.spec
@@ -2,7 +2,7 @@
 
 Name: libwidget
 Summary: Widget development library
-Version: 1.1.5
+Version: 1.2.0
 Release: 1
 Group: Applications/Core Applications
 License: Flora-1.1

diff --git a/src/binder.c b/src/binder.c
index 74d4cde..a839c87 100644 (file)
--- a/src/binder.c
+++ b/src/binder.c
@@ -2,6 +2,8 @@
 #include <stdlib.h>
 #define __USE_GNU
 #include <dlfcn.h>
+#define _GNU_SOURCE
+#include <string.h>
 
 #include <Elementary.h>
 #include <Ecore_Evas.h>
@@ -498,6 +500,16 @@ static void free_fb(void *data, void *ptr)
        }
 }
 
+static inline int check_gl_engine(const char *engine)
+{
+       /**
+        * @todo
+        * If the "engine" string going to be changed to more complicated formatted string,
+        * We should replace this with sytanx recognizer (parser).
+        */
+       return !!strcasestr(engine, GL_ENGINE);
+}
+
 Ecore_Evas *binder_ecore_evas_new(vwin_info_t info)
 {
        const char *engine;
@@ -507,8 +519,8 @@ Ecore_Evas *binder_ecore_evas_new(vwin_info_t info)
 
        engine = elm_config_accel_preference_get();
 
-       DbgPrint("Preferred engine: %s (%s)\n", engine, GL_ENGINE);
-       if (engine && !strcmp(engine, GL_ENGINE)) {
+       DbgPrint("Preferred engine: %s (%s or %s)\n", engine, GL_ENGINE, GL_ENGINE_X11);
+       if (engine && check_gl_engine(engine)) {
                if (s_info.alloc_canvas_with_pixmap) {
                        ee = s_info.alloc_canvas_with_pixmap(NULL, 0u, 0, 0, info->w, info->h, alloc_pixmap_cb, free_pixmap_cb, info);
                        if (!ee) {