diff -u faad2-2.7/debian/control faad2-2.7/debian/control --- faad2-2.7/debian/control +++ faad2-2.7/debian/control @@ -1,7 +1,8 @@ Source: faad2 Section: libs Priority: optional -Maintainer: Debian multimedia packages maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian multimedia packages maintainers Uploaders: Matthew W. S. Bell , Andres Mejia , Reinhard Tartler , diff -u faad2-2.7/debian/changelog faad2-2.7/debian/changelog --- faad2-2.7/debian/changelog +++ faad2-2.7/debian/changelog @@ -1,3 +1,53 @@ +faad2 (2.7-6ubuntu1~ppa1~lucid1) lucid; urgency=low + + * Backport to Lucidbleed ppa. + + -- Nicola Ferralis Wed, 01 Dec 2010 23:14:51 -0800 + +faad2 (2.7-6ubuntu1) natty; urgency=low + + [ Angel Abad ] + * Merge from debian unstable (LP: #680474). Remaining changes: + - debian/patches/fix_ftbfs_with_gcc4.5.patch + + Correctly declare lrintf in libfaad/common.h to avoid a conflict of + declaration in mathcalls.h to fix FTBFS on i386 + + [ Bhavani Shankar ] + * Remove useless chunk from the patch I created above to fix FTBFS + which happened due to my mistake. Sigh! + + -- Angel Abad Tue, 23 Nov 2010 13:48:21 +0100 + +faad2 (2.7-6) unstable; urgency=high + + [ Alessio Treglia ] + * Fix segmentation fault in faad due to an incorrect pointer size + (Closes: #603807, LP: #665802). + * Add gbp config file. + + [ Andres Mejia ] + * Revert changes in 2.7-5. Upload of 2.7-5 was unintentionally done. + * Refresh patches. + + -- Andres Mejia Mon, 22 Nov 2010 19:17:36 -0500 + +faad2 (2.7-5ubuntu1) natty; urgency=low + + * debian/patches/fix_ftbfs_with_gcc4.5.patch + - Correctly declare lrintf in libfaad/common.h to avoid a conflict of + declaration in mathcalls.h to fix FTBFS on i386 + + -- Bhavani Shankar Tue, 23 Nov 2010 12:35:27 +0530 + +faad2 (2.7-5) unstable; urgency=low + + * Update my e-mail address. + * Apply SqueezeCenter patches from FreeBSD that enable streaming with + BBCiPlayer and ezstream (LP: #470562). + * Extend file name buffers for longer path names (LP: #475050). + + -- Fabian Greffrath Mon, 16 Aug 2010 16:43:14 +0200 + faad2 (2.7-4) unstable; urgency=low * debian/control: Do not build the shared libmp4ff library packages diff -u faad2-2.7/debian/patches/series faad2-2.7/debian/patches/series --- faad2-2.7/debian/patches/series +++ faad2-2.7/debian/patches/series @@ -1,0 +2,2 @@ +incorrect_pointer_size.patch +fix_ftbfs_with_gcc4.5.patch only in patch2: unchanged: --- faad2-2.7.orig/debian/gbp.conf +++ faad2-2.7/debian/gbp.conf @@ -0,0 +1,5 @@ +[DEFAULT] +debian-branch = unstable +upstream-branch = upstream +pristine-tar = True +sign-tags = True only in patch2: unchanged: --- faad2-2.7.orig/debian/patches/incorrect_pointer_size.patch +++ faad2-2.7/debian/patches/incorrect_pointer_size.patch @@ -0,0 +1,35 @@ +Description: faad segfaults on amd64 due to incorrect pointer size + When running faad with a command line similar to: + alessio@alessio-laptop:~$ faad -b 2 -f 2 -w sample.aac + a SIGSEGV gets raised. This issue is due to an incorrect pointer size + used in the write_audio{32,64}bit functions. +Origin: Ubuntu +Bug: https://sourceforge.net/support/tracker.php?aid=3110758 +Bug-Debian: http://bugs.debian.org/603807 +Bug-Ubuntu: https://launchpad.net/bugs/665802 +Reviewed-by: Alessio Treglia +Last-Update: 2010-11-17 +--- + frontend/audio.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/frontend/audio.c ++++ b/frontend/audio.c +@@ -347,7 +347,7 @@ + { + int ret; + unsigned int i; +- long *sample_buffer24 = (long*)sample_buffer; ++ int *sample_buffer24 = (int*)sample_buffer; + char *data = malloc(samples*aufile->bits_per_sample*sizeof(char)/8); + + aufile->total_samples += samples; +@@ -391,7 +391,7 @@ + { + int ret; + unsigned int i; +- long *sample_buffer32 = (long*)sample_buffer; ++ int *sample_buffer32 = (int*)sample_buffer; + char *data = malloc(samples*aufile->bits_per_sample*sizeof(char)/8); + + aufile->total_samples += samples; only in patch2: unchanged: --- faad2-2.7.orig/debian/patches/fix_ftbfs_with_gcc4.5.patch +++ faad2-2.7/debian/patches/fix_ftbfs_with_gcc4.5.patch @@ -0,0 +1,22 @@ +Index: faad2-2.7/libfaad/common.h +===================================== +--- faad2-2.7.orig/libfaad/common.h ++++ faad2-2.7/libfaad/common.h +@@ -330,7 +330,7 @@ + #ifndef HAVE_LRINTF + #define HAS_LRINTF + // from http://www.stereopsis.com/FPU.html +- static INLINE int lrintf(float f) ++ static INLINE int _lrintf(float f) + { + int i; + __asm__ __volatile__ ( +@@ -396,7 +396,7 @@ + + #ifndef HAS_LRINTF + /* standard cast */ +-#define lrintf(f) ((int32_t)(f)) ++#define _lrintf(f) ((int32_t)(f)) + #endif + + typedef real_t complex_t[2];