summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Seifert <soap@gentoo.org>2020-08-08 18:53:24 +0200
committerDavid Seifert <soap@gentoo.org>2020-08-08 18:53:24 +0200
commit9ad99e9ec198ceac774013a65828ed92e81fdfee (patch)
tree7d043c3994b2ebf904cbf73387ef77c3fd4ff725
parentmedia-sound/chordii: Fix building under -fno-common (diff)
downloadgentoo-9ad99e9ec198ceac774013a65828ed92e81fdfee.tar.gz
gentoo-9ad99e9ec198ceac774013a65828ed92e81fdfee.tar.bz2
gentoo-9ad99e9ec198ceac774013a65828ed92e81fdfee.zip
media-sound/wavegain: Fix building under -fno-common
Closes: https://bugs.gentoo.org/706692 Package-Manager: Portage-3.0.1, Repoman-2.3.23 Signed-off-by: David Seifert <soap@gentoo.org>
-rw-r--r--media-sound/wavegain/files/wavegain-1.3.1-fno-common.patch11
-rw-r--r--media-sound/wavegain/files/wavegain-1.3.1-makefile.patch7
-rw-r--r--media-sound/wavegain/wavegain-1.3.1.ebuild15
3 files changed, 27 insertions, 6 deletions
diff --git a/media-sound/wavegain/files/wavegain-1.3.1-fno-common.patch b/media-sound/wavegain/files/wavegain-1.3.1-fno-common.patch
new file mode 100644
index 00000000000..ff282740f8f
--- /dev/null
+++ b/media-sound/wavegain/files/wavegain-1.3.1-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/audio.h
++++ b/audio.h
+@@ -136,7 +136,7 @@
+ long wav_read(void *, double **buffer, int samples, int fast, int chunk);
+ long wav_ieee_read(void *, double **buffer, int samples, int fast, int chunk);
+
+-enum {
++typedef enum {
+ WAV_NO_FMT = 0,
+ WAV_FMT_8BIT,
+ WAV_FMT_16BIT,
diff --git a/media-sound/wavegain/files/wavegain-1.3.1-makefile.patch b/media-sound/wavegain/files/wavegain-1.3.1-makefile.patch
new file mode 100644
index 00000000000..a5364f561b5
--- /dev/null
+++ b/media-sound/wavegain/files/wavegain-1.3.1-makefile.patch
@@ -0,0 +1,7 @@
+--- a/Makefile
++++ b/Makefile
+@@ -0,0 +1,4 @@
++LDLIBS = -lm
++CPPFLAGS += -DHAVE_CONFIG_H
++
++wavegain: audio.o dither.o gain_analysis.o getopt1.o getopt.o main.o misc.o recurse.o
diff --git a/media-sound/wavegain/wavegain-1.3.1.ebuild b/media-sound/wavegain/wavegain-1.3.1.ebuild
index 8e51ee45a37..9790a1958c4 100644
--- a/media-sound/wavegain/wavegain-1.3.1.ebuild
+++ b/media-sound/wavegain/wavegain-1.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,15 +12,18 @@ SRC_URI="http://www.rarewares.org/files/others/${P}srcs.zip"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="amd64 x86"
-IUSE=""
BDEPEND="app-arch/unzip"
-S=${WORKDIR}/${P/wavegain/WaveGain}
+S="${WORKDIR}/${P/wavegain/WaveGain}"
-src_compile() {
- $(tc-getCC) ${LDFLAGS} ${CFLAGS} *.c -o ${PN} \
- -DHAVE_CONFIG_H -lm || die "build failed"
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.3.1-makefile.patch
+ "${FILESDIR}"/${PN}-1.3.1-fno-common.patch
+)
+
+src_configure() {
+ tc-export CC
}
src_install() {