gentoo resync : 21.06.2021

4 files changed, 169 insertions, 4 deletions

diff --git a/media-sound/brutefir/Manifest b/media-sound/brutefir/Manifest
index 710b462f28bf..08a7c5377813 100644
--- a/media-sound/brutefir/Manifest
+++ b/media-sound/brutefir/Manifest
@@ -1,4 +1,7 @@
 AUX brutefir-1.0k-ld.patch 4655 BLAKE2B 56ae2cf653311030e5552e50653082b059baa39bf00d1d9a2692e319b459a88b4bef4e0a1aa01aedd2ec9c97f19de0f03b966d10c6faeeccd6ef907d91b12a59 SHA512 606d32f1b76901e3cb6d106259d19c64e3a6f841fd5d0791623ad824c7264ff3ecd7178073fe488c7f1d26b996b9900f9661406f987f2443e9eb8ef9eeb6491a
+AUX brutefir-1.0o-ld.patch 4226 BLAKE2B 2173740f52c60845e181508619d26b0aa21f52329d6f35ba62fbeaec9ce62f69041fcef84d1e3e999fbd34568116b51716a90b1ea8b4232e20a032efcbbb9f86 SHA512 bf8f736a634b80d40a3880393b9958f78278f83c122e310a8e3848ec83634e6d729754cae22c3e455292be84ba0ce8e794fe1009cb5c9eeb3bdc2efca9037b1e
 DIST brutefir-1.0k.tar.gz 246987 BLAKE2B 3db08c1f51e8febb63b293d1a242342e7d9f4fa4b447b46da37bc3de594bef8a6ee15cd8330ef73673011186dcfe47a5b056ec3c177f3982cd1837a582f050a1 SHA512 5eb81a18935fc3f014613b74c30b2e9a3acfe0ab58b72358f0428b60f0296ab54796b99fa00b12a671935b57589d710dd81b1e0ca675bd2b841c9e932a2c94ef
-EBUILD brutefir-1.0k-r2.ebuild 1080 BLAKE2B b8370021bf1bf6104292c21aa1efb33b0f02952978138a499ebfe0986388c17e57f5a39149d7acd8eabe9701ee1c5ebf47a7da245ae2f48591342108109962f2 SHA512 70060a3750b4209dafa7bcc48b73e14d74295ea44dceb28e00057a22e32cb858f7e62d577df0aab1ed88cb376444618804b8ce3dc8110aabee98203f57c3cb49
+DIST brutefir-1.0o.tar.gz 246504 BLAKE2B ab2b3c1d22e45422d01aa45a9e869770cbf017d85c1f7af54562a0972545df1f9ae5aa0d155baa02ee5aeef1c65eccf6bc9c9f75edce0f54882e4095ba2f1493 SHA512 e696948eeabb54a9cea8a9f2629c11c620fd37bc685cf32d3c21b1ea89ae7127f703c04a1f1775b073f5135b9268cc0a387c8087da5828cc2194295f850e8d1f
+EBUILD brutefir-1.0k-r2.ebuild 1066 BLAKE2B efbf3ea427688107fdac99fa6c84d118b39bb6a696f01bab9be1fff2080009a1137872383e46033d2570fa70cf6b52d5e860943f988f84dfcaeeacf34ed65c49 SHA512 044b154d4582ccebc9b76c083fa81742b59432216099ac2d73b41f919afee3d88f9f49d671a23d7d491cc27f7cc0cddf9d2096299fbd3877bb07e063c3e8c6a1
+EBUILD brutefir-1.0o.ebuild 1065 BLAKE2B 7de0cc6545b88c7755912bad73bb524d8556722161e98e12e67c48f5df070e41dc7e5c1443e5e18d98012ac32a2d4e71356238eee7ddf1251ddcc43477b758d0 SHA512 765229b15dae7542fbda5d9a1d0c6d4528e12c7e9d7fcf06bf0ce41d4526c728efd853103542a63b271ec79634a22ae25da245d777fe06357e85a81c02af12f3
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/brutefir/brutefir-1.0k-r2.ebuild b/media-sound/brutefir/brutefir-1.0k-r2.ebuild
index c0dbb7ac747e..28ddf46c7b96 100644
--- a/media-sound/brutefir/brutefir-1.0k-r2.ebuild
+++ b/media-sound/brutefir/brutefir-1.0k-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,8 +6,8 @@ EAPI=7
 inherit toolchain-funcs
 
 DESCRIPTION="Software convolution engine for applying long FIR filters"
