From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:1008:1e59::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id gHO8NrIci2UlSwAAkFu2QA (envelope-from ) for ; Tue, 26 Dec 2023 19:34:26 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id MObKMrIci2ULwQAA62LTzQ (envelope-from ) for ; Tue, 26 Dec 2023 19:34:26 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=none; 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=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1703615666; 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: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; bh=TssUVZY2VVbGcddmws1ZFoOrogk8c5KQiOkYx34ASUw=; b=eQQv315vXL/Jn82+9igzp3EgDtStqWO/Yx6gEOcufnhirU/9c6B9EpMOsmg9gING1HSukR TQKUHUj4hxO2HNcrdAaZMwvQVoL1+yJ24vSDgdHA/i4oDa8vSijoL+8mkhnzK7zAld0WKi 6TtU2zrB7PQ4KczhXp3mCRHv1sirHVG8IL2IBjd5o5uqJq5T9Ji03qN9yc3YW0W/OGTC/8 rCJ5J4qZjGn6L9SP7jL1TfO8YdWaG2rE4POrwgSmBzGNfKpyEgTn24O06KCXou7r+NnKcf 3JNSFvoeSaq86MLcWo4lAvTczmxIjU/3oXX1DJ/QOtFmULxy3gni178xOfktew== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1703615666; a=rsa-sha256; cv=none; b=FWGDiQTK0DAk+hHccb8g2BPa7Gb5/Pq9XGpLVeFbIq1VjMR57njMC8liWJNdqLVHBJJzSf a58TKS00cltEKfjfgEiGciECcjH9B0x/m6xSzqm/vxUUSGyu/ndJOe2AqmVwAOKrpPrKzq qP1SEl/ujJ2+OGSfURQFLFSTOCLHMtQdziQBNdrbSozJPPWsW5ry8WTYFLV4mTMppxcsdg SQGoBqyAXrb9q2GD0Xm2BUfCeTCzux1muKwNcncJiMvFg/wk3J6o6jexsVNuIYm7FVwWoM ga76xDz+W7QEhaybJMggwfLaUJYqDALT9xGhlINnqihJJYynWT8TOT75Bdb8Rw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; 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=none 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 B073815E65 for ; Tue, 26 Dec 2023 19:34:26 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rICFj-0003Y9-L7; Tue, 26 Dec 2023 13:34:07 -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 1rICFg-0003XA-JB for guix-patches@gnu.org; Tue, 26 Dec 2023 13:34: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 1rICFg-0006lF-AP for guix-patches@gnu.org; Tue, 26 Dec 2023 13:34:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rICFd-0007JR-UG for guix-patches@gnu.org; Tue, 26 Dec 2023 13:34:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68044] [PATCH] gnu: mpv-mpris: Fix build. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 26 Dec 2023 18:34: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: Josselin Poiret Cc: 68044@debbugs.gnu.org Received: via spool by 68044-submit@debbugs.gnu.org id=B68044.170361563828099 (code B ref 68044); Tue, 26 Dec 2023 18:34:01 +0000 Received: (at 68044) by debbugs.gnu.org; 26 Dec 2023 18:33:58 +0000 Received: from localhost ([127.0.0.1]:35022 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rICFZ-0007J8-Gf for submit@debbugs.gnu.org; Tue, 26 Dec 2023 13:33:57 -0500 Received: from smtp84.cstnet.cn ([159.226.251.84]:53472 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rICFW-0007Iq-L3 for 68044@debbugs.gnu.org; Tue, 26 Dec 2023 13:33:56 -0500 Received: from m (unknown [183.247.5.190]) by APP-05 (Coremail) with SMTP id zQCowAAXKD2IHItl+FYhAQ--.63294S2; Wed, 27 Dec 2023 02:33:46 +0800 (CST) References: <3f2f99c174d858a58ce40b875184c46c6f4381f9.1703608723.git.dev@jpoiret.xyz> User-agent: mu4e 1.10.8; emacs 30.0.50 From: Zheng Junjie Date: Wed, 27 Dec 2023 02:33:18 +0800 In-reply-to: <3f2f99c174d858a58ce40b875184c46c6f4381f9.1703608723.git.dev@jpoiret.xyz> Message-ID: <87frzo4xvb.fsf@iscas.ac.cn> MIME-Version: 1.0 Content-Type: text/plain X-CM-TRANSID: zQCowAAXKD2IHItl+FYhAQ--.63294S2 X-Coremail-Antispam: 1UD129KBjvJXoWxAFyrXFWrJFWxJr1UKF1kuFg_yoW5Ww48pa 4fAFyF9r48Grn5Cw4SqFsF9r13WrZ5tFy5X39xCr1rt3WY9ry09FW2gay5A3W7JwnrXw47 ua1kGa1UXFWUuFJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUy0b7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Jr0_JF4l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Jr0_Gr1l84ACjcxK6I8E87Iv67AKxVWUJVW8JwA2z4x0Y4vEx4 A2jsIEc7CjxVAFwI0_Gr0_Gr1UM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI 64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8Jw Am72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IY64vIr41l42xK82IYc2Ij64vIr41l4I8I3I0E 4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGV WUWwC2zVAF1VAY17CE14v26r1Y6r17MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_ Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r1j6r4UMIIF0xvE42xK8VAvwI8IcIk0rV WUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r1j6r4U YxBIdaVFxhVjvjDU0xZFpf9x07bOoGdUUUUU= X-Originating-IP: [183.247.5.190] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ 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-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -6.25 X-Spam-Score: -6.25 X-Migadu-Queue-Id: B073815E65 X-Migadu-Scanner: mx12.migadu.com X-TUID: 6zIjAv/lNTjA Josselin Poiret via Guix-patches via writes: > 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(-) > > 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")) And don't use file-append here, should add `sound-theme-freedesktop' to native-inputs and use `search-input-file' to find this file. > + (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 > > base-commit: 5bd80ccd69047b1777749e24d4adf2c951b5d14b