summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@gmail.com>2018-02-28 11:47:52 +0100
committerOtavio Salvador <otavio@ossystems.com.br>2018-04-02 10:20:17 -0300
commit052e8599b80034fa9ef3e36a1ecff45d3d119a92 (patch)
tree4de81cc93bd7b299dbd0f7044d3a35bf75eae36e
parent35305769282009d5849234d5c208fe043b807d1c (diff)
downloadmeta-freescale-052e8599b80034fa9ef3e36a1ecff45d3d119a92.tar.gz
remove efl dynamic layer support
meta-efl was removed completely in August 2017 Change-Id: Ic734ec38d6dc4d248367186eb51077e04a453b6d Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> (cherry picked from commit 66e6349b72de37d20c3ad423afcb4211c84a26df)
-rw-r--r--dynamic-layers/efl-layer/recipes-efl/efl/efl/0001-Add-preprocessor-definitions-for-Vivante-GLES-header.patch63
-rw-r--r--dynamic-layers/efl-layer/recipes-efl/efl/efl_%.bbappend3
2 files changed, 0 insertions, 66 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
deleted file mode 100644
index 77717ac7..00000000
--- a/dynamic-layers/efl-layer/recipes-efl/efl/efl/0001-Add-preprocessor-definitions-for-Vivante-GLES-header.patch
+++ /dev/null
@@ -1,63 +0,0 @@
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 | 3 ++
15 2 files changed, 5 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@@ -745,6 +745,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@@ -766,6 +767,7 @@ modules_evas_engines_gl_generic_module_la_CFLAGS = \
46 -I$(top_srcdir)/src/lib/evas/cserve2 \
47 -I$(top_srcdir)/src/modules/evas/engines/gl_common \
48 -I$(top_builddir)/src/modules/evas/engines/gl_generic \
49+-DLINUX \
50 @evas_engine_gl_common_cflags@ \
51 @EVAS_CFLAGS@
52 modules_evas_engines_gl_generic_module_la_LIBADD = \
53@@ -897,6 +899,7 @@ install_engineglx11pkgLTLIBRARIES = install-engineglx11pkgLTLIBRARIES
54 $(install_engineglx11pkgLTLIBRARIES): install-libLTLIBRARIES
55
56 modules_evas_engines_gl_x11_module_la_SOURCES = $(GL_X11_SOURCES)
57+modules_evas_engines_gl_x11_module_la_CFLAGS = -DLINUX
58 modules_evas_engines_gl_x11_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
59 -I$(top_srcdir)/src/lib/evas/include \
60 -I$(top_srcdir)/src/lib/evas/cserve2 \
61--
621.8.3.2
63
diff --git a/dynamic-layers/efl-layer/recipes-efl/efl/efl_%.bbappend b/dynamic-layers/efl-layer/recipes-efl/efl/efl_%.bbappend
deleted file mode 100644
index 7f711aa7..00000000
--- a/dynamic-layers/efl-layer/recipes-efl/efl/efl_%.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2
3SRC_URI_append_imxgpu2d = " file://0001-Add-preprocessor-definitions-for-Vivante-GLES-header.patch"