From 0a696f5fa3c38ba9a41083ff686a80268d6b4ccd Mon Sep 17 00:00:00 2001 From: Chris Michael Date: Wed, 16 Nov 2016 09:15:12 -0500 Subject: [PATCH] fix missing definition of DRM_FORMAT_XRGB8888 As we do not compile-time link with libdrm inside Ecore_Drm2 anymore, we need to include relivant bits of drm_fourcc header here in order to define DRM_FORMAT_XRGB8888 else we fail to compile Enlightenment Wayland Signed-off-by: Chris Michael --- src/bin/e_alert_main.c | 54 +++++++++++++++++++++++++++++++++--------- 1 file changed, 43 insertions(+), 11 deletions(-) diff --git a/src/bin/e_alert_main.c b/src/bin/e_alert_main.c index 7317896a9..3cfcd6c58 100644 --- a/src/bin/e_alert_main.c +++ b/src/bin/e_alert_main.c @@ -1,7 +1,7 @@ #include "config.h" #ifdef HAVE_DRM2 -# define EFL_BETA_API_SUPPORT +# define EFL_BETA_API_SUPPORT #endif #include @@ -20,17 +20,49 @@ #include #include -# ifdef HAVE_WL_DRM -# include -# ifdef HAVE_DRM2 -# include -# include -# else -# include -# endif -# include -# include +#ifdef HAVE_WL_DRM +# include +# ifdef HAVE_DRM2 +# include +# else +# include # endif +# include +# include +#endif + +#ifdef HAVE_WL_DRM +# ifdef HAVE_DRM2 +/* DRM_FORMAT_XRGB8888 and fourcc_code borrowed from + * + * Copyright 2011 Intel Corporation + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + * 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) \ + ((uint32_t)(a) | ((uint32_t)(b) << 8) | \ + ((uint32_t)(c) << 16) | ((uint32_t)(d) << 24)) +# 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 #define WINDOW_HEIGHT 240