From d6f2658b8689ea075c170bbaf2c6c3e01645687b Mon Sep 17 00:00:00 2001
From: vascom <vascom2@gmail.com>
Date: Tue, 23 Feb 2021 09:24:16 +0300
Subject: [PATCH] Update to 1.8.7.

---
 .gitignore    |  2 ++
 deadbeef.spec | 27 ++++++++++++++++++---------
 sources       |  3 ++-
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index f47af7d..fc647e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,5 @@
 /1.8.2.tar.gz
 /1.8.3.tar.gz
 /1.8.4.tar.gz
+/1.8.7.tar.gz
+/mp4p-f111d7a.tar.gz
diff --git a/deadbeef.spec b/deadbeef.spec
index 578018a..d92b728 100644
--- a/deadbeef.spec
+++ b/deadbeef.spec
@@ -1,17 +1,21 @@
-%global optflags %{optflags} -flto=auto
-%global build_ldflags %{build_ldflags} -flto
+%global toolchain clang
+
+# Git submodules
+%global mp4p_commit        f111d7aa10d4516f5e02465245e9202db83b7c10
+%global mp4p_shortcommit   %(c=%{mp4p_commit}; echo ${c:0:7})
 
 Name:           deadbeef
-Version:        1.8.4
-Release:        4%{?dist}
+Version:        1.8.7
+Release:        1%{?dist}
 Summary:        An audio player for GNU/Linux
 Summary(ru):    Музыкальный проигрыватель для GNU/Linux
 
 License:        GPLv2+ and LGPLv2+ 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
 
-BuildRequires:  gcc-c++
+BuildRequires:  clang
 BuildRequires:  pkgconfig(alsa)
 BuildRequires:  pkgconfig(dbus-1)
 BuildRequires:  ffmpeg-devel
@@ -39,6 +43,7 @@ BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  desktop-file-utils
 BuildRequires:  pkgconfig(jansson)
 BuildRequires:  pkgconfig(opusfile)
+BuildRequires:  libdispatch-devel
 
 Requires:       hicolor-icon-theme
 Requires:       %{name}-plugins%{?_isa} = %{version}-%{release}
@@ -73,6 +78,8 @@ This package contains plugins for %{name}
 
 %prep
 %autosetup
+tar -xvf %{SOURCE1}
+mv mp4p-%{mp4p_commit}/* external/mp4p
 
 # Remove exec permission from source files
 find . \( -name '*.cpp' -or -name '*.hpp' -or -name '*.h' \) -and -executable -exec chmod -x {} \;
@@ -84,16 +91,15 @@ done
 
 
 %build
-export AR=%{_bindir}/gcc-ar
-export RANLIB=%{_bindir}/gcc-ranlib
-export NM=%{_bindir}/gcc-nm
 ./autogen.sh
 %configure \
     --enable-ffmpeg --docdir=%{_defaultdocdir}/%{name}-%{version} \
     --disable-silent-rules \
     --disable-static \
     --disable-gtk2 \
-    --enable-gtk3
+    --enable-gtk3 \
+    --enable-lfm \
+    --disable-notify
 %make_build
 
 
@@ -134,6 +140,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
 
 
 %changelog
+* 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
 
diff --git a/sources b/sources
index b727f12..c79d916 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-SHA512 (1.8.4.tar.gz) = 18c54ae2c7931419ea06f3eb581cc8e704fa6eb87d330fc09f7295f4a8ef6e88b6f8c314223c34c321cd2a54f14cb6911add41602250c39c1b1c1edbf64d63b7
+SHA512 (1.8.7.tar.gz) = b8026b934a211ed24cdbc7e738fbfaa95d20706c0fcaef65530d7354e19d71c1e05af59305354478b4c4f1dbe4f7dbf436af7093d25727a2508b24c692a09258
+SHA512 (mp4p-f111d7a.tar.gz) = 2245931580eb46e6718c814dcc1a51740d3a27caffe41699becd59b88e509816ec7dd79654c737f3cba78d9c0c99a0eee6abf9433b7efb864a7951e0f04e3089