diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-07-30 03:08:54 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-07-30 03:08:54 +0100 |
| commit | cdb747b791914a30c287a3a8e33d1b635e431707 (patch) | |
| tree | be22ab4ebfae7f170acb577486d0edc7e6d14279 /media-sound/combine_wave | |
| parent | 496936ff0f7db69d1f7317341230acb866e3c330 (diff) | |
gentoo auto-resync : 30:07:2022 - 03:08:54
Diffstat (limited to 'media-sound/combine_wave')
| -rw-r--r-- | media-sound/combine_wave/Manifest | 4 | ||||
| -rw-r--r-- | media-sound/combine_wave/combine_wave-0.3.1-r2.ebuild (renamed from media-sound/combine_wave/combine_wave-0.3.1-r1.ebuild) | 22 | ||||
| -rw-r--r-- | media-sound/combine_wave/files/combine_wave-0.3.1-makefile.patch | 22 | ||||
| -rw-r--r-- | media-sound/combine_wave/files/combine_wave-0.3.1-missing-includes.patch | 14 |
4 files changed, 48 insertions, 14 deletions
diff --git a/media-sound/combine_wave/Manifest b/media-sound/combine_wave/Manifest index 3fa02af51e97..e102b93aa21e 100644 --- a/media-sound/combine_wave/Manifest +++ b/media-sound/combine_wave/Manifest @@ -1,4 +1,6 @@ +AUX combine_wave-0.3.1-makefile.patch 449 BLAKE2B 93a6bcc3429e9a239a438f11e4ca2fd136fcebfb93b4cbef0661d37c09e34b9d92cb4789f6a0f8863d7e60f6f97a211c2c24e376b5dd087080ac0e1974d54916 SHA512 de8aefea0b4866683a97bb81cb3456640a1dcc46c4f9a7268ea45addcdf2dc78e6cf05c3d6712840cfe6fae141285693a7b2c6e8e9c7f678b6cd5d19453884e7 +AUX combine_wave-0.3.1-missing-includes.patch 268 BLAKE2B ef9aa01211f675d5c3fc0bd9386668f6b3f278597076745e1b1c3b990409608c4065bc9e38fdbeafae07292c26cf18b4d471c7e29bdf00d5221ad90b8905200c SHA512 e8aa66b7cea2175aac68995f12f4dbd5edeb43484044133298a1a4aae0ad28712addfcfa53a66c5f2f5e95294785d55b463ebd0aaccddba71b8277626cc9565e AUX combine_wave-0.3.1-overflow.patch 765 BLAKE2B 3b4be839e5292b059345535a67ea4702c62aee72ac04e44bce52d8321f52e2b46efc7a8161b8fc5dc246f441dff3a6d6631246aac0ccfaf4dd6d2eb212fa7f22 SHA512 0c19f3f7344b586fa546b1c32fc7e4469ba84fd415e24ddbfdf5085739c1bc6f3b2e518e7715da52a647e30961219eda310cc6d5505f803486491996f3e71887 DIST combine_wave-0.3.1.tgz 14875 BLAKE2B 8884cbb07bf2f713c9f308420e7c48c366575ca5fc390d0e067760eba3f6bdd197fe1b12bf5fe5b0100f376146b85d42fc6ac42ad01e48a2b9e30ffc85f136c0 SHA512 81c97074b86945d6dc7299a79e38483ce50693f25b450e9bbdfc60ea1812e9a767e726805f0cd638e27321146cd72a9ed4df77cae5522b1777d0980c3eaaa3a8 -EBUILD combine_wave-0.3.1-r1.ebuild 731 BLAKE2B 1636b0ad274c8bf049819ce1e6696f22e0da7da05fa30dcba8c9d0ceace00e6cdd9a8a6399f829197a1b617b905ab21b0d87e937ddc3915b4ddfd9704f7b0665 SHA512 d5a17daeb8193f544708a8259a1743d13b71577f6ab6847e49c1c3eaf211dcfffc051822ea1a0eb140c21daf44cb9b2061a2a1e0d95ffa97c73fc2b2bf4b78db +EBUILD combine_wave-0.3.1-r2.ebuild 617 BLAKE2B 5c897d1b73237699b122fa66593c5e51d9f1c719d9544681a314d0a23f30096102aa9c5e1331c9b05234856a5005ddf40cdf4315fa71a6574d6e01c71b690548 SHA512 3ef8b8aebc810a332f13f0bd1f6bc565b6eedfeedf9b92f611c458ef97c2aafd40dceb141746465023a5be9eb9f5c2ef7b2ac46c6db7f6d85f78e03b1d981963 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8 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 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> + + |