From patchwork Sat Jul 19 17:33:23 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?RmF0aWggQcWfxLFjxLE=?= X-Patchwork-Id: 371842 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 6B8A114012A for ; Sun, 20 Jul 2014 03:36:13 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id ADAA18C198; Sat, 19 Jul 2014 17:36:12 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8DvDILAyGH6K; Sat, 19 Jul 2014 17:36:09 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 50EE18B88D; Sat, 19 Jul 2014 17:36:08 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 0E14A1BF970 for ; Sat, 19 Jul 2014 17:36:03 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 0B0078A3B0 for ; Sat, 19 Jul 2014 17:36:03 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pt2QGFKDPSOp for ; Sat, 19 Jul 2014 17:36:02 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-we0-f179.google.com (mail-we0-f179.google.com [74.125.82.179]) by hemlock.osuosl.org (Postfix) with ESMTPS id D478E89A9B for ; Sat, 19 Jul 2014 17:36:01 +0000 (UTC) Received: by mail-we0-f179.google.com with SMTP id u57so5771295wes.24 for ; Sat, 19 Jul 2014 10:36:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=glymCOA2nqzPzDg8XC7Ij4x5/on9ra419PHTCg9MsVg=; b=qZdjr+Viri8P/XpKI0H3jI0Uil7iFzVl9sLbrJ3ZaCzpgrh+sSuLTKXWnXHxMstn10 MZKB8yMmPOZBb64TsVm8dLatdqf3hsa62R8sVXmY8tWphdGkZh4O0MlyC82ppsbYzqPu LSHGm5HPeOFs5NhwVGwgp3NlleFVcNvaY9A/+iGzOHFQM6iddybgYwCksBJKiZxg0uLd Ey3qk2/hUFiBGCowwoDxp/b1bLbt+GUQZElH2uoARe0B2w5KTr27SLTFDR6L8iv7PkM4 zA7pbY80e+U59+Zd+oZM0c/8tW8q8PhxlGscPKiJSpPqXfY2biJokg94emlyhjGzXbox lPZA== X-Received: by 10.180.208.13 with SMTP id ma13mr18123879wic.45.1405791360353; Sat, 19 Jul 2014 10:36:00 -0700 (PDT) Received: from localhost.localdomain ([85.107.187.218]) by mx.google.com with ESMTPSA id ch5sm23341913wjb.18.2014.07.19.10.35.58 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 19 Jul 2014 10:35:59 -0700 (PDT) From: =?UTF-8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= To: buildroot@uclibc.org, buildroot@buildroot.org Date: Sat, 19 Jul 2014 20:33:23 +0300 Message-Id: <1405791208-30356-2-git-send-email-fatih.asici@gmail.com> X-Mailer: git-send-email 2.0.1 In-Reply-To: <1405791208-30356-1-git-send-email-fatih.asici@gmail.com> References: <1405791208-30356-1-git-send-email-fatih.asici@gmail.com> MIME-Version: 1.0 Cc: Thomas Petazzoni , =?UTF-8?q?J=C3=A9r=C3=B4me=20Pouiller?= Subject: [Buildroot] [PATCH 1/6] qt5multimedia: make qt5declarative dependency optional X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Also add missing dependencies on gui and network modules. Signed-off-by: Fatih Aşıcı --- package/qt5/qt5multimedia/Config.in | 10 ++-------- package/qt5/qt5multimedia/qt5multimedia.mk | 6 +++++- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/package/qt5/qt5multimedia/Config.in b/package/qt5/qt5multimedia/Config.in index c00491c..36128eb 100644 --- a/package/qt5/qt5multimedia/Config.in +++ b/package/qt5/qt5multimedia/Config.in @@ -1,10 +1,8 @@ config BR2_PACKAGE_QT5MULTIMEDIA bool "qt5multimedia" select BR2_PACKAGE_QT5BASE - select BR2_PACKAGE_QT5DECLARATIVE - depends on BR2_PACKAGE_HAS_LIBEGL - depends on BR2_PACKAGE_HAS_LIBGLES - depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE + select BR2_PACKAGE_QT5BASE_GUI + select BR2_PACKAGE_QT5BASE_NETWORK help Qt is a cross-platform application and UI framework for developers using C++. @@ -12,7 +10,3 @@ config BR2_PACKAGE_QT5MULTIMEDIA This package corresponds to the qt5multimedia module. http://qt-project.org - -comment "qt5multimedia requires an OpenGL-capable backend" - depends on (!BR2_PACKAGE_HAS_LIBEGL || !BR2_PACKAGE_HAS_LIBGLES) && \ - BR2_PACKAGE_QT5_JSCORE_AVAILABLE diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk index 5eef543..e89e31c 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.mk +++ b/package/qt5/qt5multimedia/qt5multimedia.mk @@ -7,7 +7,7 @@ QT5MULTIMEDIA_VERSION = $(QT5_VERSION) QT5MULTIMEDIA_SITE = $(QT5_SITE) QT5MULTIMEDIA_SOURCE = qtmultimedia-opensource-src-$(QT5MULTIMEDIA_VERSION).tar.xz -QT5MULTIMEDIA_DEPENDENCIES = qt5base qt5declarative +QT5MULTIMEDIA_DEPENDENCIES = qt5base QT5MULTIMEDIA_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) @@ -22,6 +22,10 @@ ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE),y) QT5MULTIMEDIA_DEPENDENCIES += gst-plugins-base endif +ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) +QT5MULTIMEDIA_DEPENDENCIES += qt5declarative +endif + define QT5MULTIMEDIA_CONFIGURE_CMDS (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake) endef