From patchwork Sun Sep 1 15:46:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Eure X-Patchwork-Id: 67475 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 99EED27BBE9; Sun, 1 Sep 2024 16:48:19 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable 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 5CAD527BBE2 for ; Sun, 1 Sep 2024 16:48:17 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1skmo9-0003Jx-Mz; Sun, 01 Sep 2024 11:48:05 -0400 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 1skmo7-0003JM-If for guix-patches@gnu.org; Sun, 01 Sep 2024 11:48:03 -0400 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 1skmo7-00088j-9G for guix-patches@gnu.org; Sun, 01 Sep 2024 11:48:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=RLEDo9uMIKW8wQfjKNp+jWIW3H42DPlaT05wsBczYV0=; b=AN+h3KGZ+rpo5mHP8d1DSSBnPwxJNfNgF4j84yah0eLWrYasDX19q8ZAyrwtOkrnahDGhkdxc4PaPB7Tqq152I0Clk8ofFDKhtmhws5QDhjJqhJphhGektGtT5giRiKHmBgL06P8kcA4zEattyne4OgjhCPWIw8EvVUXVpvHaB95Z/4I3vQm3EDrY3/ev/sPpoAsrYWL5qUiEP+J1K4mtRUMPk9aiBMm6bnTs75ds0+4e8+uollDk3+nkpucJv30myGL8P0LHfH3F9Zm0rC+pOEIG3Ehhe/Bv92AOaYcfsYYxMAS167G+gYp19fp2b/u/ZR3nkg6/v8VrRa5lY5wLA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1skmp4-0004Jv-Qz for guix-patches@gnu.org; Sun, 01 Sep 2024 11:49:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72935] [PATCH] gnu: python-mpv: Update to 1.0.7. Resent-From: Ian Eure Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 01 Sep 2024 15:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 72935 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72935@debbugs.gnu.org Cc: Ian Eure X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.172520568816495 (code B ref -1); Sun, 01 Sep 2024 15:49:02 +0000 Received: (at submit) by debbugs.gnu.org; 1 Sep 2024 15:48:08 +0000 Received: from localhost ([127.0.0.1]:37193 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1skmoB-0004Hw-W5 for submit@debbugs.gnu.org; Sun, 01 Sep 2024 11:48:08 -0400 Received: from lists.gnu.org ([209.51.188.17]:44526) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1skmo9-0004Hn-9Z for submit@debbugs.gnu.org; Sun, 01 Sep 2024 11:48:05 -0400 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 1skmnB-0003DV-2e for guix-patches@gnu.org; Sun, 01 Sep 2024 11:47:05 -0400 Received: from fhigh5-smtp.messagingengine.com ([103.168.172.156]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1skmn8-00080y-1W for guix-patches@gnu.org; Sun, 01 Sep 2024 11:47:04 -0400 Received: from phl-compute-04.internal (phl-compute-04.nyi.internal [10.202.2.44]) by mailfhigh.nyi.internal (Postfix) with ESMTP id 838F81140153; Sun, 1 Sep 2024 11:46:58 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-04.internal (MEProxy); Sun, 01 Sep 2024 11:46:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=retrospec.tv; h= cc:cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:message-id:mime-version:reply-to:subject:subject:to :to; s=fm3; t=1725205618; x=1725292018; bh=RLEDo9uMIKW8wQfjKNp+j WIW3H42DPlaT05wsBczYV0=; b=jsuTOsDvTqrKBISaTAg1i+SVyte7AaVwFG4+F f7AZX8U3IJgF6MBY9MjnFHWdpSZbfrzv1ojmWapdo1eGWN9A++Mi4D6wJJ7lz9bB tcp0o6zwrtw4szGyabfcrUeQQ2urY8pRW3MyAmVTvMXHD4FOQL1S8Is7kAJtW3fA 8K8IYX0qlb6KOGa14Oz3aT0ZrdJSmxa24HhaL2kRPAwCmi72yDpIghYtIi1RleBP mlDNEc0/qc05GMj7sKeds+RKWYZF4o/vg2Yenv6d2QVjutIe1i8UofNbNhp4x8dj 3056AkpSKzR0+ter79j1+uByP2JAUHyH0Ts77hqAzCFwFlmAg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:message-id:mime-version:reply-to:subject:subject:to :to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; t=1725205618; x=1725292018; bh=RLEDo9uMIKW8wQfjKNp+jWIW3H42 DPlaT05wsBczYV0=; b=js33msGSPHkRsic3PrR2S1CTrs93/WSIC5AyUbv8yl/U kRH2K7GE9GSZQQkO4FSYxFZyGyMT2BGGHI0iUKw5Dc/2fvP4In6Bv1snfyR2LKxz M4FUvx+Wz8dCCP6YUdKmprkSgpdoc+sTyg+GwMit1sb9d8HUJcSXDCSJtvaWMEAa 5FByUKNpRv2OtyvB700Cw1KRjEJb0du5fQeE381Tzp7h88teKpJdiLzUkWLS4Hli ODZ5JtIl0lRQo2Vzctq/yGKL2DvzVKYaZnDi6lLU38zceR8sqxmOeHTXBuWOrgIW INIRc3N9quN2Tn6qY5BCpYjGp2+GqG+Hl/QUXSnd8g== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudegjecutefuodetggdotefrodftvfcurf hrohhfihhlvgemucfhrghsthforghilhdpggftfghnshhusghstghrihgsvgdpuffrtefo kffrpgfnqfghnecuuegrihhlohhuthemuceftddtnecunecujfgurhephffvvefufffkof gggfestdekredtredttdenucfhrhhomhepkfgrnhcugfhurhgvuceoihgrnhesrhgvthhr ohhsphgvtgdrthhvqeenucggtffrrghtthgvrhhnpeffleethefgueegkeetteduudefvd efuefhtddufffgveeuuedtjeduteefudekgeenucffohhmrghinhepghhithhhuhgsrdgt ohhmnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepih grnhesrhgvthhrohhsphgvtgdrthhvpdhnsggprhgtphhtthhopedvpdhmohguvgepshhm thhpohhuthdprhgtphhtthhopehguhhigidqphgrthgthhgvshesghhnuhdrohhrghdprh gtphhtthhopehirghnsehrvghtrhhoshhpvggtrdhtvh X-ME-Proxy: Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 1 Sep 2024 11:46:57 -0400 (EDT) From: Ian Eure Date: Sun, 1 Sep 2024 08:46:47 -0700 Message-ID: <20240901154647.7917-1-ian@retrospec.tv> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 Received-SPF: pass client-ip=103.168.172.156; envelope-from=ian@retrospec.tv; helo=fhigh5-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, 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: , 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 * gnu/packages/python-xyz.scm (python-mpv): Update to 1.0.7. The recent core-updates merge broke the previous version of this package, so I updated to the most recent upstream while fixing the build. Upstream switched to pyproject, so use that build-system and add packages the tests need. Upstream added an environment variable to skip the test the previous package patched out, so use that rather than changing the source. Change-Id: Ia0e6c3341292fe6a40f63b484d70c6a68b6f7eb4 --- gnu/packages/python-xyz.scm | 72 +++++++++++++++++-------------------- 1 file changed, 33 insertions(+), 39 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a7688050e1..10908f185f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -37071,7 +37071,7 @@ (define-public python-bsdiff4 (define-public python-mpv (package (name "python-mpv") - (version "1.0.1") + (version "1.0.7") (source (origin ;; python-mpv from pypi does not include the tests directory. @@ -37081,43 +37081,37 @@ (define-public python-mpv (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "10w6j3n62ap45sf6q487kz8z6g58sha37i14fa2hhng794z7a8jh")) - (modules '((guix build utils))) - (snippet - #~(begin - ;; One of the tests never completes, so neutering it using - ;; early return allows other test to run without issue. - (substitute* "tests/test_mpv.py" - ;; Note the typo in "prooperty" - this was fixed later in - ;; upstream but has no effect on whether the tests hangs or not. - (("test_wait_for_prooperty_event_overflow.*" line) - ;; The long whitespace between \n and return is to match the - ;; identation level, which is significant in python. - (string-append line "\n return\n"))))))) - (build-system python-build-system) + (base32 "102fajzrcgxapsanh0phlqmk9q2v95bvix6mrkg8rypv717idins")) + (modules '((guix build utils))))) + (build-system pyproject-build-system) (arguments - (list #:phases - #~(modify-phases %standard-phases - (add-before 'build 'patch-reference-to-mpv - (lambda* (#:key inputs #:allow-other-keys) - ;; Without an absolute path it is not able find and - ;; load the libmpv library. - (substitute* "mpv.py" - (("sofile = .*") - (string-append "sofile = \"" - (search-input-file inputs "/lib/libmpv.so") - "\"\n"))))) - (add-before 'check 'prepare-for-tests - (lambda _ - ;; Fontconfig throws errors when it has no cache dir to use. - (setenv "XDG_CACHE_HOME" (getcwd)) - ;; Some tests fail without a writable and readable HOME. - (setenv "HOME" (getcwd))))))) - (native-inputs - (list python-xvfbwrapper)) ; needed for tests only + (list + #:phases #~(modify-phases %standard-phases + (add-before 'build 'patch-reference-to-mpv + (lambda* (#:key inputs #:allow-other-keys) + ;; Without an absolute path it is not able find and + ;; load the libmpv library. + (substitute* "mpv.py" + (("sofile = .*") + (string-append "sofile = \"" + (search-input-file inputs + "/lib/libmpv.so") + "\"\n"))))) + (add-before 'check 'prepare-for-tests + (lambda _ + ;; Fontconfig throws errors when it has no cache dir to use. + (setenv "XDG_CACHE_HOME" + (getcwd)) + ;; Some tests fail without a writable and readable HOME. + (setenv "HOME" + (getcwd)) + (setenv "PY_MPV_SKIP_TESTS" + "test_wait_for_property_event_overflow")))))) + (native-inputs (list + ;; needed for tests + python-pyvirtualdisplay python-xvfbwrapper python-pytest)) (inputs (list mpv)) - (propagated-inputs (list python-pillow)) ; for raw screenshots + (propagated-inputs (list python-pillow)) ;for raw screenshots (home-page "https://github.com/jaseg/python-mpv") (synopsis "Python interface to the mpv media player") (description @@ -37125,9 +37119,9 @@ (define-public python-mpv It gives you more or less full control of all features of the player, just as the lua interface does.") ;; From the project's README: - ;; python-mpv inherits the underlying libmpv's license, which can be either - ;; GPLv2 or later (default) or LGPLv2.1 or later. For details, see the mpv - ;; copyright page. + ;; python-mpv inherits the underlying libmpv's license, which can be either + ;; GPLv2 or later (default) or LGPLv2.1 or later. For details, see the mpv + ;; copyright page. (license license:gpl2+))) (define-public python-biblib