diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2020-06-13 00:19:55 +0100 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2020-06-13 00:19:55 +0100 |
| commit | d003b99aff2ca04697f7598397d9c0767349647a (patch) | |
| tree | d0fec44f78aef04544fab44ccd12ee5b9c267b17 /media-sound/musepack-tools | |
| parent | app-crypt/pinentry: respect user's AR setting (diff) | |
| download | gentoo-d003b99aff2ca04697f7598397d9c0767349647a.tar.gz gentoo-d003b99aff2ca04697f7598397d9c0767349647a.tar.bz2 gentoo-d003b99aff2ca04697f7598397d9c0767349647a.zip | |
media-sound/musepack-tools: fix -fno-common build failure
Fix by Jeroen Roovers.
Reported-by: Toralf Förster
Closes: https://bugs.gentoo.org/706992
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Diffstat (limited to 'media-sound/musepack-tools')
| -rw-r--r-- | media-sound/musepack-tools/files/musepack-tools-465-fno-common.patch | 16 | ||||
| -rw-r--r-- | media-sound/musepack-tools/musepack-tools-465-r1.ebuild | 5 |
2 files changed, 20 insertions, 1 deletions
diff --git a/media-sound/musepack-tools/files/musepack-tools-465-fno-common.patch b/media-sound/musepack-tools/files/musepack-tools-465-fno-common.patch new file mode 100644 index 000000000000..0fb9f5e5eb55 --- /dev/null +++ b/media-sound/musepack-tools/files/musepack-tools-465-fno-common.patch @@ -0,0 +1,16 @@ +https://bugs.gentoo.org/706992 +--- a/libmpcdec/requant.h ++++ b/libmpcdec/requant.h +@@ -47,9 +47,9 @@ + + + /* 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/media-sound/musepack-tools/musepack-tools-465-r1.ebuild b/media-sound/musepack-tools/musepack-tools-465-r1.ebuild index dd79c74addd3..6c28404bd48e 100644 --- a/media-sound/musepack-tools/musepack-tools-465-r1.ebuild +++ b/media-sound/musepack-tools/musepack-tools-465-r1.ebuild @@ -27,4 +27,7 @@ RDEPEND="${DEPEND} !media-libs/libmpcdecsv7 " -PATCHES=( "${FILESDIR}/${P}-gentoo.patch" ) +PATCHES=( + "${FILESDIR}/${P}-gentoo.patch" + "${FILESDIR}/${P}-fno-common.patch" +) |