[deadbeef] fix build
commit 823c62a03035513cb3cafacb2535fae47e7a0f7a
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Tue May 8 11:54:06 2018 +0100
fix build
adplug-2.2.1-signed-char.patch | 22 ++++++++++++++++++++++
deadbeef.spec | 4 +++-
sidplay-libs-gcc6.patch | 22 ++++++++++++++++++++++
3 files changed, 47 insertions(+), 1 deletion(-)
---
diff --git a/adplug-2.2.1-signed-char.patch b/adplug-2.2.1-signed-char.patch
new file mode 100644
index 0000000..ec3be43
--- /dev/null
+++ b/adplug-2.2.1-signed-char.patch
@@ -0,0 +1,22 @@
+--- plugins/adplug/adplug/s3m.cpp
++++ plugins/adplug/adplug/s3m.cpp
+@@ -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
+
{-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
+ char filetype[30];
+
+ private:
+- static const char chnresolv[];
++ static const signed char chnresolv[];
+ static const unsigned short notetable[12];
+ static const unsigned char vibratotab[32];
+
diff --git a/deadbeef.spec b/deadbeef.spec
index 388ffd8..995782b 100644
--- a/deadbeef.spec
+++ b/deadbeef.spec
@@ -8,7 +8,9 @@ Group: Applications/Multimedia
License: GPLv2+ and LGPLv2+ and BSD and MIT and zlib
URL: http://deadbeef.sourceforge.net
Source0:
http://downloads.sourceforge.net/project/%{name}/%{name}-%{version}.tar.bz2
-Patch: desktop.patch
+Patch0: desktop.patch
+Patch1: adplug-2.2.1-signed-char.patch
+Patch2: sidplay-libs-gcc6.patch
BuildRequires: pkgconfig(alsa)
BuildRequires: pkgconfig(dbus-1)
diff --git a/sidplay-libs-gcc6.patch b/sidplay-libs-gcc6.patch
new file mode 100644
index 0000000..f189cff
--- /dev/null
+++ b/sidplay-libs-gcc6.patch
@@ -0,0 +1,22 @@
+--- 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'
+ };
+ */
+-const int8_t XSID::sampleConvertTable[16] =
++const char 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;
+
+ private: