Update patches to use upstream code.

adplug-2.2.1-signed-char.patch

@@ -1,22 +1,32 @@
---- plugins/adplug/adplug/s3m.cpp
-+++ plugins/adplug/adplug/s3m.cpp
+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 <string.h>
  #include "s3m.h"
  
 -const char Cs3mPlayer::chnresolv[] =	// S3M -> adlib channel conversion
-+const signed 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
---- plugins/adplug/adplug/s3m.h
-+++ plugins/adplug/adplug/s3m.h
-@@ -92,7 +92,7 @@ class Cs3mPlayer: public CPlayer
+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 <cstdint>
+ 
+ class Cs3mPlayer: public CPlayer
+ {
+@@ -92,7 +93,7 @@
    char filetype[30];
  
   private:
 -  static const char chnresolv[];
-+  static const signed char chnresolv[];
++  static const int8_t chnresolv[];
    static const unsigned short notetable[12];
    static const unsigned char vibratotab[32];
  

deadbeef.spec

@@ -1,6 +1,6 @@
 Name:           deadbeef
 Version:        0.7.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        An audio player for GNU/Linux
 Summary(ru):    Музыкальный проигрыватель для GNU/Linux
 
@@ -78,7 +78,7 @@ This package contains plugins for %{name}
 
 
 %prep
-%autosetup -p0
+%autosetup -p1
 
 # Remove exec permission from source files
 find . \( -name '*.cpp' -or -name '*.hpp' -or -name '*.h' \) -and -executable -exec chmod -x {} \;
@@ -134,6 +134,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
 
 
 %changelog
+* Thu May 10 2018 Vasiliy N. Glazov <vascom2@gmail.com> - 0.7.2-6
+- Correct patches as in upstream
+
 * Fri May 04 2018 Vasiliy N. Glazov <vascom2@gmail.com> - 0.7.2-5
 - Rebuild with new ffmpeg
 

desktop.patch

@@ -1,5 +1,6 @@
---- deadbeef.desktop.in	2016-04-27 09:19:10.000000000 -0600
-+++ deadbeef.desktop-1.in	2016-04-27 12:52:26.510991183 -0600
+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

sidplay-libs-gcc6.patch

@@ -1,22 +1,14 @@
---- plugins/sid/sidplay-libs/libsidplay/src/xsid/xsid.cpp.orig
-+++ plugins/sid/sidplay-libs/libsidplay/src/xsid/xsid.cpp
-@@ -94,7 +94,7 @@
-     '\x08', '\x19', '\x2a', '\x3b', '\x4c', '\x5d', '\x6e', '\x7f'
- };
+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] =
-+const char XSID::sampleConvertTable[16] =
+ const int8_t XSID::sampleConvertTable[16] =
  {
-     '\x80', '\x94', '\xa9', '\xbc', '\xce', '\xe1', '\xf2', '\x03',
-     '\x1b', '\x2a', '\x3b', '\x49', '\x58', '\x66', '\x73', '\x7f'
---- plugins/sid/sidplay-libs/libsidplay/src/xsid/xsid.h.orig
-+++ plugins/sid/sidplay-libs/libsidplay/src/xsid/xsid.h
-@@ -238,7 +238,7 @@
-     uint8_t             sidData0x18;
-     bool                _sidSamples;
-     int8_t              sampleOffset;
--    static const int8_t sampleConvertTable[16];
-+    static const char sampleConvertTable[16];
-     bool                wasRunning;
+-    '\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
+ };
  
- private:
+ const char *XSID::credit =