[SCM] faad2/master: Merge patch from ubuntu.

Reinhard Tartler siretart at tauware.de
Tue Aug 2 14:51:18 UTC 2011


On Tue, Aug 02, 2011 at 16:02:28 (CEST), fabian-guest at users.alioth.debian.org wrote:

> The following commit has been merged in the master branch:
> commit 78803a6606e92345a892acc49af61a8a638ff683
> Author: Fabian Greffrath <fabian at greffrath.com>
> Date:   Tue Aug 2 15:58:56 2011 +0200
>
>     Merge patch from ubuntu.

patch is missing documentation

> diff --git a/debian/patches/fix_ftbfs_with_gcc4.5.patch b/debian/patches/fix_ftbfs_with_gcc4.5.patch
> new file mode 100644
> index 0000000..e1d543f
> --- /dev/null
> +++ b/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];

-- 
Gruesse/greetings,
Reinhard Tartler, KeyID 945348A4



More information about the pkg-multimedia-maintainers mailing list