summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDerek Foreman <derekf@osg.samsung.com>2016-09-08 11:51:36 -0500
committerDerek Foreman <derekf@osg.samsung.com>2016-09-08 11:51:36 -0500
commitdc2bad0fcda063ee72b35beb3954cc2fc1eb94ba (patch)
treebe01bd6f76c8736adf157df299202ae30d668c5a
parent0a9b8889e0730774ae9c6183e6ff8a72455a0e02 (diff)
bump ecore_drm2 dependency, update to latest beta API
-rw-r--r--configure.ac10
-rw-r--r--src/bin/e_alert_main.c2
-rw-r--r--src/modules/wl_drm/e_mod_main.c8
3 files changed, 10 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac
index ec14351ec..e35493cc0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -94,6 +94,10 @@ AC_DEFINE(HAVE_ENVIRON, 1, [Have environ var])
94efl_version="1.17.0" 94efl_version="1.17.0"
95AC_SUBST(efl_version) 95AC_SUBST(efl_version)
96 96
97#We use ecore_drm2 beta API
98efl_ecore_drm2_version="1.18.99"
99AC_SUBST(efl_ecore_drm2_version)
100
97AC_CHECK_HEADERS([sys/timerfd.h sys/ptrace.h arpa/inet.h netinet/in.h]) 101AC_CHECK_HEADERS([sys/timerfd.h sys/ptrace.h arpa/inet.h netinet/in.h])
98 102
99dnl 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])) 103dnl 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
763define([CHECK_MODULE_WL_DRM], 767define([CHECK_MODULE_WL_DRM],
764[ 768[
765 if test "x${have_wayland}" = "xyes" ; then 769 if test "x${have_wayland}" = "xyes" ; then
766 PKG_CHECK_EXISTS([ecore-drm2 >= $efl_version], [have_ecore_drm2="yes"], [have_ecore_drm2="no"]) 770 PKG_CHECK_EXISTS([ecore-drm2 >= $efl_ecore_drm2_version], [have_ecore_drm2="yes"], [have_ecore_drm2="no"])
767 if test "x${have_ecore_drm2}" = "xyes"; then 771 if test "x${have_ecore_drm2}" = "xyes"; then
768 AC_E_CHECK_PKG(WL_DRM, [ ecore-drm2 >= $efl_version ecore >= $efl_version eina >= $efl_version ], 772 AC_E_CHECK_PKG(WL_DRM, [ ecore-drm2 >= $efl_ecore_drm2_version ecore >= $efl_version eina >= $efl_version ],
769 [ 773 [
770 WL_DRM=true 774 WL_DRM=true
771 AC_DEFINE_UNQUOTED([HAVE_DRM2],[1],[enable ecore-drm2 support]) 775 AC_DEFINE_UNQUOTED([HAVE_DRM2],[1],[enable ecore-drm2 support])
@@ -901,7 +905,7 @@ if test "x${have_wayland}" = "xyes"; then
901 e_alert_requires="\ 905 e_alert_requires="\
902 $e_alert_requires \ 906 $e_alert_requires \
903 ecore-input >= ${efl_version} \ 907 ecore-input >= ${efl_version} \
904 ecore-drm2 >= ${efl_version} \ 908 ecore-drm2 >= ${efl_ecore_drm2_version} \
905 evas >= ${efl_version}" 909 evas >= ${efl_version}"
906 else 910 else
907 e_alert_requires="\ 911 e_alert_requires="\
diff --git a/src/bin/e_alert_main.c b/src/bin/e_alert_main.c
index c0cb3c6d7..7317896a9 100644
--- a/src/bin/e_alert_main.c
+++ b/src/bin/e_alert_main.c
@@ -456,7 +456,7 @@ _e_alert_drm_display(void)
456 updates = evas_render_updates(canvas); 456 updates = evas_render_updates(canvas);
457 evas_render_updates_free(updates); 457 evas_render_updates_free(updates);
458 458
459 ecore_drm2_fb_flip(buffer, output, NULL); 459 ecore_drm2_fb_flip(buffer, output);
460} 460}
461 461
462static void 462static void
diff --git a/src/modules/wl_drm/e_mod_main.c b/src/modules/wl_drm/e_mod_main.c
index 5f50f2da4..1052c626c 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)
788 out = ecore_drm2_output_find(dev, output->x, output->y); 788 out = ecore_drm2_output_find(dev, output->x, output->y);
789 if (!out) return; 789 if (!out) return;
790 790
791 fb = ecore_drm2_output_next_fb_get(out); 791 fb = ecore_drm2_output_latest_fb_get(out);
792 if (!fb) 792 if (!fb) return;
793 {
794 fb = ecore_drm2_output_current_fb_get(out);
795 if (!fb) return;
796 }
797 793
798 data = ecore_drm2_fb_data_get(fb); 794 data = ecore_drm2_fb_data_get(fb);
799 fstride = ecore_drm2_fb_stride_get(fb); 795 fstride = ecore_drm2_fb_stride_get(fb);