Add patch to fix void to integer casting for amd64. Bug #318787

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 67 insertions, 3 deletions

diff --git a/media-sound/miniaudicle/ChangeLog b/media-sound/miniaudicle/ChangeLog
index 7a7a1fdc05e4..d7334307a4cd 100644
--- a/media-sound/miniaudicle/ChangeLog
+++ b/media-sound/miniaudicle/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/miniaudicle
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/miniaudicle/ChangeLog,v 1.6 2010/07/15 08:54:53 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/miniaudicle/ChangeLog,v 1.7 2010/07/15 12:12:12 hwoarang Exp $
+
+  15 Jul 2010; Markos Chandras <hwoarang@gentoo.org>
+  miniaudicle-0.1.3.8-r1.ebuild,
+  +files/miniaudicle-0.1.3.8-void-to-int-cast.patch:
+  Add patch to fix void to integer casting for amd64. Bug #318787
 
   15 Jul 2010; Christian Faulhammer <fauli@gentoo.org>
   miniaudicle-0.1.3.8-r1.ebuild:
diff --git a/media-sound/miniaudicle/files/miniaudicle-0.1.3.8-void-to-int-cast.patch b/media-sound/miniaudicle/files/miniaudicle-0.1.3.8-void-to-int-cast.patch
new file mode 100644
index 000000000000..926788c6f20c
--- /dev/null
+++ b/media-sound/miniaudicle/files/miniaudicle-0.1.3.8-void-to-int-cast.patch
@@ -0,0 +1,58 @@
+Index: miniAudicle-0.1.3.8/wxw/mAPreferencesWindow.cpp
+===================================================================
+--- miniAudicle-0.1.3.8.orig/wxw/mAPreferencesWindow.cpp
++++ miniAudicle-0.1.3.8/wxw/mAPreferencesWindow.cpp
+@@ -828,7 +828,7 @@ void mAPreferencesWindow::LoadGUIToMiniA
+     selected_item = audio_output->GetSelection();
+     if( selected_item != wxNOT_FOUND )
+     {
+-        int dac = ( int ) audio_output->GetClientData( selected_item );
++        int dac = ( intptr_t ) audio_output->GetClientData( selected_item );
+         config->Write( mAPreferencesAudioOutput, dac );
+         ma->set_dac( dac );
+     }
+@@ -837,7 +837,7 @@ void mAPreferencesWindow::LoadGUIToMiniA
+     selected_item = audio_input->GetSelection();
+     if( selected_item != wxNOT_FOUND )
+     {
+-        int adc = ( int ) audio_input->GetClientData( selected_item );
++        int adc = ( intptr_t ) audio_input->GetClientData( selected_item );
+         config->Write( mAPreferencesAudioInput, adc );
+         ma->set_adc( adc );
+     }
+@@ -846,7 +846,7 @@ void mAPreferencesWindow::LoadGUIToMiniA
+     selected_item = output_channels->GetSelection();
+     if( selected_item != wxNOT_FOUND )
+     {
+-        int num_outputs = ( int ) output_channels->GetClientData( selected_item );
++        int num_outputs = ( intptr_t ) output_channels->GetClientData( selected_item );
+         config->Write( mAPreferencesOutputChannels, num_outputs );
+         ma->set_num_outputs( num_outputs );
+     }
+@@ -855,7 +855,7 @@ void mAPreferencesWindow::LoadGUIToMiniA
+     selected_item = input_channels->GetSelection();
+     if( selected_item != wxNOT_FOUND )
+     {
+-        int num_inputs = ( int ) input_channels->GetClientData( selected_item );
++        int num_inputs = ( intptr_t ) input_channels->GetClientData( selected_item );
+         config->Write( mAPreferencesInputChannels, num_inputs );
+         ma->set_num_inputs( num_inputs );
+     }
+@@ -864,7 +864,7 @@ void mAPreferencesWindow::LoadGUIToMiniA
+     selected_item = sample_rate->GetSelection();
+     if( selected_item != wxNOT_FOUND )
+     {
+-        int _sample_rate = ( int ) sample_rate->GetClientData( selected_item );
++        int _sample_rate = ( intptr_t ) sample_rate->GetClientData( selected_item );
+         config->Write( mAPreferencesSampleRate, _sample_rate );
+         ma->set_sample_rate( _sample_rate );
+     }
+@@ -873,7 +873,7 @@ void mAPreferencesWindow::LoadGUIToMiniA
+     selected_item = buffer_size->GetSelection();
+     if( selected_item != wxNOT_FOUND )
+     {
+-        int _buffer_size = ( int ) buffer_size->GetClientData( selected_item );
++        int _buffer_size = ( intptr_t ) buffer_size->GetClientData( selected_item );
+         config->Write( mAPreferencesBufferSize, _buffer_size );
+         ma->set_buffer_size( _buffer_size );
+     }
diff --git a/media-sound/miniaudicle/miniaudicle-0.1.3.8-r1.ebuild b/media-sound/miniaudicle/miniaudicle-0.1.3.8-r1.ebuild
index 6ff0b2529703..adfa4a9b327f 100644
--- a/media-sound/miniaudicle/miniaudicle-0.1.3.8-r1.ebuild
+++ b/media-sound/miniaudicle/miniaudicle-0.1.3.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/miniaudicle/miniaudicle-0.1.3.8-r1.ebuild,v 1.3 2010/07/15 08:54:53 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/miniaudicle/miniaudicle-0.1.3.8-r1.ebuild,v 1.4 2010/07/15 12:12:12 hwoarang Exp $
 
 EAPI=2
 WX_GTK_VER=2.8
@@ -14,7 +14,7 @@ SRC_URI="http://audicle.cs.princeton.edu/mini/release/files/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="amd64 x86"
 IUSE="+alsa jack oss"
 
 RDEPEND="jack? ( media-sound/jack-audio-connection-kit )
@@ -39,6 +39,7 @@ pkg_setup() {
 src_prepare() {
 	epatch "${FILESDIR}/${P}-hid-smc.patch"
 	epatch "${FILESDIR}/${P}-gcc44.patch"
+	epatch "${FILESDIR}/${P}-void-to-int-cast.patch"
 
 	sed -i -e "s/make -C/#make -C/" \
 		-e "s/g++/\$(CXX)/" \