README.md

@@ -347,7 +347,7 @@ Required by default:
 * openjpeg2
 * gstreamer (Ensure all codecs you want are installed.)
 * zlib
-* lua (lua 5.1, luajit or lua 5.2 support optional)
+* luajit (lua 5.1 or 5.2 support optional)
 * libtiff
 * openssl
 * curl

meson.build

@@ -1,5 +1,5 @@
 project('efl', ['c','cpp'],
-  version: '1.27.99',
+  version: '1.27.0',
   default_options : ['buildtype=plain', 'warning_level=1', 'cpp_std=c++11'],
   meson_version : '>=0.50'
 )

meson_options.txt

@@ -330,7 +330,7 @@ option('dotnet',
 option('lua-interpreter',
   type: 'combo',
   choices: ['luajit', 'lua'],
-  value: 'lua',
+  value: 'luajit',
   description: 'Which Lua back-end library to use in efl'
 )
 

src/lib/eina/eina_file_posix.c

@@ -412,7 +412,7 @@ _eina_file_timestamp_compare(Eina_File *f, struct stat *st)
    if (f->length != (unsigned long long) st->st_size) return EINA_FALSE;
    if (f->inode != st->st_ino) return EINA_FALSE;
 #ifdef _STAT_VER_LINUX
-# ifdef st_mtime
+# if (defined __USE_MISC && defined st_mtime)
    if (f->mtime_nsec != (unsigned long int)st->st_mtim.tv_nsec)
      return EINA_FALSE;
 # else
@@ -870,7 +870,11 @@ eina_file_open(const char *path, Eina_Bool shared)
         n->length = file_stat.st_size;
         n->mtime = file_stat.st_mtime;
 #ifdef _STAT_VER_LINUX
+# if (defined __USE_MISC && defined st_mtime)
         n->mtime_nsec = (unsigned long int)file_stat.st_mtim.tv_nsec;
+# else
+        n->mtime_nsec = (unsigned long int)file_stat.st_mtimensec;
+# endif
 #endif
         n->inode = file_stat.st_ino;
         n->fd = fd;
@@ -924,7 +928,11 @@ eina_file_refresh(Eina_File *file)
    file->length = file_stat.st_size;
    file->mtime = file_stat.st_mtime;
 #ifdef _STAT_VER_LINUX
+# if (defined __USE_MISC && defined st_mtime)
    file->mtime_nsec = (unsigned long int)file_stat.st_mtim.tv_nsec;
+# else
+   file->mtime_nsec = (unsigned long int)file_stat.st_mtimensec;
+# endif
 #endif
    file->inode = file_stat.st_ino;
 
@@ -1237,9 +1245,15 @@ eina_file_statat(void *container, Eina_File_Direct_Info *info, Eina_Stat *st)
    st->mtime = buf.st_mtime;
    st->ctime = buf.st_ctime;
 #ifdef _STAT_VER_LINUX
+# if (defined __USE_MISC && defined st_mtime)
    st->atimensec = buf.st_atim.tv_nsec;
    st->mtimensec = buf.st_mtim.tv_nsec;
    st->ctimensec = buf.st_ctim.tv_nsec;
+# else
+   st->atimensec = buf.st_atimensec;
+   st->mtimensec = buf.st_mtimensec;
+   st->ctimensec = buf.st_ctimensec;
+# endif
 #else
    st->atimensec = 0;
    st->mtimensec = 0;

src/lib/eio/eio_monitor_poll.c

@@ -110,9 +110,15 @@ _eio_monitor_fallback_heavy_cb(void *data, Ecore_Thread *thread)
    est->mtime = st.st_mtime;
    est->ctime = st.st_ctime;
 #ifdef _STAT_VER_LINUX
+# if (defined __USE_MISC && defined st_mtime)
    est->atimensec = st.st_atim.tv_nsec;
    est->mtimensec = st.st_mtim.tv_nsec;
    est->ctimensec = st.st_ctim.tv_nsec;
+# else
+   est->atimensec = st.st_atimensec;
+   est->mtimensec = st.st_mtimensec;
+   est->ctimensec = st.st_ctimensec;
+# endif
 #else
    est->atimensec = 0;
    est->mtimensec = 0;

src/lib/eio/eio_single.c

@@ -128,9 +128,15 @@ _eio_file_struct_2_eina(Eina_Stat *es, _eio_stat_t *st)
    es->mtime = st->st_mtime;
    es->ctime = st->st_ctime;
 #ifdef _STAT_VER_LINUX
+# if (defined __USE_MISC && defined st_mtime)
    es->atimensec = st->st_atim.tv_nsec;
    es->mtimensec = st->st_mtim.tv_nsec;
    es->ctimensec = st->st_ctim.tv_nsec;
+# else
+   es->atimensec = st->st_atimensec;
+   es->mtimensec = st->st_mtimensec;
+   es->ctimensec = st->st_ctimensec;
+# endif
 #else
    es->atimensec = 0;
    es->mtimensec = 0;

src/lib/evas/cache/evas_cache_image.c

@@ -201,8 +201,13 @@ _timestamp_compare(Image_Timestamp *tstamp, struct stat *st)
    if (tstamp->size != st->st_size) return EINA_FALSE;
    if (tstamp->ino != st->st_ino) return EINA_FALSE;
 #ifdef _STAT_VER_LINUX
+#if (defined __USE_MISC && defined st_mtime)
    if (tstamp->mtime_nsec != (unsigned long int)st->st_mtim.tv_nsec)
      return EINA_FALSE;
+#else
+   if (tstamp->mtime_nsec != (unsigned long int)st->st_mtimensec)
+     return EINA_FALSE;
+#endif
 #endif
    return EINA_TRUE;
 }
