diff --git a/.gitignore b/.gitignore index 03f438a..bfaea9d 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,3 @@ /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 -/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..5498c93 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xmp-plugin-audacious-a5fbde8.tar.gz) = 81f65993912c2db24b765ac8cc56721e9d4a3e2413a42ac03eaf4d57b697e7144adf68051077ceda68970af04328bdc07f75ccfd9a50fae2f68c5771a3240be0 +a014dbffe9df71058d3a237308bfcad3 xmp-plugin-audacious-4.0.0-637d1e0.tar.gz 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 38f9f51..ba5c2a7 100644 --- a/xmp-plugin-audacious.spec +++ b/xmp-plugin-audacious.spec @@ -1,42 +1,41 @@ -# 2025-09-09 -%global commit a5fbde82fd5ac017c9ef3c1a0bfdab46fe338d4c +%global commit 637d1e009c09cd549a1114c2cb2fe37fd11235db %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global plugin_dir %(%___build_pre_env; pkg-config --variable=plugin_dir audacious) +%global plugin_dir %(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 %global aud_plugin_dep Requires: audacious(plugin-api)%{?_isa} = %{aud_plugin_api} %endif - Name: xmp-plugin-audacious -Version: 4.0.0.3.8 -Release: 0.11.20250909git%{shortcommit}%{?dist} +Version: 4.0.0 +Release: 0.32.20160922git%{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 +#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+ 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} -%description -n audacious-plugins-xmp -Audacious input plugin based on Extended Module Player (xmp) library. +# 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 over 90 mainstream and obscure module formats including Protracker (MOD), Scream Tracker 3 (S3M), Fast Tracker II (XM), and Impulse Tracker (IT). @@ -44,6 +43,7 @@ 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} @@ -54,9 +54,14 @@ and Amiga file packers including gzip, bzip2, SQSH, PowerPacker, etc. # just a guard pkg-config --print-variables audacious | grep ^plugin_dir -%autosetup -n %{name}-%{commit} -p1 +#setup -qn %%{name}-%%{commit} +%setup -qn %{name}-%{version} autoreconf -i +%if 0%{?fedora} >= 34 +%patch1 -p1 -b .EXPORT +%endif + %build %configure make OPTFLAGS="%{optflags}" V=1 %{?_smp_mflags} @@ -64,55 +69,12 @@ make OPTFLAGS="%{optflags}" V=1 %{?_smp_mflags} %install make install DESTDIR=%{buildroot} -%files -n audacious-plugins-xmp +%files %license COPYING %{plugin_dir}/Input/*.so -#exclude %%{plugin_dir}/Input/*.la +%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 - -* 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. - -* 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. - -* 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. - -* 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