commit bb6aa2b861d6a747b499b5148eab83a3a3feab46 Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Sun Jul 7 15:33:52 2024 +0100 Update to 4.4 Sync with Fedora and use Meson build system. .gitignore | 1 + audacious-plugins-freeworld.spec | 95 ++++++++++++++++++++++++++++++++++++---- sources | 2 +- 3 files changed, 89 insertions(+), 9 deletions(-) --- diff --git a/.gitignore b/.gitignore index e081362..ee8a5ee 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ audacious-plugins-3.7.2.tar.bz2 /audacious-plugins-4.2.tar.bz2 /audacious-plugins-4.3-beta1.tar.bz2 /audacious-plugins-4.3.1.tar.bz2 +/audacious-plugins-4.4.tar.bz2 diff --git a/audacious-plugins-freeworld.spec b/audacious-plugins-freeworld.spec index 4478207..fd05c4d 100644 --- a/audacious-plugins-freeworld.spec +++ b/audacious-plugins-freeworld.spec @@ -1,22 +1,27 @@ +%bcond_without meson + %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 %{?aud_plugin_dep} -Name: audacious-plugins-freeworld -Version: 4.3.1 -Release: 3%{?dist} -Summary: Additional plugins for the Audacious media player -License: GPLv3 + +Name: audacious-plugins-freeworld +Version: 4.4 +Release: 1%{?dist} +Summary: Additional plugins for the Audacious media player +License: GPLv3 URL: https://audacious-media-player.org/ Source0: https://distfiles.audacious-media-player.org/audacious-plugins-%{version}... BuildRequires: audacious-devel >= %{version} BuildRequires: gcc-c++ +BuildRequires: meson +BuildRequires: make BuildRequires: zlib-devel BuildRequires: libxml2-devel -BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt6Core) BuildRequires: taglib-devel >= 1.4 BuildRequires: gettext BuildRequires: libbinio-devel @@ -24,7 +29,7 @@ BuildRequires: dbus-devel >= 0.60 BuildRequires: dbus-glib-devel >= 0.60 # ffaudio plugin BuildRequires: faad2-devel -# we need to have configure detect atleast one audio output to make it happy +# we need to have configure detect at least one audio output to make it happy BuildRequires: alsa-lib-devel # require all the plugins @@ -53,11 +58,69 @@ This is the plugin needed to play AAC audio files. %prep %autosetup -p1 -n audacious-plugins-%{version} +%if %{without meson} sed -i '\,^.SILENT:,d' buildsys.mk.in sed -i 's!MAKE} -s!MAKE} !' buildsys.mk.in +%endif %build +%if %{with meson} +%meson \ + -Daac=true \ + -Dadplug=false \ + -Dalsa=false \ + -Damidiplug=false \ + -Dampache=false \ + -Daosd=false \ + -Dbs2b=false \ + -Dcdaudio=false \ + -Dconsole=false \ + -Dcoreaudio=false \ + -Dcue=false \ + -Dffaudio=false \ + -Dfilewriter=false \ + -Dfilewriter-flac=false \ + -Dfilewriter-mp3=false \ + -Dfilewriter-ogg=false \ + -Dflac=false \ + -Dgl-spectrum=false \ + -Dgtk=false \ + -Dhotkey=false \ + -Djack=false \ + -Dlirc=false \ + -Dmac-media-keys=false \ + -Dmms=false \ + -Dmodplug=false \ + -Dmoonstone=false \ + -Dmpg123=false \ + -Dmpris2=false \ + -Dneon=false \ + -Dnotify=false \ + -Dopenmpt=false \ + -Dopus=false \ + -Doss=false \ + -Dpulse=false \ + -Dpipewire=false \ + -Dqt=false \ + -Dqtaudio=false \ + -Dresample=false \ + -Dscrobbler2=false \ + -Dsdlout=false \ + -Dsid=false \ + -Dsndfile=false \ + -Dsndio=false \ + -Dsongchange=false \ + -Dsoxr=false \ + -Dspeedpitch=false \ + -Dstreamtuner=false \ + -Dvorbis=false \ + -Dvumeter=false \ + -Dwavpack=false + +%meson_build +#%%{__meson} compile -C %%{_vpath_builddir} -j %%{_smp_build_ncpus} --verbose +%else %configure \ --disable-rpath \ --disable-vorbis \ @@ -68,11 +131,23 @@ sed -i 's!MAKE} -s!MAKE} !' buildsys.mk.in --disable-mms \ --disable-opus %make_build -C src/aac +%endif %install +%if %{with meson} +%meson_install +rm -rf %{buildroot}%{_libdir}/audacious/Container +rm -rf %{buildroot}%{_libdir}/audacious/Effect +rm -rf %{buildroot}%{_libdir}/audacious/Transport +pushd %{buildroot}%{_libdir}/audacious/Input +shopt -s extglob +rm !(aac-raw.so) +popd +rm -rf %{buildroot}%{_datadir}/locale/ +%else %make_install -C src/aac -find %buildroot -type f -name "*.la" -exec rm -f {} ';' +%endif %files @@ -83,6 +158,10 @@ find %buildroot -type f -name "*.la" -exec rm -f {} ';' %changelog +* Sat Jul 06 2024 Sérgio Basto <sergio(a)serjux.com&gt; - 4.4-1 +- Update to 4.4 +- Sync with Fedora and use Meson build system. + * Sat Feb 03 2024 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org&gt; - 4.3.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index 65ad12d..a192d0f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (audacious-plugins-4.3.1.tar.bz2) = ca065b4558406702e4f2aa2ac085ea02d3215e689e09e9c0b6a740970a469297910df52cd222997e8a4206a68d3a064ac3f6d94c6412830ce8bd34a5b42c30da +SHA512 (audacious-plugins-4.4.tar.bz2) = 67c1b5880ad1c53e4407536677a06f7fbe9e9701f98106bf33e7f9dafcbb93200b670de8120442d197315f6c1f30b05936e358724c0b22baded4b3a258ea2563