From 46e91bbed741e356b3eef3da2ac83e2664ed595a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Fri, 6 Feb 2015 16:37:21 +0100 Subject: [PATCH] plasma-framework / kinfocenter / kwin: do not depend on virtual/egl explicitly MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit cmake decides upon the contents of Qt5Gui_OPENGL_IMPLEMENTATION set by qtbase. qtbase already adds the correct dependencies based on PACKAGECONFIG_GL so we don't need to do that again. The egl assumtion was wrong for (most?) non gles opengl anyway. Signed-off-by: Andreas Müller --- recipes-kde/kf5/tier3/plasma-framework/plasma-framework.bb | 1 - recipes-kde/plasma/untier/kinfocenter/kinfocenter.bb | 1 - recipes-kde/plasma/untier/kwin/kwin.bb | 1 - 3 files changed, 3 deletions(-) diff --git a/recipes-kde/kf5/tier3/plasma-framework/plasma-framework.bb b/recipes-kde/kf5/tier3/plasma-framework/plasma-framework.bb index b0861b80..d0b578f4 100644 --- a/recipes-kde/kf5/tier3/plasma-framework/plasma-framework.bb +++ b/recipes-kde/kf5/tier3/plasma-framework/plasma-framework.bb @@ -28,7 +28,6 @@ DEPENDS += " \ knotifications \ kpackage \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver qtx11extras", "", d)} \ - virtual/egl \ " PV = "${KF5_VERSION}" diff --git a/recipes-kde/plasma/untier/kinfocenter/kinfocenter.bb b/recipes-kde/plasma/untier/kinfocenter/kinfocenter.bb index 7661d0fb..6fe5705d 100644 --- a/recipes-kde/plasma/untier/kinfocenter/kinfocenter.bb +++ b/recipes-kde/plasma/untier/kinfocenter/kinfocenter.bb @@ -30,7 +30,6 @@ DEPENDS += " \ # REVISIT optionals DEPENDS += " \ kwayland \ - virtual/egl \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver", "", d)} \ " diff --git a/recipes-kde/plasma/untier/kwin/kwin.bb b/recipes-kde/plasma/untier/kwin/kwin.bb index 9801177a..b50e09b8 100644 --- a/recipes-kde/plasma/untier/kwin/kwin.bb +++ b/recipes-kde/plasma/untier/kwin/kwin.bb @@ -43,7 +43,6 @@ DEPENDS += " \ kwayland \ kactivities \ kdoctools \ - virtual/egl \ " PV = "5.2.0.1"