Fix ambiguous math on SunOS

4 files changed, 62 insertions, 1 deletions

diff --git a/audio/libvisual-plugins/distinfo b/audio/libvisual-plugins/distinfo
index ddf0826ce22..cfb16b3dfe0 100644
--- a/audio/libvisual-plugins/distinfo
+++ b/audio/libvisual-plugins/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2011/08/28 23:56:07 dholland Exp $
+$NetBSD: distinfo,v 1.11 2014/02/25 01:45:53 wiedi Exp $
 
 SHA1 (libvisual-plugins-0.4.0.tar.gz) = 20490573c282d900ec0bd05133cb3707640254f5
 RMD160 (libvisual-plugins-0.4.0.tar.gz) = f7a82f4a9e4dec3e877833612ece570ffbf2404d
@@ -9,4 +9,7 @@ SHA1 (patch-ac) = b431acd28d9ff7c8bf5a8655fe4969f08ad80772
 SHA1 (patch-ad) = 9f9adc7bc9074b6474b83a245be67f1db753d645
 SHA1 (patch-ae) = ce54b7682f0d7a184a15392ee8f3a7cd2510be13
 SHA1 (patch-af) = 35e2b6517a7c7bd5605fd6593a113f184d8dc1b3
+SHA1 (patch-plugins_actor_G-Force_Common_GeneralTools_UtilStr.cpp) = 6dfb4d2d8ba5ed6be37523b66515df630bfba604
+SHA1 (patch-plugins_actor_G-Force_Common_UI_LineXX.cpp) = f0e527dd7bc2918fbab00846cbf3c7c882ba82eb
+SHA1 (patch-plugins_actor_corona_corona.cpp) = 89292f12be75a59a62f7a52c660a1146fda8f1e5
 SHA1 (patch-plugins_morph_flash_morph__flash_c) = 94d696aa43213fa43fb98a563cdc040d5fe9a92c
diff --git a/audio/libvisual-plugins/patches/patch-plugins_actor_G-Force_Common_GeneralTools_UtilStr.cpp b/audio/libvisual-plugins/patches/patch-plugins_actor_G-Force_Common_GeneralTools_UtilStr.cpp
new file mode 100644
index 00000000000..acb331227d3
--- /dev/null
+++ b/audio/libvisual-plugins/patches/patch-plugins_actor_G-Force_Common_GeneralTools_UtilStr.cpp
@@ -0,0 +1,14 @@
+$NetBSD: patch-plugins_actor_G-Force_Common_GeneralTools_UtilStr.cpp,v 1.1 2014/02/25 01:45:53 wiedi Exp $
+
+fix "pow() is ambiguous" on SunOS
+--- plugins/actor/G-Force/Common/GeneralTools/UtilStr.cpp.orig	2005-12-06 10:48:28.000000000 +0000
++++ plugins/actor/G-Force/Common/GeneralTools/UtilStr.cpp
+@@ -1213,7 +1213,7 @@ void UtilStr::SetFloatValue( float inVal
+ 		deci_digits = 10 - left_digits;
+ 		if ( deci_digits > inPercision )
+ 			deci_digits = inPercision;
+-		scale =  pow( 10, deci_digits );
++		scale =  pow( 10, (double) deci_digits );
+ 		SetValue( inValue * scale, scale, deci_digits ); }
+ 	else
+ 		Assign( "Overflow" );
diff --git a/audio/libvisual-plugins/patches/patch-plugins_actor_G-Force_Common_UI_LineXX.cpp b/audio/libvisual-plugins/patches/patch-plugins_actor_G-Force_Common_UI_LineXX.cpp
new file mode 100644
index 00000000000..597c4cd79db
--- /dev/null
+++ b/audio/libvisual-plugins/patches/patch-plugins_actor_G-Force_Common_UI_LineXX.cpp
@@ -0,0 +1,30 @@
+$NetBSD: patch-plugins_actor_G-Force_Common_UI_LineXX.cpp,v 1.1 2014/02/25 01:45:53 wiedi Exp $
+
+fix "sqrt(int) is ambiguous" on SunOS
+--- plugins/actor/G-Force/Common/UI/LineXX.cpp.orig	2005-01-17 19:53:46.000000000 +0000
++++ plugins/actor/G-Force/Common/UI/LineXX.cpp
+@@ -74,13 +74,13 @@
+ 
+ 		
+ 	#if CLR_INTERP && P_SZ != 1
+-	long len = sqrt( dx * dx + dy * dy ) + 1;
++	long len = sqrt( (double) (dx * dx + dy * dy) ) + 1;
+ 	dR /= len;
+ 	dG /= len;
+ 	dB /= len;
+ 	color = __Clr( R, G, B );
+ 	#elif CLR_INTERP && P_SZ == 1
+-	long len = sqrt( dx * dx + dy * dy ) + 1;
++	long len = sqrt( (double) (dx * dx + dy * dy) ) + 1;
+ 	dR /= len;
+ 	color = __Clr( R, G, B );
+ 	#endif
+@@ -154,7 +154,7 @@
+ 		
+ 			for ( j = 0; j < tw; j++ ) {
+ 				long tmp = j - halfW;
+-				c_x = halfW - ( ( long ) sqrt( halfW * halfW - tmp * tmp ) );
++				c_x = halfW - ( ( long ) sqrt((double) (halfW * halfW - tmp * tmp) ) );
+ 				center = basePtr + (j-halfW) * mBytesPerRow;
+ 				for ( int k = c_x; k < tw - c_x; k++ ){
+ 					((PIXTYPE*) center)[k-halfW] = color;
diff --git a/audio/libvisual-plugins/patches/patch-plugins_actor_corona_corona.cpp b/audio/libvisual-plugins/patches/patch-plugins_actor_corona_corona.cpp
new file mode 100644
index 00000000000..f8978412590
--- /dev/null
+++ b/audio/libvisual-plugins/patches/patch-plugins_actor_corona_corona.cpp
@@ -0,0 +1,14 @@
+$NetBSD: patch-plugins_actor_corona_corona.cpp,v 1.1 2014/02/25 01:45:53 wiedi Exp $
+
+fix "sqrt(int) is ambiguous" on SunOS
+--- plugins/actor/corona/corona.cpp.orig	2006-02-05 18:47:26.000000000 +0000
++++ plugins/actor/corona/corona.cpp
+@@ -118,7 +118,7 @@ bool Corona::setUpSurface(int width, int
+ 	}
+ 
+ 	// Change the number of particles
+-	int newsize = (int) (::sqrt(m_width * m_height) * 3.0);
++	int newsize = (int) (::sqrt((double) (m_width * m_height)) * 3.0);
+ 	if (newsize < 2000) newsize = 2000;
+ 	int oldsize = (int) nbParticules;
+ 	nbParticules = newsize;