From patchwork Wed Oct 24 11:41:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 18 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0E7E8165AB; Wed, 24 Oct 2018 12:48:32 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) by mira.cbaines.net (Postfix) with ESMTPS id B1BD616449 for ; Wed, 24 Oct 2018 12:48:31 +0100 (BST) Received: from localhost ([::1]:47746 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gFHeJ-00060C-3I for patchwork@mira.cbaines.net; Wed, 24 Oct 2018 07:48:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48665) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gFHY5-0007Xm-Dz for guix-patches@gnu.org; Wed, 24 Oct 2018 07:42:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gFHY3-0007K6-DH for guix-patches@gnu.org; Wed, 24 Oct 2018 07:42:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:34903) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gFHY3-0007Jq-6M for guix-patches@gnu.org; Wed, 24 Oct 2018 07:42:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gFHY3-0006ur-2r for guix-patches@gnu.org; Wed, 24 Oct 2018 07:42:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#33136] [PATCH 3/7] gnu: qt: Add vulkan support. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 24 Oct 2018 11:42:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33136 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33136@debbugs.gnu.org Received: via spool by 33136-submit@debbugs.gnu.org id=B33136.154038131826529 (code B ref 33136); Wed, 24 Oct 2018 11:42:03 +0000 Received: (at 33136) by debbugs.gnu.org; 24 Oct 2018 11:41:58 +0000 Received: from localhost ([127.0.0.1]:39151 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gFHXx-0006tk-Lm for submit@debbugs.gnu.org; Wed, 24 Oct 2018 07:41:57 -0400 Received: from flashner.co.il ([178.62.234.194]:50684) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gFHXt-0006t2-KW for 33136@debbugs.gnu.org; Wed, 24 Oct 2018 07:41:54 -0400 Received: from localhost (unknown [141.226.14.143]) by flashner.co.il (Postfix) with ESMTPSA id E2B214000B; Wed, 24 Oct 2018 11:41:47 +0000 (UTC) From: Efraim Flashner Date: Wed, 24 Oct 2018 14:41:30 +0300 Message-Id: <20181024114134.3116-3-efraim@flashner.co.il> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181024112618.2417-1-efraim@flashner.co.il> References: <20181024112618.2417-1-efraim@flashner.co.il> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/qt.scm (qt, qtbase)[native-inputs]: Add vulkan-headers. (qt@4)[native-inputs]: Don't add vulkan-headers. (qttools)[native-inputs]: Add vulkan-headers. --- gnu/packages/qt.scm | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index dffa8b5cf..143ca45b7 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -64,9 +64,11 @@ #:use-module (gnu packages ruby) #:use-module (gnu packages sdl) #:use-module (gnu packages tls) + #:use-module (gnu packages vulkan) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xorg) - #:use-module (gnu packages xml)) + #:use-module (gnu packages xml) + #:use-module (srfi srfi-1)) (define-public grantlee (package @@ -224,6 +226,7 @@ system, and the core design of Django is reused in Grantlee.") ("pkg-config" ,pkg-config) ("python" ,python-2) ("ruby" ,ruby) + ("vulkan-headers" ,vulkan-headers) ("which" ,(@ (gnu packages base) which)))) (arguments `(#:parallel-build? #f ; Triggers race condition in qtbase module on Hydra. @@ -401,10 +404,16 @@ system, and the core design of Django is reused in Grantlee.") ;; Remove webkit module, which is not built. '(begin (delete-file-recursively "src/3rdparty/webkit") #t)))) - (inputs `(,@(alist-delete "harfbuzz" - (alist-delete "libjpeg" (package-inputs qt))) - ("libjepg" ,libjpeg-8) - ("libsm" ,libsm))) + (inputs + `(,@(fold alist-delete + (package-inputs qt) + '("harfbuzz" "libjepg")) + ("libjepg" ,libjpeg-8) + ("libsm" ,libsm))) + (native-inputs + `(,@(fold alist-delete + (package-native-inputs qt) + '("vulkan-headers")))) ;; Note: there are 37 MiB of examples and a '-exampledir' configure flags, ;; but we can't make them a separate output because "out" and "examples" @@ -560,6 +569,7 @@ system, and the core design of Django is reused in Grantlee.") ("perl" ,perl) ("pkg-config" ,pkg-config) ("python" ,python-2) + ("vulkan-headers" ,vulkan-headers) ("ruby" ,ruby))) (arguments `(#:phases @@ -1283,7 +1293,8 @@ positioning and geolocation plugins."))) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (native-inputs `(("perl" ,perl) - ("qtdeclarative" ,qtdeclarative))) + ("qtdeclarative" ,qtdeclarative) + ("vulkan-headers" ,vulkan-headers))) (inputs `(("mesa" ,mesa) ("qtbase" ,qtbase)))