@@ -214,7 +219,11 @@ _timestamp_build(Image_Timestamp *tstamp, struct stat *st)
    tstamp->size = st->st_size;
    tstamp->ino = st->st_ino;
 #ifdef _STAT_VER_LINUX
+#if (defined __USE_MISC && defined st_mtime)
    tstamp->mtime_nsec = (unsigned long int)st->st_mtim.tv_nsec;
+#else
+   tstamp->mtime_nsec = (unsigned long int)st->st_mtimensec;
+#endif
 #endif
 }
 

src/lib/evas/canvas/evas_object_textblock.c

@@ -976,7 +976,7 @@ struct _Escape_Value
    size_t value_len;
 };
 
-#define ESCAPE_VALUE(e,v) {e,v,sizeof(e)-1,sizeof(v)-1}
+#define ESCAPE_VALUE(e,v) {e,v,strlen(e),strlen(v)}
 
 /**
  * @internal

src/lib/evas/common/evas_image_load.c

@@ -415,7 +415,11 @@ _timestamp_build(Image_Timestamp *tstamp, struct stat *st)
    tstamp->size = st->st_size;
    tstamp->ino = st->st_ino;
 #ifdef _STAT_VER_LINUX
+# if (defined __USE_MISC && defined st_mtime)
    tstamp->mtime_nsec = (unsigned long int)st->st_mtim.tv_nsec;
+# else
+   tstamp->mtime_nsec = (unsigned long int)st->st_mtimensec;
+# endif
 #endif
 }
 

src/lib/evas/common/evas_text_utils.c

@@ -19,7 +19,7 @@ struct _Color_Name_Value
    unsigned char b;
 };
 
-#define COLOR_NAME(name,r,g,b) {name,(unsigned char)sizeof(name)-1,r,g,b}
+#define COLOR_NAME(name,r,g,b) {name,(unsigned char)strlen(name),r,g,b}
 
 /**
  * @internal

src/lib/evas/filters/evas_filter_utils.c

@@ -92,18 +92,9 @@ _interpolate_linear(DATA8 *output, int *points)
      {
         if (points[j] != -1)
           {
-             int val1, val2, vald, pos, len;
-
              output[j] = (DATA8) points[j];
-             val1 = points[last_idx];
-             val2 = points[j];
-             vald = val2 - val1;
-             len = j - last_idx;
              for (k = last_idx + 1; k < j; k++)
-               {
-                  pos = k - last_idx;
-                  output[k] = (DATA8) (val1 + ((pos * vald) / len));
-               }
+               output[k] = (DATA8) (points[j] + ((k - last_idx) * (points[j] - points[last_idx]) / (j - last_idx)));
              last_idx = j;
           }
      }

src/tests/ecore/meson.build

@@ -110,11 +110,9 @@ efl_app_suite = executable('efl_app_suite',
 )
 
 test('ecore-suite', ecore_suite,
-  env : test_env,
-  timeout : master_timeout
+  env : test_env
 )
 
 test('efl-app', efl_app_suite,
-  env : test_env,
-  timeout : master_timeout
+  env : test_env
 )

src/tests/ecore_con/meson.build

@@ -16,6 +16,5 @@ ecore_con_suite = executable('ecore_con_suite',
 )
 
 test('ecore_con-suite', ecore_con_suite,
-  env : test_env,
-  timeout : master_timeout
+  env : test_env
 )

src/tests/ecore_wl2/meson.build

@@ -27,6 +27,5 @@ ecore_wl2_suite = executable('ecore_wl2_suite',
 )
 
 test('ecore_wl2-suite', ecore_wl2_suite,
-  env : test_env,
-  timeout : master_timeout
+  env : test_env
 )

src/tests/edje/meson.build

@@ -25,6 +25,5 @@ edje_suite = executable('edje_suite',
 )
 
 test('edje-suite', edje_suite,
-  env : test_env,
-  timeout : master_timeout
+  env : test_env
 )

src/tests/eet/meson.build

@@ -23,6 +23,5 @@ eet_suite = executable('eet_suite',
 )
 
 test('eet-suite', eet_suite,
-  env : test_env,
-  timeout : master_timeout
+  env : test_env
 )

src/tests/eeze/meson.build

@@ -16,6 +16,5 @@ eeze_suite = executable('eeze_suite',
 )
 
 test('eeze-suite', eeze_suite,
-  env : test_env,
-  timeout : master_timeout
+  env : test_env
 )

src/tests/efl/meson.build

@@ -14,6 +14,5 @@ efl_suite_bin = executable('efl_suite',
 )
 
 test('efl-suite', efl_suite_bin,
-  env : test_env,
-  timeout : master_timeout
+  env : test_env
 )

src/tests/efl_check.h

@@ -306,9 +306,9 @@ _efl_suite_wait_on_fork(int *num_forks, Eina_Bool *timeout)
      ret = WEXITSTATUS(status);
    else
      ret = 1;
-   if ((timeout_pid > 0) && (pid == timeout_pid))
+   if (pid == timeout_pid)
      *timeout = EINA_TRUE;
-   else if (timeout_pid > 0)
+   else
      {
         eina_hash_del_by_key(fork_map, &pid);
         (*num_forks)--;
@@ -374,26 +374,8 @@ _efl_suite_build_and_run(int argc, const char **argv, const char *suite_name, co
              if (!timeout_pid)
                {
                   timeout_pid = fork();
-                  if (timeout_pid == 0)
-                    {
-                       int ret = execl(PACKAGE_BUILD_DIR "/src/tests/timeout",
-                                       PACKAGE_BUILD_DIR "/src/tests/timeout",
-                                       (char *)NULL);
-                       if (ret != 0)
-                         {
-                            fprintf(stderr, "EXECL %s TO RUN TIMEOUT!!!\n", PACKAGE_BUILD_DIR "/src/tests/timeout");
-                            perror("EXECL");
-                            fflush(stderr);
-                            abort();
-                         }
-                    }
-                  else if (timeout_pid < 0)
-                    {
-                       fprintf(stderr, "FORK TO RUN TIMEOUT TOOL FAILED!!!\n");
-                       perror("FORK");
-                       fflush(stderr);
-                       abort();
-                    }
+                  if (!timeout_pid)
+                    execl("/bin/sh", "/bin/sh", "-c", PACKAGE_BUILD_DIR "/src/tests/timeout", (char *)NULL);
                }
              if (num_forks == eina_cpu_count())
                failed_count += _efl_suite_wait_on_fork(&num_forks, &timeout_reached);
@@ -410,13 +392,6 @@ _efl_suite_build_and_run(int argc, const char **argv, const char *suite_name, co
 # endif
                   continue;
                }
-            else if (pid < 0)
-              {
-                fprintf(stderr, "FORK TO RUN TIMEOUT TOOL FAILED!!!\n");
-                perror("FORK");
-                fflush(stderr);
-                abort();
-              }
           }
 #endif
 

src/tests/efreet/meson.build

@@ -15,8 +15,7 @@ efreet_suite = executable('efreet_suite',
 )
 
 test('efreet-suite', efreet_suite,
-  env : test_env,
-  timeout : master_timeout
+  env : test_env
 )
 
 efreet_test_src = [

src/tests/eina/meson.build

@@ -72,5 +72,4 @@ eina_test_exe = executable('eina_suite',
 
 test('eina', eina_test_exe,
   env : test_env,
-  timeout : master_timeout
 )

src/tests/eio/meson.build

@@ -26,5 +26,5 @@ eio_suite = executable('eio_suite',
 
 test('eio-suite', eio_suite,
   env : test_env,
-  timeout : master_timeout
+  timeout : 120
 )

src/tests/eldbus/meson.build

@@ -29,5 +29,4 @@ eldbus_suite = executable('eldbus_suite',
 
 test('eldbus-suite', eldbus_suite,
   env : test_env,
-  timeout : master_timeout
 )

src/tests/elementary/efl_ui_test_focus.c

@@ -500,7 +500,6 @@ EFL_START_TEST(order_check)
 }
 EFL_END_TEST
 
-/* this is not working - but doesn't affect anything in real life
 EFL_START_TEST(logical_shift)
 {
    Efl_Ui_Focus_Manager *m;
@@ -531,7 +530,6 @@ EFL_START_TEST(logical_shift)
    efl_unref(m);
 }
 EFL_END_TEST
-*/
 
 EFL_START_TEST(root_redirect_chain)
 {
@@ -1097,7 +1095,7 @@ void efl_ui_test_focus(TCase *tc)
     tcase_add_test(tc, redirect_param);
     tcase_add_test(tc, invalid_args_check);
     tcase_add_test(tc, order_check);
-//    tcase_add_test(tc, logical_shift);
+    tcase_add_test(tc, logical_shift);
     tcase_add_test(tc, root_redirect_chain);
     tcase_add_test(tc, root_redirect_chain_unset);
     tcase_add_test(tc, first_touch_check);

src/tests/elementary/elm_suite.c

@@ -30,7 +30,7 @@ static const Efl_Test_Case etc[] = {
   { "elm_prefs", elm_test_prefs},
   { "elm_map", elm_test_map},
   { "elm_glview", elm_test_glview},
-//  { "elm_web", elm_test_web},
+  { "elm_web", elm_test_web},
   { "elm_toolbar", elm_test_toolbar},
   { "elm_grid", elm_test_grid},
   { "elm_diskselector", elm_test_diskselector},

src/tests/elementary/elm_test_web.c

@@ -6,7 +6,6 @@
 #include <Elementary.h>
 #include "elm_suite.h"
 
-/*
 EFL_START_TEST(elm_web_legacy_type_check)
 {
    Evas_Object *win, *web;
@@ -47,4 +46,3 @@ void elm_test_web(TCase *tc)
    tcase_add_test(tc, elm_web_legacy_type_check);
    tcase_add_test(tc, elm_atspi_role_get);
 }
-*/

src/tests/elementary/meson.build

@@ -193,13 +193,11 @@ executable('efl_ui_window_cnp_dnd_slave',
 )
 
 test('elementary-suite', elementary_suite,
-  env : test_env,
-  timeout : master_timeout
+  env : test_env
 )
 
 test('efl-ui-suite', efl_ui_suite,
-  env : test_env,
-  timeout : master_timeout
+  env : test_env
 )
 
 install_data(files(['testdiff.diff', 'testfile-windows.txt', 'testfile-withblanks.txt', 'testfile.txt']),

src/tests/elementary/spec/meson.build

@@ -45,5 +45,5 @@ efl_ui_behavior_suite = executable('efl_ui_spec_suite',
 
 test('efl_ui_spec-suite', efl_ui_behavior_suite,
   env : test_env,
-  timeout: master_timeout
+  timeout: 60
 )

src/tests/emile/meson.build

@@ -14,6 +14,5 @@ emile_suite = executable('emile_suite',
 )
 
 test('emile-suite', emile_suite,
-  env : test_env,
-  timeout : master_timeout
+  env : test_env
 )

src/tests/eo/suite/meson.build

@@ -30,8 +30,7 @@ eo_suite = executable('eo_suite',
 )
 
 test('eo-suite', eo_suite,
-  env : test_env,
-  timeout : master_timeout
+  env : test_env
 )
 
 eo_suite = executable('eo_suite_dbg',
@@ -44,8 +43,7 @@ eo_suite = executable('eo_suite_dbg',
 )
 
 test('eo-suite-dbg', eo_suite,
-  env : test_env,
-  timeout : master_timeout
+  env : test_env
 )
 
 eo_suite = executable('eo_suite_fallback',
@@ -59,6 +57,5 @@ eo_suite = executable('eo_suite_fallback',
 )
 
 test('eo-suite-fallback', eo_suite,
-  env : test_env,
-  timeout : master_timeout
+  env : test_env
 )

src/tests/evas/evas_test_filters.c

@@ -232,9 +232,8 @@ static struct Filter_Test_Case _test_cases[] = {
 
    { 0, 0, 0, 0, "a = buffer ({ 'alpha' }) blend ({ dst = a }) curve ({ '0:0-255:255', src = a,dst = a }) blend ({ a })", NULL },
    { 0, 0, 0, 0, "a = buffer ({ 'alpha' }) blend ({ dst = a }) curve ({ '0:0-255:255',dst = a }) blend ({ a })", NULL },
-// these are broken - why? it's not the interpolation...
-//   { 0, 0, 0, 0, "a = buffer ({ 'rgba' }) blend ({ dst = a }) curve ({ '0:0-255:255', src = a, channel = 'r' })", NULL },
-//   { 0, 0, 0, 0, "a = buffer ({ 'rgba' }) blend ({ dst = a }) curve ({ '0:128-128:0', src = a, channel = 'rgb', interpolation = 'none' })", NULL },
+   { 0, 0, 0, 0, "a = buffer ({ 'rgba' }) blend ({ dst = a }) curve ({ '0:0-255:255', src = a, channel = 'r' })", NULL },
+   { 0, 0, 0, 0, "a = buffer ({ 'rgba' }) blend ({ dst = a }) curve ({ '0:128-128:0', src = a, channel = 'rgb', interpolation = 'none' })", NULL },
 
    { 0, 0, 0, 0, "fill ({ color = 'red' })", NULL },
 
@@ -334,19 +333,11 @@ _ecore_evas_pixels_check(Ecore_Evas *ee)
         DATA8 *rgba = (DATA8 *) pixels;
 
         if (*pixels && (*pixels != 0xFF000000)) nonzero = EINA_TRUE;
-        if (rgba[ALPHA] < rgba[RED])
+        if ((rgba[ALPHA] < rgba[RED])
+            || (rgba[ALPHA] < rgba[GREEN])
+            || (rgba[ALPHA] < rgba[BLUE]))
           {
-             fprintf(stderr, "Invalid RGBA  R value! must %i < %i\n", rgba[ALPHA], rgba[RED]);
-             return EINA_FALSE;
-          }
-        if (rgba[ALPHA] < rgba[GREEN])
-          {
-             fprintf(stderr, "Invalid RGBA  G value! must %i < %i\n", rgba[ALPHA], rgba[GREEN]);
-             return EINA_FALSE;
-          }
-        if (rgba[ALPHA] < rgba[BLUE])
-          {
-             fprintf(stderr, "Invalid RGBA  B value! must %i < %i\n", rgba[ALPHA], rgba[BLUE]);
+             fprintf(stderr, "Invalid RGBA values!\n");
              return EINA_FALSE;
           }
      }

src/tests/evas/evas_test_image.c

@@ -1125,26 +1125,7 @@ EFL_START_TEST(evas_object_image_9patch)
 
         fail_if(r_w != 1024 || r_h != 1024);
         for (int i = 0; i < r_w * r_h; i++)
-         {
-           int pixa, pixr, pixg, pixb, refa, refr, refg, refb;
-
-           pixa = (d[i] >> 24) & 0xff;
-           pixr = (d[i] >> 16) & 0xff;
-           pixg = (d[i] >>  8) & 0xff;
-           pixb = (d[i]      ) & 0xff;
-           refa = (r_d[i] >> 24) & 0xff;
-           refr = (r_d[i] >> 16) & 0xff;
-           refg = (r_d[i] >>  8) & 0xff;
-           refb = (r_d[i]      ) & 0xff;
-           pixa = abs(pixa - refa);
-           fail_if(pixa > 32);
-           pixr = abs(pixr - refr);
-           fail_if(pixr > 32);
-           pixg = abs(pixg - refg);
-           fail_if(pixg > 32);
-           pixb = abs(pixb - refb);
-           fail_if(pixb > 32);
-         }
+          fail_if(((d[i] - r_d[i]) & 0xF8F8F8F8) != 0);
      }
 
    evas_object_del(obj);

src/tests/evas/evas_test_mask.c

@@ -250,7 +250,6 @@ EFL_START_TEST(evas_mask_test_compare_clip)
 EFL_END_TEST
 
 // This will simply check that a mask is recursively applied to children
-/* this wasn't a ver goodvalid test to begin with... see comments
 EFL_START_TEST(evas_mask_test_mask_of_mask)
 {
    Evas_Object *bg, *tbl, *rect0, *mask0, *mask1, *obj;
@@ -371,7 +370,6 @@ EFL_START_TEST(evas_mask_test_mask_of_mask)
    END_MASK_TEST();
 }
 EFL_END_TEST
-*/
 
 // NOTE: Much more extensive tests are required. But they should
 // be based on "exactness" or a pixel similarity tool.
@@ -381,8 +379,7 @@ void evas_test_mask(TCase *tc)
 {
    tcase_add_test(tc, evas_mask_test_setget);
    tcase_add_test(tc, evas_mask_test_compare_clip);
-/// I don't see how this ever worked? mask of masks...
-//   tcase_add_test(tc, evas_mask_test_mask_of_mask);
+   tcase_add_test(tc, evas_mask_test_mask_of_mask);
 }
 
 #endif // BUILD_ENGINE_BUFFER

src/tests/evas/meson.build

@@ -35,5 +35,5 @@ evas_suite = executable('evas_suite',
 
 test('evas-suite', evas_suite,
   env : test_env,
-  timeout : master_timeout
+  timeout: 60,
 )

src/tests/meson.build

@@ -1,2 +1 @@
-master_timeout = 240
 executable('timeout', 'timeout.c')

src/tests/timeout.c

@@ -10,6 +10,6 @@
 int
 main(int arc, char *argv[])
 {
-   sleep(240);
+   sleep(60);
    return 0;
 }