From: Michael Januszewski Date: Fri, 16 Mar 2007 20:03:01 +0000 (+0000) Subject: Add a patch to make UADE work with audacious-1.3.x. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=329a964fa796472a2e1b3c7cbff0096943547b95;p=gentoo.git Add a patch to make UADE work with audacious-1.3.x. Package-Manager: portage-2.1.2.2 --- diff --git a/app-emulation/uade/ChangeLog b/app-emulation/uade/ChangeLog index 1b1353c48759..576a24b87475 100644 --- a/app-emulation/uade/ChangeLog +++ b/app-emulation/uade/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-emulation/uade # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/uade/ChangeLog,v 1.42 2007/01/27 11:49:46 spock Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/uade/ChangeLog,v 1.43 2007/03/16 20:03:01 spock Exp $ + + 16 Mar 2007; Michał Januszewski + +files/uade-2.05-audacious-1.3api.patch, uade-2.05.ebuild: + Add a patch to make UADE work with audacious-1.3.x. *uade-2.05 (27 Jan 2007) diff --git a/app-emulation/uade/Manifest b/app-emulation/uade/Manifest index d89dc293f52f..2449c2f6db83 100644 --- a/app-emulation/uade/Manifest +++ b/app-emulation/uade/Manifest @@ -1,6 +1,10 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX uade-2.05-audacious-1.3api.patch 5368 RMD160 ecb790272b6f98bd7543f87ee0c65f43847532ed SHA1 c813044ceec0b270918b77a7c064c34aac747dbf SHA256 b15e808456353ff53e05d89e41e62094f673feb64ad28e0f34f8b9275b6bfa34 +MD5 6e659afa0e18092d99a92b23888aecbb files/uade-2.05-audacious-1.3api.patch 5368 +RMD160 ecb790272b6f98bd7543f87ee0c65f43847532ed files/uade-2.05-audacious-1.3api.patch 5368 +SHA256 b15e808456353ff53e05d89e41e62094f673feb64ad28e0f34f8b9275b6bfa34 files/uade-2.05-audacious-1.3api.patch 5368 DIST uade-2.02.tar.bz2 2237098 RMD160 b1d2d1f9a0450dceaad87d68468a1f4c56ca78c2 SHA1 b45d76f1aaffd5b7c66b5b7158e6f3d2dde93758 SHA256 9e9fbd8e970fbc18bb1b53a1c819b0c0e2e04159bc8fa4c1398db69ca11b350f DIST uade-2.03.tar.bz2 2445151 RMD160 c40c8b3b97c565143b2204407ecad56de8389291 SHA1 9c8436c8285c895815df1a55b5991951fea15cd6 SHA256 5513ac7359c0aabcc314023664f75eef2b2e5e9c41966dc87d4eb496aed1cfbb DIST uade-2.05.tar.bz2 2506572 RMD160 d84d78cfd0ff27b8daa9789109c1b5c955e9ba99 SHA1 9470c9b78e52ee766b45507dc034eb2e794beece SHA256 3c1f08d1eaa19d3381407994b5190bbd01ff97e9aaec992ddcbdfa245724eead @@ -12,14 +16,14 @@ EBUILD uade-2.03.ebuild 949 RMD160 bd7cc02af2a1415b0e15e96596b19f88bd892b2d SHA1 MD5 be9fc564ae216cb6474f2a52efd5638c uade-2.03.ebuild 949 RMD160 bd7cc02af2a1415b0e15e96596b19f88bd892b2d uade-2.03.ebuild 949 SHA256 1a6266dd71fbcc3dedd5172a3c1a270e677c70134dae946f5f97b3b36e6c462b uade-2.03.ebuild 949 -EBUILD uade-2.05.ebuild 946 RMD160 78a054d732095ebed5c0358dd04beec2c5ebc60d SHA1 0386fc86a344ca3569cfbb1be8415d11ad844b0c SHA256 8ad662a447f8983a15575d5f8a612ba8471dbe69913d461124cd1d87b2c24fa1 -MD5 e831dc929ae5f23d389da889e6e1ad9b uade-2.05.ebuild 946 -RMD160 78a054d732095ebed5c0358dd04beec2c5ebc60d uade-2.05.ebuild 946 -SHA256 8ad662a447f8983a15575d5f8a612ba8471dbe69913d461124cd1d87b2c24fa1 uade-2.05.ebuild 946 -MISC ChangeLog 5817 RMD160 825ff49658a66d0459430e26848df6b97c02d374 SHA1 3c4d2e2bc9cc92786a4aaf5a4f7a374cddc8c773 SHA256 f044e2d363667ca3f753b5cf27b5ff16f20428b2b5705e740b3fd9aa56237d13 -MD5 b7d63108e42e800bc59d1a6802d38f72 ChangeLog 5817 -RMD160 825ff49658a66d0459430e26848df6b97c02d374 ChangeLog 5817 -SHA256 f044e2d363667ca3f753b5cf27b5ff16f20428b2b5705e740b3fd9aa56237d13 ChangeLog 5817 +EBUILD uade-2.05.ebuild 1098 RMD160 9b7d696a9e17b540436215219a2b3b2d9a03050d SHA1 4cca82990cd2a0a2e8585208d0893cbff0d0b206 SHA256 7c25de40d57b80615bf66ff3a7bff1ceb8a99391628485866d90f74bea97c589 +MD5 93e88035d99a86d3745ac5fb63c86dd0 uade-2.05.ebuild 1098 +RMD160 9b7d696a9e17b540436215219a2b3b2d9a03050d uade-2.05.ebuild 1098 +SHA256 7c25de40d57b80615bf66ff3a7bff1ceb8a99391628485866d90f74bea97c589 uade-2.05.ebuild 1098 +MISC ChangeLog 5987 RMD160 309685fc0f31122332ef677d020e8786267e6b93 SHA1 c2d688cc8cc49762b773197a990f31aed9f12983 SHA256 0aca9b9bb92f0957911232611703c1f0c7074de4a7499e663507bf2ee1925e88 +MD5 2530161f16f733f7c92877b5d71d6bb8 ChangeLog 5987 +RMD160 309685fc0f31122332ef677d020e8786267e6b93 ChangeLog 5987 +SHA256 0aca9b9bb92f0957911232611703c1f0c7074de4a7499e663507bf2ee1925e88 ChangeLog 5987 MISC metadata.xml 218 RMD160 b10411259113a239f02f2e712a32633b3899261f SHA1 d9d7e09f5001d8f20471ae09a9f1962381edc5cf SHA256 dcc5da1084320a3cc6e00901462943cc8d56a75a2016e9f1117ca77732425f49 MD5 0b82c3330c62c51575e96b017e41a42f metadata.xml 218 RMD160 b10411259113a239f02f2e712a32633b3899261f metadata.xml 218 @@ -34,9 +38,9 @@ MD5 971dbf7a6abcbc61146028b05f56458e files/digest-uade-2.05 235 RMD160 ff92462557e0216bdd7999d1fb0d12e1a2902c54 files/digest-uade-2.05 235 SHA256 5c8f892fbecc34f77c7dbb326f34c37c964a69b1bd2c4f0bf6a54898bd29d6f0 files/digest-uade-2.05 235 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.1 (GNU/Linux) +Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFFuzxnchej4aZK9/cRAmquAJ9U8IxrzHlSw8On6BS5XmY/hQzzLACfecQh -OdraS6/uWyIlGriq1Nq58AI= -=OZpE +iD8DBQFF+vfmchej4aZK9/cRAt1hAJ9fmIBQcxTkvDk1J6QbpTLGjvjE/wCfTxLU +JPLCHigHnn25MOAhFXcNEi0= +=XWaA -----END PGP SIGNATURE----- diff --git a/app-emulation/uade/files/uade-2.05-audacious-1.3api.patch b/app-emulation/uade/files/uade-2.05-audacious-1.3api.patch new file mode 100644 index 000000000000..e93c92c9e2ea --- /dev/null +++ b/app-emulation/uade/files/uade-2.05-audacious-1.3api.patch @@ -0,0 +1,165 @@ +diff -ruN uade.orig/src/frontends/audacious/plugin.c uade/src/frontends/audacious/plugin.c +--- uade.orig/src/frontends/audacious/plugin.c 2006-07-02 13:51:17.000000000 +0200 ++++ uade/src/frontends/audacious/plugin.c 2007-02-02 21:57:26.000000000 +0100 +@@ -45,13 +45,13 @@ + static void uade_cleanup(void); + static void uade_file_info(char *filename); + static void uade_get_song_info(char *filename, char **title, int *length); +-static int uade_get_time(void); ++static int uade_get_time(InputPlayback *playback); + static void uade_init(void); + static int uade_is_our_file(char *filename); +-static void uade_pause(short paused); +-static void uade_play_file(char *filename); +-static void uade_seek(int time); +-static void uade_stop(void); ++static void uade_pause(InputPlayback *playback, short paused); ++static void uade_play_file(InputPlayback *playback); ++static void uade_seek(InputPlayback *playback, int time); ++static void uade_stop(InputPlayback *playback); + static void uade_info_string(void); + + +@@ -371,6 +371,8 @@ + + static void *play_loop(void *arg) + { ++ InputPlayback *playback = arg; ++ + enum uade_control_state state = UADE_S_STATE; + int ret; + int left = 0; +@@ -402,13 +404,13 @@ + uade_lock(); + if (uade_seek_forward) { + skip_bytes += uade_seek_forward * (UADE_BYTES_PER_FRAME * config.frequency); +- uade_ip.output->flush(uade_ip.output->written_time() + uade_seek_forward * 1000); ++ playback->output->flush(playback->output->written_time() + uade_seek_forward * 1000); + uade_seek_forward = 0; + } + if (uade_select_sub != -1) { + uadesong->cur_subsong = uade_select_sub; + uade_change_subsong(uadesong->cur_subsong, &uadeipc); +- uade_ip.output->flush(0); ++ playback->output->flush(0); + uade_select_sub = -1; + subsong_end = 0; + subsong_bytes = 0; +@@ -425,9 +427,9 @@ + song_end_trigger = 1; + } else { + uade_change_subsong(uadesong->cur_subsong, &uadeipc); +- while (uade_ip.output->buffer_playing()) ++ while (playback->output->buffer_playing()) + xmms_usleep(10000); +- uade_ip.output->flush(0); ++ playback->output->flush(0); + subsong_end = 0; + subsong_bytes = 0; + +@@ -444,7 +446,7 @@ + if (song_end_trigger) { + /* We must drain the audio fast if abort_playing happens (e.g. + the user changes song when we are here waiting the sound device) */ +- while (uade_ip.output->buffer_playing() && abort_playing == 0) ++ while (playback->output->buffer_playing() && abort_playing == 0) + + xmms_usleep(10000); + break; +@@ -501,7 +503,7 @@ + } + + uade_effect_run(&effects, (int16_t *) um->data, play_bytes / framesize); +- produce_audio(uade_ip.output->written_time(), sample_format, UADE_CHANNELS, play_bytes, um->data, &uade_thread_running); ++ produce_audio(playback->output->written_time(), sample_format, UADE_CHANNELS, play_bytes, um->data, &uade_thread_running); + + if (config.timeout != -1 && config.use_timeouts) { + if (song_end_trigger == 0) { +@@ -675,8 +677,9 @@ + } + + +-static void uade_play_file(char *filename) ++static void uade_play_file(InputPlayback *playback) + { ++ char *filename = playback->filename; + char tempname[PATH_MAX]; + char *t; + +@@ -716,7 +719,7 @@ + uade_spawn(&uadeipc, &uadepid, UADE_CONFIG_UADE_CORE, configname); + } + +- if (!uade_ip.output->open_audio(sample_format, config_backup.frequency, UADE_CHANNELS)) { ++ if (!playback->output->open_audio(sample_format, config_backup.frequency, UADE_CHANNELS)) { + abort_playing = 1; + return; + } +@@ -748,7 +751,7 @@ + if (initialize_song(filename) == FALSE) + goto err; + +- if (pthread_create(&decode_thread, NULL, play_loop, NULL)) { ++ if (pthread_create(&decode_thread, NULL, play_loop, playback)) { + fprintf(stderr, "uade: can't create play_loop() thread\n"); + uade_unalloc_song(uadesong); + uade_lock(); +@@ -762,11 +765,11 @@ + + err: + /* close audio that was opened */ +- uade_ip.output->close_audio(); ++ playback->output->close_audio(); + abort_playing = 1; + } + +-static void uade_stop(void) ++static void uade_stop(InputPlayback *playback) + { + /* Signal other subsystems to proceed to finished state as soon as possible + */ +@@ -803,22 +806,22 @@ + uade_unlock(); + } + +- uade_ip.output->close_audio(); ++ playback->output->close_audio(); + } + + + /* XMMS calls this function when pausing or unpausing */ +-static void uade_pause(short paused) ++static void uade_pause(InputPlayback *playback, short paused) + { + uade_lock(); + uade_is_paused = paused; + uade_unlock(); +- uade_ip.output->pause(paused); ++ playback->output->pause(paused); + } + + + /* XMMS calls this function when song is seeked */ +-static void uade_seek(int time) ++static void uade_seek(InputPlayback *playback, int time) + { + uade_gui_seek_subsong(time); + } +@@ -827,7 +830,7 @@ + /* XMMS calls this function periodically to determine current playing time. + We use this function to report song name and title after play_file(), + and to tell XMMS to end playing if song ends for any reason. */ +-static int uade_get_time(void) ++static int uade_get_time(InputPlayback *playback) + { + if (abort_playing || last_beat_played) + return -1; +@@ -842,7 +845,7 @@ + file_info_update(gui_module_filename, gui_player_filename, gui_modulename, gui_playername, gui_formatname); + } + +- return uade_ip.output->output_time(); ++ return playback->output->output_time(); + } + + diff --git a/app-emulation/uade/uade-2.05.ebuild b/app-emulation/uade/uade-2.05.ebuild index 756762f0c0e3..2379f58badd2 100644 --- a/app-emulation/uade/uade-2.05.ebuild +++ b/app-emulation/uade/uade-2.05.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/uade/uade-2.05.ebuild,v 1.1 2007/01/27 11:49:46 spock Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/uade/uade-2.05.ebuild,v 1.2 2007/03/16 20:03:01 spock Exp $ inherit eutils @@ -19,6 +19,14 @@ RDEPEND="media-libs/libao DEPEND="${RDEPEND} dev-util/pkgconfig" +src_unpack() { + unpack ${A} + cd ${S} + if has_version ">=media-sound/audacious-1.3.0"; then + epatch ${FILESDIR}/uade-2.05-audacious-1.3api.patch + fi +} + src_compile() { ./configure \ --prefix=/usr \