From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 26 12:56:30 2023 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== From: Josselin Poiret To: guix-patches@gnu.org Subject: [PATCH] gnu: mpv-mpris: Fix build. Date: Tue, 26 Dec 2023 17:38:43 +0100 Message-ID: <3f2f99c174d858a58ce40b875184c46c6f4381f9.1703608723.git.dev@jpoiret.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Level: **** 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-Spam-Score: 0.9 (/) X-Debbugs-Envelope-To: submit Cc: Josselin Poiret X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.1 (/) 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")) + (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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 26 13:12:01 2023 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= Authentication-Results: mail-nwsmtp-smtp-production-main-25.sas.yp-c.yandex.net; dkim=pass header.i=@yandex.com Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable From: =?utf-8?B?6YOR5L+K5p2w?= Mime-Version: 1.0 (1.0) Subject: Re: [bug#68044] [PATCH] gnu: mpv-mpris: Fix build. 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> To: Josselin Poiret X-Mailer: iPad Mail (21B101) X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 68044 Cc: 68044@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) > =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 From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 26 13:33:57 2023 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 To: Josselin Poiret Subject: Re: [bug#68044] [PATCH] gnu: mpv-mpris: Fix build. 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-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 68044 Cc: 68044@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 From debbugs-submit-bounces@debbugs.gnu.org Wed Dec 27 05:15:55 2023 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== From: Josselin Poiret To: Zheng Junjie , Josselin Poiret Subject: [PATCH v2] gnu: mpv-mpris: Fix build. 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spamd-Bar: / Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 68044 Cc: 68044@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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(-) 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 From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 05 00:09:39 2024 Received: (at 68044) by debbugs.gnu.org; 5 Jan 2024 05:09:39 +0000 Received: from localhost ([127.0.0.1]:56156 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLcSh-0000OM-Bq for submit@debbugs.gnu.org; Fri, 05 Jan 2024 00:09:39 -0500 Received: from mail.boiledscript.com ([144.168.59.46]:50346) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLcSe-0000Nv-2v; Fri, 05 Jan 2024 00:09:37 -0500 Date: Fri, 05 Jan 2024 13:09:17 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1704431341; 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: in-reply-to:in-reply-to:references:references; bh=6aB32GasFbSIjCLyzzzrrqdM2HhmxOYhQdIX5tiiKnM=; b=pxEkWCU+Ex2ftdMwBoDqWdIlkd4JKmpy27HEJsFs6Zqas43S/0dARsI87qyQV7SXQH24vu mV9Ws888W/emZf+fUn8+/v/hjMtFOAY/graiTEhNwRYLRCycV6N2jXx6xiF+1XZ14aqJ3P pE6Svoqh4ywbxAsjoSjlM67zP6HR0ZweTC/E00C3gC1gpgPA8O2ijC/WwFHU7zExXaSCDM qqkXcHaZ77c9O6DGhd+K/ckoeOmZYxCJSr4aX98DLO8dAqLCwQs/aGhlwI/h/Uv/faJ2j+ RgBWgQX7W2z4s3TBKwL2YkiQrD33/SPJi80p5MNYAupiQe44U42YVKtp37qFqQ== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Message-ID: <87sf3c5ptu.wl-hako@ultrarare.space> From: Hilton Chain To: Andrew Tropin Subject: Re: bug#67814: [PATCH 0/3] gnu: mpv: Update to 0.37.0. In-Reply-To: <87sf3q1ppm.fsf@trop.in> References: <87ttoatigz.wl-hako@ultrarare.space> <87sf3q1ppm.fsf@trop.in> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-Spamd-Bar: / X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 68044 Cc: 68044@debbugs.gnu.org, Josselin Poiret , Zheng Junjie , 68250@debbugs.gnu.org, 67814@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, On Mon, 25 Dec 2023 19:33:41 +0800, Andrew Tropin wrote: > > Hi Hilton! > > It seem the mpv update breaks mpv-mpris build. I didn't dive into > issue yet, only tried to revert this patch. It's because mpv's pkgconfig file (for libmpv) now includes all its dependencies in Requires.private. Sorry that I didn't check all the dependent packages. Josselin has sent bug#68044, which adds mpv's inputs to mpv-mpris. However there're actually other packages depend on libmpv, so I think the proper fix is to split libmpv from the mpv package and propagate inputs in a new package (as mpv users are likely to include mpv in their profiles, thus these propagated inputs are usually unwanted). I tried to add a "lib" output for mpv first but there would be cycles. As a result, I disabled libmpv in mpv, added a libmpv package which inherits from mpv, and sent it to bug#68250. Thanks From debbugs-submit-bounces@debbugs.gnu.org Thu Feb 01 01:30:41 2024 Received: (at 68044-done) by debbugs.gnu.org; 1 Feb 2024 06:30:41 +0000 Received: from localhost ([127.0.0.1]:40082 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rVQav-0005LM-FB for submit@debbugs.gnu.org; Thu, 01 Feb 2024 01:30:41 -0500 Received: from mail.boiledscript.com ([144.168.59.46]:60574) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rVQat-0005KO-4c for 68044-done@debbugs.gnu.org; Thu, 01 Feb 2024 01:30:39 -0500 Date: Thu, 01 Feb 2024 14:30:24 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1706768979; 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: in-reply-to:in-reply-to:references:references; bh=quLApPgdiW7g/zUDmByvd9ccUxG1Zva93aNtUgEZfqY=; b=XkoF4SI8T2vKMIKSmLPCzAqY9SGEsOL4+AxRZmCO7sf9ZMZXAnCfdcctwkBGLCKQ86fXFX sTs5BxsJUsu6epV6pRW9gJtxwrpHPKMqE1bKMCQcAfi0e0tkFFYWa1pfCC8dHJNgnzwJKE kjAr0KxickNu9F0Pl5gAndTqu3xbTvYBX1lviyOcK2/iu3TMOs4tLNiog0el321I7JIo3O Ge286zqL3chPexuAVqnBIXi2i1Xxt1C73rV7orydF10E//pNIxTehnL2d9QQj/SFIaIpNj d2H5giKu6IketWb1tgROF6XL3vdZ2gY0cjZzV2OhfXBd56SDO4EyP75wT68Ouw== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Message-ID: <87jzno4ry7.wl-hako@ultrarare.space> From: Hilton Chain To: Josselin Poiret Subject: Re: [bug#68044] [PATCH v2] gnu: mpv-mpris: Fix build. In-Reply-To: <82c9f77bd248c517cd059c956e8019426b0bd3e6.1703672122.git.dev@jpoiret.xyz> References: <87frzo4xvb.fsf@iscas.ac.cn> <82c9f77bd248c517cd059c956e8019426b0bd3e6.1703672122.git.dev@jpoiret.xyz> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-Spamd-Bar: / X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 68044-done Cc: 68044-done@debbugs.gnu.org, Zheng Junjie X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Josselin, On Wed, 27 Dec 2023 18:15:22 +0800, Josselin Poiret via Guix-patches via wrote: > > 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 > --- I have applied the build system switching part as ee20e6fa2ee7, thanks! From unknown Sun Sep 21 02:49:55 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Thu, 29 Feb 2024 12:24:09 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator