From: Markos Chandras Date: Thu, 15 Jul 2010 12:12:12 +0000 (+0000) Subject: Add patch to fix void to integer casting for amd64. Bug #318787 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=382dc52744d4aee426d8828c0202c05a5a31c635;p=gentoo.git Add patch to fix void to integer casting for amd64. Bug #318787 Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- 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 + 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 miniaudicle-0.1.3.8-r1.ebuild: diff --git a/media-sound/miniaudicle/Manifest b/media-sound/miniaudicle/Manifest index fda5bdfc8a9d..2899b4dbb4f7 100644 --- a/media-sound/miniaudicle/Manifest +++ b/media-sound/miniaudicle/Manifest @@ -1,16 +1,7 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX miniaudicle-0.1.3.8-gcc44.patch 6358 RMD160 229de4851c3e86e8d0fbca13ea415c71634f2b8f SHA1 26b3a58ab814a80eede9a8f0509175e7e4ee7108 SHA256 dacaf5680b766e115efd187dac773231d209d23f149d85c541be8724815c37c2 AUX miniaudicle-0.1.3.8-hid-smc.patch 3101 RMD160 f8b325dd7da234c3bb85d13f3acc69e1a1f274c9 SHA1 7f4aa83ed7e437e90774f408f0c6392b53094121 SHA256 20c137254828b1638c5ef1aecb25d5eaa674fb3c723d98a45c41843e38bb3d73 +AUX miniaudicle-0.1.3.8-void-to-int-cast.patch 2821 RMD160 b180e424f85dc9f9092a99e4d027120bb082653f SHA1 622ad0cf7041962e95a0a36660374bec63f0b7bf SHA256 3deb04ae8df380698e47a80c46ca48a612d38afd463cfc4d5944bbdfbeb58472 DIST miniAudicle-0.1.3.8.tgz 2253821 RMD160 d332fffb4cddadf3f144ffc84f7fd62ec6bc82be SHA1 fbebccaf90fe11951fb104848444bcda292df5a1 SHA256 adfbd244a7963e646c466f70111fee4ecf32eee500c4c9a33ca9b52387631cd6 -EBUILD miniaudicle-0.1.3.8-r1.ebuild 2531 RMD160 81d0f95e01cf7d0a6b575521c38892132880d461 SHA1 4c75287123c88aae355ec93ddaf487194eec421a SHA256 3ffb1d252b62fd1cd55a505082cc31bf25ad38449585d8c07a4dddb908a96e26 -MISC ChangeLog 1183 RMD160 572df03ede6dadb418f60f5a71916a3e2785bd14 SHA1 004c57d1629ec837f2254f3f2c41e059ae8e6121 SHA256 892329d00204473de5137dac43a0e46c9bfc2850483fc95249e8a52e3065e9d9 +EBUILD miniaudicle-0.1.3.8-r1.ebuild 2590 RMD160 f42ba1d1b5080441895fc2407826d14f163a2833 SHA1 ed316bbb1c39dadab19379f82ee331099cd7995b SHA256 b502ba0c4107db4d8b7b492afda9dff63702dcef4409f40c7c7f12042eb68e8a +MISC ChangeLog 1392 RMD160 9b195bad0a1f6fdd2c5af819092d801cdd0545d0 SHA1 9cb87a9556e595f03a2e4bbc4ad96db44f0afe92 SHA256 d1a3a46bcdec4159ec4141d6103d78383430c17f494eda665589bf99f703003e MISC metadata.xml 405 RMD160 33bef0e9877b6e20dcf8d558327eb775cace4084 SHA1 54acba4e626df4d51aed5cd2d855770cf45dff95 SHA256 bc3639b5d9f5b72f07a88b90aad07da64da85bb37bc3f7d9ab5d5a15a8d82fd4 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.15 (GNU/Linux) - -iEYEARECAAYFAkw+zVAACgkQNQqtfCuFneOrvQCgmbpT3CVfCXi4EgM7ec6Rf+LO -UlYAni+QkaOBO7NgoaU4v2/1SkFtI8a/ -=HM/2 ------END PGP SIGNATURE----- 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)/" \