Date: Tuesday, May 26, 2020 @ 14:46:01 Author: schuay Revision: 635105
upgpkg: shntool 3.0.10-6: 3.0.10-6 Added: shntool/trunk/debian_patches_950803.patch shntool/trunk/debian_patches_no-cdquality-check.patch Modified: shntool/trunk/PKGBUILD -----------------------------------------+ PKGBUILD | 9 +++++ debian_patches_950803.patch | 46 ++++++++++++++++++++++++++++++ debian_patches_no-cdquality-check.patch | 21 +++++++++++++ 3 files changed, 75 insertions(+), 1 deletion(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-05-26 14:36:26 UTC (rev 635104) +++ PKGBUILD 2020-05-26 14:46:01 UTC (rev 635105) @@ -3,7 +3,7 @@ pkgname=shntool pkgver=3.0.10 -pkgrel=5 +pkgrel=6 pkgdesc="A multi-purpose WAVE data processing and reporting utility" arch=('x86_64') url="http://shnutils.freeshell.org/shntool/" @@ -14,15 +14,20 @@ 'flac: support for flac format' 'wavpack: support for wv format') source=("http://shnutils.freeshell.org/shntool/dist/src/${pkgname}-${pkgver}.tar.gz" + 'debian_patches_950803.patch' + 'debian_patches_no-cdquality-check.patch' 'shntool-3.0.10-large-size.diff' 'shntool-3.0.10-large-times.diff') # Patches taken from https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=684600 +# https://salsa.debian.org/debian/shntool/-/tree/master/debian/patches prepare() { cd "${srcdir}"/${pkgname}-${pkgver} + patch -Np1 < "${srcdir}/debian_patches_950803.patch" patch -Np1 < "${srcdir}/shntool-3.0.10-large-size.diff" patch -Np1 < "${srcdir}/shntool-3.0.10-large-times.diff" + patch -Np1 < "${srcdir}/debian_patches_no-cdquality-check.patch" } build() { @@ -37,6 +42,8 @@ } md5sums=('5d41f8f42c3c15e3145a7a43539c3eae' + 'a3aa5b817cedb4226fa32340609a5995' + '596398b13e02b243078320ebde4743fb' '4265935ef1d684a4b49041278ffda7de' '6f0d61ddbf8cbee5c0b51a99e987ddda') Added: debian_patches_950803.patch =================================================================== --- debian_patches_950803.patch (rev 0) +++ debian_patches_950803.patch 2020-05-26 14:46:01 UTC (rev 635105) @@ -0,0 +1,46 @@ +Origin: https://github.com/max619/shntool/commit/cfd06e4ed +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=950803 +From cfd06e4edecdca2013e0fe04db135fd110a68203 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=D0=9C=D0=B0=D0=BA=D1=81=D0=B8=D0=BC=20=D0=91=D0=B0=D0=B3?= + =?UTF-8?q?=D1=80=D1=8F=D0=BD=D1=86=D0=B5=D0=B2?= <maxbag97...@gmail.com> +Date: Mon, 11 Nov 2019 00:53:06 +0300 +Subject: [PATCH] Added WAVE_FORMAT_EXTENSIBLE with value 0xfffe and supressed + error on wav header parsing with that format + +--- a/include/wave.h ++++ b/include/wave.h +@@ -58,8 +58,9 @@ + #define WAVE_FORMAT_MPEG (0x0050) + #define WAVE_FORMAT_MPEGLAYER3 (0x0055) + #define WAVE_FORMAT_G726_ADPCM (0x0064) + #define WAVE_FORMAT_G722_ADPCM (0x0065) ++#define WAVE_FORMAT_EXTENSIBLE (0xfffe) + + #define CD_BLOCK_SIZE (2352) + #define CD_BLOCKS_PER_SEC (75) + #define CD_BLOCK_ALIGN (4) +--- a/src/core_wave.c ++++ b/src/core_wave.c +@@ -166,8 +166,9 @@ + return FALSE; + } + + switch (info->wave_format) { ++ case WAVE_FORMAT_EXTENSIBLE: + case WAVE_FORMAT_PCM: + break; + default: + st_warning("unsupported format 0x%04x (%s) while processing file: [%s]", +@@ -510,9 +511,11 @@ + return "MPEG Layer 3"; + case WAVE_FORMAT_G726_ADPCM: + return "G.726 ADPCM"; + case WAVE_FORMAT_G722_ADPCM: +- return "G.722 ADPCM"; ++ return "G.722 ADPCM"; ++ case WAVE_FORMAT_EXTENSIBLE: ++ return "WAVE Extensible format"; + } + return "Unknown"; + } + Added: debian_patches_no-cdquality-check.patch =================================================================== --- debian_patches_no-cdquality-check.patch (rev 0) +++ debian_patches_no-cdquality-check.patch 2020-05-26 14:46:01 UTC (rev 635105) @@ -0,0 +1,21 @@ +Last-Update: 2014-11-15 +Forwarded: yes +Author: Dmitry Smirnov <only...@member.fsf.org> +Bug-Debian: http://bugs.debian.org/769585 +Description: disable CD-quality check, needed to process 24bit 96kHz files. + +--- a/src/core_mode.c ++++ b/src/core_mode.c +@@ -344,10 +344,10 @@ + + *colon = 0; + *dot = 0; + +- if (PROB_NOT_CD(info)) +- st_error("m:ss.ff format can only be used with CD-quality files"); ++// if (PROB_NOT_CD(info)) ++// st_error("m:ss.ff format can only be used with CD-quality files"); + + min = atoi((const char *)buf); + sec = atoi((const char *)(colon+1)); + frames = atoi((const char *)(dot+1));