Remove fix.

Signed-off-by: Sérgio M. Basto <sergio@serjux.com>

.gitignore

@@ -7,3 +7,24 @@
 /1.8.2.tar.gz
 /1.8.3.tar.gz
 /1.8.4.tar.gz
+/1.8.7.tar.gz
+/mp4p-f111d7a.tar.gz
+/1.8.8.tar.gz
+/mp4p-82291e4.tar.gz
+/1.9.0.tar.gz
+/mp4p-a80941d.tar.gz
+/1.9.0.tar.gz
+/mp4p-a80941d.tar.gz
+/1.9.1.tar.gz
+/1.9.2.tar.gz
+/mp4p-814f747.tar.gz
+/1.9.3.tar.gz
+/1.9.4.tar.gz
+/mp4p-97ab728.tar.gz
+/1.9.5.tar.gz
+/ddb_dsp_libretro-97ab728.tar.gz
+/ddb_output_pw-97ab728.tar.gz
+/1.9.6.tar.gz
+/mp4p-156195c.tar.gz
+/ddb_dsp_libretro-156195c.tar.gz
+/ddb_output_pw-156195c.tar.gz

deadbeef.spec

@@ -1,17 +1,34 @@
-%global optflags %{optflags} -flto=auto
+%global toolchain clang
-%global build_ldflags %{build_ldflags} -flto
+%global optflags %optflags -Wno-unused-but-set-variable -Wno-unused-variable
+%global build_cxxflags %build_cxxflags -std=c++11
+
+# Git submodules
+%global mp4p_commit        156195ccb635f016dc34b89425bfbecf046c90d4
+%global mp4p_shortcommit   %(c=%{mp4p_commit}; echo ${c:0:7})
+
+%global ddb_dsp_libretro_commit        b4d3db19566398603069d02eeacb3b06987a1b74
+%global ddb_dsp_libretro_shortcommit   %(c=%{mp4p_commit}; echo ${c:0:7})
+
+%global ddb_output_pw_commit        0b099d13ab0e89d9934aabdeb2872f0f66ea6960
+%global ddb_output_pw_shortcommit   %(c=%{mp4p_commit}; echo ${c:0:7})
 
 Name:           deadbeef
-Version:        1.8.4
+Version:        1.9.6
 Release:        1%{?dist}
 Summary:        An audio player for GNU/Linux
-Summary(ru):    Музыкальный проигрыватель для GNU/Linux
 
-License:        GPLv2+ and LGPLv2+ and BSD and MIT and zlib
+License:        GPL-2.0-or later AND LGPL-2.0-or-later and BSD and MIT AND Zlib
 URL:            https://deadbeef.sourceforge.io/
 Source0:        https://github.com/DeaDBeeF-Player/%{name}/archive/%{version}.tar.gz
+Source1:        https://github.com/DeaDBeeF-Player/mp4p/archive/%{mp4p_commit}/mp4p-%{mp4p_shortcommit}.tar.gz
+Source2:        https://github.com/DeaDBeeF-Player/ddb_dsp_libretro/archive/%{ddb_dsp_libretro_commit}/ddb_dsp_libretro-%{ddb_dsp_libretro_shortcommit}.tar.gz
+Source3:        https://github.com/DeaDBeeF-Player/ddb_output_pw/archive/%{ddb_output_pw_commit}/ddb_output_pw-%{ddb_output_pw_shortcommit}.tar.gz
+
+# Build for armv7hl failed
+# https://github.com/DeaDBeeF-Player/deadbeef/issues/2538
+ExcludeArch:    armv7hl
 
-BuildRequires:  gcc-c++
+BuildRequires:  clang
 BuildRequires:  pkgconfig(alsa)
 BuildRequires:  pkgconfig(dbus-1)
 BuildRequires:  ffmpeg-devel
@@ -29,7 +46,7 @@ BuildRequires:  pkgconfig(samplerate)
 BuildRequires:  pkgconfig(sndfile)
 BuildRequires:  libtool
 BuildRequires:  pkgconfig(vorbis)
-BuildRequires:  pkgconfig(libpulse)
+BuildRequires:  pkgconfig(libpipewire-0.3)
 BuildRequires:  pkgconfig(wavpack)
 BuildRequires:  yasm-devel
 BuildRequires:  bison
