From patchwork Wed Dec 27 10:15:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 58097 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 E388C27BBE9; Wed, 27 Dec 2023 10:16:27 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 100AC27BBE2 for ; Wed, 27 Dec 2023 10:16:27 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rIQxN-0004VZ-M9; Wed, 27 Dec 2023 05:16:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rIQxH-0004VF-Oa for guix-patches@gnu.org; Wed, 27 Dec 2023 05:16:04 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rIQxH-0002HQ-EJ for guix-patches@gnu.org; Wed, 27 Dec 2023 05:16:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rIQxF-00025z-Ma for guix-patches@gnu.org; Wed, 27 Dec 2023 05:16:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68044] [PATCH v2] gnu: mpv-mpris: Fix build. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Dec 2023 10:16:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68044 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Zheng Junjie , Josselin Poiret Cc: 68044@debbugs.gnu.org Received: via spool by 68044-submit@debbugs.gnu.org id=B68044.17036721557374 (code B ref 68044); Wed, 27 Dec 2023 10:16:01 +0000 Received: (at 68044) by debbugs.gnu.org; 27 Dec 2023 10:15:55 +0000 Received: from localhost ([127.0.0.1]:35394 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rIQx8-0001u9-DZ for submit@debbugs.gnu.org; Wed, 27 Dec 2023 05:15:54 -0500 Received: from jpoiret.xyz ([206.189.101.64]:34988) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rIQx5-0001oM-Js for 68044@debbugs.gnu.org; Wed, 27 Dec 2023 05:15:52 -0500 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id D375518543C; Wed, 27 Dec 2023 10:15:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1703672151; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wXgeqfaaLk/ki9vEHwFRTxQgSISFwd/hc2sHVqI8z/M=; b=gzUkap7mHyJjVWig3Sttv8QRpSL9gkW8sjrJtQL6gUlYOkiCoEYfnt3SRdHqE7f442u5qH zk1Evt/qr1vUXVxdZt4T/FzPtD8DZQZXiWwdBIPWrIr33zCfWnzwRO0vncKihngjgi71CL 77AWHqgWh60TuDFi5oDz8e6UsWLTQXBYn7ybS2FnuFu6gGL+sFOhL7qBdzhAU0sKjunRqz cvl9u7e8IgvBrg58kLYyyRhmVQq6aOuKFsfJwHyyVr/W9z1yxecgA7FZvP/A3c97/JXUPf a483r7zNtEwsCzacVxgqUmz2tv7A7nPRC8016+lFwA54x5QA9VaRfFK2TqP49Q== Date: Wed, 27 Dec 2023 11:15:22 +0100 Message-ID: <82c9f77bd248c517cd059c956e8019426b0bd3e6.1703672122.git.dev@jpoiret.xyz> In-Reply-To: <87frzo4xvb.fsf@iscas.ac.cn> References: <87frzo4xvb.fsf@iscas.ac.cn> MIME-Version: 1.0 X-Spamd-Bar: / Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Josselin Poiret X-ACL-Warn: , Josselin Poiret via Guix-patches X-Patchwork-Original-From: Josselin Poiret via Guix-patches via From: Josselin Poiret Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Josselin Poiret * 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(-) base-commit: 5bd80ccd69047b1777749e24d4adf2c951b5d14b 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