From: Josselin Poiret via Guix-patches via <guix-patches@gnu.org>
To: Zheng Junjie <zhengjunjie@iscas.ac.cn>,
Josselin Poiret <dev@jpoiret.xyz>
Cc: 68044@debbugs.gnu.org
Subject: [bug#68044] [PATCH v2] gnu: mpv-mpris: Fix build.
Date: Wed, 27 Dec 2023 11:15:22 +0100 [thread overview]
Message-ID: <82c9f77bd248c517cd059c956e8019426b0bd3e6.1703672122.git.dev@jpoiret.xyz> (raw)
In-Reply-To: <87frzo4xvb.fsf@iscas.ac.cn>
From: Josselin Poiret <dev@jpoiret.xyz>
* gnu/packages/video.scm (mpv-mpris): Use gnu-build-system again. Include
mpv's required dependencies now that its pkg-config file requires them. Run
tests.
Change-Id: I9de4ade633388ec42ac30019feb133ca98811ad9
---
Hi Zheng,
Thanks for the speedy review! Good catches, seems I've been slacking off too
much… Here is an updated patch.
Best,
gnu/packages/video.scm | 41 ++++++++++++++++++++++++++++++-----------
1 file changed, 30 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 6da4897a57..25004155f0 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -154,6 +154,7 @@ (define-module (gnu packages video)
#:use-module (gnu packages image)
#:use-module (gnu packages imagemagick)
#:use-module (gnu packages iso-codes)
+ #:use-module (gnu packages libcanberra)
#:use-module (gnu packages libidn)
#:use-module (gnu packages libusb)
#:use-module (gnu packages linux)
@@ -2511,20 +2512,38 @@ (define-public mpv-mpris
(file-name (git-file-name name version))
(sha256
(base32 "1384y8n3l0xk8hbad1nsj9ljzb1h02g3ln3jysd8bd6shbl0x4mx"))))
- (build-system copy-build-system)
+ (build-system gnu-build-system)
(arguments
- '(#:install-plan
- '(("mpris.so" "lib/"))
- #:phases
- (modify-phases %standard-phases
- (add-before 'install 'build
- (lambda _
- (setenv "CC" (which "gcc"))
- (invoke "make"))))))
+ (list
+ #:make-flags
+ #~(list (string-append "SCRIPTS_DIR=" #$output "/lib")
+ (string-append "CC=" #$(cc-for-target)))
+ #:phases
+ #~(modify-phases %standard-phases
+ (delete 'configure)
+ (replace 'check
+ (lambda* (#:key inputs native-inputs tests? #:allow-other-keys)
+ (if tests?
+ (begin
+ (setenv
+ "MPV_MPRIS_TEST_PLAY"
+ (search-input-file
+ (or native-inputs inputs)
+ "/share/sounds/freedesktop/stereo/alarm-clock-elapsed.oga"))
+ (invoke "make" "test"))
+ (format #t "test suite not run~%")))))))
(native-inputs
- (list pkg-config))
+ (list pkg-config
+ dbus
+ jq
+ playerctl
+ socat
+ sound-theme-freedesktop
+ xorg-server-for-tests
+ xvfb-run))
(inputs
- (list ffmpeg glib mpv))
+ (modify-inputs (package-inputs mpv)
+ (prepend ffmpeg glib mpv)))
(home-page "https://github.com/hoyon/mpv-mpris")
(synopsis "MPRIS plugin for mpv")
(description "This package provides an @dfn{MPRIS} (Media Player Remote
base-commit: 5bd80ccd69047b1777749e24d4adf2c951b5d14b
--
2.41.0
next prev parent reply other threads:[~2023-12-27 10:16 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-26 16:38 [bug#68044] [PATCH] gnu: mpv-mpris: Fix build Josselin Poiret via Guix-patches via
2023-12-26 18:11 ` 郑俊杰
2023-12-26 18:33 ` Zheng Junjie
2023-12-27 10:15 ` Josselin Poiret via Guix-patches via [this message]
2024-02-01 6:30 ` bug#68044: [PATCH v2] " Hilton Chain via Guix-patches via
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=82c9f77bd248c517cd059c956e8019426b0bd3e6.1703672122.git.dev@jpoiret.xyz \
--to=guix-patches@gnu.org \
--cc=68044@debbugs.gnu.org \
--cc=dev@jpoiret.xyz \
--cc=zhengjunjie@iscas.ac.cn \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).