From patchwork Thu Jul 13 16:18:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joshua Henderson X-Patchwork-Id: 787880 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3x7gxC58X3z9sNx for ; Fri, 14 Jul 2017 02:18:55 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id D4AF530A9D; Thu, 13 Jul 2017 16:18:52 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kIUcXZWTAyhw; Thu, 13 Jul 2017 16:18:51 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id D73932E17E; Thu, 13 Jul 2017 16:18:50 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 5503F1C3EBB for ; Thu, 13 Jul 2017 16:18:49 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 4FA318A263 for ; Thu, 13 Jul 2017 16:18:49 +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 avOyJT9jclX1 for ; Thu, 13 Jul 2017 16:18:48 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from esa6.microchip.iphmx.com (esa6.microchip.iphmx.com [216.71.154.253]) by hemlock.osuosl.org (Postfix) with ESMTPS id E99B881ED1 for ; Thu, 13 Jul 2017 16:18:47 +0000 (UTC) X-IronPort-AV: E=Sophos;i="5.40,354,1496127600"; d="scan'208";a="2204667" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa6.microchip.iphmx.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 13 Jul 2017 09:18:46 -0700 Received: from jhenderson-hp.microchip.com (10.10.76.4) by chn-sv-exch07.mchp-main.com (10.10.76.108) with Microsoft SMTP Server id 14.3.352.0; Thu, 13 Jul 2017 09:18:45 -0700 From: Joshua Henderson To: Date: Thu, 13 Jul 2017 09:18:44 -0700 Message-ID: <1499962724-536-2-git-send-email-joshua.henderson@microchip.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1499962724-536-1-git-send-email-joshua.henderson@microchip.com> References: <1499962724-536-1-git-send-email-joshua.henderson@microchip.com> MIME-Version: 1.0 Cc: Naoki Matsumoto , Brent Sink , =?UTF-8?q?Ga=C3=ABl=20Portay?= , Peter Seiderer Subject: [Buildroot] [PATCH v2 2/2] qt5wayland: new package 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: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" QtWayland is a Qt 5 module that wraps the functionality of Wayland. Signed-off-by: Joshua Henderson Cc: Julien Corjon Cc: Brent Sink Cc: Naoki Matsumoto --- Changes for v2: - Fix config dependency logic. - Add license file hashes. - Fix opengl dependency. - Make enabling the compositor a config option. - This is now part of the QT bump to 5.9.1 series because it depends on it. --- package/qt5/Config.in | 1 + package/qt5/qt5wayland/Config.in | 24 ++++++++++++++++++ package/qt5/qt5wayland/qt5wayland.hash | 5 ++++ package/qt5/qt5wayland/qt5wayland.mk | 45 ++++++++++++++++++++++++++++++++++ 4 files changed, 75 insertions(+) create mode 100644 package/qt5/qt5wayland/Config.in create mode 100644 package/qt5/qt5wayland/qt5wayland.hash create mode 100644 package/qt5/qt5wayland/qt5wayland.mk diff --git a/package/qt5/Config.in b/package/qt5/Config.in index abaa584..386dcb1 100644 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@ -82,4 +82,5 @@ source "package/qt5/qt5webkit/Config.in" source "package/qt5/qt5websockets/Config.in" source "package/qt5/qt5x11extras/Config.in" source "package/qt5/qt5xmlpatterns/Config.in" +source "package/qt5/qt5wayland/Config.in" endif diff --git a/package/qt5/qt5wayland/Config.in b/package/qt5/qt5wayland/Config.in new file mode 100644 index 0000000..c83319f --- /dev/null +++ b/package/qt5/qt5wayland/Config.in @@ -0,0 +1,24 @@ +config BR2_PACKAGE_QT5WAYLAND + bool "qt5wayland" + select BR2_PACKAGE_QT5DECLARATIVE + depends on BR2_PACKAGE_WAYLAND + depends on BR2_PACKAGE_QT5_GL_AVAILABLE + help + Qt is a cross-platform application and UI framework for + developers using C++. + + This package corresponds to the qt5wayland module. + + http://qt.io + +comment "qt5wayland needs QT OpenGL/Wayland support" + depends on !BR2_PACKAGE_QT5_GL_AVAILABLE || !BR2_PACKAGE_WAYLAND + +if BR2_PACKAGE_QT5WAYLAND + +config BR2_PACKAGE_QT5WAYLAND_COMPOSITOR + bool "Enable compositor (experimental)" + help + The compositor API is still experimental, and not built by default. + +endif diff --git a/package/qt5/qt5wayland/qt5wayland.hash b/package/qt5/qt5wayland/qt5wayland.hash new file mode 100644 index 0000000..95b8824 --- /dev/null +++ b/package/qt5/qt5wayland/qt5wayland.hash @@ -0,0 +1,5 @@ +# hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtwayland-opensource-src-5.6.2.tar.xz.mirrorlist +sha256 035c3199f4719627b64b7020f0f4574da2b4cb78c6981aba75f27b872d8e6c86 qtwayland-opensource-src-5.6.2.tar.xz + +# Hash from: http://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtwayland-opensource-src-5.9.1.tar.xz.mirrorlist +sha256 cf0cb1982a7b748bfec8c7834691f13072f104884c61809d0bbd1a01ebda3ffa qtwayland-opensource-src-5.9.1.tar.xz diff --git a/package/qt5/qt5wayland/qt5wayland.mk b/package/qt5/qt5wayland/qt5wayland.mk new file mode 100644 index 0000000..0431374 --- /dev/null +++ b/package/qt5/qt5wayland/qt5wayland.mk @@ -0,0 +1,45 @@ +################################################################################ +# +# qt5wayland +# +################################################################################ + +QT5WAYLAND_VERSION = $(QT5_VERSION) +QT5WAYLAND_SITE = $(QT5_SITE) +QT5WAYLAND_SOURCE = qtwayland-opensource-src-$(QT5WAYLAND_VERSION).tar.xz +QT5WAYLAND_DEPENDENCIES = qt5base qt5declarative +QT5WAYLAND_INSTALL_STAGING = YES + +ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) +QT5WAYLAND_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) +QT5WAYLAND_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL +else +QT5WAYLAND_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs) +QT5WAYLAND_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL +endif + +ifeq ($(BR2_PACKAGE_QT5WAYLAND_COMPOSITOR),y) +QT5WAYLAND_QMAKEFLAGS += CONFIG+=wayland-compositor +endif + +define QT5WAYLAND_CONFIGURE_CMDS + (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake $(QT5WAYLAND_QMAKEFLAGS)) +endef + +define QT5WAYLAND_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) +endef + +define QT5WAYLAND_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install + $(QT5_LA_PRL_FILES_FIXUP) +endef + +define QT5WAYLAND_INSTALL_TARGET_CMDS + cp -dpf $(STAGING_DIR)/usr/lib/libQt5WaylandCompositor.so* $(TARGET_DIR)/usr/lib + cp -dpf $(STAGING_DIR)/usr/lib/libQt5WaylandClient.so* $(TARGET_DIR)/usr/lib + cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/wayland* $(TARGET_DIR)/usr/lib/qt/plugins + cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/platforms/libqwayland* $(TARGET_DIR)/usr/lib/qt/plugins/platforms +endef + +$(eval $(generic-package))