[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/21: gnu: libva: Use G-expressions.
From: |
guix-commits |
Subject: |
02/21: gnu: libva: Use G-expressions. |
Date: |
Thu, 23 Jun 2022 13:56:42 -0400 (EDT) |
mbakke pushed a commit to branch staging
in repository guix.
commit 87793b349fe8dcca58c8b1964f3e78f35a4b1613
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Thu Jun 23 18:42:17 2022 +0200
gnu: libva: Use G-expressions.
* gnu/packages/video.scm (libva)[arguments]: Use G-expressions.
---
gnu/packages/video.scm | 35 ++++++++++++++++-------------------
1 file changed, 16 insertions(+), 19 deletions(-)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 9363b6de87..a82b1b8889 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -1490,27 +1490,24 @@ quality and performance.")
mesa
wayland))
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-before
- 'build 'fix-dlopen-paths
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
+ (list
+ ;; Most drivers are in mesa's $prefix/lib/dri, so use that. (Can be
+ ;; overridden at run-time via LIBVA_DRIVERS_PATH.)
+ #:configure-flags
+ #~(list (string-append "--with-drivers-path="
+ (search-input-directory %build-inputs "lib/dri")))
+ ;; However, we can't write to mesa's store directory, so override the
+ ;; following make variable to install the dummy driver to libva's
+ ;; $prefix/lib/dri directory.
+ #:make-flags
+ #~(list (string-append "dummy_drv_video_ladir=" #$output "/lib/dri"))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'build 'fix-dlopen-paths
+ (lambda _
(substitute* "va/drm/va_drm_auth_x11.c"
(("\"libva-x11\\.so\\.%d\"")
- (string-append "\"" out "/lib/libva-x11.so.%d\"")))
- #t))))
- ;; Most drivers are in mesa's $prefix/lib/dri, so use that. (Can be
- ;; overridden at run-time via LIBVA_DRIVERS_PATH.)
- #:configure-flags
- (list (string-append "--with-drivers-path="
- (assoc-ref %build-inputs "mesa") "/lib/dri"))
- ;; However, we can't write to mesa's store directory, so override the
- ;; following make variable to install the dummy driver to libva's
- ;; $prefix/lib/dri directory.
- #:make-flags
- (list (string-append "dummy_drv_video_ladir="
- (assoc-ref %outputs "out") "/lib/dri"))))
+ (string-append "\"" #$output "/lib/libva-x11.so.%d\""))))))))
(home-page "https://www.freedesktop.org/wiki/Software/vaapi/")
(synopsis "Video acceleration library")
(description "The main motivation for VA-API (Video Acceleration API) is
- branch staging created (now 6c7fcc71d1), guix-commits, 2022/06/23
- 01/21: gnu: libva: Update to 2.14.0., guix-commits, 2022/06/23
- 02/21: gnu: libva: Use G-expressions.,
guix-commits <=
- 04/21: gnu: python-sphinx: Update to 5.0.2., guix-commits, 2022/06/23
- 09/21: gnu: libepoxy: Update to 1.5.10., guix-commits, 2022/06/23
- 06/21: gnu: python-requests: Update to 2.28.0., guix-commits, 2022/06/23
- 14/21: gnu: bluez: Simplify inputs., guix-commits, 2022/06/23
- 11/21: gnu: libwebp: Update to 1.2.2., guix-commits, 2022/06/23
- 03/21: gnu: python-babel: Update to 2.10.3., guix-commits, 2022/06/23
- 10/21: gnu: libepoxy: Use new style., guix-commits, 2022/06/23
- 08/21: gnu: python-charset-normalizer: Update to 2.1.0., guix-commits, 2022/06/23
- 20/21: gnu: Remove postgresql@13 replacement., guix-commits, 2022/06/23
- 16/21: gnu: freeglut: Update to 3.2.2., guix-commits, 2022/06/23