[SCM] libmpc/master: Avoid re-define mpc_uint8_t, MPC_SAMPLE_FORMAT and mpc_int16_t in libmpcdec/requant.h, they are defined somewhere else in the code.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 529907a35bff5c199e13b3d531dbf55bedd1f50b
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Jun 21 09:27:11 2012 +0200

    Avoid re-define mpc_uint8_t, MPC_SAMPLE_FORMAT and mpc_int16_t in
    libmpcdec/requant.h, they are defined somewhere else in the code.
    
    Patch taken from upstream trunk.
    
    Closes: #665974
    Thanks: Han Boetes for the report and Fabian Greffrath for traging the bug.

diff --git a/debian/patches/1001_missing_extern_kw.patch b/debian/patches/1001_missing_extern_kw.patch
new file mode 100644
index 0000000..031d8f6
--- /dev/null
+++ b/debian/patches/1001_missing_extern_kw.patch
@@ -0,0 +1,22 @@
+Subject: Add extern keyword to global variable declaration.
+Origin: upstream, commit:r479
+Bug-Debian: http://bugs.debian.org/665974
+---
+ libmpcdec/requant.h |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- libmpc.orig/libmpcdec/requant.h
++++ libmpc/libmpcdec/requant.h
+@@ -47,9 +47,9 @@ extern "C" {
+ 
+ 
+ /* C O N S T A N T S */
+-const mpc_uint8_t      Res_bit [18];     ///< Bits per sample for chosen quantizer
+-const MPC_SAMPLE_FORMAT __Cc    [1 + 18]; ///< Requantization coefficients
+-const mpc_int16_t       __Dc    [1 + 18]; ///< Requantization offset
++extern const mpc_uint8_t      Res_bit [18];     ///< Bits per sample for chosen quantizer
++extern const MPC_SAMPLE_FORMAT __Cc    [1 + 18]; ///< Requantization coefficients
++extern const mpc_int16_t       __Dc    [1 + 18]; ///< Requantization offset
+ 
+ #define Cc (__Cc + 1)
+ #define Dc (__Dc + 1)
diff --git a/debian/patches/series b/debian/patches/series
index c35219a..5c06017 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 02_link-libm.patch
 03_mpcchap.patch
 04_link-order.patch
+1001_missing_extern_kw.patch

-- 
libmpc packaging