From 8119340b1ce6dcd26501b3fb3650eda0e0fb65cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sat, 21 Feb 2015 12:45:21 +0100 Subject: [PATCH] greenisland: update to latest version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- ...o-not-require-wayland-egl-explicitly.patch | 48 +++++++++++++++++++ recipes-hawaii/greenisland/greenisland_git.bb | 9 ++-- 2 files changed, 54 insertions(+), 3 deletions(-) create mode 100644 recipes-hawaii/greenisland/files/0001-do-not-require-wayland-egl-explicitly.patch diff --git a/recipes-hawaii/greenisland/files/0001-do-not-require-wayland-egl-explicitly.patch b/recipes-hawaii/greenisland/files/0001-do-not-require-wayland-egl-explicitly.patch new file mode 100644 index 00000000..1cece2bf --- /dev/null +++ b/recipes-hawaii/greenisland/files/0001-do-not-require-wayland-egl-explicitly.patch @@ -0,0 +1,48 @@ +From 0a02b5b8aea60bc01985cd36279f2b1a7a6241f3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Sat, 21 Feb 2015 00:33:34 +0100 +Subject: [PATCH] do not require wayland-egl explicitly +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Andreas Müller +--- + CMakeLists.txt | 3 +-- + src/libgreenisland/CMakeLists.txt | 1 - + 2 files changed, 1 insertion(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9cca1bc..ed2fcf6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -82,13 +82,12 @@ set_package_properties(EGL PROPERTIES + + # Wayland + set(REQUIRED_WAYLAND_VERSION 1.2.0) +-find_package(Wayland ${REQUIRED_WAYLAND_VERSION} COMPONENTS Client Server Egl) ++find_package(Wayland ${REQUIRED_WAYLAND_VERSION} COMPONENTS Client Server) + set_package_properties(Wayland PROPERTIES + TYPE REQUIRED + PURPOSE "Required to build Green Island") + add_feature_info("Wayland-Client" Wayland_Client_FOUND "Required for protocols") + add_feature_info("Wayland-Server" Wayland_Server_FOUND "Required for protocols") +-add_feature_info("Wayland-Egl" Wayland_Egl_FOUND "Required for the compositor") + + # Wayland and QtWayland scanner + find_package(QtWaylandScanner REQUIRED) +diff --git a/src/libgreenisland/CMakeLists.txt b/src/libgreenisland/CMakeLists.txt +index be29026..6006679 100644 +--- a/src/libgreenisland/CMakeLists.txt ++++ b/src/libgreenisland/CMakeLists.txt +@@ -92,7 +92,6 @@ target_link_libraries(GreenIsland + KF5::Screen + Wayland::Client + Wayland::Server +- Wayland::Egl + EGL::EGL + ) + +-- +1.9.3 + diff --git a/recipes-hawaii/greenisland/greenisland_git.bb b/recipes-hawaii/greenisland/greenisland_git.bb index fbc02209..743569d4 100644 --- a/recipes-hawaii/greenisland/greenisland_git.bb +++ b/recipes-hawaii/greenisland/greenisland_git.bb @@ -9,14 +9,17 @@ DEPENDS = " \ extra-cmake-modules-native \ qtbase \ qtdeclarative \ - qtquickcontrols \ + wayland \ qtwayland \ libkscreen \ virtual/egl \ " -SRC_URI = "git://github.com/greenisland/${BPN}.git;protocol=git;branch=master" +SRC_URI = " \ + git://github.com/greenisland/${BPN}.git;protocol=git;branch=master \ + file://0001-do-not-require-wayland-egl-explicitly.patch \ +" -SRCREV = "3f8ccb4613112eb3b0d7f9c3a3cf5c157fecbc92" +SRCREV = "02db54bf021d74f5695cb1fc3f9ea0200f90a8c1" PV = "0.5.90+git${SRCPV}" S = "${WORKDIR}/git"