From a4c591092c6534fbc30299f2e2caf06a1c6250a4 Mon Sep 17 00:00:00 2001
From: rillig <rillig@pkgsrc.org>
Date: Wed, 23 May 2007 11:44:36 +0000
Subject: Fixed the gcc4 error messages and a warning about undefined behavior.

---
 audio/xmms-synaesthesia/distinfo               |  4 +++-
 audio/xmms-synaesthesia/patches/patch-synacore | 23 +++++++++++++++++++++++
 audio/xmms-synaesthesia/patches/patch-synah    | 20 ++++++++++++++++++++
 3 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 audio/xmms-synaesthesia/patches/patch-synacore
 create mode 100644 audio/xmms-synaesthesia/patches/patch-synah

(limited to 'audio')

diff --git a/audio/xmms-synaesthesia/distinfo b/audio/xmms-synaesthesia/distinfo
index 26a6d37352e..2d8e5aa5a99 100644
--- a/audio/xmms-synaesthesia/distinfo
+++ b/audio/xmms-synaesthesia/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.3 2005/10/03 12:12:12 joerg Exp $
+$NetBSD: distinfo,v 1.4 2007/05/23 11:44:36 rillig Exp $
 
 SHA1 (synaesthesia-xmms-0.0.3-rc3.tar.gz) = 7c60a4ac9cc069e0f1fecf97d34b4f48a7b77c5c
 RMD160 (synaesthesia-xmms-0.0.3-rc3.tar.gz) = 89150fd577e7639fb9878ce6d11ffdf50f1bdebb
 Size (synaesthesia-xmms-0.0.3-rc3.tar.gz) = 152116 bytes
 SHA1 (patch-aa) = 4eec587086f03253ecb292db82ac1f3fa319838b
+SHA1 (patch-synacore) = ddf6ae0f9d3eb01ff5e9e5e1a879a153b5f74071
+SHA1 (patch-synah) = 7fa2e69feb3dae9039cd8c5d7a6f7da26fc8e94e
diff --git a/audio/xmms-synaesthesia/patches/patch-synacore b/audio/xmms-synaesthesia/patches/patch-synacore
new file mode 100644
index 00000000000..3b3e9b3565e
--- /dev/null
+++ b/audio/xmms-synaesthesia/patches/patch-synacore
@@ -0,0 +1,23 @@
+$NetBSD: patch-synacore,v 1.1 2007/05/23 11:44:36 rillig Exp $
+
+gcc4 complains about possibly undefined behavior in line 161.
+
+--- syna_core.c.orig	2001-04-26 22:46:13.000000000 +0200
++++ syna_core.c	2007-05-23 13:27:21.000000000 +0200
+@@ -158,14 +158,13 @@ static void fadeFade()
+ /*    //Bytewize version was: *(ptr++) -= *ptr+(*ptr>>1)>>4;*/
+ 		if (*ptr)
+ /*      //if (*ptr & 0xf0f0f0f0ul)*/
+-			*(ptr++) -=
++			*ptr -=
+ 				((*ptr & 0xf0f0f0f0ul) >> 4) +
+ 				((*ptr & 0xe0e0e0e0ul) >> 5);
+ /*      //else {
+       //  *(ptr++) = (*ptr * 14 >> 4) & 0x0f0f0f0ful;
+       //}*/
+-		else
+-			ptr++;
++		ptr++;
+ 	}
+ 	while (--i > 0);
+ }
diff --git a/audio/xmms-synaesthesia/patches/patch-synah b/audio/xmms-synaesthesia/patches/patch-synah
new file mode 100644
index 00000000000..24736bea5bb
--- /dev/null
+++ b/audio/xmms-synaesthesia/patches/patch-synah
@@ -0,0 +1,20 @@
+$NetBSD: patch-synah,v 1.1 2007/05/23 11:44:36 rillig Exp $
+
+These macros are used as lvalues, but were defined as rvalues. The type
+casts are unnecessary as well.
+
+--- syna.h.orig	2001-04-26 20:39:58.000000000 +0200
++++ syna.h	2007-05-23 13:41:55.000000000 +0200
+@@ -52,9 +52,9 @@
+ 
+ /* core */
+ extern guint16 *synx_output[3];
+-#define output ((guchar*)(synx_output[0]))
+-#define lastOutput ((guchar*)(synx_output[1]))
+-#define lastLastOutput ((guchar*)(synx_output[2]))
++#define output (synx_output[0])
++#define lastOutput (synx_output[1])
++#define lastLastOutput (synx_output[2])
+ 
+ #define fadeMode (synx_cfg.fadeMode)
+ #define starSize (synx_cfg.starSize)
-- 
cgit v1.2.3