greenisland: update to 0.5.92+git

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
This commit is contained in:
Andreas Müller
2015-04-23 12:58:30 +02:00
parent 8bf9bc6644
commit e9f03ee40e
2 changed files with 10 additions and 53 deletions

View File

@@ -1,48 +0,0 @@
From 0a02b5b8aea60bc01985cd36279f2b1a7a6241f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
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 <schnitzeltony@googlemail.com>
---
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

View File

@@ -16,11 +16,10 @@ DEPENDS = " \
"
SRC_URI = " \
git://github.com/greenisland/${BPN}.git;protocol=git;branch=master \
file://0001-do-not-require-wayland-egl-explicitly.patch \
"
SRCREV = "02db54bf021d74f5695cb1fc3f9ea0200f90a8c1"
PV = "0.5.90+git${SRCPV}"
SRCREV = "93835c578ae04febe047afd7113da84d816daac1"
PV = "0.5.92+git${SRCPV}"
S = "${WORKDIR}/git"
@@ -33,6 +32,12 @@ EXTRA_OECMAKE += " \
CMAKE_ALIGN_SYSROOT[1] = "GreenIsland, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "GreenIsland, -S${includedir}, -S${STAGING_INCDIR}"
FILES_${PN} += "${libdir}/qml/GreenIsland"
FILES_${PN}-dbg += "${libdir}/qml/GreenIsland/.debug"
FILES_${PN} += " \
${libdir}/qml/GreenIsland \
${libdir}/plugins/greenisland \
"
FILES_${PN}-dbg += " \
${libdir}/qml/GreenIsland/.debug \
${libdir}/plugins/greenisland/.debug \
"
FILES_${PN}-dev += "${libdir}/cmake"