diff --git a/.gitignore b/.gitignore index 8e8f181..bb57d93 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /deadbeef-0.7.2.tar.bz2 /6d02b028861ab4c8c8f06f480d5b2197011b6dbd /73f972277cd7ecebc92dda6ae2a74ea05a9719f6 +/373f55642b6b752bdca159ed621fcd732ce9063c diff --git a/adplug-2.2.1-signed-char.patch b/adplug-2.2.1-signed-char.patch deleted file mode 100644 index 2a138ed..0000000 --- a/adplug-2.2.1-signed-char.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -uNdr deadbeef-0.7.2_orig/plugins/adplug/adplug/s3m.cpp deadbeef-0.7.2_new/plugins/adplug/adplug/s3m.cpp ---- deadbeef-0.7.2_orig/plugins/adplug/adplug/s3m.cpp 2016-06-19 14:26:18.000000000 +0300 -+++ deadbeef-0.7.2_new/plugins/adplug/adplug/s3m.cpp 2018-05-10 14:08:22.481231976 +0300 -@@ -26,7 +26,7 @@ - #include - #include "s3m.h" - --const char Cs3mPlayer::chnresolv[] = // S3M -> adlib channel conversion -+const int8_t Cs3mPlayer::chnresolv[] = // S3M -> adlib channel conversion - {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,1,2,3,4,5,6,7,8,-1,-1,-1,-1,-1,-1,-1}; - - const unsigned short Cs3mPlayer::notetable[12] = // S3M adlib note table -diff -uNdr deadbeef-0.7.2_orig/plugins/adplug/adplug/s3m.h deadbeef-0.7.2_new/plugins/adplug/adplug/s3m.h ---- deadbeef-0.7.2_orig/plugins/adplug/adplug/s3m.h 2016-06-19 14:26:18.000000000 +0300 -+++ deadbeef-0.7.2_new/plugins/adplug/adplug/s3m.h 2018-05-10 14:07:39.071591002 +0300 -@@ -23,6 +23,7 @@ - #define H_ADPLUG_S3M - - #include "player.h" -+#include - - class Cs3mPlayer: public CPlayer - { -@@ -92,7 +93,7 @@ - char filetype[30]; - - private: -- static const char chnresolv[]; -+ static const int8_t chnresolv[]; - static const unsigned short notetable[12]; - static const unsigned char vibratotab[32]; - diff --git a/deadbeef.spec b/deadbeef.spec index 0e5d70a..2b7d9dd 100644 --- a/deadbeef.spec +++ b/deadbeef.spec @@ -1,6 +1,9 @@ -%global gitcommit_full 73f972277cd7ecebc92dda6ae2a74ea05a9719f6 +%global gitcommit_full 373f55642b6b752bdca159ed621fcd732ce9063c %global gitcommit %(c=%{gitcommit_full}; echo ${c:0:7}) -%global date 20181224 +%global date 20190209 + +%global optflags %{optflags} -flto +%global build_ldflags %{build_ldflags} -flto Name: deadbeef Version: 0.7.3 @@ -36,12 +39,7 @@ BuildRequires: yasm-devel BuildRequires: bison BuildRequires: pkgconfig(imlib2) BuildRequires: pkgconfig(libzip) -%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7 BuildRequires: pkgconfig(gtk+-3.0) -%else -BuildRequires: libstdc++-devel -BuildRequires: pkgconfig(gtk+-2.0) -%endif BuildRequires: desktop-file-utils BuildRequires: pkgconfig(jansson) BuildRequires: pkgconfig(opusfile) @@ -90,16 +88,16 @@ 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 \ -%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7 - --disable-gtk2 --enable-gtk3 -%else - --enable-gtk2 --disable-gtk3 --disable-lfm -%endif + --disable-gtk2 \ + --enable-gtk3 %make_build @@ -140,6 +138,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %changelog +* Wed Feb 27 2019 Vasiliy N. Glazov - 0.7.3-0.1.20190209git373f556 +- Update to latest git +- Enable LTO + * Thu Dec 27 2018 Vasiliy N. Glazov - 0.7.3-0.1.20181224git73f9722 - Update to latest git diff --git a/desktop.patch b/desktop.patch deleted file mode 100644 index 147f71f..0000000 --- a/desktop.patch +++ /dev/null @@ -1,76 +0,0 @@ -diff -uNdr deadbeef-0.7.2_orig/deadbeef.desktop.in deadbeef-0.7.2_new/deadbeef.desktop.in ---- deadbeef-0.7.2_orig/deadbeef.desktop.in 2016-06-19 14:26:18.000000000 +0300 -+++ deadbeef-0.7.2_new/deadbeef.desktop.in 2018-05-10 14:00:34.981900715 +0300 -@@ -18,60 +18,60 @@ - - X-Ayatana-Desktop-Shortcuts=Play;Pause;Stop;Next;Prev - --Keywords=Sound;Music;Audio;Player;Musicplayer;MP3 --Keywords[zh_TW]=Sound;Music;Audio;Player;Musicplayer;MP3;音樂;音樂播放器;播放器;音訊 -+Keywords=Sound;Music;Audio;Player;Musicplayer;MP3; -+Keywords[zh_TW]=Sound;Music;Audio;Player;Musicplayer;MP3;音樂;音樂播放器;播放器;音訊; - --[Play Shortcut Group] -+[X-Play Shortcut Group] - Name=Play - Name[zh_TW]=播放 - Exec=deadbeef --play - TargetEnvironment=Unity - --[Pause Shortcut Group] -+[X-Pause Shortcut Group] - Name=Pause - Name[zh_TW]=暫停 - Exec=deadbeef --pause - TargetEnvironment=Unity - --[Stop Shortcut Group] -+[X-Stop Shortcut Group] - Name=Stop - Name[zh_TW]=停止 - Exec=deadbeef --stop - TargetEnvironment=Unity - --[Next Shortcut Group] -+[X-Next Shortcut Group] - Name=Next - Name[zh_TW]=下一首 - Exec=deadbeef --next - TargetEnvironment=Unity - --[Prev Shortcut Group] -+[X-Prev Shortcut Group] - Name=Prev - Name[zh_TW]=上一首 - Exec=deadbeef --prev - TargetEnvironment=Unity - --[Desktop Action Play] -+[X-Desktop Action Play] - Name=Play - Name[zh_TW]=播放 - Exec=deadbeef --play - --[Desktop Action Pause] -+[X-Desktop Action Pause] - Name=Pause - Name[zh_TW]=暫停 - Exec=deadbeef --pause - --[Desktop Action Stop] -+[X-Desktop Action Stop] - Name=Stop - Name[zh_TW]=停止 - Exec=deadbeef --stop - --[Desktop Action Next] -+[X-Desktop Action Next] - Name=Next - Name[zh_TW]=下一首 - Exec=deadbeef --next - --[Desktop Action Previous] -+[X-Desktop Action Previous] - Name=Prev - Name[zh_TW]=上一首 - Exec=deadbeef --prev diff --git a/sidplay-libs-gcc6.patch b/sidplay-libs-gcc6.patch deleted file mode 100644 index 2f8f7cf..0000000 --- a/sidplay-libs-gcc6.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -uNdr deadbeef-0.7.2_orig/plugins/sid/sidplay-libs/libsidplay/src/xsid/xsid.cpp deadbeef-0.7.2_new/plugins/sid/sidplay-libs/libsidplay/src/xsid/xsid.cpp ---- deadbeef-0.7.2_orig/plugins/sid/sidplay-libs/libsidplay/src/xsid/xsid.cpp 2016-06-19 14:26:18.000000000 +0300 -+++ deadbeef-0.7.2_new/plugins/sid/sidplay-libs/libsidplay/src/xsid/xsid.cpp 2018-05-10 13:46:50.910531570 +0300 -@@ -83,8 +83,8 @@ - */ - const int8_t XSID::sampleConvertTable[16] = - { -- '\x80', '\x94', '\xa9', '\xbc', '\xce', '\xe1', '\xf2', '\x03', -- '\x1b', '\x2a', '\x3b', '\x49', '\x58', '\x66', '\x73', '\x7f' -+ -128, -108, -87, -68, -50, -31, -14, -+ 3, 27, 42, 59, 73, 88, 102, 115, 127 - }; - - const char *XSID::credit = diff --git a/sources b/sources index 64c0c97..a219411 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0690a353fba8e58d18b7e8d3e36da5d6 73f972277cd7ecebc92dda6ae2a74ea05a9719f6 +b7b2d99b421ad9184dbd23a679e58f27 373f55642b6b752bdca159ed621fcd732ce9063c