tags 583985 + patch tags 583985 + pending thanks Dear maintainer,
I've prepared an NMU for upse (versioned as 0.6.0-1.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. -- .''`. http://info.comodo.priv.at/ -- GPG key IDs: 0x8649AA06, 0x00F3CFE4 : :' : Debian GNU/Linux user, admin, & developer - http://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of Free Software Foundation Europe `- NP: Queen: I'm Going Slightly Mad
diff -u upse-0.6.0/debian/control upse-0.6.0/debian/control --- upse-0.6.0/debian/control +++ upse-0.6.0/debian/control @@ -2,7 +2,7 @@ Section: sound Priority: extra Maintainer: William Pitcock <neno...@sacredspiral.co.uk> -Build-Depends: debhelper (>= 5), autotools-dev, audacious-plugins-dev (>= 1.4), libao-dev, dpatch +Build-Depends: debhelper (>= 5), autotools-dev, audacious-dev (>= 1.4), libao-dev, dpatch Standards-Version: 3.7.3 Homepage: http://nenolod.net/upse diff -u upse-0.6.0/debian/patches/00list upse-0.6.0/debian/patches/00list --- upse-0.6.0/debian/patches/00list +++ upse-0.6.0/debian/patches/00list @@ -1,0 +2 @@ +02_audacious_2.3 diff -u upse-0.6.0/debian/changelog upse-0.6.0/debian/changelog --- upse-0.6.0/debian/changelog +++ upse-0.6.0/debian/changelog @@ -1,3 +1,14 @@ +upse (0.6.0-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix "FTBFS against audacious 2.3": + - build depend on audacious-dev instead of audacious-plugins-dev + - add patch 02_audacious_2.3.dpatch (taken from Ubuntu) + Thanks to Benjamin Drung for the bug report and to James Westby for the + patch; closes: #583985. + + -- gregor herrmann <gre...@debian.org> Sun, 20 Jun 2010 23:00:47 +0200 + upse (0.6.0-1) unstable; urgency=low * New upstream release. only in patch2: unchanged: --- upse-0.6.0.orig/debian/patches/02_audacious_2.3.dpatch +++ upse-0.6.0/debian/patches/02_audacious_2.3.dpatch @@ -0,0 +1,75 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_audacious_2.3.dpatch by <james.wes...@ubuntu.com> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +...@dpatch@ +diff -urNad upse~/src/upse-audacious/plugin.c upse/src/upse-audacious/plugin.c +--- upse~/src/upse-audacious/plugin.c 2010-04-16 12:25:52.000000000 +0100 ++++ upse/src/upse-audacious/plugin.c 2010-04-16 12:37:47.000000000 +0100 +@@ -68,26 +68,8 @@ + void upse_aud_update(unsigned char *buffer, long count, gpointer data) + { + InputPlayback *playback = (InputPlayback *) data; +- const int mask = ~((((16 / 8) * 2)) - 1); +- +- while (count > 0) +- { +- int t = playback->output->buffer_free() & mask; +- if (t > count) +- playback->pass_audio(playback, +- FMT_S16_NE, 2, count, buffer, &playback->playing); +- else +- { +- if (t) +- playback->pass_audio(playback, FMT_S16_NE, 2, t, buffer, &playback->playing); + +- /* XXX: wait for the buffer to drain */ +- g_usleep((count - t)*1000*5/441/2); +- } +- +- count -= t; +- buffer += t; +- } ++ playback->pass_audio(playback, FMT_S16_NE, 2, count, buffer, &playback->playing); + + if (seek) + { +@@ -140,10 +122,6 @@ + { + upse_execute(); + +- /* we have reached the end of the song or a command was issued */ +- playback->output->buffer_free(); +- playback->output->buffer_free(); +- + if (playback->playing == FALSE) + break; + +@@ -195,17 +173,6 @@ + seek = time * 1000; + } + +-static void upse_aud_getsonginfo(char *fn, char **title, int *length) +-{ +- upse_psf_t *tmp; +- +- if((tmp = upse_get_psf_metadata(fn, &upse_aud_iofuncs))) { +- *length = tmp->length; +- *title = upse_aud_get_title_psf(fn, tmp); +- upse_free_psf_metadata(tmp); +- } +-} +- + static Tuple *upse_aud_get_tuple_psf(const gchar *fn, upse_psf_t *psf) { + Tuple *tuple = NULL; + +@@ -284,7 +251,6 @@ + .stop = upse_aud_stop, + .pause = upse_aud_pause, + .seek = upse_aud_seek, +- .get_song_info = upse_aud_getsonginfo, + .get_song_tuple = get_tuple_psf, + .is_our_file_from_vfs = is_our_fd, + .vfs_extensions = upse_fmts,
signature.asc
Description: Digital signature
