[SCM] lame/master: Unbreak compilation with gcc 4.4

[Andres Mejia]

On Aug 10, 2011 3:47 PM, <siretart at users.alioth.debian.org> wrote:
>
> The following commit has been merged in the master branch:
> commit f0dab4aa25fa51c851c8190ef172194ecc275a80
> Author: Reinhard Tartler <siretart at tauware.de>
> Date:   Wed Aug 10 21:44:23 2011 +0200
>
>    Unbreak compilation with gcc 4.4
>
>    This patch is only necessary before gcc 4.5, such as gcc 4.4 in
debian/squeeze.
>    Actually, this is a workaround in config.h for a workaround in the
autoconf
>    generated configure script, which comments out every #undef CPP
statement.
>    This is actually documented in the autoconf manual, like here:
>    http://www.gnu.org/s/hello/manual/autoconf/Header-Templates.html
>
> diff --git a/debian/patches/series b/debian/patches/series
> index 0eeed71..9fa2916 100644
> --- a/debian/patches/series
> +++ b/debian/patches/series
> @@ -5,3 +5,4 @@ license-ouput-change.patch
>  parallel-builds-fix.patch
>  portableio-compiler-warning-fix.patch
>  alpha-build-fix.patch
> +unbreak-ftbfs-gcc4.4.patch
> diff --git a/debian/patches/unbreak-ftbfs-gcc4.4.patch
b/debian/patches/unbreak-ftbfs-gcc4.4.patch
> new file mode 100644
> index 0000000..d061b9b
> --- /dev/null
> +++ b/debian/patches/unbreak-ftbfs-gcc4.4.patch
> @@ -0,0 +1,93 @@
> +Description: Unbreak compilation with gcc 4.4
> + This patch is only necessary before gcc 4.5, such as gcc 4.4 in
debian/squeeze.
> + Actually, this is a workaround in config.h for a workaround in the
autoconf
> + generated configure script, which comments out every #undef CPP
statement.
> + This is actually documented in the autoconf manual, like here:
> + http://www.gnu.org/s/hello/manual/autoconf/Header-Templates.html
> +Author: Reinhard Tartler <siretart at tauware.de>
> +
> +
> +
> +--- lame-3.98.4+repack2.orig/config.h.in
> ++++ lame-3.98.4+repack2/config.h.in
> +@@ -54,12 +54,14 @@
> + /* add ieee754_float32_t type */
> + #undef HAVE_IEEE754_FLOAT32_T
> + #ifndef HAVE_IEEE754_FLOAT32_T
> ++#define HAVE_IEEE754_FLOAT32_T
> +       typedef float ieee754_float32_t;
> + #endif
> +
> + /* add ieee754_float64_t type */
> + #undef HAVE_IEEE754_FLOAT64_T
> + #ifndef HAVE_IEEE754_FLOAT64_T
> ++#define HAVE_IEEE754_FLOAT64_T
> +       typedef double ieee754_float64_t;
> + #endif
> +
> +@@ -69,6 +71,7 @@
> + /* add ieee854_float80_t type */
> + #undef HAVE_IEEE854_FLOAT80_T
> + #ifndef HAVE_IEEE854_FLOAT80_T
> ++#define HAVE_IEEE854_FLOAT80_T
> +       typedef long double ieee854_float80_t;
> + #endif
> +
> +--- lame-3.98.4+repack2.orig/configure.in
> ++++ lame-3.98.4+repack2/configure.in
> +@@ -141,6 +141,7 @@ AH_VERBATIM([HAVE_UINT8_T],
> + [/* add uint8_t type */
> + #undef HAVE_UINT8_T
> + #ifndef HAVE_UINT8_T
> ++#define HAVE_UINT8_T
> +       typedef unsigned char uint8_t;
> + #endif])
> +
> +@@ -148,6 +149,7 @@ AH_VERBATIM([HAVE_INT8_T],
> + [/* add int8_t type */
> + #undef HAVE_INT8_T
> + #ifndef HAVE_INT8_T
> ++#define HAVE_INT8_T
> +       typedef char int8_t;
> + #endif])
> +
> +@@ -155,6 +157,7 @@ AH_VERBATIM([HAVE_UINT16_T],
> + [/* add uint16_t type */
> + #undef HAVE_UINT16_T
> + #ifndef HAVE_UINT16_T
> ++#define HAVE_UINT16_T
> +       typedef unsigned short uint16_t;
> + #endif])
> +
> +@@ -162,6 +165,7 @@ AH_VERBATIM([HAVE_INT16_T],
> + [/* add int16_t type */
> + #undef HAVE_INT16_T
> + #ifndef HAVE_INT16_T
> ++#define HAVE_INT16_T
> +       typedef short int16_t;
> + #endif])
> +
> +@@ -269,6 +273,7 @@ if test "${alex_cv_ieee854_float80}" = "
> + [/* add ieee854_float80_t type */
> + #undef HAVE_IEEE854_FLOAT80_T
> + #ifndef HAVE_IEEE854_FLOAT80_T
> ++#define HAVE_IEEE854_FLOAT80_T
> +       typedef long double ieee854_float80_t;
> + #endif])
> +
> +@@ -281,6 +286,7 @@ AH_VERBATIM([HAVE_IEEE754_FLOAT64_T],
> + [/* add ieee754_float64_t type */
> + #undef HAVE_IEEE754_FLOAT64_T
> + #ifndef HAVE_IEEE754_FLOAT64_T
> ++#define HAVE_IEEE754_FLOAT64_T
> +       typedef double ieee754_float64_t;
> + #endif])
> +
> +@@ -288,6 +294,7 @@ AH_VERBATIM([HAVE_IEEE754_FLOAT32_T],
> + [/* add ieee754_float32_t type */
> + #undef HAVE_IEEE754_FLOAT32_T
> + #ifndef HAVE_IEEE754_FLOAT32_T
> ++#define HAVE_IEEE754_FLOAT32_T
> +       typedef float ieee754_float32_t;
> + #endif])
> +
>
> --
> lame packaging
>
> _______________________________________________
> pkg-multimedia-commits mailing list
> pkg-multimedia-commits at lists.alioth.debian.org
>
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-commits

If this is only specific to a compiler version, than this should be done
only for those compiler versions.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-multimedia-maintainers/attachments/20110812/d63b4f88/attachment.html>