diff --git a/.gitignore b/.gitignore index 30f138e..6cdbec4 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,3 @@ /xwax-1.5.tar.gz /xwax-1.6.tar.gz /xwax-1.7.tar.gz -/xwax-1.8.tar.gz -/xwax-1.9.tar.gz -/xwax-1.10.tar.gz diff --git a/.packit.yaml b/.packit.yaml deleted file mode 100644 index 82bb099..0000000 --- a/.packit.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# See the documentation for more information: -# https://packit.dev/docs/configuration/ - -specfile_path: xwax.spec - -copy_upstream_release_description: false - -jobs: - - job: pull_from_upstream - trigger: release - dist_git_branches: - - fedora-all - - - job: koji_build - trigger: commit - allowed_committers: ['packit','all_admins'] - dist_git_branches: - - fedora-all - - - job: bodhi_update - trigger: commit - allowed_builders: ['packit','all_users'] - dist_git_branches: - - fedora-branched - diff --git a/changelog b/changelog deleted file mode 100644 index 212fc72..0000000 --- a/changelog +++ /dev/null @@ -1,129 +0,0 @@ -* Sat Jan 17 2026 Fedora Release Engineering - 1.9-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Fri Jul 25 2025 Fedora Release Engineering - 1.9-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sun Jan 19 2025 Fedora Release Engineering - 1.9-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Mon Jul 29 2024 Miroslav Suchý - 1.9-5 -- convert license to SPDX - -* Sat Jul 20 2024 Fedora Release Engineering - 1.9-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jan 27 2024 Fedora Release Engineering - 1.9-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 1.9-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Fri Jun 09 2023 Filipe Rosset - 1.9-1 -- Update to 1.9 fixes rhbz#2204460 - -* Sat Jan 21 2023 Fedora Release Engineering - 1.8-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 1.8-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 1.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Sep 29 2021 Filipe Rosset - 1.8-1 -- Update to 1.8, fixes rhbz#1974107 rhbz#1988055 and rhbz#1995356 - -* Fri Jul 23 2021 Fedora Release Engineering - 1.7-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Thu Jan 28 2021 Fedora Release Engineering - 1.7-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 1.7-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jan 31 2020 Fedora Release Engineering - 1.7-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jul 27 2019 Fedora Release Engineering - 1.7-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 1.7-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sun Sep 23 2018 Filipe Rosset - 1.7-4 -- rebuilt to fix FTBFS rhbz #1606762 and #1370846 + spec cleanup - -* Sat Jul 14 2018 Fedora Release Engineering - 1.7-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 1.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Sun Feb 04 2018 Filipe Rosset - 1.7-1 -- Rebuilt for new upstream version 1.7, fixes rhbz #1370846 - -* Thu Aug 03 2017 Fedora Release Engineering - 1.6-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 1.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 1.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Sun Dec 04 2016 Filipe Rosset - 1.6-1 -- Rebuilt for new upstream version 1.6, fixes rhbz #1370846 - -* Fri Feb 05 2016 Fedora Release Engineering - 1.5-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 1.5-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Aug 18 2014 Fedora Release Engineering - 1.5-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 1.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sat May 24 2014 Filipe Rosset - 1.5-2 -- Rebuilt for new upstream version, fixes rhbz #1063828 - -* Sun Aug 04 2013 Fedora Release Engineering - 1.2-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri Feb 15 2013 Fedora Release Engineering - 1.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sun Jul 22 2012 Fedora Release Engineering - 1.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Thu Jul 5 2012 John Brier 1.2-3 -- SPEC file fixes - -* Sun Jul 1 2012 John Brier 1.2-2 -- SPEC file fixes - -* Sun Jun 10 2012 John Brier 1.2-1 -- rebuild for new upstream version - -* Sun May 1 2011 John Brier 0.9-3 -- changed License from GPL to GPLv2 -- fixed inconsistent macros for build root -- fixed debuginfo package by adding configure macro in build - -* Thu Apr 28 2011 John Brier 0.9-2 -- Removed flac and vorbis-tools from Requires in favor of sox - as fallback decoder - -* Fri Apr 22 2011 John Brier 0.9-1 -- New upstream version 0.9 - -* Mon Apr 18 2011 John Brier 0.8-2 -- Changed summary and added flac, vorbis-tools, sox and cdparanoia - to Requires - -* Mon Apr 11 2011 John Brier 0.8-1 -- First RPM package of xwax for Fedora 14 diff --git a/sources b/sources index f2534a5..b0b98dc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xwax-1.10.tar.gz) = 16992935346a6866179356e539ef643346686825e297d854a42ddd76fd6d0829c07080efd37ce8f859a8028e0f206e58ebf1d71d4c8572a98eb235686c4d554d +SHA512 (xwax-1.7.tar.gz) = ab0fcaf32f1fd1d6b38323095524f1932a067a3d04d40e4b043993e360411fed0c4b78bb71662581b438cb1e3005bc21659db4521a6ec704994b2e8e1b7e62d4 diff --git a/xwax-1.6-import-sox.patch b/xwax-1.6-import-sox.patch new file mode 100644 index 0000000..10d89ab --- /dev/null +++ b/xwax-1.6-import-sox.patch @@ -0,0 +1,21 @@ +--- import.sox 2016-08-13 21:19:12.000000000 -0300 ++++ import 2016-12-04 19:39:16.952891500 -0200 +@@ -28,11 +28,14 @@ + *) + echo "Calling fallback decoder..." >&2 + +- FFMPEG=$(which ffmpeg 2> /dev/null || which avconv 2> /dev/null) +- ++ FFMPEG=$(which ffmpeg 2> /dev/null) + if [ -z "$FFMPEG" ]; then +- echo "$0: no ffmpeg or avconv available to decode file" >&2 +- exit 1 ++ FFMPEG=$(which avconv 2> /dev/null) ++ if [ -z "$FFMPEG" ]; then ++ FFMPEG=$(which sox 2> /dev/null) ++ echo "$0: no ffmpeg, avconv or sox available to decode file" >&2 ++ exit 1 ++ fi + fi + + exec "$FFMPEG" -v 0 -i "$FILE" -f s16le -ar "$RATE" - diff --git a/xwax-import.patch b/xwax-import.patch new file mode 100644 index 0000000..3088ad0 --- /dev/null +++ b/xwax-import.patch @@ -0,0 +1,11 @@ +--- xwax-0.9/import 2011-04-28 09:32:05.000000000 -0400 ++++ xwax-0.9/import.sox 2011-04-28 09:37:51.479272903 -0400 +@@ -27,7 +27,7 @@ + + *) + echo "Calling fallback decoder..." >&2 +- exec ffmpeg -v 0 -i "$FILE" -f s16le -ar "$RATE" - ++ exec sox --single-threaded "$FILE" -t raw -r "$RATE" -e signed -b 16 -c 2 - + ;; + + esac diff --git a/xwax.spec b/xwax.spec index 5a78dd3..8d95bbf 100644 --- a/xwax.spec +++ b/xwax.spec @@ -1,19 +1,19 @@ Name: xwax -Version: 1.10 -Release: %autorelease +Version: 1.7 +Release: 9%{?dist} Summary: Open source vinyl emulation software for Linux -License: GPL-3.0-only -URL: https://www.xwax.org -Source0: https://xwax.org/releases/%{name}-%{version}.tar.gz -ExcludeArch: %{ix86} -BuildRequires: alsa-lib-devel + +License: GPLv2 +URL: http://www.xwax.org +Source0: http://www.xwax.org/releases/%{name}-%{version}.tar.gz +# use sox as fallback decoder instead of ffmpeg for time being while we work out the best patch for Fedora +# http://sourceforge.net/mailarchive/forum.php?thread_name=4DB4E2E0.6080609%40redhat.com&forum_name=xwax-devel +Patch0: xwax-1.6-import-sox.patch + +BuildRequires: make BuildRequires: gcc -BuildRequires: jack-audio-connection-kit-devel -BuildRequires: make -BuildRequires: SDL2_ttf-devel -BuildRequires: sdl2-compat-devel -Requires: cdparanoia -Requires: sox +BuildRequires: SDL-devel SDL_ttf-devel jack-audio-connection-kit-devel +Requires: sox cdparanoia %description xwax is open-source vinyl emulation software for Linux. @@ -48,4 +48,93 @@ make ALSA=yes JACK=yes install PREFIX=%{buildroot}/%{_prefix} EXECDIR=%{buildroo %doc %{_mandir}/man1/xwax.1.gz %changelog -%autochangelog +* Thu Jan 28 2021 Fedora Release Engineering - 1.7-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 1.7-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jan 31 2020 Fedora Release Engineering - 1.7-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jul 27 2019 Fedora Release Engineering - 1.7-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 03 2019 Fedora Release Engineering - 1.7-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sun Sep 23 2018 Filipe Rosset - 1.7-4 +- rebuilt to fix FTBFS rhbz #1606762 and #1370846 + spec cleanup + +* Sat Jul 14 2018 Fedora Release Engineering - 1.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 1.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Sun Feb 04 2018 Filipe Rosset - 1.7-1 +- Rebuilt for new upstream version 1.7, fixes rhbz #1370846 + +* Thu Aug 03 2017 Fedora Release Engineering - 1.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 1.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 1.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Sun Dec 04 2016 Filipe Rosset - 1.6-1 +- Rebuilt for new upstream version 1.6, fixes rhbz #1370846 + +* Fri Feb 05 2016 Fedora Release Engineering - 1.5-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jun 19 2015 Fedora Release Engineering - 1.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon Aug 18 2014 Fedora Release Engineering - 1.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sun Jun 08 2014 Fedora Release Engineering - 1.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sat May 24 2014 Filipe Rosset - 1.5-2 +- Rebuilt for new upstream version, fixes rhbz #1063828 + +* Sun Aug 04 2013 Fedora Release Engineering - 1.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri Feb 15 2013 Fedora Release Engineering - 1.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sun Jul 22 2012 Fedora Release Engineering - 1.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Jul 5 2012 John Brier 1.2-3 +- SPEC file fixes + +* Sun Jul 1 2012 John Brier 1.2-2 +- SPEC file fixes + +* Sun Jun 10 2012 John Brier 1.2-1 +- rebuild for new upstream version + +* Sun May 1 2011 John Brier 0.9-3 +- changed License from GPL to GPLv2 +- fixed inconsistent macros for build root +- fixed debuginfo package by adding configure macro in build + +* Thu Apr 28 2011 John Brier 0.9-2 +- Removed flac and vorbis-tools from Requires in favor of sox + as fallback decoder + +* Fri Apr 22 2011 John Brier 0.9-1 +- New upstream version 0.9 + +* Mon Apr 18 2011 John Brier 0.8-2 +- Changed summary and added flac, vorbis-tools, sox and cdparanoia + to Requires + +* Mon Apr 11 2011 John Brier 0.8-1 +- First RPM package of xwax for Fedora 14