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

[Bruno Pagani]

    Date: Tuesday, July 20, 2021 @ 19:27:41
  Author: archange
Revision: 980529

FS#71217,FS#71503 Fix mess in dependencies

Also update required patches

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

------------------------------------------------+
 PKGBUILD                                       |   50 +++++++++++------------
 c229c01a5821276de9ee275ccfebe99b51a1a8c8.patch |   34 ---------------
 2 files changed, 25 insertions(+), 59 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-07-20 19:27:28 UTC (rev 980528)
+++ PKGBUILD	2021-07-20 19:27:41 UTC (rev 980529)
@@ -10,39 +10,40 @@
 
 pkgname=whipper
 pkgver=0.10.0
-pkgrel=1
-pkgdesc="A Unix CD ripper aiming for accuracy over speed -- forked from morituri"
-arch=('x86_64')
+pkgrel=2
+pkgdesc="Python CD-DA ripper preferring accuracy over speed"
+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
-  libsndfile            # for reading wav files (pulls in flac, also required for reading flac files)
+  cdrdao
+  flac
+  libcdio-paranoia
+  libsndfile
+  python-discid
   python-gobject
-  python-musicbrainzngs # for metadata lookup
-  python-mutagen        # for metadata handling
-  python-pycdio         # for storing drive identification in config file
-  python-requests
-  python-ruamel-yaml    # for log output
-  python-setuptools     # for plugin support
-  sox                   # for track peak detection
+  python-musicbrainzngs
+  python-mutagen
+  python-pycdio
+  python-ruamel-yaml
+  python-setuptools
+  sox
 )
 checkdepends=(
   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"
-        "c229c01a5821276de9ee275ccfebe99b51a1a8c8.patch")
+makedepends=(python-setuptools-scm python-docutils)
+optdepends=('python-pillow: cover art support')
+conflicts=(accuraterip-checksum)
+provides=(accuraterip-checksum)
+source=(${url}/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz
+        whipper-ruamel.yaml-0.17.patch::https://github.com/whipper-team/whipper/pull/543.patch)
 sha512sums=('728ad98185aa2d29f4fb215a597136691bb2c3590b3cac4f659238f90a3b4328c377fafe830a725b655f050538739f404b3eca853db4c39001d1b9d721dc7fd8'
-            '478cf26f36e77ad1fc9cb4f44995f807ce6b7c4810b426053a0439c5f7dab0dfbc32d027474a626af1911c58add1c9f295b41a4fb079dfed91b5c433a5d9da82')
+            '893e2f23717633971410e0f9917345eaec5af313d83702b36a2693b51eaf54d755d58db864de82e13e8506dc98ab548334d7ba6d02fd6c200bd0670e4bca73bf')
 
 prepare() {
   cd ${pkgname}-${pkgver}
-  patch -np1 < "${srcdir}/c229c01a5821276de9ee275ccfebe99b51a1a8c8.patch"
+  patch -p1 -i ../whipper-ruamel.yaml-0.17.patch
 }
 
 build() {
@@ -54,11 +55,10 @@
 check() {
   cd ${pkgname}-${pkgver}
   local python_version=$(python -c 'import sys; print(".".join(map(str, sys.version_info[:2])))')
-  # https://github.com/whipper-team/whipper/issues/515
-  PYTHONPATH="build/lib.linux-${CARCH}-${python_version}/" python -m unittest discover || echo "Tests failed"
+  PYTHONPATH="build/lib.linux-${CARCH}-${python_version}/" python -m unittest discover
 }
 
 package() {
   cd ${pkgname}-${pkgver}
-  python setup.py install --root="${pkgdir}"/ --optimize=1 --skip-build
+  python setup.py install --root="${pkgdir}" --optimize=1 --skip-build
 }

Deleted: c229c01a5821276de9ee275ccfebe99b51a1a8c8.patch
===================================================================
--- c229c01a5821276de9ee275ccfebe99b51a1a8c8.patch	2021-07-20 19:27:28 UTC (rev 980528)
+++ c229c01a5821276de9ee275ccfebe99b51a1a8c8.patch	2021-07-20 19:27:41 UTC (rev 980529)
@@ -1,34 +0,0 @@
-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