commit: 088ae1176787ef3d2c6bcd6f314b59b8766a7149 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Fri Jul 29 21:38:14 2022 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Fri Jul 29 21:38:14 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=088ae117
media-sound/combine_wave: update EAPI 6 -> 8 Closes: https://bugs.gentoo.org/714654 Signed-off-by: David Seifert <soap <AT> gentoo.org> ....3.1-r1.ebuild => combine_wave-0.3.1-r2.ebuild} | 22 +++++++++------------- .../files/combine_wave-0.3.1-makefile.patch | 22 ++++++++++++++++++++++ .../combine_wave-0.3.1-missing-includes.patch | 14 ++++++++++++++ 3 files changed, 45 insertions(+), 13 deletions(-) diff --git a/media-sound/combine_wave/combine_wave-0.3.1-r1.ebuild b/media-sound/combine_wave/combine_wave-0.3.1-r2.ebuild similarity index 58% rename from media-sound/combine_wave/combine_wave-0.3.1-r1.ebuild rename to media-sound/combine_wave/combine_wave-0.3.1-r2.ebuild index 6974e43cf260..ff73a2b87cd2 100644 --- a/media-sound/combine_wave/combine_wave-0.3.1-r1.ebuild +++ b/media-sound/combine_wave/combine_wave-0.3.1-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit toolchain-funcs @@ -12,18 +12,12 @@ SRC_URI="http://panteltje.com/panteltje/dvd/${P}.tgz"; LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" -DOCS=( CHANGES README combine_wave.man ) - -PATCHES=( "${FILESDIR}/${P}-overflow.patch" ) - -src_prepare() { - default - # fix makefile - sed -i -e "s:gcc:\$(CC):g" -e "s:= -O2:+=:g" \ - -e "s:\( -o \): \$(LDFLAGS)\1:g" Makefile || die "sed Makefile failed" -} +PATCHES=( + "${FILESDIR}"/${P}-makefile.patch + "${FILESDIR}"/${P}-overflow.patch + "${FILESDIR}"/${P}-missing-includes.patch +) src_configure() { tc-export CC @@ -31,5 +25,7 @@ src_configure() { src_install() { dobin combine_wave + einstalldocs + dodoc combine_wave.man } diff --git a/media-sound/combine_wave/files/combine_wave-0.3.1-makefile.patch b/media-sound/combine_wave/files/combine_wave-0.3.1-makefile.patch new file mode 100644 index 000000000000..591d56ad1867 --- /dev/null +++ b/media-sound/combine_wave/files/combine_wave-0.3.1-makefile.patch @@ -0,0 +1,22 @@ +--- a/Makefile ++++ b/Makefile +@@ -3,16 +3,13 @@ + #CC = /usr/local/bin/g++ + #CC = /usr/bin/g++ + +-CFLAGS = -O2 -Wall -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 +- +-.c.o: +- gcc $(CFLAGS) -c $< ++CFLAGS += -Wall ++CPPFLAGS += -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 + + OBJECT =\ + combine_wave.o + +-a.out : $(OBJECT) +- gcc -o combine_wave $(OBJECT) ++all: combine_wave + + # DEPENDENCIES + combine_wave.o : combine_wave.c combine_wave.h wave_header.h diff --git a/media-sound/combine_wave/files/combine_wave-0.3.1-missing-includes.patch b/media-sound/combine_wave/files/combine_wave-0.3.1-missing-includes.patch new file mode 100644 index 000000000000..3d6a3c938ba1 --- /dev/null +++ b/media-sound/combine_wave/files/combine_wave-0.3.1-missing-includes.patch @@ -0,0 +1,14 @@ +--- a/combine_wave.h ++++ b/combine_wave.h +@@ -12,9 +12,10 @@ + #include <float.h> + #include <math.h> + #include <linux/soundcard.h> +-#include <sys/poll.h> ++#include <poll.h> + #include "stdint.h" + #include <sys/ioctl.h> ++#include <sys/select.h> + #include <string.h> + +
