diff --git a/.gitignore b/.gitignore index 03f438a..f037e02 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,3 @@ /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 be917e6..3ca100a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xmp-plugin-audacious-a5fbde8.tar.gz) = 81f65993912c2db24b765ac8cc56721e9d4a3e2413a42ac03eaf4d57b697e7144adf68051077ceda68970af04328bdc07f75ccfd9a50fae2f68c5771a3240be0 +SHA512 (xmp-plugin-audacious-0320cfd.tar.gz) = 921cf1228ea37a603bf231600c6b4063d15a8887aea7ce6a521bdf85d76b5cf205eef0b2f8dcfc482c0881d97992599987a3421d790f5443072550886907fc44 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 38f9f51..a4c7bb9 100644 --- a/xmp-plugin-audacious.spec +++ b/xmp-plugin-audacious.spec @@ -1,8 +1,8 @@ -# 2025-09-09 -%global commit a5fbde82fd5ac017c9ef3c1a0bfdab46fe338d4c +# 2025-03-25 +%global commit 0320cfd7e2784322af7075115cfdcc548ceebaeb %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global plugin_dir %(%___build_pre_env; 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 @@ -12,7 +12,7 @@ Name: xmp-plugin-audacious Version: 4.0.0.3.8 -Release: 0.11.20250909git%{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 @@ -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 . @@ -33,6 +35,9 @@ 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. @@ -70,25 +75,6 @@ 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. - -* 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) - -* 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. - * 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