From 7e661952b670451d1efcec5846e1a41003b5b980 Mon Sep 17 00:00:00 2001
From: NHOrus <jy6x2b32pie9@yahoo.com>
Date: Wed, 5 Jun 2024 23:52:41 +0400
Subject: media-sound/awesfx: update EAPI 7 -> 8, fix wrong function signature
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes: https://bugs.gentoo.org/831176
Signed-off-by: NHOrus <jy6x2b32pie9@yahoo.com>
Closes: https://github.com/gentoo/gentoo/pull/37040
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
---
 media-sound/awesfx/awesfx-0.5.2-r1.ebuild          | 47 ++++++++++++++++++++++
 media-sound/awesfx/awesfx-0.5.2.ebuild             | 45 ---------------------
 .../awesfx/files/awesfx-0.5.2-return-type.patch    | 12 ++++++
 3 files changed, 59 insertions(+), 45 deletions(-)
 create mode 100644 media-sound/awesfx/awesfx-0.5.2-r1.ebuild
 delete mode 100644 media-sound/awesfx/awesfx-0.5.2.ebuild
 create mode 100644 media-sound/awesfx/files/awesfx-0.5.2-return-type.patch

(limited to 'media-sound')

diff --git a/media-sound/awesfx/awesfx-0.5.2-r1.ebuild b/media-sound/awesfx/awesfx-0.5.2-r1.ebuild
new file mode 100644
index 000000000000..082914feb1dd
--- /dev/null
+++ b/media-sound/awesfx/awesfx-0.5.2-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="AWE32 Sound Driver Utility Programs"
+HOMEPAGE="https://github.com/tiwai/awesfx"
+SRC_URI="https://github.com/tiwai/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~sparc x86"
+IUSE=""
+
+DEPEND="media-libs/alsa-lib"
+RDEPEND="${DEPEND}"
+
+BANK_LOC="${EPREFIX}/usr/share/sounds/sf2"
+
+DOCS=( AUTHORS ChangeLog README SBKtoSF2.txt samples/README-bank )
+
+PATCHES="${FILESDIR}/${P}-return-type.patch"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-sfpath=${BANK_LOC}
+}
+
+src_install() {
+	default
+
+	rm "${ED}"/usr/share/sounds/sf2/README-bank || die
+	newinitd "${FILESDIR}"/sfxload.initd sfxload
+	newconfd "${FILESDIR}"/sfxload.confd sfxload
+}
+
+pkg_postinst() {
+	elog "Copy your SoundFont files from the original CDROM"
+	elog "shipped with your soundcard to ${BANK_LOC}."
+}
diff --git a/media-sound/awesfx/awesfx-0.5.2.ebuild b/media-sound/awesfx/awesfx-0.5.2.ebuild
deleted file mode 100644
index 4dc34b5e106d..000000000000
--- a/media-sound/awesfx/awesfx-0.5.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="AWE32 Sound Driver Utility Programs"
-HOMEPAGE="https://github.com/tiwai/awesfx"
-SRC_URI="https://github.com/tiwai/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE=""
-
-DEPEND="media-libs/alsa-lib"
-RDEPEND="${DEPEND}"
-
-BANK_LOC="${EPREFIX}/usr/share/sounds/sf2"
-
-DOCS=( AUTHORS ChangeLog README SBKtoSF2.txt samples/README-bank )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-sfpath=${BANK_LOC}
-}
-
-src_install() {
-	default
-
-	rm "${ED}"/usr/share/sounds/sf2/README-bank || die
-	newinitd "${FILESDIR}"/sfxload.initd sfxload
-	newconfd "${FILESDIR}"/sfxload.confd sfxload
-}
-
-pkg_postinst() {
-	elog "Copy your SoundFont files from the original CDROM"
-	elog "shipped with your soundcard to ${BANK_LOC}."
-}
diff --git a/media-sound/awesfx/files/awesfx-0.5.2-return-type.patch b/media-sound/awesfx/files/awesfx-0.5.2-return-type.patch
new file mode 100644
index 000000000000..2fbe38abaea9
--- /dev/null
+++ b/media-sound/awesfx/files/awesfx-0.5.2-return-type.patch
@@ -0,0 +1,12 @@
+diff -ru a/alsa.c b/alsa.c
+--- a/alsa.c	2024-06-05 19:43:42.987168221 -0000
++++ b/alsa.c	2024-06-05 19:44:48.530787408 -0000
+@@ -139,7 +139,7 @@
+ 	return snd_hwdep_ioctl(hwdep, SNDRV_EMUX_IOCTL_MISC_MODE, &mode);
+ }
+ 
+-void seq_set_gus_bank(int bank)
++int seq_set_gus_bank(int bank)
+ {
+ 	struct sndrv_emux_misc_mode mode;
+ 	mode.port = -1;
-- 
cgit v1.2.3-65-gdbad