diff --git a/0001-fix-valid-wavepack-header-versions.patch b/0001-fix-valid-wavepack-header-versions.patch deleted file mode 100644 index ebbfac0..0000000 --- a/0001-fix-valid-wavepack-header-versions.patch +++ /dev/null @@ -1,28 +0,0 @@ -From bb245a645b69602582e14bccda0158209b38c74b Mon Sep 17 00:00:00 2001 -From: Felix Kaechele -Date: Thu, 7 Oct 2021 22:42:57 -0400 -Subject: [PATCH] fix valid wavepack header versions - -https://bugzilla.redhat.com/show_bug.cgi?id=1940701 - -Signed-off-by: Felix Kaechele ---- - src/format_wv.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/format_wv.c b/src/format_wv.c -index 3222bc8..288fee3 100644 ---- a/src/format_wv.c -+++ b/src/format_wv.c -@@ -251,7 +251,7 @@ static bool is_our_file(char *filename) - - little_endian_to_native(wph4,WavpackHeader4Format); - -- if (tagcmp((unsigned char *)wph4->ckID,(unsigned char *)WAVPACK_MAGIC) || wph4->version < 4 || wph4->version > 0x40f) { -+ if (tagcmp((unsigned char *)wph4->ckID,(unsigned char *)WAVPACK_MAGIC) || wph4->version < 4 || wph4->version > 0x410) { - return FALSE; - } - --- -2.33.0 - diff --git a/cfd06e4edecdca2013e0fe04db135fd110a68203.patch b/cfd06e4edecdca2013e0fe04db135fd110a68203.patch deleted file mode 100644 index ffd82f5..0000000 --- a/cfd06e4edecdca2013e0fe04db135fd110a68203.patch +++ /dev/null @@ -1,47 +0,0 @@ -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?= -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 - ---- - include/wave.h | 1 + - src/core_wave.c | 5 ++++- - 2 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/include/wave.h b/include/wave.h -index 01aa3fe..039ca19 100644 ---- a/include/wave.h -+++ b/include/wave.h -@@ -59,6 +59,7 @@ - #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) -diff --git a/src/core_wave.c b/src/core_wave.c -index 47c36c9..7bea4d1 100644 ---- a/src/core_wave.c -+++ b/src/core_wave.c -@@ -167,6 +167,7 @@ bool verify_wav_header_internal(wave_info *info,bool verbose) - } - - switch (info->wave_format) { -+ case WAVE_FORMAT_EXTENSIBLE: - case WAVE_FORMAT_PCM: - break; - default: -@@ -511,7 +512,9 @@ char *format_to_str(wshort format) - 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"; - } diff --git a/changelog b/changelog deleted file mode 100644 index 8df8f65..0000000 --- a/changelog +++ /dev/null @@ -1,111 +0,0 @@ -* Sun Jan 19 2025 Fedora Release Engineering - 3.0.10-35 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Jul 26 2024 Miroslav Suchý - 3.0.10-34 -- convert license to SPDX - -* Sat Jul 20 2024 Fedora Release Engineering - 3.0.10-33 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jan 27 2024 Fedora Release Engineering - 3.0.10-32 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 3.0.10-31 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering - 3.0.10-30 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 3.0.10-29 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 3.0.10-28 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Oct 08 2021 Felix Kaechele - 3.0.10-27 -- add patch to support newer wavepack header versions (rhbz#1940701) - -* Fri Jul 23 2021 Fedora Release Engineering - 3.0.10-26 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 3.0.10-25 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 3.0.10-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Thu May 07 2020 Felix Kaechele - 3.0.10-23 -- Fix for rhbz#1833083 (shntool: cannot split 24-bit flac files) - -* Thu Jan 30 2020 Fedora Release Engineering - 3.0.10-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Jul 26 2019 Fedora Release Engineering - 3.0.10-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sat Feb 02 2019 Fedora Release Engineering - 3.0.10-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 20 2018 Felix Kaechele - 3.0.10-19 -- Add gcc BuildRequires - -* Sat Jul 14 2018 Fedora Release Engineering - 3.0.10-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Apr 17 2018 Leigh Scott - 3.0.10-17 -- Fix splitting large files at high bitrate -- Clean spec file - -* Fri Feb 09 2018 Fedora Release Engineering - 3.0.10-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 3.0.10-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 3.0.10-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 3.0.10-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Feb 04 2016 Fedora Release Engineering - 3.0.10-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 3.0.10-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Aug 18 2014 Fedora Release Engineering - 3.0.10-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 3.0.10-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun Sep 01 2013 Felix Kaechele - 3.0.10-8 -- run autoreconf during setup for aarch64 support - -* Sun Aug 04 2013 Fedora Release Engineering - 3.0.10-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu Feb 14 2013 Fedora Release Engineering - 3.0.10-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sat Jul 21 2012 Fedora Release Engineering - 3.0.10-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jan 14 2012 Fedora Release Engineering - 3.0.10-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Wed Feb 09 2011 Fedora Release Engineering - 3.0.10-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Sun Jul 26 2009 Fedora Release Engineering - 3.0.10-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu Apr 09 2009 Felix Kaechele - 3.0.10-1 -- 3.0.10 - -* Sun Mar 29 2009 Felix Kaechele - 3.0.9-1 -- 3.0.9 - -* Tue Mar 03 2009 Felix Kaechele - 3.0.8-1 -- initial build diff --git a/gcc-15-fixes.patch b/gcc-15-fixes.patch deleted file mode 100644 index 06d190b..0000000 --- a/gcc-15-fixes.patch +++ /dev/null @@ -1,90 +0,0 @@ -From 9b27cda17e20a733549763579b0734932ab68280 Mon Sep 17 00:00:00 2001 -From: Felix Kaechele -Date: Wed, 22 Jan 2025 20:53:32 -0500 -Subject: [PATCH] gcc 15 fixes - -Signed-off-by: Felix Kaechele ---- - include/format.h | 2 +- - include/mode.h | 2 +- - include/module-types.h | 5 ++--- - src/core_mode.c | 10 ++-------- - 4 files changed, 6 insertions(+), 13 deletions(-) - -diff --git a/include/format.h b/include/format.h -index 567993e805ba..ab293f8ae91d 100644 ---- a/include/format.h -+++ b/include/format.h -@@ -35,7 +35,7 @@ void tagcpy(unsigned char *,unsigned char *); - int tagcmp(unsigned char *,unsigned char *); - - /* function to check if a file name is about to be clobbered, and if so, asks whether this is OK */ --int clobber_check(char *); -+bool clobber_check(char *); - - /* find an output format module with the given name */ - format_module *find_format(char *); -diff --git a/include/mode.h b/include/mode.h -index a9c8cd003d04..fc13d4f16940 100644 ---- a/include/mode.h -+++ b/include/mode.h -@@ -78,7 +78,7 @@ void create_output_filename(char *,char *,char *); - FILE *open_output_stream(char *,proc_info *); - - /* function to determine if two filenames point to the same file */ --int files_are_identical(char *,char *); -+bool files_are_identical(char *,char *); - - /* function to remove a file if it exists */ - void remove_file(char *); -diff --git a/include/module-types.h b/include/module-types.h -index c49c6613bde2..2cabf64d3598 100644 ---- a/include/module-types.h -+++ b/include/module-types.h -@@ -23,6 +23,8 @@ - #ifndef __MODULE_TYPES_H__ - #define __MODULE_TYPES_H__ - -+#include -+ - #ifdef HAVE_CONFIG_H - #include "config.h" - #endif -@@ -44,9 +46,6 @@ - #define PATHSEPCHAR '/' - #endif - --/* boolean type */ --typedef int bool; -- - /* wtypes */ - typedef unsigned long wlong; - typedef unsigned short wshort; -diff --git a/src/core_mode.c b/src/core_mode.c -index 4585b8376668..3e0a60c92050 100644 ---- a/src/core_mode.c -+++ b/src/core_mode.c -@@ -564,18 +564,12 @@ static int compare_ascii(const wave_info **w1,const wave_info **w2) - - static void ascii_sort_files(wave_info **filenames, int numfiles) - { -- int (*cmpfunc) (); -- -- cmpfunc = compare_ascii; -- qsort(filenames,numfiles,sizeof(wave_info *),cmpfunc); -+ qsort(filenames,numfiles,sizeof(wave_info *),(int (*)(const void*, const void*))compare_ascii); - } - - static void version_sort_files(wave_info **filenames,int numfiles) - { -- int (*cmpfunc) (); -- -- cmpfunc = compare_version; -- qsort(filenames,numfiles,sizeof(wave_info *),cmpfunc); -+ qsort(filenames,numfiles,sizeof(wave_info *),(int (*)(const void*, const void*))compare_version); - } - - /* public functions */ --- -2.48.1 - diff --git a/large-size.patch b/large-size.patch deleted file mode 100644 index be1e354..0000000 --- a/large-size.patch +++ /dev/null @@ -1,29 +0,0 @@ -Last-Update: 2014-11-15 -Forwarded: yes -From: Adam Sampson -Bug-Debian: http://bugs.debian.org/684600 -Description: fix large files processing. - ---- a/src/core_fileio.c -+++ b/src/core_fileio.c -@@ -109,12 +109,18 @@ - - buf[4] = 0; - - if (be_val) -- *be_val = (buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | buf[3]; -+ *be_val = (((unsigned long)buf[0]) << 24) -+ | (((unsigned long)buf[1]) << 16) -+ | (((unsigned long)buf[2]) << 8) -+ | ((unsigned long)buf[3]); - - if (le_val) -- *le_val = (buf[3] << 24) | (buf[2] << 16) | (buf[1] << 8) | buf[0]; -+ *le_val = (((unsigned long)buf[3]) << 24) -+ | (((unsigned long)buf[2]) << 16) -+ | (((unsigned long)buf[1]) << 8) -+ | ((unsigned long)buf[0]); - - if (tag_val) - tagcpy(tag_val,buf); - diff --git a/large-times.patch b/large-times.patch deleted file mode 100644 index 5b51770..0000000 --- a/large-times.patch +++ /dev/null @@ -1,49 +0,0 @@ -Last-Update: 2014-11-15 -Forwarded: yes -From: Adam Sampson -Bug-Debian: http://bugs.debian.org/684600 -Description: fix large files processing. - ---- a/src/core_mode.c -+++ b/src/core_mode.c -@@ -309,10 +309,10 @@ - - if (sec >= 60) - st_error("invalid value for seconds: [%d]",sec); - -- bytes = (wlong)(min * info->rate * 60) + -- (wlong)(sec * info->rate); -+ bytes = (((wlong)min) * info->rate * 60) + -+ (((wlong)sec) * info->rate); - - return bytes; - } - -@@ -357,11 +357,11 @@ - - if (frames >= 75) - st_error("invalid value for frames: [%d]",frames); - -- bytes = (wlong)(min * CD_RATE * 60) + -- (wlong)(sec * CD_RATE) + -- (wlong)(frames * CD_BLOCK_SIZE); -+ bytes = (((wlong)min) * CD_RATE * 60) + -+ (((wlong)sec) * CD_RATE) + -+ (((wlong)frames) * CD_BLOCK_SIZE); - - return bytes; - } - -@@ -402,10 +402,10 @@ - st_error("invalid value for seconds: [%d]",sec); - - nearest_byte = (int)((((double)ms * (double)info->rate) / 1000.0) + 0.5); - -- bytes = (wlong)(min * info->rate * 60) + -- (wlong)(sec * info->rate); -+ bytes = (((wlong)min) * info->rate * 60) + -+ (((wlong)sec) * info->rate); - - if (PROB_NOT_CD(info)) { - bytes += nearest_byte; - } diff --git a/no-cdquality-check.patch b/no-cdquality-check.patch deleted file mode 100644 index 4ca3717..0000000 --- a/no-cdquality-check.patch +++ /dev/null @@ -1,21 +0,0 @@ -Last-Update: 2014-11-15 -Forwarded: yes -Author: Dmitry Smirnov -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)); diff --git a/shntool.spec b/shntool.spec index 083c96e..7d638a0 100644 --- a/shntool.spec +++ b/shntool.spec @@ -1,26 +1,15 @@ Name: shntool Version: 3.0.10 -Release: %autorelease +Release: 15%{?dist} Summary: A multi-purpose WAVE data processing and reporting utility -# Automatically converted from old format: GPLv2+ - review is highly recommended. -License: GPL-2.0-or-later -URL: http://shnutils.freeshell.org/shntool/ -Source0: http://shnutils.freeshell.org/shntool/dist/src/%{name}-%{version}.tar.gz +Group: Applications/Multimedia +License: GPLv2+ +URL: http://etree.org/shnutils/shntool +Source0: http://etree.org/shnutils/shntool/dist/src/%{name}-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -# Patches are from Debian -# https://sources.debian.org/patches/shntool/3.0.10-1/ -Patch0: large-size.patch -Patch1: large-times.patch -Patch2: no-cdquality-check.patch -Patch3: https://github.com/max619/shntool/commit/cfd06e4edecdca2013e0fe04db135fd110a68203.patch -Patch4: 0001-fix-valid-wavepack-header-versions.patch -Patch5: gcc-15-fixes.patch - -BuildRequires: make -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: gcc +BuildRequires: autoconf automake %description A multi-purpose WAVE data processing and reporting utility. File @@ -29,23 +18,79 @@ WAVE data, compressed or not - provided there exists a format module to handle that particular file type. %prep -%autosetup -p1 -autoreconf -fiv +%setup -q +autoreconf -f -i %build %configure -%make_build +make %{?_smp_mflags} + %install -%make_install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT + + +%clean +rm -rf $RPM_BUILD_ROOT + %files -%doc AUTHORS ChangeLog NEWS README +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README %doc doc/* -%license COPYING %{_bindir}/shn* -%{_mandir}/man1/%{name}.1.* +%{_mandir}/man1/%{name}.1.gz %changelog -%autochangelog +* Thu Aug 03 2017 Fedora Release Engineering - 3.0.10-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 3.0.10-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 3.0.10-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Feb 04 2016 Fedora Release Engineering - 3.0.10-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jun 19 2015 Fedora Release Engineering - 3.0.10-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon Aug 18 2014 Fedora Release Engineering - 3.0.10-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sun Jun 08 2014 Fedora Release Engineering - 3.0.10-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sun Sep 01 2013 Felix Kaechele - 3.0.10-8 +- run autoreconf during setup for aarch64 support + +* Sun Aug 04 2013 Fedora Release Engineering - 3.0.10-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Feb 14 2013 Fedora Release Engineering - 3.0.10-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sat Jul 21 2012 Fedora Release Engineering - 3.0.10-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jan 14 2012 Fedora Release Engineering - 3.0.10-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Wed Feb 09 2011 Fedora Release Engineering - 3.0.10-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Sun Jul 26 2009 Fedora Release Engineering - 3.0.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Thu Apr 09 2009 Felix Kaechele - 3.0.10-1 +- 3.0.10 + +* Sun Mar 29 2009 Felix Kaechele - 3.0.9-1 +- 3.0.9 + +* Tue Mar 03 2009 Felix Kaechele - 3.0.8-1 +- initial build