From patchwork Sun Aug 29 19:05:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Streit X-Patchwork-Id: 32452 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 259A227BBE5; Tue, 31 Aug 2021 22:42:19 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C637927BBE3 for ; Tue, 31 Aug 2021 22:42:18 +0100 (BST) Received: from localhost ([::1]:46958 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mLBWL-0003U1-UI for patchwork@mira.cbaines.net; Tue, 31 Aug 2021 17:42:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41030) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mLBW7-0003TX-6S for guix-patches@gnu.org; Tue, 31 Aug 2021 17:42:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52287) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mLBW6-0006R1-EE for guix-patches@gnu.org; Tue, 31 Aug 2021 17:42:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mLBW6-0004qF-CU for guix-patches@gnu.org; Tue, 31 Aug 2021 17:42:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50309] [PATCH 3/5] gnu: python-mediafile: Update to 0.7.0. References: In-Reply-To: Resent-From: Simon Streit Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 31 Aug 2021 21:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50309 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50309@debbugs.gnu.org Received: via spool by 50309-submit@debbugs.gnu.org id=B50309.163044608818557 (code B ref 50309); Tue, 31 Aug 2021 21:42:02 +0000 Received: (at 50309) by debbugs.gnu.org; 31 Aug 2021 21:41:28 +0000 Received: from localhost ([127.0.0.1]:35597 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mLBVT-0004p8-4h for submit@debbugs.gnu.org; Tue, 31 Aug 2021 17:41:28 -0400 Received: from smtprelay01.ispgateway.de ([80.67.31.24]:14323) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mLBVR-0004oz-Bt for 50309@debbugs.gnu.org; Tue, 31 Aug 2021 17:41:22 -0400 Received: from [79.252.144.124] (helo=motorball) by smtprelay01.ispgateway.de with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1mLBVv-0003rI-W7; Tue, 31 Aug 2021 23:41:52 +0200 From: Simon Streit Date: Sun, 29 Aug 2021 21:05:01 +0200 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Df-Sender: bGlzdHNAbmV0cGFuaWMub3Jn 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" X-getmail-retrieved-from-mailbox: Patches Remove patch. It is now included in upstream release. * gnu/packages/music.scm (python-mediafile): Update to 0.7.0. * gnu/packages/patches/python-mediafile-wavpack.patch: Delete patch. --- gnu/packages/music.scm | 7 ++- .../patches/python-mediafile-wavpack.patch | 57 ------------------- 2 files changed, 4 insertions(+), 60 deletions(-) delete mode 100644 gnu/packages/patches/python-mediafile-wavpack.patch diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index b95be813dc..c417e22804 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -41,6 +41,7 @@ ;;; Copyright © 2021 Rovanion Luckey ;;; Copyright © 2021 Justin Veilleux ;;; Copyright © 2021 Felix Gruber +;;; Copyright © 2021 Simon Streit ;;; ;;; This file is part of GNU Guix. ;;; @@ -3604,15 +3605,15 @@ streams on an individual packet/page level.") (define-public python-mediafile (package (name "python-mediafile") - (version "0.6.0") + (version "0.7.0") (source (origin (method url-fetch) (uri (pypi-uri "mediafile" version)) - (patches (search-patches "python-mediafile-wavpack.patch")) + ;; (patches (search-patches "python-mediafile-wavpack.patch")) (sha256 (base32 - "0jmsp3f57xj35ayp8b6didk85nxgl3viw34s5px3l5dwgc055yx3")))) + "0fvxhiypf5qp1m9gzd0bik5wnfcm8sd7xivd02d6d0ml85qxwcwg")))) (build-system python-build-system) (propagated-inputs `(("python-mutagen" ,python-mutagen) diff --git a/gnu/packages/patches/python-mediafile-wavpack.patch b/gnu/packages/patches/python-mediafile-wavpack.patch deleted file mode 100644 index 9839fe87b5..0000000000 --- a/gnu/packages/patches/python-mediafile-wavpack.patch +++ /dev/null @@ -1,57 +0,0 @@ -This patch has already been applied upstream, but is not included in the -current release 0.6.0. - -From d2fc3b59f77c515b02dfe7ad936f89264375d2b4 Mon Sep 17 00:00:00 2001 -From: Adrian Sampson -Date: Wed, 29 Jul 2020 19:42:57 -0400 -Subject: [PATCH] Fix test for WavPack bitrate - -Fixes #34. ---- - docs/index.rst | 5 +++++ - mediafile.py | 2 +- - test/test_mediafile.py | 2 +- - 3 files changed, 7 insertions(+), 2 deletions(-) - -diff --git a/docs/index.rst b/docs/index.rst -index 7b622df..1465405 100644 ---- a/docs/index.rst -+++ b/docs/index.rst -@@ -100,6 +100,11 @@ Internals - Changelog - --------- - -+v0.7.0 -+'''''' -+ -+- Mutagen 1.45.0 or later is now required. -+ - v0.6.0 - '''''' - -diff --git a/mediafile.py b/mediafile.py -index 23fadaf..9e9d063 100644 ---- a/mediafile.py -+++ b/mediafile.py -@@ -56,7 +56,7 @@ - import six - - --__version__ = '0.6.0' -+__version__ = '0.7.0' - __all__ = ['UnreadableFileError', 'FileTypeError', 'MediaFile'] - - log = logging.getLogger(__name__) -diff --git a/test/test_mediafile.py b/test/test_mediafile.py -index e9e1850..7f17f44 100644 ---- a/test/test_mediafile.py -+++ b/test/test_mediafile.py -@@ -907,7 +907,7 @@ class WavpackTest(ReadWriteTestBase, unittest.TestCase): - 'bitrate': 109312, - 'format': u'WavPack', - 'samplerate': 44100, -- 'bitdepth': 0, -+ 'bitdepth': 16, - 'channels': 1, - } -