[arch-commits] Commit in whipper/trunk (2 files)

[Christian Rebischke]

    Date: Saturday, March 27, 2021 @ 13:17:48
  Author: shibumi
Revision: 905069

upgpkg: whipper 0.9.0-3 set gnudb as cddb server

This fixes: https://bugs.archlinux.org/task/68914

Added:
  whipper/trunk/c229c01a5821276de9ee275ccfebe99b51a1a8c8.patch
Modified:
  whipper/trunk/PKGBUILD

------------------------------------------------+
 PKGBUILD                                       |   23 ++++++++++-----
 c229c01a5821276de9ee275ccfebe99b51a1a8c8.patch |   34 +++++++++++++++++++++++
 2 files changed, 49 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-03-27 13:17:42 UTC (rev 905068)
+++ PKGBUILD	2021-03-27 13:17:48 UTC (rev 905069)
@@ -10,11 +10,11 @@
 
 pkgname=whipper
 pkgver=0.9.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A Unix CD ripper aiming for accuracy over speed -- forked from morituri"
-arch=(x86_64)
+arch=('x86_64')
 url="https://github.com/whipper-team/whipper"
-license=(GPL3)
+license=('GPL3')
 depends=(
   cdrdao                # for session, TOC, pregap, and ISRC extraction
   libcdio-paranoia      # for the actual ripping
@@ -32,12 +32,19 @@
   python-twisted
 )
 optdepends=('flac: For free lossless audio codec (FLAC) support')
-makedepends=(python-setuptools-scm)
-conflicts=(accuraterip-checksum)
-provides=(accuraterip-checksum)
-source=("${url}/archive/v${pkgver}/${pkgname}-v${pkgver}.tar.gz")
-sha512sums=('49e66ad2c6e8450199a53a28bb71725704daac86ce2cbf68080d4dee1c2357cf8367ddb4735a07f2ffe612d84f016661e5b6f94efa9d5a7d6b8cf56ee32b0ae7')
+makedepends=('python-setuptools-scm')
+conflicts=('accuraterip-checksum')
+provides=('accuraterip-checksum')
+source=("${url}/archive/v${pkgver}/${pkgname}-v${pkgver}.tar.gz"
+        "c229c01a5821276de9ee275ccfebe99b51a1a8c8.patch")
+sha512sums=('49e66ad2c6e8450199a53a28bb71725704daac86ce2cbf68080d4dee1c2357cf8367ddb4735a07f2ffe612d84f016661e5b6f94efa9d5a7d6b8cf56ee32b0ae7'
+            '478cf26f36e77ad1fc9cb4f44995f807ce6b7c4810b426053a0439c5f7dab0dfbc32d027474a626af1911c58add1c9f295b41a4fb079dfed91b5c433a5d9da82')
 
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -np1 < "${srcdir}/c229c01a5821276de9ee275ccfebe99b51a1a8c8.patch"
+}
+
 build() {
   cd ${pkgname}-${pkgver}
   echo "Version: ${pkgver}" > PKG-INFO

Added: c229c01a5821276de9ee275ccfebe99b51a1a8c8.patch
===================================================================
--- c229c01a5821276de9ee275ccfebe99b51a1a8c8.patch	                        (rev 0)
+++ c229c01a5821276de9ee275ccfebe99b51a1a8c8.patch	2021-03-27 13:17:48 UTC (rev 905069)
@@ -0,0 +1,34 @@
+From c229c01a5821276de9ee275ccfebe99b51a1a8c8 Mon Sep 17 00:00:00 2001
+From: JoeLametta <JoeLametta at users.noreply.github.com>
+Date: Sat, 28 Nov 2020 17:44:21 +0000
+Subject: [PATCH] Replace 'freedb.dbpoweramp.com' CDDB server with gnudb.org
+
+It seems gnudb.org allows submissions too while 'freedb.dbpoweramp.com' is read only.
+
+Signed-off-by: JoeLametta <JoeLametta at users.noreply.github.com>
+---
+ whipper/common/program.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/whipper/common/program.py b/whipper/common/program.py
+index 97edd943..04e979e8 100644
+--- a/whipper/common/program.py
++++ b/whipper/common/program.py
+@@ -230,7 +230,7 @@ def getPath(self, outdir, template, mbdiscid, metadata, track_number=None):
+     @staticmethod
+     def getCDDB(cddbdiscid):
+         """
+-        Fetch basic metadata from dBpoweramp's mirror of freedb's CDDB.
++        Fetch basic metadata from gnudb.org's mirror of freedb's CDDB.
+ 
+         Freedb's official CDDB isn't used anymore because it's going to be
+         shut down on 31/03/2020.
+@@ -244,7 +244,7 @@ def getCDDB(cddbdiscid):
+         # FIXME: convert to nonblocking?
+         try:
+             md = freedb.perform_lookup(
+-                     cddbdiscid, 'freedb.dbpoweramp.com', 80
++                     cddbdiscid, 'gnudb.gnudb.org', 80
+             )
+             logger.debug('CDDB query result: %r', md)
+             return [item['DTITLE'] for item in md if 'DTITLE' in item] or None