[pkgsrc/trunk]: pkgsrc/audio/xmms-synaesthesia Fixed the gcc4 error messages ...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8a23ad522e2a
branches:  trunk
changeset: 529040:8a23ad522e2a
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Wed May 23 11:44:36 2007 +0000

description:
Fixed the gcc4 error messages and a warning about undefined behavior.

diffstat:

 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 deletions(-)

diffs (64 lines):

diff -r c02dae778b3d -r 8a23ad522e2a audio/xmms-synaesthesia/distinfo
--- a/audio/xmms-synaesthesia/distinfo  Wed May 23 11:13:42 2007 +0000
+++ b/audio/xmms-synaesthesia/distinfo  Wed May 23 11:44:36 2007 +0000
@@ -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 -r c02dae778b3d -r 8a23ad522e2a audio/xmms-synaesthesia/patches/patch-synacore
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/xmms-synaesthesia/patches/patch-synacore    Wed May 23 11:44:36 2007 +0000
@@ -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 -r c02dae778b3d -r 8a23ad522e2a audio/xmms-synaesthesia/patches/patch-synah
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/xmms-synaesthesia/patches/patch-synah       Wed May 23 11:44:36 2007 +0000
@@ -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)