Fri Apr 26 17:39:23 2013 UTC ()
Unreak build on SmartOS (seen in pbulk logs, untested)
(shattered)
diff -r1.5 -r1.6 pkgsrc/audio/ocp/distinfo
diff -r1.2 -r1.3 pkgsrc/audio/ocp/patches/patch-af
diff -r0 -r1.1 pkgsrc/audio/ocp/patches/patch-playym_ympplay.cpp
--- pkgsrc/audio/ocp/distinfo 2012/02/15 22:23:16 1.5
+++ pkgsrc/audio/ocp/distinfo 2013/04/26 17:39:23 1.6
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2012/02/15 22:23:16 hans Exp $
+$NetBSD: distinfo,v 1.6 2013/04/26 17:39:23 shattered Exp $
SHA1 (ocp-0.1.21.tar.bz2) = aaa16cf1979c572b09c73e7cc61350bfc4477380
RMD160 (ocp-0.1.21.tar.bz2) = 6b42e93e9fe5879e844b2d336825a2db156b7e6f
@@ -7,5 +7,6 @@
SHA1 (patch-ac) = f28f3ebc5e3d61858f2f5bed79094fff57130da6
SHA1 (patch-ad) = 1a3e3aa02eeae905faebac7fc7fc27eb93fa0e46
SHA1 (patch-ae) = 00f5b6edaf0dcb2200f8e9f14ab6a8e1a9711f65
-SHA1 (patch-af) = 63c598841a9998cce54deb0b9898c5b433f0fe21
+SHA1 (patch-af) = dbb7b2d1b7a5f35c14477725ad18e31b2af787b9
SHA1 (patch-playay_ayplay.c) = 565efad3e619743fd7260c2957152a0b116674c4
+SHA1 (patch-playym_ympplay.cpp) = d0d5fd0126e30f5036f0267d17ae3524c9afcb34
--- pkgsrc/audio/ocp/patches/patch-af 2012/02/15 22:23:16 1.2
+++ pkgsrc/audio/ocp/patches/patch-af 2013/04/26 17:39:23 1.3
@@ -1,7 +1,16 @@
-$NetBSD: patch-af,v 1.2 2012/02/15 22:23:16 hans Exp $
+$NetBSD: patch-af,v 1.3 2013/04/26 17:39:23 shattered Exp $
---- config.h.in.orig 2008-01-14 18:48:57.000000000 +0000
+--- config.h.in.orig 2011-11-17 21:46:08.000000000 +0000
+++ config.h.in
+@@ -2,7 +2,7 @@
+
+ #undef WORDS_BIGENDIAN
+
+-#if __STDC_VERSION__ < 199901L
++#if __STDC_VERSION__ < 199901L && !defined(__func__)
+ # if __GNUC__ >= 2
+ # define __func__ __FUNCTION__
+ # else
@@ -250,7 +250,7 @@
#include <duma.h>
#endif
$NetBSD: patch-playym_ympplay.cpp,v 1.1 2013/04/26 17:39:23 shattered Exp $
--- playym/ympplay.cpp.orig 2011-11-17 21:46:08.000000000 +0000
+++ playym/ympplay.cpp
@@ -110,7 +110,7 @@ static char convnote(long freq)
float frfac=(float)freq/220.0;
- float nte=12*(log(frfac)/log(2))+48;
+ float nte=12*(log(frfac)/log(2.0))+48;
if (nte<0 || nte>127) nte=0xff;
return (char)nte;