Sat Aug 2 17:43:57 2008 UTC ()
Fix broken amd64 build.
(dholland)
diff -r1.7 -r1.8 pkgsrc/audio/darkice/distinfo
diff -r0 -r1.3 pkgsrc/audio/darkice/patches/patch-ab
diff -r0 -r1.3 pkgsrc/audio/darkice/patches/patch-ac
--- pkgsrc/audio/darkice/distinfo 2006/10/10 20:09:22 1.7
+++ pkgsrc/audio/darkice/distinfo 2008/08/02 17:43:56 1.8
| @@ -1,6 +1,8 @@ | | | @@ -1,6 +1,8 @@ |
| 1 | $NetBSD: distinfo,v 1.7 2006/10/10 20:09:22 rillig Exp $ | | 1 | $NetBSD: distinfo,v 1.8 2008/08/02 17:43:56 dholland Exp $ |
| 2 | | | 2 | |
| 3 | SHA1 (darkice-0.17.1.tar.gz) = 2952961c8e99412d831ca619f152ba6774efefac | | 3 | SHA1 (darkice-0.17.1.tar.gz) = 2952961c8e99412d831ca619f152ba6774efefac |
| 4 | RMD160 (darkice-0.17.1.tar.gz) = b6575b28190276d77e721e2ef15e8a93162693cc | | 4 | RMD160 (darkice-0.17.1.tar.gz) = b6575b28190276d77e721e2ef15e8a93162693cc |
| 5 | Size (darkice-0.17.1.tar.gz) = 1407826 bytes | | 5 | Size (darkice-0.17.1.tar.gz) = 1407826 bytes |
| 6 | SHA1 (patch-aa) = 6f58c2ae94a9b199ac733fd4b0742178f46dc961 | | 6 | SHA1 (patch-aa) = 6f58c2ae94a9b199ac733fd4b0742178f46dc961 |
| | | 7 | SHA1 (patch-ab) = 51cf308b209b933fe003775116d8b7d986e92476 |
| | | 8 | SHA1 (patch-ac) = 4ba61f7544da079a6e6aaaf49e03ef7c6c3fb8ca |
$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()) ) {
$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__,