From 7883c3f223b2ebb7821d9cd404d049980ee98573 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Mon, 1 Jun 2015 15:01:42 +0200
Subject: [PATCH] kwin: make use of egl compiler flags
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

this solves imx6 -DLINUX hack

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../0002-add-egl-flags-for-compiling.patch    | 46 +++++++++++++++++++
 recipes-kde/plasma/untier/kwin/kwin.bb        | 13 ++----
 2 files changed, 50 insertions(+), 9 deletions(-)
 create mode 100644 recipes-kde/plasma/untier/kwin/files/0002-add-egl-flags-for-compiling.patch

diff --git a/recipes-kde/plasma/untier/kwin/files/0002-add-egl-flags-for-compiling.patch b/recipes-kde/plasma/untier/kwin/files/0002-add-egl-flags-for-compiling.patch
new file mode 100644
index 00000000..0ad51ac9
--- /dev/null
+++ b/recipes-kde/plasma/untier/kwin/files/0002-add-egl-flags-for-compiling.patch
@@ -0,0 +1,46 @@
+From 670bb48076453b98c2d6ef5492fb1ea4cfbdded0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Mon, 1 Jun 2015 14:27:20 +0200
+Subject: [PATCH] add egl flags for compiling
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ CMakeLists.txt                | 4 ++++
+ libkwineffects/CMakeLists.txt | 3 +++
+ 2 files changed, 7 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7866d2c..c678bd4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -562,6 +562,10 @@ set_target_properties(kwin PROPERTIES
+    SOVERSION ${PROJECT_VERSION_MAJOR}
+    )
+ 
++if(KWIN_HAVE_EGL)
++    target_compile_options(kwin PUBLIC ${EGL_DEFINITIONS})
++endif()
++
+ target_link_libraries(kwin ${kwinLibs})
+ generate_export_header(kwin EXPORT_FILE_NAME kwin_export.h)
+ 
+diff --git a/libkwineffects/CMakeLists.txt b/libkwineffects/CMakeLists.txt
+index 1797ed5..2d71cb8 100644
+--- a/libkwineffects/CMakeLists.txt
++++ b/libkwineffects/CMakeLists.txt
+@@ -92,6 +92,9 @@ macro( KWIN4_ADD_GLUTILS_BACKEND name glinclude )
+         VERSION ${KWINEFFECTS_VERSION_STRING}
+         SOVERSION ${KWINEFFECTS_SOVERSION}
+     )
++    if(KWIN_HAVE_EGL)
++        target_compile_options(${name} PUBLIC ${EGL_DEFINITIONS})
++    endif()
+     target_link_libraries(${name} PUBLIC ${ARGN})
+ 
+     install(TARGETS ${name} EXPORT kdeworkspaceLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+-- 
+1.9.3
+
diff --git a/recipes-kde/plasma/untier/kwin/kwin.bb b/recipes-kde/plasma/untier/kwin/kwin.bb
index 71ee99fa..adf1801c 100644
--- a/recipes-kde/plasma/untier/kwin/kwin.bb
+++ b/recipes-kde/plasma/untier/kwin/kwin.bb
@@ -49,15 +49,10 @@ PV = "${PLASMA_VERSION}"
 SRC_URI[md5sum] = "34607a1d125dc12fd88b5b8cdcc396b1"
 SRC_URI[sha256sum] = "665412fd2cdd8b1f69fcd957f8972afd4c0da29166063d1da2b62e460b717d11"
 
-SRC_URI += "file://0001-fix-build-for-qtbase-without-session-management.patch"
-
-# REVISIT: this should be fixed in meta-fsl-arm
-CXXFLAGS_append_mx6 = " -DLINUX \
-                      ${@base_contains('DISTRO_FEATURES', 'x11', '', \
-                                       base_contains('DISTRO_FEATURES', 'wayland', \
-                                                     '-DEGL_API_WL -DEGL_API_FB', '', d), d)}"
-
-
+SRC_URI += " \
+    file://0001-fix-build-for-qtbase-without-session-management.patch \
+    file://0002-add-egl-flags-for-compiling.patch \
+"
 
 FILES_${PN} += " \
     ${datadir}/config.kcfg \