Merge branch 'upstream'

Conflicts:
	.gitignore
	src/lib/ecore_evas/ecore_evas_x.c

diff --cc .gitignore
index 85f0263,5b8a4f1..5a69096
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -80,29 -79,4 +79,30 @@@ po/remove-potcdate.si
  po/stamp-po
  /stamp-h1
  /doc/Doxyfile
+ /src/bin/ecore_test
 +debian/*.debhelper.log
 +debian/*.substvars
 +debian/*.debhelper
 +debian/libecore-bin/
 +config.guess.cdbs-orig
 +config.sub.cdbs-orig
 +debian/files
 +debian/libecore-con/
 +debian/libecore-config/
 +debian/libecore-data/
 +debian/libecore-dbg/
 +debian/libecore-dev/
 +debian/libecore-doc/
 +debian/libecore-evas/
 +debian/libecore-fb/
 +debian/libecore-file/
 +debian/libecore-imf/
 +debian/libecore-input/
 +debian/libecore-ipc/
 +debian/libecore-x/
 +debian/libecore/
 +debian/stamp-*
 +debian/tmp/
 +doc/html/
 +doc/latex/
 +doc/man/

diff --cc ecore.spec.in
Simple merge

diff --cc src/lib/ecore/ecore_thread.c
Simple merge

diff --cc src/lib/ecore_evas/ecore_evas_private.h
index c7727d0,ae28ce2..d9027c9
mode 100755,100644..100755
--- 1/src/lib/ecore_evas/ecore_evas_private.h
--- 2/src/lib/ecore_evas/ecore_evas_private.h
+++ b/src/lib/ecore_evas/ecore_evas_private.h

diff --cc src/lib/ecore_evas/ecore_evas_x.c
index 77b942a,aa6cfaa..d3dcb58
mode 100755,100644..100755
--- 1/src/lib/ecore_evas/ecore_evas_x.c
--- 2/src/lib/ecore_evas/ecore_evas_x.c
+++ b/src/lib/ecore_evas/ecore_evas_x.c
@@@ -1045,27 -997,17 +997,28 @@@ _ecore_evas_x_event_window_show(void *d
     ee = ecore_event_window_match(e->win);
     if (!ee) return ECORE_CALLBACK_PASS_ON; /* pass on event */
     if (e->win != ee->prop.window) return ECORE_CALLBACK_PASS_ON;
 +   /* some GL drivers are doing buffer copy in a separate thread.
 +    * we need to check whether GL driver sends SYNC_DRAW_DONE msg afger copying
 +    * that are required in order to exactly render. - added by gl77.lee
 +    */
 +   if (ee->gl_sync_draw_done < 0)
 +     {
 +        if (getenv("ECORE_EVAS_GL_SYNC_DRAW_DONE"))
 +           ee->gl_sync_draw_done = atoi(getenv("ECORE_EVAS_GL_SYNC_DRAW_DONE"));
 +        else
 +           ee->gl_sync_draw_done = 0;
 +     }
     if (first_map_bug < 0)
       {
-         if (getenv("ECORE_EVAS_GL_FIRST_MAP_BUG"))
-            first_map_bug = atoi(getenv("ECORE_EVAS_GL_FIRST_MAP_BUG"));
+         char *bug = NULL;
+ 
+         if ((bug = getenv("ECORE_EVAS_GL_FIRST_MAP_BUG")))
+           first_map_bug = atoi(bug);
          else
-            first_map_bug = 0;
+           first_map_bug = 0;
       }
-    if ((first_map_bug) &&
-        (!strcmp(ee->driver, "opengl_x11")))
-       evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);
+    if ((first_map_bug) && (!strcmp(ee->driver, "opengl_x11")))
+      evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);
     if (ee->visible) return ECORE_CALLBACK_DONE;
  //   printf("SHOW EVENT %p\n", ee);
     ee->visible = 1;
