From patchwork Tue Dec 26 16:38:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 58082 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 C618E27BBE2; Tue, 26 Dec 2023 17:57:20 +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 18A2E27BBE9 for ; Tue, 26 Dec 2023 17:57:17 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rIBfu-0006aq-00; Tue, 26 Dec 2023 12:57:06 -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 1rIBfs-0006aD-Go for guix-patches@gnu.org; Tue, 26 Dec 2023 12:57: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 1rIBfs-0000n8-7a for guix-patches@gnu.org; Tue, 26 Dec 2023 12:57:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rIBfq-0006th-Au for guix-patches@gnu.org; Tue, 26 Dec 2023 12:57:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68044] [PATCH] gnu: mpv-mpris: Fix build. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 26 Dec 2023 17:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 68044 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68044@debbugs.gnu.org Cc: Josselin Poiret X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.170361339026454 (code B ref -1); Tue, 26 Dec 2023 17:57:02 +0000 Received: (at submit) by debbugs.gnu.org; 26 Dec 2023 17:56:30 +0000 Received: from localhost ([127.0.0.1]:34938 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rIBfK-0006sZ-Ch for submit@debbugs.gnu.org; Tue, 26 Dec 2023 12:56:30 -0500 Received: from lists.gnu.org ([2001:470:142::17]:41580) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rIBfE-0006rX-9R for submit@debbugs.gnu.org; Tue, 26 Dec 2023 12:56:25 -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 1rIAUb-0005tk-Mg for guix-patches@gnu.org; Tue, 26 Dec 2023 11:41:21 -0500 Received: from jpoiret.xyz ([206.189.101.64]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rIAUZ-0004pl-CD for guix-patches@gnu.org; Tue, 26 Dec 2023 11:41:20 -0500 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 9981718543C; Tue, 26 Dec 2023 16:41:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1703608876; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=BWX4OTmNtH7RuGSpoY+kign0dsEbhxtWf3VLfjQqkhs=; b=UN7DChwXBQclf5KTr5DzQ0EdG0bxaFJR5G34CU99UAqKDMDpob8xjdBvOUJk/+BTPT7QHZ Csi6sQ9F0mXV2o6iwOfkw3JxCIhxPFiQEvlV5x4zMuVg74vfFqDAb75mYr7Z0GQJPnLtdV H3NrlyX+A5Cl2JkgJcOZFNxgoSK4dz6x5Br/kyyfU/CzcuMBrCSBNUhsj/CW28piTgpHm/ edcFWCudPePTFbrNimXialKtG0JDTewdsJDkA6CT97E7ByHKOxRVJHcybMI0xyw4dTQ7gr Yfu7kpC4DAbYWIDty3G8hJUNcM3+utqYfYQ1qeLxAkyqPiITlL/lwlgnh25EEw== Date: Tue, 26 Dec 2023 17:38:43 +0100 Message-ID: <3f2f99c174d858a58ce40b875184c46c6f4381f9.1703608723.git.dev@jpoiret.xyz> MIME-Version: 1.0 X-Spamd-Bar: ++++ Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz Received-SPF: pass client-ip=206.189.101.64; envelope-from=dev@jpoiret.xyz; helo=jpoiret.xyz X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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 everyone, mpv-mpris doesn't build anymore, because mpv's pkg-config file now requires almost all of its dependencies. I chose to simply add all of mpv's inputs, but also to revert back to gnu-build-system, while making use of upstream's env vars to make it as painless as possible. Also, tests were actually not that bad so we can enable them. gnu/packages/video.scm | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) base-commit: 5bd80ccd69047b1777749e24d4adf2c951b5d14b diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 6da4897a57..987bc91f4f 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,26 @@ (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 _ + (setenv "MPV_MPRIS_TEST_PLAY" + #$(file-append sound-theme-freedesktop + "/share/sounds/freedesktop/stereo/alarm-clock-elapsed.oga")) + (invoke "make" "test")))))) (native-inputs - (list pkg-config)) + (list pkg-config dbus jq playerctl socat 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