From c406efe674a4a5c872f58312d777c7591caba5ed Mon Sep 17 00:00:00 2001
From: Michael Schwendt <mschwendt@fedoraproject.org>
Date: Mar 03 2015 15:41:40 +0000
Subject: armv7hl build fails with a narrowing conversion GCC error not found


---

diff --git a/audacious-plugins-3.6-arm-no-narrowing.patch b/audacious-plugins-3.6-arm-no-narrowing.patch
new file mode 100644
index 0000000..db3a07e
--- /dev/null
+++ b/audacious-plugins-3.6-arm-no-narrowing.patch
@@ -0,0 +1,25 @@
+diff -Nur audacious-plugins-3.6-orig/src/adplug/core/s3m.cc audacious-plugins-3.6/src/adplug/core/s3m.cc
+--- audacious-plugins-3.6-orig/src/adplug/core/s3m.cc	2015-02-28 22:57:53.000000000 +0100
++++ audacious-plugins-3.6/src/adplug/core/s3m.cc	2015-03-03 16:36:40.668042345 +0100
+@@ -28,8 +28,8 @@
+ 
+ const 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 };
++{ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0, 1, 2, 3,
++    4, 5, 6, 7, 8, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
+ 
+ const unsigned short
+   Cs3mPlayer::notetable[12] =   // S3M adlib note table
+@@ -323,8 +323,8 @@
+     if (!(header.chanset[chan] & 128))  // resolve S3M -> AdLib channels
+       realchan = chnresolv[header.chanset[chan] & 127];
+     else
+-      realchan = -1;            // channel disabled
+-    if (realchan != -1)
++      realchan = 0xFF;            // channel disabled
++    if (realchan != 0xFF)
+     {                           // channel playable?
+       // set channel values
+       donote = 0;
diff --git a/audacious-plugins.spec b/audacious-plugins.spec
index 61fca4c..5c541a3 100644
--- a/audacious-plugins.spec
+++ b/audacious-plugins.spec
@@ -44,6 +44,8 @@ Patch0: audacious-plugins-3.6-alpha1-xmms-skindir.patch
 Patch1: audacious-plugins-3.6-alpha1-enable-gnomeshortcuts.patch
 # Fedora customization: add default system-wide module_path
 Patch2: audacious-plugins-3.6-ladspa.patch
+# new GCC 5 narrowing conversion build failure / Arch: armv7hl
+Patch3: audacious-plugins-3.6-arm-no-narrowing.patch
 
 BuildRequires: audacious-devel >= %{aud_ver}
 BuildRequires: gettext-devel
@@ -141,6 +143,7 @@ input plugin for Audacious.
 %patch0 -p1 -b .xmms-skindir
 %patch1 -p1 -b .enable-gnomeshortcuts
 %patch2 -p1 -b .ladspa
+%patch3 -p1 -b .no-narrowing
 
 for i in src/ladspa/plugin.cc
 do
@@ -297,6 +300,8 @@ install -p -m0644 %{SOURCE102} ${RPM_BUILD_ROOT}%{_datadir}/appdata
 
 %changelog
 * Tue Mar  3 2015 Michael Schwendt <mschwendt@fedoraproject.org> - 3.6-3
+- armv7hl build fails with a narrowing conversion GCC error not found
+  in Copr (x86_64/i686 only) builds. Probably further patches necessary.
 - For Fedora 23, build with gtk2 and Qt.
   Run "audacious --qt" once to switch to Qt user-interface.
 - For Fedora 22, build with gtk2 and without Qt by default.