@@@ -1615,17 -1545,8 +1587,17 @@@ _ecore_evas_x_rotation_set(Ecore_Evas *
          einfo = (Evas_Engine_Info_GL_X11 *)evas_engine_info_get(ee->evas);
          if (!einfo) return;
          einfo->info.rotation = rotation;
-         _ecore_evas_x_rotation_set_internal
-           (ee, rotation, resize, (Evas_Engine_Info *)einfo);
+         _ecore_evas_x_rotation_set_internal(ee, rotation, resize, 
+                                             (Evas_Engine_Info *)einfo);
 +# if _USE_WIN_ROT_EFFECT
-        ecore_x_window_prop_property_set (ee->prop.window,
++        ecore_x_window_prop_property_set(ee->prop.window,
 +                                         ECORE_X_ATOM_E_ILLUME_ROTATE_WINDOW_ANGLE,
 +                                         ECORE_X_ATOM_CARDINAL, 32, &angles, 2);
 +# else
-        ecore_x_window_prop_property_set (ee->prop.window,
++        ecore_x_window_prop_property_set(ee->prop.window,
 +                                         ECORE_X_ATOM_E_ILLUME_ROTATE_WINDOW_ANGLE,
 +                                         ECORE_X_ATOM_CARDINAL, 32, &rotation, 1);
 +# endif
  #endif /* BUILD_ECORE_EVAS_OPENGL_X11 */
       }
     else if (!strcmp(ee->driver, "software_x11"))
@@@ -1636,17 -1557,8 +1608,17 @@@
          einfo = (Evas_Engine_Info_Software_X11 *)evas_engine_info_get(ee->evas);
          if (!einfo) return;
          einfo->info.rotation = rotation;
-         _ecore_evas_x_rotation_set_internal
-           (ee, rotation, resize, (Evas_Engine_Info *)einfo);
+         _ecore_evas_x_rotation_set_internal(ee, rotation, resize, 
+                                             (Evas_Engine_Info *)einfo);
 +# if _USE_WIN_ROT_EFFECT
-        ecore_x_window_prop_property_set (ee->prop.window,
++        ecore_x_window_prop_property_set(ee->prop.window,
 +                                         ECORE_X_ATOM_E_ILLUME_ROTATE_WINDOW_ANGLE,
 +                                         ECORE_X_ATOM_CARDINAL, 32, &angles, 2);
 +# else
-        ecore_x_window_prop_property_set (ee->prop.window,
++        ecore_x_window_prop_property_set(ee->prop.window,
 +                                         ECORE_X_ATOM_E_ILLUME_ROTATE_WINDOW_ANGLE,
 +                                         ECORE_X_ATOM_CARDINAL, 32, &rotation, 1);
 +# endif
  #endif /* BUILD_ECORE_EVAS_SOFTWARE_X11 */
       }
     else if (!strcmp(ee->driver,  "software_16_x11"))
@@@ -1657,17 -1569,8 +1629,17 @@@
          einfo = (Evas_Engine_Info_Software_16_X11 *)evas_engine_info_get(ee->evas);
          if (!einfo) return;
          einfo->info.rotation = rotation;
-         _ecore_evas_x_rotation_set_internal
-           (ee, rotation, resize, (Evas_Engine_Info *)einfo);
+         _ecore_evas_x_rotation_set_internal(ee, rotation, resize, 
+                                             (Evas_Engine_Info *)einfo);
 +# if _USE_WIN_ROT_EFFECT
-        ecore_x_window_prop_property_set (ee->prop.window,
++        ecore_x_window_prop_property_set(ee->prop.window,
 +                                         ECORE_X_ATOM_E_ILLUME_ROTATE_WINDOW_ANGLE,
 +                                         ECORE_X_ATOM_CARDINAL, 32, &angles, 2);
 +# else
-        ecore_x_window_prop_property_set (ee->prop.window,
++        ecore_x_window_prop_property_set(ee->prop.window,
 +                                         ECORE_X_ATOM_E_ILLUME_ROTATE_WINDOW_ANGLE,
 +                                         ECORE_X_ATOM_CARDINAL, 32, &rotation, 1);
 +# endif
  #endif /* BUILD_ECORE_EVAS_SOFTWARE_16_X11 */
       }
     else if (!strcmp(ee->driver,  "software_8_x11"))
@@@ -1678,24 -1581,10 +1650,24 @@@
          einfo = (Evas_Engine_Info_Software_8_X11 *)evas_engine_info_get(ee->evas);
          if (!einfo) return;
          einfo->info.rotation = rotation;
-         _ecore_evas_x_rotation_set_internal
-            (ee, rotation, resize, (Evas_Engine_Info *)einfo);
+         _ecore_evas_x_rotation_set_internal(ee, rotation, resize, 
+                                             (Evas_Engine_Info *)einfo);
 +# if _USE_WIN_ROT_EFFECT
-        ecore_x_window_prop_property_set (ee->prop.window,
++        ecore_x_window_prop_property_set(ee->prop.window,
 +                                         ECORE_X_ATOM_E_ILLUME_ROTATE_WINDOW_ANGLE,
 +                                         ECORE_X_ATOM_CARDINAL, 32, &angles, 2);
 +# else
-        ecore_x_window_prop_property_set (ee->prop.window,
++        ecore_x_window_prop_property_set(ee->prop.window,
 +                                         ECORE_X_ATOM_E_ILLUME_ROTATE_WINDOW_ANGLE,
 +                                         ECORE_X_ATOM_CARDINAL, 32, &rotation, 1);
 +# endif
  #endif /* BUILD_ECORE_EVAS_SOFTWARE_8_X11 */
       }
 +
 +#if _USE_WIN_ROT_EFFECT
 +  _ecore_evas_x_rotation_effect_setup();
 +  _ecore_evas_x_flush_pre(ee, NULL, NULL);
 +#endif /* end of _USE_WIN_ROT_EFFECT */
  }
  
  static void
@@@ -2922,9 -2759,7 +2842,8 @@@ _ecore_evas_x_flush_post(void *data, Ev
  {
     Ecore_Evas *ee = data;
  
-    if ((!ee->no_comp_sync) &&
-        (_ecore_evas_app_comp_sync) &&
 -   if ((!ee->no_comp_sync) && (_ecore_evas_app_comp_sync))
++   if ((!ee->no_comp_sync) && (_ecore_evas_app_comp_sync) &&
 +       (!ee->gl_sync_draw_done)) // added by gl77.lee
       {
          if (ee->engine.x.sync_counter)
            {

diff --cc src/lib/ecore_x/Ecore_X.h
index d67f93c,c6b1634..630e11b
mode 100755,100644..100755
--- 1/src/lib/ecore_x/Ecore_X.h
--- 2/src/lib/ecore_x/Ecore_X.h
+++ b/src/lib/ecore_x/Ecore_X.h

diff --cc src/lib/ecore_x/Ecore_X_Atoms.h
Simple merge

diff --cc src/lib/ecore_x/ecore_x_atoms_decl.h
Simple merge