From 022dd52cd90cbbf33daa51dd90805b9634b8a6b0 Mon Sep 17 00:00:00 2001
From: Derek Foreman <derekf@osg.samsung.com>
Date: Thu, 10 Aug 2017 13:28:15 -0500
Subject: [PATCH] Remove more pre-ecore-drm2 stuff

We no longer need a HAVE_DRM2 define since it's become synonymous with
HAVE_WL_DRM.
---
 configure.ac              |  1 -
 meson.build               |  7 -------
 src/bin/e_alert_main.c    | 14 ++++----------
 src/bin/e_comp_wl_input.c | 10 +---------
 src/bin/e_drm2.x          |  2 --
 5 files changed, 5 insertions(+), 29 deletions(-)

diff --git a/configure.ac b/configure.ac
index 776e0795a..c90544e8b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -779,7 +779,6 @@ define([CHECK_MODULE_WL_DRM],
       AC_E_CHECK_PKG(WL_DRM, [ ecore-drm2 >= $efl_ecore_drm2_version elput >= $efl_version ecore >= $efl_version eina >= $efl_version ],
         [
           WL_DRM=true
-          AC_DEFINE_UNQUOTED([HAVE_DRM2],[1],[enable ecore-drm2 support])
         ], [WL_DRM=false])
     else
       WL_DRM=false
diff --git a/meson.build b/meson.build
index a23cdbaaa..65bfe914e 100644
--- a/meson.build
+++ b/meson.build
@@ -244,13 +244,6 @@ if get_option('mount-eeze') == true
   endif
 endif
 
-if get_option('wayland') == true
-  if get_option('wl-drm')
-    dep_ecore_drm2 = dependency('ecore-drm2', required : true)
-    config_h.set('HAVE_DRM2', '1')
-  endif
-endif
-
 dep_rt               = cc.find_library('rt', required: false)
 dep_eina             = dependency('eina'            , required: true, version: efl_version)
 dep_eet              = dependency('eet'             , required: true)
diff --git a/src/bin/e_alert_main.c b/src/bin/e_alert_main.c
index a1784bf4b..faa7151c2 100644
--- a/src/bin/e_alert_main.c
+++ b/src/bin/e_alert_main.c
@@ -1,6 +1,6 @@
 #include "config.h"
 
-#ifdef HAVE_DRM2
+#ifdef HAVE_WL_DRM
 # define EFL_BETA_API_SUPPORT
 #endif
 
@@ -23,11 +23,7 @@
 #endif
 #ifdef HAVE_WL_DRM
 # include <Ecore_Input.h>
-# ifdef HAVE_DRM2
-#  include <Ecore_Drm2.h>
-# else
-#  include <Ecore_Drm.h>
-# endif
+# include <Ecore_Drm2.h>
 # include <Evas.h>
 # include <Evas_Engine_Buffer.h>
 #endif
@@ -35,7 +31,6 @@
 #include "e_drm2.x"
 
 #ifdef HAVE_WL_DRM
-# ifdef HAVE_DRM2
 
 /* DRM_FORMAT_XRGB8888 and fourcc_code borrowed from <drm_fourcc.h>
  *
@@ -60,12 +55,11 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  * OTHER DEALINGS IN THE SOFTWARE.
  */
-#  define fourcc_code(a, b, c, d) \
+# define fourcc_code(a, b, c, d) \
    ((uint32_t)(a) | ((uint32_t)(b) << 8) | \
        ((uint32_t)(c) << 16) | ((uint32_t)(d) << 24))
-#  define DRM_FORMAT_XRGB8888 \
+# define DRM_FORMAT_XRGB8888 \
    fourcc_code('X', 'R', '2', '4') /* [31:0] x:R:G:B 8:8:8:8 little endian */
-# endif
 #endif
 
 #define WINDOW_WIDTH   320
diff --git a/src/bin/e_comp_wl_input.c b/src/bin/e_comp_wl_input.c
index 9d1c9de62..1ae189297 100644
--- a/src/bin/e_comp_wl_input.c
+++ b/src/bin/e_comp_wl_input.c
@@ -3,11 +3,7 @@
 #include "e.h"
 #include <sys/mman.h>
 #ifdef HAVE_WL_DRM
-# ifdef HAVE_DRM2
-#  include <Ecore_Drm2.h>
-# else
-#  include <Ecore_Drm.h>
-# endif
+#include <Ecore_Drm2.h>
 #endif
 
 E_API int E_EVENT_TEXT_INPUT_PANEL_VISIBILITY_CHANGE = -1;
@@ -670,7 +666,6 @@ _e_comp_wl_input_context_keymap_set(struct xkb_keymap *keymap, struct xkb_contex
    if (!e_comp->ee) return;
 //set the values to the drm devices
 #ifdef HAVE_WL_DRM
-# ifdef HAVE_DRM2
    if (strstr(ecore_evas_engine_name_get(e_comp->ee), "drm"))
      {
         Ecore_Drm2_Device *dev;
@@ -680,7 +675,6 @@ _e_comp_wl_input_context_keymap_set(struct xkb_keymap *keymap, struct xkb_contex
           ecore_drm2_device_keyboard_info_set(dev, context, keymap,
             e_comp_wl ? e_comp_wl->kbd.choosen_group : choosen_group);
      }
-# endif
 #endif
 }
 
@@ -688,7 +682,6 @@ E_API void
 e_comp_wl_input_keymap_index_set(xkb_layout_index_t index)
 {
 #ifdef HAVE_WL_DRM
-# ifdef HAVE_DRM2
    if (e_comp && e_comp->ee && strstr(ecore_evas_engine_name_get(e_comp->ee), "drm"))
      {
         Ecore_Drm2_Device *dev;
@@ -697,7 +690,6 @@ e_comp_wl_input_keymap_index_set(xkb_layout_index_t index)
         if (dev)
           ecore_drm2_device_keyboard_group_set(dev, index);
      }
-# endif
 #endif
    if (e_comp_wl)
      {
diff --git a/src/bin/e_drm2.x b/src/bin/e_drm2.x
index 1f852a0da..8d620e000 100644
--- a/src/bin/e_drm2.x
+++ b/src/bin/e_drm2.x
@@ -1,4 +1,3 @@
-# ifdef HAVE_DRM2
 # include <dlfcn.h>
 
 static int crude_hack_fd;
@@ -114,4 +113,3 @@ e_drm2_fb_create(Ecore_Drm2_Device *device, int width, int height, int depth, in
 }
 
 #undef E_DRM2_EFL_VERSION_MINIMUM
-#endif