aboutsummaryrefslogtreecommitdiffstats
path: root/meta-efl/recipes-efl/efl/efl
diff options
context:
space:
mode:
Diffstat (limited to 'meta-efl/recipes-efl/efl/efl')
-rw-r--r--meta-efl/recipes-efl/efl/efl/0001-configure.ac-Don-t-check-for-Xprint-extension.patch10
-rw-r--r--meta-efl/recipes-efl/efl/efl/0002-evas_3d-Add-Eet.h-includes.patch51
2 files changed, 56 insertions, 5 deletions
diff --git a/meta-efl/recipes-efl/efl/efl/0001-configure.ac-Don-t-check-for-Xprint-extension.patch b/meta-efl/recipes-efl/efl/efl/0001-configure.ac-Don-t-check-for-Xprint-extension.patch
index 012810b1ea..f34b9576f1 100644
--- a/meta-efl/recipes-efl/efl/efl/0001-configure.ac-Don-t-check-for-Xprint-extension.patch
+++ b/meta-efl/recipes-efl/efl/efl/0001-configure.ac-Don-t-check-for-Xprint-extension.patch
@@ -1,7 +1,7 @@
-From 7097b46383a6ec96662bf1bf0a04190a38d25a20 Mon Sep 17 00:00:00 2001
+From a7ee62a2e90a346bf9aaf9260c918d87e21cfba6 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Fri, 10 Jan 2014 17:07:13 +0100
-Subject: [PATCH] configure.ac: Don't check for Xprint extension
+Subject: [PATCH 1/3] configure.ac: Don't check for Xprint extension
* it's long gone
@@ -11,10 +11,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
1 file changed, 1 deletion(-)
diff --git a/configure.ac b/configure.ac
-index 0d8c4cc..0a08330 100644
+index 779763a..57d3601 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -2769,7 +2769,6 @@ if test "x${want_x11_xlib}" = "xyes" ; then
+@@ -3445,7 +3445,6 @@ if test "x${want_x11_xlib}" = "xyes" ; then
ECORE_CHECK_X_EXTENSION([Xdpms], [dpms.h], [Xext], [DPMSQueryExtension])
ECORE_CHECK_X_EXTENSION([Xfixes], [Xfixes.h], [Xfixes], [XFixesExpandRegion])
ECORE_CHECK_X_EXTENSION([Xinerama], [Xinerama.h], [Xinerama], [XineramaQueryScreens])
@@ -23,5 +23,5 @@ index 0d8c4cc..0a08330 100644
ECORE_CHECK_X_EXTENSION([Xrender], [Xrender.h], [Xrender], [XRenderFindVisualFormat])
ECORE_CHECK_X_EXTENSION([Xtest], [XTest.h], [Xtst], [XTestFakeKeyEvent])
--
-1.8.5.2
+2.1.3
diff --git a/meta-efl/recipes-efl/efl/efl/0002-evas_3d-Add-Eet.h-includes.patch b/meta-efl/recipes-efl/efl/efl/0002-evas_3d-Add-Eet.h-includes.patch
new file mode 100644
index 0000000000..9847c07ff2
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/efl/0002-evas_3d-Add-Eet.h-includes.patch
@@ -0,0 +1,51 @@
+From 9db1f2f9dfe785e3a42445b766e7f4736821264a Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Tue, 2 Dec 2014 12:21:10 +0100
+Subject: [PATCH 2/3] evas_3d: Add Eet.h includes
+
+* with some very restrictive options like we use in efl-native, the build is complaining
+ about missing symbols from Eet.h, add include where needed
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ src/lib/evas/canvas/evas_3d_eet.c | 1 +
+ src/lib/evas/canvas/evas_3d_mesh_loader_eet.c | 1 +
+ src/lib/evas/canvas/evas_3d_mesh_saver_eet.c | 1 +
+ 3 files changed, 3 insertions(+)
+
+diff --git a/src/lib/evas/canvas/evas_3d_eet.c b/src/lib/evas/canvas/evas_3d_eet.c
+index 1515f5a..a438217 100644
+--- a/src/lib/evas/canvas/evas_3d_eet.c
++++ b/src/lib/evas/canvas/evas_3d_eet.c
+@@ -1,3 +1,4 @@
++#include <Eet.h>
+ #include <stdio.h>
+ #include "evas_common_private.h"
+ #include "evas_private.h"
+diff --git a/src/lib/evas/canvas/evas_3d_mesh_loader_eet.c b/src/lib/evas/canvas/evas_3d_mesh_loader_eet.c
+index 26c3569..a93efca 100644
+--- a/src/lib/evas/canvas/evas_3d_mesh_loader_eet.c
++++ b/src/lib/evas/canvas/evas_3d_mesh_loader_eet.c
+@@ -3,6 +3,7 @@
+ #endif
+
+ #include <Eo.h>
++#include <Eet.h>
+ #include <stdio.h>
+ #include "evas_common_private.h"
+ #include "evas_private.h"
+diff --git a/src/lib/evas/canvas/evas_3d_mesh_saver_eet.c b/src/lib/evas/canvas/evas_3d_mesh_saver_eet.c
+index c801ac1..0a4d269 100644
+--- a/src/lib/evas/canvas/evas_3d_mesh_saver_eet.c
++++ b/src/lib/evas/canvas/evas_3d_mesh_saver_eet.c
+@@ -2,6 +2,7 @@
+ #include "config.h"
+ #endif
+
++#include <Eet.h>
+ #include <stdio.h>
+ #include "evas_common_private.h"
+ #include "evas_private.h"
+--
+2.1.3
+