From patchwork Fri Jul 26 18:40:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "ashish.is--- via Guix-patches\" via" X-Patchwork-Id: 14777 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 36A441727C; Fri, 26 Jul 2019 19:41:09 +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=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id ECEE31724E for ; Fri, 26 Jul 2019 19:41:08 +0100 (BST) Received: from localhost ([::1]:42970 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hr59Q-0001YH-93 for patchwork@mira.cbaines.net; Fri, 26 Jul 2019 14:41:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58608) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hr59M-0001RU-Vi for guix-patches@gnu.org; Fri, 26 Jul 2019 14:41:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hr59L-00066m-Jr for guix-patches@gnu.org; Fri, 26 Jul 2019 14:41:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34546) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hr59K-00065E-FG for guix-patches@gnu.org; Fri, 26 Jul 2019 14:41:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hr59K-0002Pg-Bh for guix-patches@gnu.org; Fri, 26 Jul 2019 14:41:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36814] [BONUS PATCH 3/2] gnu: intel-vaapi-driver: Provide LIBVA_DRIVERS_PATH. References: <871rydiifr.fsf@nckx> In-Reply-To: <871rydiifr.fsf@nckx> Resent-From: Tobias Geerinckx-Rice Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 26 Jul 2019 18:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36814 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36814@debbugs.gnu.org Received: via spool by 36814-submit@debbugs.gnu.org id=B36814.15641664549252 (code B ref 36814); Fri, 26 Jul 2019 18:41:02 +0000 Received: (at 36814) by debbugs.gnu.org; 26 Jul 2019 18:40:54 +0000 Received: from localhost ([127.0.0.1]:43367 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hr59C-0002PA-Fj for submit@debbugs.gnu.org; Fri, 26 Jul 2019 14:40:54 -0400 Received: from tobias.gr ([80.241.217.52]:55660) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hr599-0002Oz-BI for 36814@debbugs.gnu.org; Fri, 26 Jul 2019 14:40:53 -0400 Received: by tobias.gr (OpenSMTPD) with ESMTP id 0a6cb44a for <36814@debbugs.gnu.org>; Fri, 26 Jul 2019 18:40:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=tobias.gr; h=from:to :subject:date:message-id:mime-version:content-transfer-encoding; s=2018; i=me@tobias.gr; bh=flD5P2cDDz0gaqvzaX/Avn3WlvcVliVBTKqR 1fdsd1s=; b=dWnD/FR3KqE4gvKDCFdQULV73SMhndfHmVd9xM1bmpRKLaw34pTI /j/aXage6PYzB0Gwu+MAiM7yhQtzLRutTgYV+++GhFE3Y6XzojAB0dWo4w0NFuAy I0y5ls3h+HiOEXF1H7gUJ0tRBHKjCu6T73LT4RvJ+4579GkPXVlLTWVuVg5jUjZl BGCV80Zs26TKxS4mU1kKEK1S55L/PwRCMpoV1eZ7Nvw0PR/Dc3VEN7DfzxPYZXFu 7oMN73BbvLhuC0ae5fPESi82vXM8GxynbQws5AbqC4PpORtywek5EvPtTPQbde8e Iu1jsj3dvnpHt9cFFAonydjOxXPSQFtYwg== Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id a37772be (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <36814@debbugs.gnu.org>; Fri, 26 Jul 2019 18:40:49 +0000 (UTC) Date: Fri, 26 Jul 2019 20:40:40 +0200 Message-Id: <20190726184040.31236-1-me@tobias.gr> X-Mailer: git-send-email 2.22.0 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: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Tobias Geerinckx-Rice via Guix-patches From: "ashish.is--- via Guix-patches\" via" Reply-To: Tobias Geerinckx-Rice Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/video.scm (intel-vaapi-driver)[native-search-paths]: Export LIBVA_DRIVERS_PATH when installed. (libva-without-mesa)[native-search-paths]: Don't inherit any. --- Guix, This ties the two together. I'm leaving the enormocomment in so I don't have to repeat it here, but I'm less sure about it now than when I wrote it. I thought this was a filthy hack, but maybe it's just mildly unconventional ;-) The documentation is very sparse indeed. I don't see any acceptable alternative. Stormy regards, T G-R gnu/packages/gl.scm | 3 ++- gnu/packages/video.scm | 13 +++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 9ed043c7ae..9495e8ee24 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -219,7 +219,8 @@ also known as DXTn or DXTC) for Mesa.") '(#:make-flags) (substitute-keyword-arguments (package-arguments libva) ((#:configure-flags flags) - '(list "--disable-glx" "--disable-egl")))))))) + '(list "--disable-glx" "--disable-egl"))))) + (native-search-paths '())))) (define-public mesa (package diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index b441c5e311..5e26b4c2dc 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2756,6 +2756,19 @@ of modern, widely supported codecs.") (let ((out (assoc-ref outputs "out"))) (setenv "LIBVA_DRIVERS_PATH" (string-append out "/lib/dri")) #t)))))) + ;; XXX This variable is actually respected by libva, and in a perfect world + ;; would be found there instead. Unfortunately, native-search-paths are set + ;; up only if the package using them is installed directly into the profile. + ;; This means that users would need to install libva into their profile for + ;; no good reason other than convincing Guix to export the right paths, or + ;; that every single one of libva's many dependents would would need to be + ;; modified instead (and would still be semantically dubious). Moving it + ;; here is logically (almost) equivalent, and keeps this hack confined to a + ;; tiny handful of back-end packages. + (native-search-paths + (list (search-path-specification + (variable "LIBVA_DRIVERS_PATH") + (files '("lib/dri"))))) (home-page "https://01.org/linuxmedia/vaapi") (synopsis "VA-API video acceleration driver for Intel GEN Graphics devices") (description