From 45c9daa1c3830e66eb98e9a00dced1614cf1e00a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 04:24:56 +0000 Subject: [PATCH 01/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 9742550..7c30be0 100644 --- a/xmp-plugin-audacious.spec +++ b/xmp-plugin-audacious.spec @@ -10,7 +10,7 @@ Name: xmp-plugin-audacious Version: 4.0.0 -Release: 0.21.20160922git%{shortcommit}%{?dist} +Release: 0.22.20160922git%{shortcommit}%{?dist} Summary: Multi-format module playback plugin for Audacious using libxmp #Source0: https://github.com/cmatsuoka/%{name}/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz # C++ usage in Audacious 3.6 required a larger rewrite: @@ -67,6 +67,9 @@ make install DESTDIR=%{buildroot} %exclude %{plugin_dir}/Input/*.la %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 4.0.0-0.22.20160922git637d1e0 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 03 2019 Fedora Release Engineering - 4.0.0-0.21.20160922git637d1e0 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 443404da2c77ea02d2bafbec6ca6a7b807259cf7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 04:40:04 +0000 Subject: [PATCH 02/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 7c30be0..17eb85e 100644 --- a/xmp-plugin-audacious.spec +++ b/xmp-plugin-audacious.spec @@ -10,7 +10,7 @@ Name: xmp-plugin-audacious Version: 4.0.0 -Release: 0.22.20160922git%{shortcommit}%{?dist} +Release: 0.23.20160922git%{shortcommit}%{?dist} Summary: Multi-format module playback plugin for Audacious using libxmp #Source0: https://github.com/cmatsuoka/%{name}/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz # C++ usage in Audacious 3.6 required a larger rewrite: @@ -67,6 +67,9 @@ make install DESTDIR=%{buildroot} %exclude %{plugin_dir}/Input/*.la %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 4.0.0-0.23.20160922git637d1e0 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Jul 27 2019 Fedora Release Engineering - 4.0.0-0.22.20160922git637d1e0 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 1781721db57f368791864f757821c0dbbbae78b3 Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Thu, 4 Jun 2020 09:52:20 +0200 Subject: [PATCH 03/32] Escape macros in spec file comments. --- xmp-plugin-audacious.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/xmp-plugin-audacious.spec b/xmp-plugin-audacious.spec index 17eb85e..4a9eb9a 100644 --- a/xmp-plugin-audacious.spec +++ b/xmp-plugin-audacious.spec @@ -10,9 +10,9 @@ Name: xmp-plugin-audacious Version: 4.0.0 -Release: 0.23.20160922git%{shortcommit}%{?dist} +Release: 0.24.20160922git%{shortcommit}%{?dist} Summary: Multi-format module playback plugin for Audacious using libxmp -#Source0: https://github.com/cmatsuoka/%{name}/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz +#Source0: https://github.com/cmatsuoka/%%{name}/archive/%%{commit}/%%{name}-%%{version}-%%{shortcommit}.tar.gz # C++ usage in Audacious 3.6 required a larger rewrite: # https://github.com/mschwendt/xmp-plugin-audacious # git clone https://github.com/mschwendt/xmp-plugin-audacious.git xmp-plugin-audacious-4.0.0 ; cd xmp-plugin-audacious-4.0.0 @@ -50,7 +50,7 @@ This package contains the xmp plugin for the Audacious media player. # just a guard pkg-config --print-variables audacious | grep ^plugin_dir -#setup -qn %{name}-%{commit} +#setup -qn %%{name}-%%{commit} %setup -qn %{name}-%{version} autoreconf -i @@ -67,6 +67,9 @@ make install DESTDIR=%{buildroot} %exclude %{plugin_dir}/Input/*.la %changelog +* Thu Jun 4 2020 Michael Schwendt - 4.0.0-0.24.20160922git637d1e0 +- Escape macros in spec file comments. + * Fri Jan 31 2020 Fedora Release Engineering - 4.0.0-0.23.20160922git637d1e0 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 5f0d59c5aa100de0ae36089179a33ed541a61473 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 14:53:30 +0000 Subject: [PATCH 04/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 4a9eb9a..d499432 100644 --- a/xmp-plugin-audacious.spec +++ b/xmp-plugin-audacious.spec @@ -10,7 +10,7 @@ Name: xmp-plugin-audacious Version: 4.0.0 -Release: 0.24.20160922git%{shortcommit}%{?dist} +Release: 0.25.20160922git%{shortcommit}%{?dist} Summary: Multi-format module playback plugin for Audacious using libxmp #Source0: https://github.com/cmatsuoka/%%{name}/archive/%%{commit}/%%{name}-%%{version}-%%{shortcommit}.tar.gz # C++ usage in Audacious 3.6 required a larger rewrite: @@ -67,6 +67,9 @@ make install DESTDIR=%{buildroot} %exclude %{plugin_dir}/Input/*.la %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 4.0.0-0.25.20160922git637d1e0 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Thu Jun 4 2020 Michael Schwendt - 4.0.0-0.24.20160922git637d1e0 - Escape macros in spec file comments. From 303b9866936eb100482659c7df2873738782db54 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 01:34:12 +0000 Subject: [PATCH 05/32] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- xmp-plugin-audacious.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xmp-plugin-audacious.spec b/xmp-plugin-audacious.spec index d499432..2cc57cc 100644 --- a/xmp-plugin-audacious.spec +++ b/xmp-plugin-audacious.spec @@ -20,6 +20,7 @@ Summary: Multi-format module playback plugin for Audacious using libxmp Source0: %{name}-%{version}-%{shortcommit}.tar.gz License: GPLv2+ URL: http://xmp.sourceforge.net/ +BuildRequires: make BuildRequires: libtool automake autoconf gcc-c++ BuildRequires: audacious-devel >= 3.8 BuildRequires: libxmp-devel From 08526dc6b09edef90a15b707dd764a239cb1fd05 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 28 Jan 2021 00:12:53 +0000 Subject: [PATCH 06/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 2cc57cc..2225c25 100644 --- a/xmp-plugin-audacious.spec +++ b/xmp-plugin-audacious.spec @@ -10,7 +10,7 @@ Name: xmp-plugin-audacious Version: 4.0.0 -Release: 0.25.20160922git%{shortcommit}%{?dist} +Release: 0.26.20160922git%{shortcommit}%{?dist} Summary: Multi-format module playback plugin for Audacious using libxmp #Source0: https://github.com/cmatsuoka/%%{name}/archive/%%{commit}/%%{name}-%%{version}-%%{shortcommit}.tar.gz # C++ usage in Audacious 3.6 required a larger rewrite: @@ -68,6 +68,9 @@ make install DESTDIR=%{buildroot} %exclude %{plugin_dir}/Input/*.la %changelog +* Thu Jan 28 2021 Fedora Release Engineering - 4.0.0-0.26.20160922git637d1e0 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 4.0.0-0.25.20160922git637d1e0 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 79b6bd81a4f91d6be4e5134902497bb05db19109 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 21:45:57 +0000 Subject: [PATCH 07/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 2225c25..d5cdb39 100644 --- a/xmp-plugin-audacious.spec +++ b/xmp-plugin-audacious.spec @@ -10,7 +10,7 @@ Name: xmp-plugin-audacious Version: 4.0.0 -Release: 0.26.20160922git%{shortcommit}%{?dist} +Release: 0.27.20160922git%{shortcommit}%{?dist} Summary: Multi-format module playback plugin for Audacious using libxmp #Source0: https://github.com/cmatsuoka/%%{name}/archive/%%{commit}/%%{name}-%%{version}-%%{shortcommit}.tar.gz # C++ usage in Audacious 3.6 required a larger rewrite: @@ -68,6 +68,9 @@ make install DESTDIR=%{buildroot} %exclude %{plugin_dir}/Input/*.la %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 4.0.0-0.27.20160922git637d1e0 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Thu Jan 28 2021 Fedora Release Engineering - 4.0.0-0.26.20160922git637d1e0 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From b4754189ecbf43558b150b0786cb8009c0b1bc49 Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Mon, 26 Jul 2021 13:44:23 +0200 Subject: [PATCH 08/32] Fix build for libxmp 4.5.0 EXPORT --> LIBXMP_EXPORT. --- xmp-plugin-audacious-4.0.0-EXPORT.patch | 12 ++++++++++++ xmp-plugin-audacious.spec | 12 +++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 xmp-plugin-audacious-4.0.0-EXPORT.patch diff --git a/xmp-plugin-audacious-4.0.0-EXPORT.patch b/xmp-plugin-audacious-4.0.0-EXPORT.patch new file mode 100644 index 0000000..f89cebb --- /dev/null +++ b/xmp-plugin-audacious-4.0.0-EXPORT.patch @@ -0,0 +1,12 @@ +diff -Naur xmp-plugin-audacious-4.0.0-orig/src/audxmp.cpp xmp-plugin-audacious-4.0.0/src/audxmp.cpp +--- xmp-plugin-audacious-4.0.0-orig/src/audxmp.cpp 2016-09-22 22:40:57.000000000 +0200 ++++ xmp-plugin-audacious-4.0.0/src/audxmp.cpp 2021-07-26 12:42:04.557623911 +0200 +@@ -80,7 +80,7 @@ + bool play(const char *filename, VFSFile &file); + }; + +-EXPORT AudXMP aud_plugin_instance; ++LIBXMP_EXPORT AudXMP aud_plugin_instance; + + const char AudXMP::about[] = + "Extended Module Player " XMP_VERSION "\n" diff --git a/xmp-plugin-audacious.spec b/xmp-plugin-audacious.spec index d5cdb39..8063b6d 100644 --- a/xmp-plugin-audacious.spec +++ b/xmp-plugin-audacious.spec @@ -10,7 +10,7 @@ Name: xmp-plugin-audacious Version: 4.0.0 -Release: 0.27.20160922git%{shortcommit}%{?dist} +Release: 0.28.20160922git%{shortcommit}%{?dist} Summary: Multi-format module playback plugin for Audacious using libxmp #Source0: https://github.com/cmatsuoka/%%{name}/archive/%%{commit}/%%{name}-%%{version}-%%{shortcommit}.tar.gz # C++ usage in Audacious 3.6 required a larger rewrite: @@ -31,6 +31,9 @@ Requires: audacious %endif Provides: audacious-plugin-xmp = %{version}-%{release} +# needed for libxmp >= 4.5.0 +Patch1: xmp-plugin-audacious-4.0.0-EXPORT.patch + %description Libxmp is a library that renders module files to PCM data. It supports @@ -55,6 +58,10 @@ pkg-config --print-variables audacious | grep ^plugin_dir %setup -qn %{name}-%{version} autoreconf -i +%if 0%{?fedora} >= 34 +%patch1 -p1 -b .EXPORT +%endif + %build %configure make OPTFLAGS="%{optflags}" V=1 %{?_smp_mflags} @@ -68,6 +75,9 @@ make install DESTDIR=%{buildroot} %exclude %{plugin_dir}/Input/*.la %changelog +* Mon Jul 26 2021 Michael Schwendt - 4.0.0-0.28.20160922git +- Fix build for libxmp 4.5.0 EXPORT --> LIBXMP_EXPORT. + * Fri Jul 23 2021 Fedora Release Engineering - 4.0.0-0.27.20160922git637d1e0 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 9c1a6cc2638120d1c24f8b7b095d5518b004516f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 05:18:42 +0000 Subject: [PATCH 09/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 8063b6d..4f4025d 100644 --- a/xmp-plugin-audacious.spec +++ b/xmp-plugin-audacious.spec @@ -10,7 +10,7 @@ Name: xmp-plugin-audacious Version: 4.0.0 -Release: 0.28.20160922git%{shortcommit}%{?dist} +Release: 0.29.20160922git%{shortcommit}%{?dist} Summary: Multi-format module playback plugin for Audacious using libxmp #Source0: https://github.com/cmatsuoka/%%{name}/archive/%%{commit}/%%{name}-%%{version}-%%{shortcommit}.tar.gz # C++ usage in Audacious 3.6 required a larger rewrite: @@ -75,6 +75,9 @@ make install DESTDIR=%{buildroot} %exclude %{plugin_dir}/Input/*.la %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 4.0.0-0.29.20160922git637d1e0 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Mon Jul 26 2021 Michael Schwendt - 4.0.0-0.28.20160922git - Fix build for libxmp 4.5.0 EXPORT --> LIBXMP_EXPORT. From e0492f2326542d0f2209ad8136b441fef3c6decd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 13:20:45 +0000 Subject: [PATCH 10/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 4f4025d..1f5f92f 100644 --- a/xmp-plugin-audacious.spec +++ b/xmp-plugin-audacious.spec @@ -10,7 +10,7 @@ Name: xmp-plugin-audacious Version: 4.0.0 -Release: 0.29.20160922git%{shortcommit}%{?dist} +Release: 0.30.20160922git%{shortcommit}%{?dist} Summary: Multi-format module playback plugin for Audacious using libxmp #Source0: https://github.com/cmatsuoka/%%{name}/archive/%%{commit}/%%{name}-%%{version}-%%{shortcommit}.tar.gz # C++ usage in Audacious 3.6 required a larger rewrite: @@ -75,6 +75,9 @@ make install DESTDIR=%{buildroot} %exclude %{plugin_dir}/Input/*.la %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 4.0.0-0.30.20160922git637d1e0 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 4.0.0-0.29.20160922git637d1e0 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 0bdd00e50690b4f5484713b7231a0d63a29757ae Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 07:41:02 +0000 Subject: [PATCH 11/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 1f5f92f..48a70e6 100644 --- a/xmp-plugin-audacious.spec +++ b/xmp-plugin-audacious.spec @@ -10,7 +10,7 @@ Name: xmp-plugin-audacious Version: 4.0.0 -Release: 0.30.20160922git%{shortcommit}%{?dist} +Release: 0.31.20160922git%{shortcommit}%{?dist} Summary: Multi-format module playback plugin for Audacious using libxmp #Source0: https://github.com/cmatsuoka/%%{name}/archive/%%{commit}/%%{name}-%%{version}-%%{shortcommit}.tar.gz # C++ usage in Audacious 3.6 required a larger rewrite: @@ -75,6 +75,9 @@ make install DESTDIR=%{buildroot} %exclude %{plugin_dir}/Input/*.la %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 4.0.0-0.31.20160922git637d1e0 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 4.0.0-0.30.20160922git637d1e0 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 2e6ef28b9a7fa64ce3c1734eb9990b93ed26a367 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 19:04:49 +0000 Subject: [PATCH 12/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 48a70e6..ba5c2a7 100644 --- a/xmp-plugin-audacious.spec +++ b/xmp-plugin-audacious.spec @@ -10,7 +10,7 @@ Name: xmp-plugin-audacious Version: 4.0.0 -Release: 0.31.20160922git%{shortcommit}%{?dist} +Release: 0.32.20160922git%{shortcommit}%{?dist} Summary: Multi-format module playback plugin for Audacious using libxmp #Source0: https://github.com/cmatsuoka/%%{name}/archive/%%{commit}/%%{name}-%%{version}-%%{shortcommit}.tar.gz # C++ usage in Audacious 3.6 required a larger rewrite: @@ -75,6 +75,9 @@ make install DESTDIR=%{buildroot} %exclude %{plugin_dir}/Input/*.la %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 4.0.0-0.32.20160922git637d1e0 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 4.0.0-0.31.20160922git637d1e0 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 6509eecf4ebab98f24a6f73884c94df4586962da Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 09:55:37 +0000 Subject: [PATCH 13/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_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 ba5c2a7..cd0109e 100644 --- a/xmp-plugin-audacious.spec +++ b/xmp-plugin-audacious.spec @@ -10,7 +10,7 @@ Name: xmp-plugin-audacious Version: 4.0.0 -Release: 0.32.20160922git%{shortcommit}%{?dist} +Release: 0.33.20160922git%{shortcommit}%{?dist} Summary: Multi-format module playback plugin for Audacious using libxmp #Source0: https://github.com/cmatsuoka/%%{name}/archive/%%{commit}/%%{name}-%%{version}-%%{shortcommit}.tar.gz # C++ usage in Audacious 3.6 required a larger rewrite: @@ -75,6 +75,9 @@ make install DESTDIR=%{buildroot} %exclude %{plugin_dir}/Input/*.la %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 4.0.0-0.33.20160922git637d1e0 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 4.0.0-0.32.20160922git637d1e0 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 5dd4097a485e9e0e55b3b1a2649c8a8af5af3159 Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:50 +0200 Subject: [PATCH 14/32] Eliminate use of obsolete %patchN syntax (#2283636) --- xmp-plugin-audacious.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmp-plugin-audacious.spec b/xmp-plugin-audacious.spec index cd0109e..0669df8 100644 --- a/xmp-plugin-audacious.spec +++ b/xmp-plugin-audacious.spec @@ -59,7 +59,7 @@ pkg-config --print-variables audacious | grep ^plugin_dir autoreconf -i %if 0%{?fedora} >= 34 -%patch1 -p1 -b .EXPORT +%patch -P1 -p1 -b .EXPORT %endif %build From bd0f09c1082e1ab3d080823f41c85079c6b7f2db Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Tue, 11 Jun 2024 23:09:32 +0200 Subject: [PATCH 15/32] Fix settings on right side of dialog. --- .gitignore | 1 + sources | 2 +- xmp-plugin-audacious-4.0.0-EXPORT.patch | 12 ------------ xmp-plugin-audacious.spec | 16 ++++++---------- 4 files changed, 8 insertions(+), 23 deletions(-) delete mode 100644 xmp-plugin-audacious-4.0.0-EXPORT.patch diff --git a/.gitignore b/.gitignore index bfaea9d..73045c3 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /xmp-plugin-audacious-4.0.0-ff91487.tar.gz /xmp-plugin-audacious-4.0.0-7a354bb.tar.gz /xmp-plugin-audacious-4.0.0-637d1e0.tar.gz +/xmp-plugin-audacious-4.0.0-c84a596.tar.gz diff --git a/sources b/sources index 5498c93..3df0f29 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a014dbffe9df71058d3a237308bfcad3 xmp-plugin-audacious-4.0.0-637d1e0.tar.gz +SHA512 (xmp-plugin-audacious-4.0.0-c84a596.tar.gz) = ba30ad16a8f00b78bcec01d778bc205e7863f3b872c7990feaf1377b788e9c66bc3ae9fd2f3e8f21e2f2b743c37ef13354011ca3d5a8869b692e4e7deafa8b02 diff --git a/xmp-plugin-audacious-4.0.0-EXPORT.patch b/xmp-plugin-audacious-4.0.0-EXPORT.patch deleted file mode 100644 index f89cebb..0000000 --- a/xmp-plugin-audacious-4.0.0-EXPORT.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur xmp-plugin-audacious-4.0.0-orig/src/audxmp.cpp xmp-plugin-audacious-4.0.0/src/audxmp.cpp ---- xmp-plugin-audacious-4.0.0-orig/src/audxmp.cpp 2016-09-22 22:40:57.000000000 +0200 -+++ xmp-plugin-audacious-4.0.0/src/audxmp.cpp 2021-07-26 12:42:04.557623911 +0200 -@@ -80,7 +80,7 @@ - bool play(const char *filename, VFSFile &file); - }; - --EXPORT AudXMP aud_plugin_instance; -+LIBXMP_EXPORT AudXMP aud_plugin_instance; - - const char AudXMP::about[] = - "Extended Module Player " XMP_VERSION "\n" diff --git a/xmp-plugin-audacious.spec b/xmp-plugin-audacious.spec index 0669df8..ef9d3ea 100644 --- a/xmp-plugin-audacious.spec +++ b/xmp-plugin-audacious.spec @@ -1,4 +1,4 @@ -%global commit 637d1e009c09cd549a1114c2cb2fe37fd11235db +%global commit c84a596ce6ee653a326c35f98252fbe7d25c4305 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global plugin_dir %(pkg-config --variable=plugin_dir audacious) @@ -10,7 +10,7 @@ Name: xmp-plugin-audacious Version: 4.0.0 -Release: 0.33.20160922git%{shortcommit}%{?dist} +Release: 0.34.20240611git%{shortcommit}%{?dist} Summary: Multi-format module playback plugin for Audacious using libxmp #Source0: https://github.com/cmatsuoka/%%{name}/archive/%%{commit}/%%{name}-%%{version}-%%{shortcommit}.tar.gz # C++ usage in Audacious 3.6 required a larger rewrite: @@ -31,9 +31,6 @@ Requires: audacious %endif Provides: audacious-plugin-xmp = %{version}-%{release} -# needed for libxmp >= 4.5.0 -Patch1: xmp-plugin-audacious-4.0.0-EXPORT.patch - %description Libxmp is a library that renders module files to PCM data. It supports @@ -58,10 +55,6 @@ pkg-config --print-variables audacious | grep ^plugin_dir %setup -qn %{name}-%{version} autoreconf -i -%if 0%{?fedora} >= 34 -%patch -P1 -p1 -b .EXPORT -%endif - %build %configure make OPTFLAGS="%{optflags}" V=1 %{?_smp_mflags} @@ -72,9 +65,12 @@ make install DESTDIR=%{buildroot} %files %license COPYING %{plugin_dir}/Input/*.so -%exclude %{plugin_dir}/Input/*.la +#exclude %%{plugin_dir}/Input/*.la %changelog +* Tue Jun 11 2024 Michael Schwendt - 4.0.0-0.34.20240611gitc84a596c +- Fix settings on right side of dialog. + * Sat Jan 27 2024 Fedora Release Engineering - 4.0.0-0.33.20160922git637d1e0 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 2ec6255416de9fbe794a9049401942c50fcadc50 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:16:27 +0000 Subject: [PATCH 16/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_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 ef9d3ea..21f517c 100644 --- a/xmp-plugin-audacious.spec +++ b/xmp-plugin-audacious.spec @@ -10,7 +10,7 @@ Name: xmp-plugin-audacious Version: 4.0.0 -Release: 0.34.20240611git%{shortcommit}%{?dist} +Release: 0.35.20240611git%{shortcommit}%{?dist} Summary: Multi-format module playback plugin for Audacious using libxmp #Source0: https://github.com/cmatsuoka/%%{name}/archive/%%{commit}/%%{name}-%%{version}-%%{shortcommit}.tar.gz # C++ usage in Audacious 3.6 required a larger rewrite: @@ -68,6 +68,9 @@ make install DESTDIR=%{buildroot} #exclude %%{plugin_dir}/Input/*.la %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 4.0.0-0.35.20240611gitc84a596 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Jun 11 2024 Michael Schwendt - 4.0.0-0.34.20240611gitc84a596c - Fix settings on right side of dialog. From 8ae166f214ea0dacaf7805a3a680e97aaf406af1 Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Wed, 24 Jul 2024 19:09:11 +0200 Subject: [PATCH 17/32] Clean up snapshot stuff, and build audacious-plugins-xmp package. --- .gitignore | 1 + sources | 2 +- xmp-plugin-audacious.spec | 38 +++++++++++++++++++++++--------------- 3 files changed, 25 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 73045c3..d885465 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /xmp-plugin-audacious-4.0.0-7a354bb.tar.gz /xmp-plugin-audacious-4.0.0-637d1e0.tar.gz /xmp-plugin-audacious-4.0.0-c84a596.tar.gz +/xmp-plugin-audacious-c84a596.tar.gz diff --git a/sources b/sources index 3df0f29..47b7952 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xmp-plugin-audacious-4.0.0-c84a596.tar.gz) = ba30ad16a8f00b78bcec01d778bc205e7863f3b872c7990feaf1377b788e9c66bc3ae9fd2f3e8f21e2f2b743c37ef13354011ca3d5a8869b692e4e7deafa8b02 +SHA512 (xmp-plugin-audacious-c84a596.tar.gz) = 7fd787888ff4d3b7a658b4c5dff6a1e350b97387623cfc44c2f2a43bf91f0682f2959ad73e0eacb08e22b08cabd0586e34052cff122cc5a9375decb385b49d47 diff --git a/xmp-plugin-audacious.spec b/xmp-plugin-audacious.spec index 21f517c..3ea4f21 100644 --- a/xmp-plugin-audacious.spec +++ b/xmp-plugin-audacious.spec @@ -1,3 +1,4 @@ +# 2024-06-11 %global commit c84a596ce6ee653a326c35f98252fbe7d25c4305 %global shortcommit %(c=%{commit}; echo ${c:0:7}) @@ -8,31 +9,37 @@ %global aud_plugin_dep Requires: audacious(plugin-api)%{?_isa} = %{aud_plugin_api} %endif + Name: xmp-plugin-audacious -Version: 4.0.0 -Release: 0.35.20240611git%{shortcommit}%{?dist} +Version: 4.0.0.3.8 +Release: 0.1.20240611git%{shortcommit}%{?dist} Summary: Multi-format module playback plugin for Audacious using libxmp -#Source0: https://github.com/cmatsuoka/%%{name}/archive/%%{commit}/%%{name}-%%{version}-%%{shortcommit}.tar.gz -# C++ usage in Audacious 3.6 required a larger rewrite: -# https://github.com/mschwendt/xmp-plugin-audacious -# git clone https://github.com/mschwendt/xmp-plugin-audacious.git xmp-plugin-audacious-4.0.0 ; cd xmp-plugin-audacious-4.0.0 -# git checkout -b 637d1e009c09cd549a1114c2cb2fe37fd11235db ; rm -rf .git* -Source0: %{name}-%{version}-%{shortcommit}.tar.gz -License: GPLv2+ +Source: https://github.com/mschwendt/xmp-plugin-audacious/archive/%%{commit}/%%{name}-%%{shortcommit}.tar.gz +License: GPL-2.0+ URL: http://xmp.sourceforge.net/ BuildRequires: make BuildRequires: libtool automake autoconf gcc-c++ BuildRequires: audacious-devel >= 3.8 BuildRequires: libxmp-devel + +%description +. + + +%package -n audacious-plugins-xmp +Summary: Multi-format module playback plugin for Audacious using libxmp %if 0%{?fedora} %{?aud_plugin_dep} %else Requires: audacious %endif -Provides: audacious-plugin-xmp = %{version}-%{release} +# 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. -%description Libxmp is a library that renders module files to PCM data. It supports over 90 mainstream and obscure module formats including Protracker (MOD), Scream Tracker 3 (S3M), Fast Tracker II (XM), and Impulse Tracker (IT). @@ -40,7 +47,6 @@ Scream Tracker 3 (S3M), Fast Tracker II (XM), and Impulse Tracker (IT). Many compressed module formats are supported, including popular Unix, DOS, and Amiga file packers including gzip, bzip2, SQSH, PowerPacker, etc. -This package contains the xmp plugin for the Audacious media player. %prep %if 0%{?fedora} @@ -51,8 +57,7 @@ This package contains the xmp plugin for the Audacious media player. # just a guard pkg-config --print-variables audacious | grep ^plugin_dir -#setup -qn %%{name}-%%{commit} -%setup -qn %{name}-%{version} +%setup -qn %{name}-%{commit} autoreconf -i %build @@ -62,12 +67,15 @@ make OPTFLAGS="%{optflags}" V=1 %{?_smp_mflags} %install make install DESTDIR=%{buildroot} -%files +%files -n audacious-plugins-xmp %license COPYING %{plugin_dir}/Input/*.so #exclude %%{plugin_dir}/Input/*.la %changelog +* Wed Jul 24 2024 Michael Schwendt - 4.0.0.3.8-0.1.20240611gitc84a596c +- Clean up snapshot stuff, and build audacious-plugins-xmp package. + * Sat Jul 20 2024 Fedora Release Engineering - 4.0.0-0.35.20240611gitc84a596 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 6164d9dc2d66a1c561522d91e615d5d043bd7c9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 29 Jul 2024 06:29:20 +0000 Subject: [PATCH 18/32] Correct SPDX license This is neither in the old nor in a new format. Converting to SPDX id. --- xmp-plugin-audacious.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmp-plugin-audacious.spec b/xmp-plugin-audacious.spec index 3ea4f21..b0ceea8 100644 --- a/xmp-plugin-audacious.spec +++ b/xmp-plugin-audacious.spec @@ -15,7 +15,7 @@ Version: 4.0.0.3.8 Release: 0.1.20240611git%{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+ +License: GPL-2.0-or-later URL: http://xmp.sourceforge.net/ BuildRequires: make BuildRequires: libtool automake autoconf gcc-c++ From 73b6a8486192a3de54e062a2b0b270e88afd8dc7 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Mon, 29 Jul 2024 12:42:49 -0400 Subject: [PATCH 19/32] Fix flatpak build As audacious is built for flatpaks in /app, pkg-config needs help to find it at global scope. --- xmp-plugin-audacious.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmp-plugin-audacious.spec b/xmp-plugin-audacious.spec index b0ceea8..0be4650 100644 --- a/xmp-plugin-audacious.spec +++ b/xmp-plugin-audacious.spec @@ -2,7 +2,7 @@ %global commit c84a596ce6ee653a326c35f98252fbe7d25c4305 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global plugin_dir %(pkg-config --variable=plugin_dir audacious) +%global plugin_dir %(%___build_pre; 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 From e927319495c1cc21538de582989d62b6317d0010 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Mon, 29 Jul 2024 12:50:43 -0400 Subject: [PATCH 20/32] Fix Source URL syntax --- xmp-plugin-audacious.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmp-plugin-audacious.spec b/xmp-plugin-audacious.spec index 0be4650..4b1e346 100644 --- a/xmp-plugin-audacious.spec +++ b/xmp-plugin-audacious.spec @@ -14,7 +14,7 @@ Name: xmp-plugin-audacious Version: 4.0.0.3.8 Release: 0.1.20240611git%{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 +Source: https://github.com/mschwendt/xmp-plugin-audacious/archive/%{commit}/%{name}-%{shortcommit}.tar.gz License: GPL-2.0-or-later URL: http://xmp.sourceforge.net/ BuildRequires: make From e1bf32020b0fb329fa8dd98f854341e9555c2bd0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:04:52 +0000 Subject: [PATCH 21/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_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 4b1e346..ce5f211 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.1.20240611git%{shortcommit}%{?dist} +Release: 0.2.20240611git%{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 @@ -73,6 +73,9 @@ make install DESTDIR=%{buildroot} #exclude %%{plugin_dir}/Input/*.la %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 4.0.0.3.8-0.2.20240611gitc84a596 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Jul 24 2024 Michael Schwendt - 4.0.0.3.8-0.1.20240611gitc84a596c - Clean up snapshot stuff, and build audacious-plugins-xmp package. From 468279b729694aaf0fbfd8d5236df2775c518cfa Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Tue, 25 Mar 2025 18:04:49 +0100 Subject: [PATCH 22/32] Merge updated filename extensions list. --- .gitignore | 1 + sources | 2 +- xmp-plugin-audacious.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index d885465..f037e02 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /xmp-plugin-audacious-4.0.0-637d1e0.tar.gz /xmp-plugin-audacious-4.0.0-c84a596.tar.gz /xmp-plugin-audacious-c84a596.tar.gz +/xmp-plugin-audacious-0320cfd.tar.gz diff --git a/sources b/sources index 47b7952..3ca100a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xmp-plugin-audacious-c84a596.tar.gz) = 7fd787888ff4d3b7a658b4c5dff6a1e350b97387623cfc44c2f2a43bf91f0682f2959ad73e0eacb08e22b08cabd0586e34052cff122cc5a9375decb385b49d47 +SHA512 (xmp-plugin-audacious-0320cfd.tar.gz) = 921cf1228ea37a603bf231600c6b4063d15a8887aea7ce6a521bdf85d76b5cf205eef0b2f8dcfc482c0881d97992599987a3421d790f5443072550886907fc44 diff --git a/xmp-plugin-audacious.spec b/xmp-plugin-audacious.spec index ce5f211..4551071 100644 --- a/xmp-plugin-audacious.spec +++ b/xmp-plugin-audacious.spec @@ -1,5 +1,5 @@ -# 2024-06-11 -%global commit c84a596ce6ee653a326c35f98252fbe7d25c4305 +# 2025-03-25 +%global commit 0320cfd7e2784322af7075115cfdcc548ceebaeb %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.2.20240611git%{shortcommit}%{?dist} +Release: 0.3.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 @@ -73,6 +73,9 @@ make install DESTDIR=%{buildroot} #exclude %%{plugin_dir}/Input/*.la %changelog +* Tue Mar 25 2025 Michael Schwendt - 4.0.0.3.8-0.3.20250325git0320cfd +- Merge updated filename extensions list. + * Sun Jan 19 2025 Fedora Release Engineering - 4.0.0.3.8-0.2.20240611gitc84a596 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 9a8226865a6af12741f21a940bf277639ddafa3c Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Fri, 9 May 2025 22:18:08 +0200 Subject: [PATCH 23/32] 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 24/32] 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 25/32] 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 26/32] 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 27/32] 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 28/32] 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 29/32] 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 30/32] 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 31/32] 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 32/32] 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.