From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:700:3204::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id +Eo0Ln8Xi2XIuwAAkFu2QA (envelope-from ) for ; Tue, 26 Dec 2023 19:12:15 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id uBsxKH8Xi2WwKAEAe85BDQ (envelope-from ) for ; Tue, 26 Dec 2023 19:12:15 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=yandex.com header.s=mail header.b=Uy+7CZ1U; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=yandex.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1703614335; h=from:from:sender:sender: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:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=8usmHC2tWzTSPluqo73gpB4/CgfSqbpZv0i4ejF8rcQ=; b=M+UQF/TTznb0EGMlbgwnt7FhA3Ehh3/U9jhLkP8IDPWHqZSSxxqSAURJ+sPTcllUJV5svS cX60m6uS9geiojZim55iojjnJPw9GZDqkkOdY80NjG0J6ulBPYSsJq1G+g+beCvCWDJdYj v6zPyTRY9nCr0wknqX+en/1LyMDcKE4YV6stoANv3GZh+6gL2rjupP+YMHao9lE8QicsLa s5lUFc95AE14fHsPLioM9DbQ+95CGfqdyixzCuWU1KbEtkWsZO1Ns4BnN9MBXBHTmJnL6r G4JZENi2np5s4pNEPGtXQJwME8HUTySFwuDKkJn/wN1UeoKJOueBgo6bC6nqLg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=yandex.com header.s=mail header.b=Uy+7CZ1U; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=yandex.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1703614335; a=rsa-sha256; cv=none; b=REONPh1IeGXE4cwxLjsS/hCzKPGRk/j1kkgLJ7xnuEJsnOWp2RpUXxkd5IHQchzO4HfrLh 73F5yCutnX2evk6M9iGvBVuSQdrJsAoKn0dALlOKimwKHw4XE52jNKNOd3TVUgSCoxviWN BuP8Nxu3dmiOODzf/rq+FN5JUJn5zLFs3K9/6kJgupSSMg8ANZP0nfNzqnCC2raKn288F0 KGSykcKEf6VveZXA+j3kShSs/dB2rdG/e57X4WNoDBsvY0tAMeCU5tFahJQtjYWTAmKvLR Nj/VvZ1GvkHBw0XbpqfCQk45GAplKsCW5kq/GDTBBY1Kx11DKyQixHuQDkPEYw== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 261AE13A63 for ; Tue, 26 Dec 2023 19:12:15 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rIBuQ-0001VN-KW; Tue, 26 Dec 2023 13:12: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 1rIBuO-0001V4-JO for guix-patches@gnu.org; Tue, 26 Dec 2023 13:12: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 1rIBuO-0003PG-9V for guix-patches@gnu.org; Tue, 26 Dec 2023 13:12:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rIBuM-0001Y8-CV for guix-patches@gnu.org; Tue, 26 Dec 2023 13:12:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68044] [PATCH] gnu: mpv-mpris: Fix build. Resent-From: =?UTF-8?Q?=E9=83=91=E4=BF=8A=E6=9D=B0?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 26 Dec 2023 18:12:02 +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: Josselin Poiret Cc: 68044@debbugs.gnu.org Received: via spool by 68044-submit@debbugs.gnu.org id=B68044.17036143215950 (code B ref 68044); Tue, 26 Dec 2023 18:12:02 +0000 Received: (at 68044) by debbugs.gnu.org; 26 Dec 2023 18:12:01 +0000 Received: from localhost ([127.0.0.1]:35016 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rIBuL-0001Xt-97 for submit@debbugs.gnu.org; Tue, 26 Dec 2023 13:12:01 -0500 Received: from forward500b.mail.yandex.net ([2a02:6b8:c02:900:1:45:d181:d500]:60232) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rIBuH-0001Xb-RM for 68044@debbugs.gnu.org; Tue, 26 Dec 2023 13:11:59 -0500 Received: from mail-nwsmtp-smtp-production-main-25.sas.yp-c.yandex.net (mail-nwsmtp-smtp-production-main-25.sas.yp-c.yandex.net [IPv6:2a02:6b8:c08:2e14:0:640:2cd1:0]) by forward500b.mail.yandex.net (Yandex) with ESMTP id AEFAA6111D; Tue, 26 Dec 2023 21:11:51 +0300 (MSK) Received: by mail-nwsmtp-smtp-production-main-25.sas.yp-c.yandex.net (smtp/Yandex) with ESMTPSA id iBYx2xWnGeA0-q5ad4GdS; Tue, 26 Dec 2023 21:11:51 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.com; s=mail; t=1703614311; bh=8usmHC2tWzTSPluqo73gpB4/CgfSqbpZv0i4ejF8rcQ=; h=In-Reply-To:Cc:Message-Id:References:Date:Subject:From:To; b=Uy+7CZ1URsSNelmggYR6qxxsK2m91RaLr1xis9GKVmWKukaU/Ej4QoVZPDltfiq0q pMUL5YqyDmtId7+uhxQAEqVzv8jWEFzI2vQmovDmL91TaKeylUcwWAkOoKU539VI49 2n2pHgfE/MdjkXWp1yc3BjpV7Lexot4Jt/9B0dVI= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable From: =?UTF-8?Q?=E9=83=91=E4=BF=8A=E6=9D=B0?= Mime-Version: 1.0 (1.0) Date: Wed, 27 Dec 2023 02:11:34 +0800 Message-Id: References: <3f2f99c174d858a58ce40b875184c46c6f4381f9.1703608723.git.dev@jpoiret.xyz> In-Reply-To: <3f2f99c174d858a58ce40b875184c46c6f4381f9.1703608723.git.dev@jpoiret.xyz> X-Mailer: iPad Mail (21B101) 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: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -5.32 X-Spam-Score: -5.32 X-Migadu-Queue-Id: 261AE13A63 X-TUID: QAqKAiQeAbs6 > =E5=9C=A8 2023=E5=B9=B412=E6=9C=8827=E6=97=A5=EF=BC=8C01:57=EF=BC=8CJossel= in Poiret via Guix-patches via =E5=86=99=E9=81=93=EF=BC= =9A >=20 > =EF=BB=BFFrom: Josselin Poiret >=20 > * gnu/packages/video.scm (mpv-mpris): Use gnu-build-system again. Include= > mpv's required dependencies now that its pkg-config file requires them. R= un > tests. >=20 > Change-Id: I9de4ade633388ec42ac30019feb133ca98811ad9 > --- > Hi everyone, >=20 > mpv-mpris doesn't build anymore, because mpv's pkg-config file now require= s > 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 en= v vars > to make it as painless as possible. Also, tests were actually not that ba= d so > we can enable them. >=20 > gnu/packages/video.scm | 29 ++++++++++++++++++----------- > 1 file changed, 18 insertions(+), 11 deletions(-) >=20 > 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=3D" #$output "/lib") > + (string-append "CC=3D" #$(cc-for-target))) > + #:phases > + #~(modify-phases %standard-phases > + (delete 'configure) > + (replace 'check Please care =E2=80=9Ctests?=E2=80=9D Like (if tests?=20 (do-test) (format #t "test suite not run~%")) > + (lambda _ > + (setenv "MPV_MPRIS_TEST_PLAY" > + #$(file-append sound-theme-freedesktop > + "/share/sounds/freedesktop/stereo/al= arm-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 Remot= e >=20 > base-commit: 5bd80ccd69047b1777749e24d4adf2c951b5d14b > -- > 2.41.0 >=20 >=20 >=20 >=20