[EGIT] [core/enlightenment] master 01/01: bump ecore_drm2 dependency, update to latest beta API

[Derek Foreman]

derekf pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=dc2bad0fcda063ee72b35beb3954cc2fc1eb94ba

commit dc2bad0fcda063ee72b35beb3954cc2fc1eb94ba
Author: Derek Foreman <der...@osg.samsung.com>
Date:   Thu Sep 8 11:51:36 2016 -0500

    bump ecore_drm2 dependency, update to latest beta API
---
 configure.ac                    | 10 +++++++---
 src/bin/e_alert_main.c          |  2 +-
 src/modules/wl_drm/e_mod_main.c |  8 ++------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/configure.ac b/configure.ac
index ec14351..e35493c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -94,6 +94,10 @@ AC_DEFINE(HAVE_ENVIRON, 1, [Have environ var])
 efl_version="1.17.0"
 AC_SUBST(efl_version)
 
+#We use ecore_drm2 beta API
+efl_ecore_drm2_version="1.18.99"
+AC_SUBST(efl_ecore_drm2_version)
+
 AC_CHECK_HEADERS([sys/timerfd.h sys/ptrace.h arpa/inet.h netinet/in.h])
 
 dnl AC_CHECK_HEADERS(X11/extensions/shape.h,, AC_MSG_ERROR([Cannot find 
X11/extensions/shape.h. Make sure your CFLAGS environment variable contains 
include lines for the location of this file]))
@@ -763,9 +767,9 @@ WL_DRM=false
 define([CHECK_MODULE_WL_DRM],
 [
   if test "x${have_wayland}" = "xyes" ; then
-    PKG_CHECK_EXISTS([ecore-drm2 >= $efl_version], [have_ecore_drm2="yes"], 
[have_ecore_drm2="no"])
+    PKG_CHECK_EXISTS([ecore-drm2 >= $efl_ecore_drm2_version], 
[have_ecore_drm2="yes"], [have_ecore_drm2="no"])
     if test "x${have_ecore_drm2}" = "xyes"; then
-      AC_E_CHECK_PKG(WL_DRM, [ ecore-drm2 >= $efl_version ecore >= 
$efl_version eina >= $efl_version ],
+      AC_E_CHECK_PKG(WL_DRM, [ ecore-drm2 >= $efl_ecore_drm2_version ecore >= 
$efl_version eina >= $efl_version ],
         [
           WL_DRM=true
           AC_DEFINE_UNQUOTED([HAVE_DRM2],[1],[enable ecore-drm2 support])
@@ -901,7 +905,7 @@ if test "x${have_wayland}" = "xyes"; then
       e_alert_requires="\
         $e_alert_requires \
         ecore-input >= ${efl_version} \
-        ecore-drm2 >= ${efl_version} \
+        ecore-drm2 >= ${efl_ecore_drm2_version} \
         evas >= ${efl_version}"
     else
       e_alert_requires="\
diff --git a/src/bin/e_alert_main.c b/src/bin/e_alert_main.c
index c0cb3c6..7317896 100644
--- a/src/bin/e_alert_main.c
+++ b/src/bin/e_alert_main.c
@@ -456,7 +456,7 @@ _e_alert_drm_display(void)
    updates = evas_render_updates(canvas);
    evas_render_updates_free(updates);
 
-   ecore_drm2_fb_flip(buffer, output, NULL);
+   ecore_drm2_fb_flip(buffer, output);
 }
 
 static void
diff --git a/src/modules/wl_drm/e_mod_main.c b/src/modules/wl_drm/e_mod_main.c
index 5f50f2d..1052c62 100644
--- a/src/modules/wl_drm/e_mod_main.c
+++ b/src/modules/wl_drm/e_mod_main.c
@@ -788,12 +788,8 @@ _drm2_read_pixels(E_Comp_Wl_Output *output, void *pixels)
    out = ecore_drm2_output_find(dev, output->x, output->y);
    if (!out) return;
 
-   fb = ecore_drm2_output_next_fb_get(out);
-   if (!fb)
-     {
-        fb = ecore_drm2_output_current_fb_get(out);
-        if (!fb) return;
-     }
+   fb = ecore_drm2_output_latest_fb_get(out);
+   if (!fb) return;
 
    data = ecore_drm2_fb_data_get(fb);
    fstride = ecore_drm2_fb_stride_get(fb);

--