From patchwork Tue Apr 19 11:43:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Corjon X-Patchwork-Id: 612072 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 3qq37x73kbz9t8f for ; Tue, 19 Apr 2016 21:44:13 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 44DE6964D3; Tue, 19 Apr 2016 11:44:12 +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 znnP360UBb8F; Tue, 19 Apr 2016 11:44:10 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 7E8D49644D; Tue, 19 Apr 2016 11:44:10 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 5276E1C0C74 for ; Tue, 19 Apr 2016 11:44:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4F38AC01B6 for ; Tue, 19 Apr 2016 11:44:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id b0KRGf8odeaE for ; Tue, 19 Apr 2016 11:44:08 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by fraxinus.osuosl.org (Postfix) with ESMTPS id C8FACC01A0 for ; Tue, 19 Apr 2016 11:44:07 +0000 (UTC) Received: by mail-wm0-f65.google.com with SMTP id l6so4371527wml.3 for ; Tue, 19 Apr 2016 04:44:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=rl5Qz7KYbt/Q8hsFtNEt4FRwsnhp0s135OENC397VDc=; b=Z2XWp6cfDgxNtSSqG7yyDOBOXBG9DM0VQnhFHcWM2QivPOlMrWJhqPvST3xGkUuF29 syqUAT+gjha4eOhT3BUT5xQrCtYKsHuQvK1BFbzbk5CnZYNswCsU0vdlRU1922R8nCaJ 1fyLfM9gLACWNWMHAgnrtiUTTqvhOjnp9IDJfu4bK5PqivEKan0uHrXf+7WvuWtJdtLO 0WzZ09iPLnm4kAR3sPfWRBb8/Rn4Q0y6yS1CvYl4Tv4ePpQRfl9lRv331rxrysJ34bwT Pk71D67HWJTeXebiMTkZzqk06/3mq79yjv0sRlITCSECVmDC0XuAlZ5VIhRiZi7wMGrN onag== X-Gm-Message-State: AOPr4FWYzj43DNZNE4on1ZNaUy5vCFjzbVM3NdakxA31lCcXjMc/5kdeLBinpWfpbR8CoA== X-Received: by 10.28.222.84 with SMTP id v81mr25098144wmg.14.1461066246468; Tue, 19 Apr 2016 04:44:06 -0700 (PDT) Received: from mic341-linux.caubios.net ([82.236.247.27]) by smtp.gmail.com with ESMTPSA id hk7sm22405138wjb.5.2016.04.19.04.44.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 19 Apr 2016 04:44:05 -0700 (PDT) From: Julien Corjon To: buildroot@buildroot.org Date: Tue, 19 Apr 2016 13:43:53 +0200 Message-Id: <1461066234-21504-1-git-send-email-corjon.j@ecagroup.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1459763762-31640-2-git-send-email-corjon.j@ecagroup.com> References: <1459763762-31640-2-git-send-email-corjon.j@ecagroup.com> Cc: software.eca-sinters@ecagroup.com Subject: [Buildroot] [PATCH v2 1/2] qt5connectivity: add QtNfc submodule X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Julien Corjon --- package/qt5/qt5connectivity/Config.in | 15 +++++++---- package/qt5/qt5connectivity/qt5connectivity.mk | 36 +++++++++++++++++++++----- 2 files changed, 40 insertions(+), 11 deletions(-) diff --git a/package/qt5/qt5connectivity/Config.in b/package/qt5/qt5connectivity/Config.in index d529ea7..83df06a 100644 --- a/package/qt5/qt5connectivity/Config.in +++ b/package/qt5/qt5connectivity/Config.in @@ -1,13 +1,10 @@ config BR2_PACKAGE_QT5CONNECTIVITY bool "qt5connectivity" - select BR2_PACKAGE_BLUEZ_UTILS select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5BASE_CONCURRENT select BR2_PACKAGE_QT5BASE_DBUS - depends on !BR2_STATIC_LIBS # bluez_utils - depends on BR2_USE_WCHAR # bluez_utils - depends on BR2_TOOLCHAIN_HAS_THREADS # bluez_utils - depends on BR2_USE_MMU # bluez_utils + depends on !BR2_STATIC_LIBS + depends on BR2_PACKAGE_NEARD || BR2_PACKAGE_BLUEZ_UTILS help Qt is a cross-platform application and UI framework for developers using C++. @@ -19,3 +16,11 @@ config BR2_PACKAGE_QT5CONNECTIVITY comment "qt5connectivity needs a toolchain w/ wchar, threads, dynamic library" depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + +comment "qt5connectivity need neard and/or bluez_utils" + depends on BR2_USE_MMU + depends on BR2_USE_WCHAR + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_STATIC_LIBS + depends on !BR2_PACKAGE_NEARD + depends on !BR2_PACKAGE_BLUEZ_UTILS diff --git a/package/qt5/qt5connectivity/qt5connectivity.mk b/package/qt5/qt5connectivity/qt5connectivity.mk index 936bc6f..6a446e9 100644 --- a/package/qt5/qt5connectivity/qt5connectivity.mk +++ b/package/qt5/qt5connectivity/qt5connectivity.mk @@ -7,7 +7,7 @@ QT5CONNECTIVITY_VERSION = $(QT5_VERSION) QT5CONNECTIVITY_SITE = $(QT5_SITE) QT5CONNECTIVITY_SOURCE = qtconnectivity-opensource-src-$(QT5CONNECTIVITY_VERSION).tar.xz -QT5CONNECTIVITY_DEPENDENCIES = bluez_utils qt5base +QT5CONNECTIVITY_DEPENDENCIES = qt5base QT5CONNECTIVITY_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) @@ -18,9 +18,9 @@ QT5CONNECTIVITY_LICENSE = Commercial license QT5CONNECTIVITY_REDISTRIBUTE = NO endif -ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) -QT5CONNECTIVITY_DEPENDENCIES += qt5declarative -endif +QT5CONNECTIVITY_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5DECLARATIVE),qt5declarative) +QT5CONNECTIVITY_DEPENDENCIES += $(if $(BR2_PACKAGE_BLUEZ_UTILS),bluez_utils) +QT5CONNECTIVITY_DEPENDENCIES += $(if $(BR2_PACKAGE_NEARD),neard) define QT5CONNECTIVITY_CONFIGURE_CMDS (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake) @@ -36,14 +36,38 @@ define QT5CONNECTIVITY_INSTALL_STAGING_CMDS endef ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) -define QT5CONNECTIVITY_INSTALL_TARGET_QMLS +ifeq ($(BR2_PACKAGE_BLUEZ_UTILS),y) +define QT5CONNECTIVITY_INSTALL_TARGET_BLUETOOTH_QMLS cp -dpfr $(STAGING_DIR)/usr/qml/QtBluetooth $(TARGET_DIR)/usr/qml/ endef endif +ifeq ($(BR2_PACKAGE_NEARD),y) +define QT5CONNECTIVITY_INSTALL_TARGET_NFC_QMLS + cp -dpfr $(STAGING_DIR)/usr/qml/QtNfc $(TARGET_DIR)/usr/qml/ +endef +endif +define QT5CONNECTIVITY_INSTALL_TARGET_QMLS + $(QT5CONNECTIVITY_INSTALL_TARGET_BLUETOOTH_QMLS) + $(QT5CONNECTIVITY_INSTALL_TARGET_NFC_QMLS) +endef +endif -define QT5CONNECTIVITY_INSTALL_TARGET_CMDS +ifeq ($(BR2_PACKAGE_BLUEZ_UTILS),y) +define QT5CONNECTIVITY_INSTALL_TARGET_BLUETOOTH cp -dpf $(STAGING_DIR)/usr/lib/libQt5Bluetooth.so.* $(TARGET_DIR)/usr/lib cp -dpf $(STAGING_DIR)/usr/bin/sdpscanner $(TARGET_DIR)/usr/bin +endef +endif + +ifeq ($(BR2_PACKAGE_NEARD),y) +define QT5CONNECTIVITY_INSTALL_TARGET_NFC + cp -dpf $(STAGING_DIR)/usr/lib/libQt5Nfc.so.* $(TARGET_DIR)/usr/lib +endef +endif + +define QT5CONNECTIVITY_INSTALL_TARGET_CMDS + $(QT5CONNECTIVITY_INSTALL_TARGET_BLUETOOTH) + $(QT5CONNECTIVITY_INSTALL_TARGET_NFC) $(QT5CONNECTIVITY_INSTALL_TARGET_QMLS) endef