summaryrefslogtreecommitdiffstats
path: root/dynamic-layers/efl-layer
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2015-07-15 17:21:16 -0300
committerOtavio Salvador <otavio@ossystems.com.br>2015-07-16 15:01:29 -0300
commitca38cdc4de1143cf6b7af76e9426ecf31f0922f0 (patch)
tree01db34465457c4b22036f27dba53d55f01ef6d03 /dynamic-layers/efl-layer
parentb6e2300960729d67720e1e626051999ca7a7009f (diff)
downloadmeta-freescale-ca38cdc4de1143cf6b7af76e9426ecf31f0922f0.tar.gz
Move external layer's specific changes for 'dynamic-layers' subdir
The external layer's specific changes are now in the 'dynamic-layers' subdirectory. This approach ease the identification of layer specific recipes and extensions as all those are more visible isolated of the main layer components. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'dynamic-layers/efl-layer')
-rw-r--r--dynamic-layers/efl-layer/recipes-efl/efl/efl/0001-Add-preprocessor-definitions-for-Vivante-GLES-header.patch55
-rw-r--r--dynamic-layers/efl-layer/recipes-efl/efl/efl_%.bbappend3
2 files changed, 58 insertions, 0 deletions
diff --git a/dynamic-layers/efl-layer/recipes-efl/efl/efl/0001-Add-preprocessor-definitions-for-Vivante-GLES-header.patch b/dynamic-layers/efl-layer/recipes-efl/efl/efl/0001-Add-preprocessor-definitions-for-Vivante-GLES-header.patch
new file mode 100644
index 00000000..53f0a528
--- /dev/null
+++ b/dynamic-layers/efl-layer/recipes-efl/efl/efl/0001-Add-preprocessor-definitions-for-Vivante-GLES-header.patch
@@ -0,0 +1,55 @@
1From 0775633e35127e903a1a84d823bf2e7d388d4042 Mon Sep 17 00:00:00 2001
2From: Carlos Rafael Giani <dv@pseudoterminal.org>
3Date: Sun, 1 Jun 2014 01:57:53 +0200
4Subject: [PATCH] Add preprocessor definitions for Vivante GLES headers
5
6The Vivante headers require the LINUX preprocessor definition, otherwise
7compile errors occur
8
9Upstream-Status: Pending
10
11Signed-off-by: Carlos Rafael Giani <dv@pseudoterminal.org>
12---
13 m4/evas_check_engine.m4 | 4 ++--
14 src/Makefile_Evas.am | 2 ++
15 2 files changed, 4 insertions(+), 2 deletions(-)
16
17diff --git a/m4/evas_check_engine.m4 b/m4/evas_check_engine.m4
18index 3fd4890..35d1c5f 100644
19--- a/m4/evas_check_engine.m4
20+++ b/m4/evas_check_engine.m4
21@@ -26,9 +26,9 @@ EFL_FIND_X(evas_engine_[]$1,
22 [X11 XCreateColormap Xrender XRenderCreatePicture],
23 [
24 CFLAGS_save="$CFLAGS"
25- CFLAGS="$evas_engine_[]$1[]_cflags $CFLAGS"
26+ CFLAGS="$evas_engine_[]$1[]_cflags $CFLAGS -DLINUX"
27 CPPFLAGS_save="$CPPFLAGS"
28- CPPFLAGS="$evas_engine_[]$1[]_cflags $CPPFLAGS"
29+ CPPFLAGS="$evas_engine_[]$1[]_cflags $CPPFLAGS -DLINUX"
30
31 AC_CHECK_HEADER([GL/gl.h],
32 [have_dep="yes"],
33diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
34index 644391b..6232f78 100644
35--- a/src/Makefile_Evas.am
36+++ b/src/Makefile_Evas.am
37@@ -632,6 +632,7 @@ lib_evas_libevas_la_LIBADD += @evas_engine_gl_common_libs@
38 else
39 noinst_LTLIBRARIES += modules/evas/engines/gl_common/libevas_engine_gl_common.la
40 modules_evas_engines_gl_common_libevas_engine_gl_common_la_SOURCES = $(GL_COMMON_SOURCES)
41+modules_evas_engines_gl_common_libevas_engine_gl_common_la_CFLAGS = -DLINUX
42 modules_evas_engines_gl_common_libevas_engine_gl_common_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
43 -I$(top_srcdir)/src/lib/evas/include \
44 -I$(top_srcdir)/src/lib/evas/cserve2 \
45@@ -736,6 +737,7 @@ else
46 engineglx11pkgdir = $(libdir)/evas/modules/engines/gl_x11/$(MODULE_ARCH)
47 engineglx11pkg_LTLIBRARIES = modules/evas/engines/gl_x11/module.la
48 modules_evas_engines_gl_x11_module_la_SOURCES = $(GL_X11_SOURCES)
49+modules_evas_engines_gl_x11_module_la_CFLAGS = -DLINUX
50 modules_evas_engines_gl_x11_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
51 -I$(top_srcdir)/src/lib/evas/include \
52 -I$(top_srcdir)/src/lib/evas/cserve2 \
53--
541.8.3.2
55
diff --git a/dynamic-layers/efl-layer/recipes-efl/efl/efl_%.bbappend b/dynamic-layers/efl-layer/recipes-efl/efl/efl_%.bbappend
new file mode 100644
index 00000000..72ef7980
--- /dev/null
+++ b/dynamic-layers/efl-layer/recipes-efl/efl/efl_%.bbappend
@@ -0,0 +1,3 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2
3SRC_URI_append_mx6 = " file://0001-Add-preprocessor-definitions-for-Vivante-GLES-header.patch"