[SCM] libmpc/master: Removed, included upstream

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Sun Sep 11 17:15:18 UTC 2016


The following commit has been merged in the master branch:
commit 000cd09aecba576e29537df2a8eee68597ba7835
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sun Sep 11 18:34:16 2016 +0200

    Removed, included upstream

diff --git a/debian/patches/1001_missing_extern_kw.patch b/debian/patches/1001_missing_extern_kw.patch
deleted file mode 100644
index 031d8f6..0000000
--- a/debian/patches/1001_missing_extern_kw.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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 eb67a69..d43571a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,5 @@
 01_am-maintainer-mode.patch
-02_link-libm.patch
 03_mpcchap.patch
 04_link-order.patch
-1001_missing_extern_kw.patch
 add_subdir-objects.patch
 05_visibility.patch

-- 
libmpc packaging



More information about the pkg-multimedia-commits mailing list