@@ -39,20 +56,20 @@ BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  desktop-file-utils
 BuildRequires:  pkgconfig(jansson)
 BuildRequires:  pkgconfig(opusfile)
+%ifnarch armv7hl
+BuildRequires:  libdispatch-devel
+%endif
 
 Requires:       hicolor-icon-theme
 Requires:       %{name}-plugins%{?_isa} = %{version}-%{release}
 
+Recommends:     deadbeef-mpris2-plugin
 
 %description
 DeaDBeeF (as in 0xDEADBEEF) is an audio player for GNU/Linux systems with X11 
 (though now it also runs in plain console without X, in FreeBSD, and in
 OpenSolaris).
 
-%description -l ru
-DeaDBeeF (как в 0xDEADBEEF) это аудиопроигрыватель для систем GNU/Linux с X11
-(теперь может работать и в чистой консоли).
-
 
 %package devel
 Summary:    Static library and header files for the %{name}
@@ -72,28 +89,47 @@ This package contains plugins for %{name}
 
 
 %prep
-%autosetup
+%autosetup -p1
+tar -xvf %{SOURCE1}
+mv mp4p-%{mp4p_commit}/* external/mp4p
+
+tar -xvf %{SOURCE2}
+mv ddb_dsp_libretro-%{ddb_dsp_libretro_commit}/* external/ddb_dsp_libretro
+sed -i 's|#include <stdint.h>||' external/ddb_dsp_libretro/sinc_resampler.h
+sed -i "s|#pragma once|#pragma once\n#include <cstdint>|" external/ddb_dsp_libretro/sinc_resampler.h
+sed -i "s|size_t|std::size_t|" external/ddb_dsp_libretro/sinc_resampler.h
+
+tar -xvf %{SOURCE3}
+mv ddb_output_pw-%{ddb_output_pw_commit}/* external/ddb_output_pw
 
 # Remove exec permission from source files
 find . \( -name '*.cpp' -or -name '*.hpp' -or -name '*.h' \) -and -executable -exec chmod -x {} \;
 
-for data in Play Pause Stop Next Prev
+sed -i 's|Toggle Pause|Toggle-Pause|' deadbeef.desktop.in
+for data in Play Pause Toggle-Pause Stop Next Prev
 do
     sed -i "s|$data Shortcut Group|X-$data Shortcut Group|" deadbeef.desktop.in
 done
 
-
 %build
-export AR=%{_bindir}/gcc-ar
+%if 0%{?fedora} && 0%{?fedora} > 35
-export RANLIB=%{_bindir}/gcc-ranlib
+export PKG_CONFIG_PATH="%{_libdir}/compat-ffmpeg4/pkgconfig"
-export NM=%{_bindir}/gcc-nm
+%endif
 ./autogen.sh
 %configure \
     --enable-ffmpeg --docdir=%{_defaultdocdir}/%{name}-%{version} \
     --disable-silent-rules \
     --disable-static \
     --disable-gtk2 \
-    --enable-gtk3
+%ifarch armv7hl ppc64le
+    --disable-lfm \
+    --disable-notify \
+%else
+    --enable-lfm \
+%endif
+    --enable-gtk3 \
+    --disable-pulse \
+    --enable-pipewire
 %make_build
 
 
@@ -134,6 +170,77 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
 
 
 %changelog
+* Mon Nov 13 2023 Vasiliy N. Glazov <vascom2@gmail.com> - 1.9.6-1
+- Update to 1.9.6
+
+* Wed Nov 08 2023 Leigh Scott <leigh123linux@gmail.com> - 1.9.5-5
+- Rebuild for new faad2 version
+
+* Fri Aug 04 2023 Vasiliy N. Glazov <vascom2@gmail.com> - 1.9.5-4
+- Fix Build for F39
+
+* Tue Aug 01 2023 Vasiliy N. Glazov <vascom2@gmail.com> - 1.9.5-3
+- Add mpris plugin to recommends
+
+* Wed Mar 01 2023 Leigh Scott <leigh123linux@gmail.com> - 1.9.5-2
+- Rebuild for new ffmpeg
+
+* Mon Feb 20 2023 Vasiliy N. Glazov <vascom2@gmail.com> - 1.9.5-1
+- Update to 1.9.5
+- Switch to Pipewire
+
+* Tue Dec 20 2022 Vasiliy N. Glazov <vascom2@gmail.com> - 1.9.4-1
+- Update to 1.9.4
+
+* Tue Nov 15 2022 Vasiliy N. Glazov <vascom2@gmail.com> - 1.9.3-1
+- Update to 1.9.3
+
+* Fri Oct 07 2022 Vasiliy N. Glazov <vascom2@gmail.com> - 1.9.2-1
+- Update to 1.9.2
+
+* Sun Aug 07 2022 RPM Fusion Release Engineering <sergiomb@rpmfusion.org> - 1.9.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg
+  5.1
+
+* Tue May 24 2022 Vasiliy N. Glazov <vascom2@gmail.com> - 1.9.1-1
+- Update to 1.9.1
+
+* Sat May 14 2022 Vasiliy N. Glazov <vascom2@gmail.com> - 1.9.0-1
+- Update to 1.9.0
+
+* Sat Mar 05 2022 Leigh Scott <leigh123linux@gmail.com> - 1.8.8-6
+- Use compat-ffmpeg4 for f36+
+
+* Fri Feb 25 2022 Vasiliy N. Glazov <vascom2@gmail.com> - 1.8.8-5
+- Enable notifications
+
+* Wed Feb 09 2022 RPM Fusion Release Engineering <sergiomb@rpmfusion.org> - 1.8.8-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Nov 11 2021 Leigh Scott <leigh123linux@gmail.com> - 1.8.8-3
+- Rebuilt for new ffmpeg snapshot
+
+* Thu Sep 23 2021 Vasiliy N. Glazov <vascom2@gmail.com> - 1.8.8-2
+- Fix segfault 0 bytes stack allocation
+
+* Thu Aug 05 2021 Vasiliy N. Glazov <vascom2@gmail.com> - 1.8.8-1
+- Update to 1.8.8
+
+* Mon Aug 02 2021 RPM Fusion Release Engineering <leigh123linux@gmail.com> - 1.8.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue Feb 23 2021 Vasiliy N. Glazov <vascom2@gmail.com> - 1.8.7-1
+- Update to 1.8.7
+
+* Wed Feb 03 2021 RPM Fusion Release Engineering <leigh123linux@gmail.com> - 1.8.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Thu Dec 31 2020 Leigh Scott <leigh123linux@gmail.com> - 1.8.4-3
+- Rebuilt for new ffmpeg snapshot
+
+* Mon Aug 17 2020 RPM Fusion Release Engineering <leigh123linux@gmail.com> - 1.8.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
 * Sun Jul  5 2020 Vasiliy N. Glazov <vascom2@gmail.com> - 1.8.4-1
 - Update to 1.8.4
 

sources

@@ -1 +1,4 @@
-SHA512 (1.8.4.tar.gz) = 18c54ae2c7931419ea06f3eb581cc8e704fa6eb87d330fc09f7295f4a8ef6e88b6f8c314223c34c321cd2a54f14cb6911add41602250c39c1b1c1edbf64d63b7
+SHA512 (1.9.6.tar.gz) = 43f864e307d2bc18bbb45edd6ab5deb019b54156a5bda73ba27e70765ea7c3b373f9b3cf8971cb90e6eb8c9ff0b9f74c556b855746b3251b78b8423051fb6de1
+SHA512 (mp4p-156195c.tar.gz) = 55c80468545caf4608aa5ad568ff1eec5f7a169aec64c7cfc23c57eaa3aa006960ad02f7f99d8143f15447a1bfcc174a1e15f2c1b2f6182adbd90f8359d41cbb
+SHA512 (ddb_dsp_libretro-156195c.tar.gz) = 4e54ab0da363a2d86041c18e4c7eb1d4eb78adaa8252fa65d31bd29a3b0c0fe2bc064058e7a2bd9b279b8f74d02bfb605d71cee73ac8bb246c5ad87601fab6f4
+SHA512 (ddb_output_pw-156195c.tar.gz) = eaaa9c8dd138e58416ade2eecf500f21a427d84b81f73b34ead858c54c210655c27c57986aa38c3a1693fa4ace69d711b688b027d490a03b3abb91413754c50a