Fix broken amd64 build.

3 files changed, 35 insertions, 1 deletions

diff --git a/audio/darkice/distinfo b/audio/darkice/distinfo
index 2c73530b50e..9318644b281 100644
--- a/audio/darkice/distinfo
+++ b/audio/darkice/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.7 2006/10/10 20:09:22 rillig Exp $
+$NetBSD: distinfo,v 1.8 2008/08/02 17:43:56 dholland Exp $
 
 SHA1 (darkice-0.17.1.tar.gz) = 2952961c8e99412d831ca619f152ba6774efefac
 RMD160 (darkice-0.17.1.tar.gz) = b6575b28190276d77e721e2ef15e8a93162693cc
 Size (darkice-0.17.1.tar.gz) = 1407826 bytes
 SHA1 (patch-aa) = 6f58c2ae94a9b199ac733fd4b0742178f46dc961
+SHA1 (patch-ab) = 51cf308b209b933fe003775116d8b7d986e92476
+SHA1 (patch-ac) = 4ba61f7544da079a6e6aaaf49e03ef7c6c3fb8ca
diff --git a/audio/darkice/patches/patch-ab b/audio/darkice/patches/patch-ab
new file mode 100644
index 00000000000..34ef3814857
--- /dev/null
+++ b/audio/darkice/patches/patch-ab
@@ -0,0 +1,17 @@
+$NetBSD: patch-ab,v 1.3 2008/08/02 17:43:56 dholland Exp $
+
+--- src/LameLibEncoder.cpp~	2006-05-19 08:35:25.000000000 -0400
++++ src/LameLibEncoder.cpp	2008-08-02 13:37:41.000000000 -0400
+@@ -79,10 +79,10 @@
+     lameGlobalFlags = lame_init();
+ 
+     // ugly lame returns -1 in a pointer on allocation errors
+-    if ( !lameGlobalFlags || ((int)lameGlobalFlags) == -1 ) {
++    if ( !lameGlobalFlags || lameGlobalFlags == (lame_global_flags *)-1 ) {
+         throw Exception( __FILE__, __LINE__,
+                          "lame lib init error",
+-                         (int) lameGlobalFlags);
++                         (int)(intptr_t)lameGlobalFlags);
+     }
+ 
+     if ( 0 > lame_set_num_channels( lameGlobalFlags, getInChannel()) ) {
diff --git a/audio/darkice/patches/patch-ac b/audio/darkice/patches/patch-ac
new file mode 100644
index 00000000000..bd0619b76e4
--- /dev/null
+++ b/audio/darkice/patches/patch-ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.3 2008/08/02 17:43:56 dholland Exp $
+
+--- src/TwoLameLibEncoder.cpp~	2006-01-25 17:49:59.000000000 -0500
++++ src/TwoLameLibEncoder.cpp	2008-08-02 13:42:36.000000000 -0400
+@@ -116,9 +116,9 @@ TwoLameLibEncoder :: open ( void )
+     // ugly twolame returns -1 in a pointer on allocation errors
+     if ( !twolame_opts  ) {
+         throw Exception( __FILE__, __LINE__,
+                          "TwoLAME lib init error",
+-                         (int) twolame_opts);
++                         /*(int) twolame_opts*/ /* why? */  0);
+     }
+ 
+     if ( 0 > twolame_set_num_channels( twolame_opts, getInChannel()) ) {
+         throw Exception( __FILE__, __LINE__,