-HOMEPAGE="https://www.ludd.ltu.se/~torger/brutefir.html"
-SRC_URI="https://www.ludd.ltu.se/~torger/files/${P}.tar.gz"
+HOMEPAGE="https://torger.se/anders/brutefir.html"
+SRC_URI="https://torger.se/anders/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-sound/brutefir/brutefir-1.0o.ebuild b/media-sound/brutefir/brutefir-1.0o.ebuild
new file mode 100644
index 000000000000..62520e57bd6b
--- /dev/null
+++ b/media-sound/brutefir/brutefir-1.0o.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Software convolution engine for applying long FIR filters"
+HOMEPAGE="https://torger.se/anders/brutefir.html"
+SRC_URI="https://torger.se/anders/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	media-libs/alsa-lib
+	sci-libs/fftw:3.0
+	virtual/jack"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-ld.patch"
+)
+
+src_compile() {
+	tc-export AS CC
+	emake
+}
+
+src_install() {
+	emake LIBDIR="/usr/$(get_libdir)" DESTDIR="${D}" install
+	dodoc CHANGES README
+
+	insinto /usr/share/${PN}
+	doins xtc_config directpath.txt crosspath.txt massive_config \
+		bench1_config bench2_config bench3_config bench4_config \
+		bench5_config
+}
+
+pkg_postinst() {
+	elog "Brutefir is a complicated piece of software. Please"
+	elog "read the documentation first! You can find"
+	elog "documentation here: http://www.ludd.luth.se/~torger/brutefir.html"
+	elog "Example config files are in /usr/share/brutefir"
+}
diff --git a/media-sound/brutefir/files/brutefir-1.0o-ld.patch b/media-sound/brutefir/files/brutefir-1.0o-ld.patch
new file mode 100644
index 000000000000..ddfd1a07e142
--- /dev/null
+++ b/media-sound/brutefir/files/brutefir-1.0o-ld.patch
@@ -0,0 +1,116 @@
+diff --git a/Makefile b/Makefile
+index a10cb89..752a112 100644
+--- a/Makefile
++++ b/Makefile
+@@ -5,12 +5,11 @@ LDFLAGS +=
+ 
+ ###################################
+ # Where to install
+-INSTALL_PREFIX	= $(DESTDIR)/usr/local
++PREFIX         = /usr
++LIBDIR         = $(PREFIX)/lib
+ 
+ ###################################
+ # Where to find libraries, and their header files.
+-LIBPATHS	= -L/usr/local/lib
+-INCLUDE		= -I/usr/local/include
+ ifdef FFTW_PATH
+ LIBPATHS	+= -L$(FFTW_PATH)/lib
+ INCLUDE		+= -I$(FFTW_PATH)/include
+@@ -22,19 +21,15 @@ FFTW_LIB	= -lfftw3 -lfftw3f
+ 
+ ###################################
+ # Binaries
+-FLEX	= flex
+-LD	= gcc
+-CC	= gcc
+-CHMOD	= chmod
++FLEX	?= flex
++CC	?= gcc
++CHMOD	?= chmod
+ 
+ ###################################
+ # Flags
+-CC_WARN		= -Wall -Wpointer-arith -Wshadow \
++CFLAGS		+= -Wall -Wpointer-arith -Wshadow \
+ -Wcast-align -Wwrite-strings -Wstrict-prototypes \
+ -Wmissing-prototypes -Wmissing-declarations -Wnested-externs
+-CC_FLAGS	= $(DEFINE) -O2 $(CFLAGS) $(CPPFLAGS)
+-CC_FPIC		= -fPIC
+-LD_SHARED	= -shared
+ CHMOD_REMOVEX	= -x
+ 
+ ###################################
+@@ -85,7 +80,7 @@ ifneq (,$(findstring sparc,$(UNAME_M)))
+ CC_FLAGS += -Wa,-xarch=v8plus
+ endif
+ BRUTEFIR_LIBS	+= -ldl
+-LDMULTIPLEDEFS	= -Xlinker --allow-multiple-definition
++LINKFLAGS      = -fPIC -shared -Xlinker --allow-multiple-definition
+ # assume that we have oss and jack, alsa being linux-only
+ ifeq ($(UNAME),Linux)
+ LIB_TARGETS	+= alsa.bfio
+@@ -111,49 +106,50 @@ TARGETS		= $(BIN_TARGETS) $(LIB_TARGETS)
+ all: $(TARGETS)
+ 
+ %.fpic.o: %.c
+-	$(CC) -o $@			-c $(LDFLAGS) $(INCLUDE) $(CC_FPIC) $(CC_WARN) $(CC_FLAGS) $<
++	$(CC) -fPIC -shared -o $@       -c $(INCLUDE) $(CFLAGS) $<
+ 
+ %.o: %.c
+-	$(CC) -o $@			-c $(LDFLAGS) $(INCLUDE) $(CC_WARN) $(CC_FLAGS) $<
++	$(CC) -o $@                     -c $(INCLUDE) $(CFLAGS) $<
+ 
+ # special rule to avoid to get warnings from code generated by flex
+ bfconf_lexical.o: bfconf_lexical.c
+-	$(CC) -o $@			-c $(LDFLAGS) $(INCLUDE) $(CC_FLAGS) $<
++	$(CC) -o $@                     -c $(INCLUDE) $(CFLAGS) $<
+ 
+ %.c: %.lex
+ 	$(FLEX) -o$@ $<
+ 
+ brutefir: $(BRUTEFIR_OBJS)
+-	$(CC) $(LDFLAGS) $(LIBPATHS) $(LDMULTIPLEDEFS) -o $@ $(BRUTEFIR_OBJS) $(BRUTEFIR_LIBS)
++	$(CC) $(LDFLAGS) $(LDMULTIPLEDEFS) $(CFLAGS) $(LIBPATHS) -o $@ $(BRUTEFIR_OBJS) $(BRUTEFIR_LIBS)
+ 
+ alsa.bfio: $(BFIO_ALSA_OBJS)
+-	$(LD) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_ALSA_OBJS) $(BFIO_ALSA_LIBS) -lc
++	$(CC) $(LINKFLAGS) $(LDFLAGS) $(CFLAGS) $(LIBPATHS) -o $@ $(BFIO_ALSA_OBJS) $(BFIO_ALSA_LIBS) -lc
+ 	$(CHMOD) $(CHMOD_REMOVEX) $@
+ 
+ oss.bfio: $(BFIO_OSS_OBJS)
+-	$(LD) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_OSS_OBJS) -lc
++	$(CC) $(LINKFLAGS) $(LDFLAGS) $(CFLAGS) $(LIBPATHS) -o $@ $(BFIO_OSS_OBJS) -lc
+ 	$(CHMOD) $(CHMOD_REMOVEX) $@
+ 
+ jack.bfio: $(BFIO_JACK_OBJS)
+-	$(LD) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_JACK_OBJS) $(BFIO_JACK_LIBS) -lc
++	$(CC) $(LINKFLAGS) $(LDFLAGS) $(CFLAGS) $(LIBPATHS) -o $@ $(BFIO_JACK_OBJS) $(BFIO_JACK_LIBS) -lc
+ 	$(CHMOD) $(CHMOD_REMOVEX) $@
+ 
+ file.bfio: $(BFIO_FILE_OBJS)
+-	$(LD) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_FILE_OBJS) -lc
++	$(CC) $(LINKFLAGS) $(LDFLAGS) $(CFLAGS) $(LIBPATHS) -o $@ $(BFIO_FILE_OBJS) -lc
+ 	$(CHMOD) $(CHMOD_REMOVEX) $@
+ 
+ cli.bflogic: $(BFLOGIC_CLI_OBJS)
+-	$(LD) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFLOGIC_CLI_OBJS) -lc
++	$(CC) $(LINKFLAGS) $(LDFLAGS) $(CFLAGS) $(LIBPATHS) -o $@ $(BFLOGIC_CLI_OBJS) -lc
+ 	$(CHMOD) $(CHMOD_REMOVEX) $@
+ 
+ eq.bflogic: $(BFLOGIC_EQ_OBJS)
+-	$(LD) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFLOGIC_EQ_OBJS) -lc
++	$(CC) $(LINKFLAGS) $(LDFLAGS) $(CFLAGS) $(LIBPATHS) -o $@ $(BFLOGIC_EQ_OBJS) -lc
+ 	$(CHMOD) $(CHMOD_REMOVEX) $@
+ 
+ install: $(BIN_TARGETS) $(LIB_TARGETS)
+-	install -d $(INSTALL_PREFIX)/bin $(INSTALL_PREFIX)/lib/brutefir
+-	install $(BIN_TARGETS) $(INSTALL_PREFIX)/bin
+-	install $(LIB_TARGETS) $(INSTALL_PREFIX)/lib/brutefir
++	install -d $(DESTDIR)$(PREFIX)/bin
++	install $(BIN_TARGETS) $(DESTDIR)$(PREFIX)/bin
++	install -d $(DESTDIR)$(LIBDIR)/brutefir
++	install $(LIB_TARGETS) $(DESTDIR)$(LIBDIR)/brutefir
+ 
+ clean:
+ 	rm -f *.core core bfconf_lexical.c $(BRUTEFIR_OBJS) $(BFIO_FILE_OBJS)  \