From 9a8226865a6af12741f21a940bf277639ddafa3c Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Fri, 9 May 2025 22:18:08 +0200 Subject: [PATCH 01/10] Fix strip_vfs. --- xmp-plugin-audacious-strip_vfs.patch | 16 ++++++++++++++++ xmp-plugin-audacious.spec | 9 +++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 xmp-plugin-audacious-strip_vfs.patch diff --git a/xmp-plugin-audacious-strip_vfs.patch b/xmp-plugin-audacious-strip_vfs.patch new file mode 100644 index 0000000..904adac --- /dev/null +++ b/xmp-plugin-audacious-strip_vfs.patch @@ -0,0 +1,16 @@ +diff --git a/src/audxmp.cpp b/src/audxmp.cpp +index 34d7ee5..ba736b8 100644 +--- a/src/audxmp.cpp ++++ b/src/audxmp.cpp +@@ -140,9 +140,9 @@ static void strip_vfs(char *s) { + val[0] = *(c + 1); + val[1] = *(c + 2); + val[2] = 0; +- *c++ = strtoul(val, NULL, 16); ++ *c = strtoul(val, NULL, 16); + len = strlen(c); +- memmove(c, c + 2, len - 1); ++ memmove(c+1, c + 3, len - 2); + } + } + } diff --git a/xmp-plugin-audacious.spec b/xmp-plugin-audacious.spec index 4551071..dcb0078 100644 --- a/xmp-plugin-audacious.spec +++ b/xmp-plugin-audacious.spec @@ -12,7 +12,7 @@ Name: xmp-plugin-audacious Version: 4.0.0.3.8 -Release: 0.3.20250325git%{shortcommit}%{?dist} +Release: 0.4.20250325git%{shortcommit}%{?dist} Summary: Multi-format module playback plugin for Audacious using libxmp Source: https://github.com/mschwendt/xmp-plugin-audacious/archive/%{commit}/%{name}-%{shortcommit}.tar.gz License: GPL-2.0-or-later @@ -22,6 +22,8 @@ BuildRequires: libtool automake autoconf gcc-c++ BuildRequires: audacious-devel >= 3.8 BuildRequires: libxmp-devel +Patch0: xmp-plugin-audacious-strip_vfs.patch + %description . @@ -57,7 +59,7 @@ and Amiga file packers including gzip, bzip2, SQSH, PowerPacker, etc. # just a guard pkg-config --print-variables audacious | grep ^plugin_dir -%setup -qn %{name}-%{commit} +%autosetup -n %{name}-%{commit} -p1 autoreconf -i %build @@ -73,6 +75,9 @@ make install DESTDIR=%{buildroot} #exclude %%{plugin_dir}/Input/*.la %changelog +* Fri May 09 2025 Michael Schwendt - 4.0.0.3.8-0.4.20250325git0320cfd +- Fix strip_vfs. + * Tue Mar 25 2025 Michael Schwendt - 4.0.0.3.8-0.3.20250325git0320cfd - Merge updated filename extensions list. From 11a7af8ce80613ef0b75b1524edc5748c612c526 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:57:48 +0000 Subject: [PATCH 02/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- xmp-plugin-audacious.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmp-plugin-audacious.spec b/xmp-plugin-audacious.spec index dcb0078..a4c7bb9 100644 --- a/xmp-plugin-audacious.spec +++ b/xmp-plugin-audacious.spec @@ -12,7 +12,7 @@ Name: xmp-plugin-audacious Version: 4.0.0.3.8 -Release: 0.4.20250325git%{shortcommit}%{?dist} +Release: 0.5.20250325git%{shortcommit}%{?dist} Summary: Multi-format module playback plugin for Audacious using libxmp Source: https://github.com/mschwendt/xmp-plugin-audacious/archive/%{commit}/%{name}-%{shortcommit}.tar.gz License: GPL-2.0-or-later @@ -75,6 +75,9 @@ make install DESTDIR=%{buildroot} #exclude %%{plugin_dir}/Input/*.la %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 4.0.0.3.8-0.5.20250325git0320cfd +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri May 09 2025 Michael Schwendt - 4.0.0.3.8-0.4.20250325git0320cfd - Fix strip_vfs. From 42c22267a67313965e90ba4812fa5502ee8b5ea4 Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Tue, 9 Sep 2025 23:09:18 +0200 Subject: [PATCH 03/10] Merge loop_count based fix for some files (e.g. XM) not ending anymore. Drop aging Obsoletes/Provides pair. --- xmp-plugin-audacious-strip_vfs.patch | 16 ---------------- xmp-plugin-audacious.spec | 15 +++++++-------- 2 files changed, 7 insertions(+), 24 deletions(-) delete mode 100644 xmp-plugin-audacious-strip_vfs.patch diff --git a/xmp-plugin-audacious-strip_vfs.patch b/xmp-plugin-audacious-strip_vfs.patch deleted file mode 100644 index 904adac..0000000 --- a/xmp-plugin-audacious-strip_vfs.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/src/audxmp.cpp b/src/audxmp.cpp -index 34d7ee5..ba736b8 100644 ---- a/src/audxmp.cpp -+++ b/src/audxmp.cpp -@@ -140,9 +140,9 @@ static void strip_vfs(char *s) { - val[0] = *(c + 1); - val[1] = *(c + 2); - val[2] = 0; -- *c++ = strtoul(val, NULL, 16); -+ *c = strtoul(val, NULL, 16); - len = strlen(c); -- memmove(c, c + 2, len - 1); -+ memmove(c+1, c + 3, len - 2); - } - } - } diff --git a/xmp-plugin-audacious.spec b/xmp-plugin-audacious.spec index a4c7bb9..280fe5d 100644 --- a/xmp-plugin-audacious.spec +++ b/xmp-plugin-audacious.spec @@ -1,5 +1,5 @@ -# 2025-03-25 -%global commit 0320cfd7e2784322af7075115cfdcc548ceebaeb +# 2025-09-09 +%global commit a5fbde82fd5ac017c9ef3c1a0bfdab46fe338d4c %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global plugin_dir %(%___build_pre; pkg-config --variable=plugin_dir audacious) @@ -12,7 +12,7 @@ Name: xmp-plugin-audacious Version: 4.0.0.3.8 -Release: 0.5.20250325git%{shortcommit}%{?dist} +Release: 0.6.20250909git%{shortcommit}%{?dist} Summary: Multi-format module playback plugin for Audacious using libxmp Source: https://github.com/mschwendt/xmp-plugin-audacious/archive/%{commit}/%{name}-%{shortcommit}.tar.gz License: GPL-2.0-or-later @@ -22,8 +22,6 @@ BuildRequires: libtool automake autoconf gcc-c++ BuildRequires: audacious-devel >= 3.8 BuildRequires: libxmp-devel -Patch0: xmp-plugin-audacious-strip_vfs.patch - %description . @@ -35,9 +33,6 @@ Summary: Multi-format module playback plugin for Audacious using libxmp %else Requires: audacious %endif -# added 2024-07-24 -Provides: xmp-plugin-audacious = %{version}-%{release} -Obsoletes: xmp-plugin-audacious < 4.0.0.3.8 %description -n audacious-plugins-xmp Audacious input plugin based on Extended Module Player (xmp) library. @@ -75,6 +70,10 @@ make install DESTDIR=%{buildroot} #exclude %%{plugin_dir}/Input/*.la %changelog +* Tue Sep 09 2025 Michael Schwendt - 4.0.0.3.8-0.6.20250909gita5fbde8 +- Merge loop_count based fix for some files (e.g. XM) not ending anymore. +- Drop aging Obsoletes/Provides pair. + * Fri Jul 25 2025 Fedora Release Engineering - 4.0.0.3.8-0.5.20250325git0320cfd - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From f9eaf0a0df5836cbdfdef4967fa104e652d33636 Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Tue, 9 Sep 2025 23:10:09 +0200 Subject: [PATCH 04/10] Merge loop_count based fix for some files (e.g. XM) not ending anymore. Drop aging Obsoletes/Provides pair. --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index f037e02..03f438a 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /xmp-plugin-audacious-4.0.0-c84a596.tar.gz /xmp-plugin-audacious-c84a596.tar.gz /xmp-plugin-audacious-0320cfd.tar.gz +/xmp-plugin-audacious-a5fbde8.tar.gz diff --git a/sources b/sources index 3ca100a..be917e6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xmp-plugin-audacious-0320cfd.tar.gz) = 921cf1228ea37a603bf231600c6b4063d15a8887aea7ce6a521bdf85d76b5cf205eef0b2f8dcfc482c0881d97992599987a3421d790f5443072550886907fc44 +SHA512 (xmp-plugin-audacious-a5fbde8.tar.gz) = 81f65993912c2db24b765ac8cc56721e9d4a3e2413a42ac03eaf4d57b697e7144adf68051077ceda68970af04328bdc07f75ccfd9a50fae2f68c5771a3240be0 From a389d28d2f795be0ca7340045a247e6adb15a8a1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:47:30 +0000 Subject: [PATCH 05/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- xmp-plugin-audacious.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmp-plugin-audacious.spec b/xmp-plugin-audacious.spec index 280fe5d..ace130f 100644 --- a/xmp-plugin-audacious.spec +++ b/xmp-plugin-audacious.spec @@ -12,7 +12,7 @@ Name: xmp-plugin-audacious Version: 4.0.0.3.8 -Release: 0.6.20250909git%{shortcommit}%{?dist} +Release: 0.7.20250909git%{shortcommit}%{?dist} Summary: Multi-format module playback plugin for Audacious using libxmp Source: https://github.com/mschwendt/xmp-plugin-audacious/archive/%{commit}/%{name}-%{shortcommit}.tar.gz License: GPL-2.0-or-later @@ -70,6 +70,9 @@ make install DESTDIR=%{buildroot} #exclude %%{plugin_dir}/Input/*.la %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 4.0.0.3.8-0.7.20250909gita5fbde8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Tue Sep 09 2025 Michael Schwendt - 4.0.0.3.8-0.6.20250909gita5fbde8 - Merge loop_count based fix for some files (e.g. XM) not ending anymore. - Drop aging Obsoletes/Provides pair. From d7e1ab8ebcc777e6544514e056e6f088e235f15d Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Wed, 20 May 2026 11:54:18 +0200 Subject: [PATCH 06/10] Rebuilt for new audacious (fixes rhbz#2476880) --- xmp-plugin-audacious.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmp-plugin-audacious.spec b/xmp-plugin-audacious.spec index ace130f..80d6098 100644 --- a/xmp-plugin-audacious.spec +++ b/xmp-plugin-audacious.spec @@ -12,7 +12,7 @@ Name: xmp-plugin-audacious Version: 4.0.0.3.8 -Release: 0.7.20250909git%{shortcommit}%{?dist} +Release: 0.8.20250909git%{shortcommit}%{?dist} Summary: Multi-format module playback plugin for Audacious using libxmp Source: https://github.com/mschwendt/xmp-plugin-audacious/archive/%{commit}/%{name}-%{shortcommit}.tar.gz License: GPL-2.0-or-later @@ -70,6 +70,9 @@ make install DESTDIR=%{buildroot} #exclude %%{plugin_dir}/Input/*.la %changelog +* Wed May 20 2026 Dominik Mierzejewski - 4.0.0.3.8-0.8.20250909gita5fbde8 +- Rebuilt for new audacious (fixes rhbz#2476880) + * Sat Jan 17 2026 Fedora Release Engineering - 4.0.0.3.8-0.7.20250909gita5fbde8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 3090c1993be3cc1291171a4616962d61fe2f8966 Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Sun, 7 Jun 2026 20:31:56 +0200 Subject: [PATCH 07/10] Rebuilt for Audacious 4.6.1 SONAMEs and plugin API version change --- xmp-plugin-audacious.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmp-plugin-audacious.spec b/xmp-plugin-audacious.spec index 80d6098..207fcc9 100644 --- a/xmp-plugin-audacious.spec +++ b/xmp-plugin-audacious.spec @@ -12,7 +12,7 @@ Name: xmp-plugin-audacious Version: 4.0.0.3.8 -Release: 0.8.20250909git%{shortcommit}%{?dist} +Release: 0.9.20250909git%{shortcommit}%{?dist} Summary: Multi-format module playback plugin for Audacious using libxmp Source: https://github.com/mschwendt/xmp-plugin-audacious/archive/%{commit}/%{name}-%{shortcommit}.tar.gz License: GPL-2.0-or-later @@ -70,6 +70,9 @@ make install DESTDIR=%{buildroot} #exclude %%{plugin_dir}/Input/*.la %changelog +* Sun Jun 07 2026 Michael Schwendt - 4.0.0.3.8-0.9.20250909gita5fbde8 +- Rebuilt for Audacious 4.6.1 SONAMEs and plugin API version change + * Wed May 20 2026 Dominik Mierzejewski - 4.0.0.3.8-0.8.20250909gita5fbde8 - Rebuilt for new audacious (fixes rhbz#2476880) From 7e15d680c9ae58923d09310e4a2a96611f0a1892 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 6 Jul 2026 13:42:42 +0200 Subject: [PATCH 08/10] RPM 6.1 changed %___build_pre macro - use %___build_pre_env instead. --- xmp-plugin-audacious.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xmp-plugin-audacious.spec b/xmp-plugin-audacious.spec index 207fcc9..2493ac7 100644 --- a/xmp-plugin-audacious.spec +++ b/xmp-plugin-audacious.spec @@ -2,7 +2,7 @@ %global commit a5fbde82fd5ac017c9ef3c1a0bfdab46fe338d4c %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global plugin_dir %(%___build_pre; pkg-config --variable=plugin_dir audacious) +%global plugin_dir %(%___build_pre_env; pkg-config --variable=plugin_dir audacious) %global aud_plugin_api %(grep '[ ]*#define[ ]*_AUD_PLUGIN_VERSION[ ]\\+' %{_includedir}/libaudcore/plugin.h 2>/dev/null | sed 's!.*_AUD_PLUGIN_VERSION[ ]*\\([0-9]\\+\\).*!\\1!') %if 0%{aud_plugin_api} > 0 @@ -12,7 +12,7 @@ Name: xmp-plugin-audacious Version: 4.0.0.3.8 -Release: 0.9.20250909git%{shortcommit}%{?dist} +Release: 0.9.20250909git%{shortcommit}.1%{?dist} Summary: Multi-format module playback plugin for Audacious using libxmp Source: https://github.com/mschwendt/xmp-plugin-audacious/archive/%{commit}/%{name}-%{shortcommit}.tar.gz License: GPL-2.0-or-later @@ -70,6 +70,9 @@ make install DESTDIR=%{buildroot} #exclude %%{plugin_dir}/Input/*.la %changelog +* Mon Jul 06 2026 Marcin Juszkiewicz - 4.0.0.3.8-0.9.20250909gita5fbde8.1 +- RPM 6.1 changed %___build_pre macro - use %___build_pre_env instead. + * Sun Jun 07 2026 Michael Schwendt - 4.0.0.3.8-0.9.20250909gita5fbde8 - Rebuilt for Audacious 4.6.1 SONAMEs and plugin API version change From 342d5407a3ab2450660387d731b29ddcbae1b829 Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Mon, 6 Jul 2026 15:04:55 +0200 Subject: [PATCH 09/10] bump minor release the right way --- xmp-plugin-audacious.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xmp-plugin-audacious.spec b/xmp-plugin-audacious.spec index 2493ac7..759cb74 100644 --- a/xmp-plugin-audacious.spec +++ b/xmp-plugin-audacious.spec @@ -12,7 +12,7 @@ Name: xmp-plugin-audacious Version: 4.0.0.3.8 -Release: 0.9.20250909git%{shortcommit}.1%{?dist} +Release: 0.10.20250909git%{shortcommit}%{?dist} Summary: Multi-format module playback plugin for Audacious using libxmp Source: https://github.com/mschwendt/xmp-plugin-audacious/archive/%{commit}/%{name}-%{shortcommit}.tar.gz License: GPL-2.0-or-later @@ -70,7 +70,7 @@ make install DESTDIR=%{buildroot} #exclude %%{plugin_dir}/Input/*.la %changelog -* Mon Jul 06 2026 Marcin Juszkiewicz - 4.0.0.3.8-0.9.20250909gita5fbde8.1 +* Mon Jul 06 2026 Marcin Juszkiewicz - 4.0.0.3.8-0.10.20250909gita5fbde8 - RPM 6.1 changed %___build_pre macro - use %___build_pre_env instead. * Sun Jun 07 2026 Michael Schwendt - 4.0.0.3.8-0.9.20250909gita5fbde8 From 2dfe125c0effa9cc0b37d350e8fc455cd48ed8e7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:20:09 +0000 Subject: [PATCH 10/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- xmp-plugin-audacious.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmp-plugin-audacious.spec b/xmp-plugin-audacious.spec index 759cb74..38f9f51 100644 --- a/xmp-plugin-audacious.spec +++ b/xmp-plugin-audacious.spec @@ -12,7 +12,7 @@ Name: xmp-plugin-audacious Version: 4.0.0.3.8 -Release: 0.10.20250909git%{shortcommit}%{?dist} +Release: 0.11.20250909git%{shortcommit}%{?dist} Summary: Multi-format module playback plugin for Audacious using libxmp Source: https://github.com/mschwendt/xmp-plugin-audacious/archive/%{commit}/%{name}-%{shortcommit}.tar.gz License: GPL-2.0-or-later @@ -70,6 +70,9 @@ make install DESTDIR=%{buildroot} #exclude %%{plugin_dir}/Input/*.la %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 4.0.0.3.8-0.11.20250909gita5fbde8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Mon Jul 06 2026 Marcin Juszkiewicz - 4.0.0.3.8-0.10.20250909gita5fbde8 - RPM 6.1 changed %___build_pre macro - use %___build_pre_env instead.