1*4882a593SmuzhiyunFrom cb1dec373ec8dc5627ed3fa1e74f6eefe2a232e2 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Jeffy Chen <jeffy.chen@rock-chips.com> 3*4882a593SmuzhiyunDate: Fri, 1 Jul 2022 18:15:50 +0800 4*4882a593SmuzhiyunSubject: [PATCH 01/10] Fix compile error with wayland-only 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunSigned-off-by: Jeffy Chen <jeffy.chen@rock-chips.com> 7*4882a593Smuzhiyun--- 8*4882a593Smuzhiyun src/bin/e_includes.h | 2 ++ 9*4882a593Smuzhiyun src/bin/tools/fprint/meson.build | 1 - 10*4882a593Smuzhiyun src/modules/conf_randr/e_int_config_randr2.c | 2 ++ 11*4882a593Smuzhiyun 3 files changed, 4 insertions(+), 1 deletion(-) 12*4882a593Smuzhiyun 13*4882a593Smuzhiyundiff --git a/src/bin/e_includes.h b/src/bin/e_includes.h 14*4882a593Smuzhiyunindex c2b0e69a9..8d161b569 100644 15*4882a593Smuzhiyun--- a/src/bin/e_includes.h 16*4882a593Smuzhiyun+++ b/src/bin/e_includes.h 17*4882a593Smuzhiyun@@ -151,8 +151,10 @@ 18*4882a593Smuzhiyun #include "e_comp_canvas.h" 19*4882a593Smuzhiyun #include "e_utils.h" 20*4882a593Smuzhiyun #include "e_hints.h" 21*4882a593Smuzhiyun+#ifndef HAVE_WAYLAND_ONLY 22*4882a593Smuzhiyun #include "e_comp_x_devices.h" 23*4882a593Smuzhiyun #include "e_comp_x_randr.h" 24*4882a593Smuzhiyun+#endif 25*4882a593Smuzhiyun #include "e_watchdog.h" 26*4882a593Smuzhiyun #include "e_gesture.h" 27*4882a593Smuzhiyun 28*4882a593Smuzhiyundiff --git a/src/bin/tools/fprint/meson.build b/src/bin/tools/fprint/meson.build 29*4882a593Smuzhiyunindex 27a3b2840..405d2a16c 100644 30*4882a593Smuzhiyun--- a/src/bin/tools/fprint/meson.build 31*4882a593Smuzhiyun+++ b/src/bin/tools/fprint/meson.build 32*4882a593Smuzhiyun@@ -16,7 +16,6 @@ efl_version = '>= 1.19.0' 33*4882a593Smuzhiyun elm = dependency('elementary', required: true, version: efl_version) 34*4882a593Smuzhiyun edje = dependency('edje', required: true, version: efl_version) 35*4882a593Smuzhiyun ecore = dependency('ecore', required: true, version: efl_version) 36*4882a593Smuzhiyun-ecorex = dependency('ecore-x', required: true, version: efl_version) 37*4882a593Smuzhiyun depe = dependency('enlightenment', required: false) 38*4882a593Smuzhiyun #curl_dep = dependency('libcurl', version : '>= 7.35.0', required: true) 39*4882a593Smuzhiyun 40*4882a593Smuzhiyundiff --git a/src/modules/conf_randr/e_int_config_randr2.c b/src/modules/conf_randr/e_int_config_randr2.c 41*4882a593Smuzhiyunindex 9f2163b41..0712c0520 100644 42*4882a593Smuzhiyun--- a/src/modules/conf_randr/e_int_config_randr2.c 43*4882a593Smuzhiyun+++ b/src/modules/conf_randr/e_int_config_randr2.c 44*4882a593Smuzhiyun@@ -392,9 +392,11 @@ _basic_screen_info_fill(E_Config_Dialog_Data *cfdata, E_Config_Randr2_Screen *cs 45*4882a593Smuzhiyun { 46*4882a593Smuzhiyun mode_cbdata->cfdata = cfdata; 47*4882a593Smuzhiyun mode_cbdata->mode = *m; 48*4882a593Smuzhiyun+#ifndef HAVE_WAYLAND_ONLY 49*4882a593Smuzhiyun if (m->flags & ECORE_X_RANDR_MODE_DOUBLE_SCAN) 50*4882a593Smuzhiyun snprintf(buf, sizeof(buf), "%ix%i @ %1.2fHz (Doublescan)", m->w, m->h, m->refresh / 2); 51*4882a593Smuzhiyun else 52*4882a593Smuzhiyun+#endif 53*4882a593Smuzhiyun snprintf(buf, sizeof(buf), "%ix%i @ %1.2fHz", m->w, m->h, m->refresh); 54*4882a593Smuzhiyun it = elm_list_item_append(cfdata->modes_obj, buf, NULL, NULL, _cb_mode_set, mode_cbdata); 55*4882a593Smuzhiyun cfdata->freelist = eina_list_append(cfdata->freelist, mode_cbdata); 56*4882a593Smuzhiyun-- 57*4882a593Smuzhiyun2.20.1 58*4882a593Smuzhiyun 59