app-emulation/faudio: Bump FAudio 21.01 and update 9999

Signed-off-by: Maxime Lombard <berillions@gmail.com>

Closes: https://github.com/gentoo/repo-proj-wine//pull/17
Signed-off-by: Nick Sarnie <sarnex@gentoo.org>

3 files changed, 113 insertions, 11 deletions

diff --git a/app-emulation/faudio/Manifest b/app-emulation/faudio/Manifest
index 5a15e42..9658415 100644
--- a/app-emulation/faudio/Manifest
+++ b/app-emulation/faudio/Manifest
@@ -3,3 +3,4 @@ DIST FAudio-19.02.tar.gz 885974 BLAKE2B f8b2402f4005125c583637482a595da9f1a05ffb
 DIST FAudio-19.03.tar.gz 886621 BLAKE2B 0cf0b60766d48472c72dc2aa9bbdb9a99db27836f38eccacb4be4bd98cf387b6009998018438e46835a9b9616d426b8a2c9f3c200b377bce2dc9bc18e42b0d37 SHA512 94e3e4f3f023879ef821d657e5a73ac25aab55c7be6a0afe77d75cabe644c9da083ae3c6a240b71af542da53a3eb34804e6a3193a0e619f89fcc20ff7d6ef095
 DIST FAudio-19.06.tar.gz 899089 BLAKE2B a59ad9613bcfa71e1fc8be1f2d389f56b8f96430c354b7c7148d1e1e084102b6d8559cd258f3ab6969a4ac93e55ea2397b18dc417857e9ee0f022ea0dae65c0e SHA512 ba3ee18b47d8d85dc39e777c420522349f9873cf1528dd6c266f7254fe27cdb5bb6ab5bcbeab870938b509bfd006590d2380908b7d1e3fd679d2a434ce82eca6
 DIST FAudio-19.09.tar.gz 901659 BLAKE2B 8bb99c67b6da2660e71c7a8a70f83130738a07e7f4ddd2001fb857c81a593935506a8c1fe6d24bfd064537ea4a5a603973c32d839228d7b3f45c9c300ba15147 SHA512 127f975c68e2b449fa7cadae0723925f35ca7a2841ea3fd85037febe964331de4b2e3031ab09c292ee5f40d90902dcf78c75cc3fe7fbe4d6f37a822b4d9eb966
+DIST FAudio-21.01.tar.gz 1134752 BLAKE2B 3acf80172744bfdc6fb44e373ee2a159ed4d49713fec38a8c6447d66c345445a435e1eb1656552289a634e3a628cfcf7df979a2d155edca1aef0c0334629424e SHA512 69405a28fdf3ff5026992bdd1d40d61653b834dac3ef2697a0e794deac2fa6257fe74b19d2fe225ce25a1ae3caec7082106f5ab6ea6109cc61e520b903d35b80
diff --git a/app-emulation/faudio/faudio-21.01.ebuild b/app-emulation/faudio/faudio-21.01.ebuild
new file mode 100644
index 0000000..52c652a
--- /dev/null
+++ b/app-emulation/faudio/faudio-21.01.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# shellcheck disable=SC2034
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+
+inherit cmake-multilib virtualx multilib-build
+
+FAUDIO_PN="FAudio"
+FAUDIO_PV="${PV}"
+FAUDIO_P="${FAUDIO_PN}-${FAUDIO_PV}"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/FNA-XNA/${FAUDIO_PN}.git"
+else
+	SRC_URI="https://github.com/FNA-XNA/${FAUDIO_PN}/archive/${FAUDIO_PV}.tar.gz -> ${FAUDIO_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${FAUDIO_P}"
+fi
+
+DESCRIPTION="FAudio - Accuracy-focused XAudio reimplementation for open platforms"
+HOMEPAGE="https://fna-xna.github.io/"
+LICENSE="ZLIB"
+SLOT="0"
+
+IUSE="+abi_x86_32 +abi_x86_64 debug dumpvoices gstreamer xnasong test utils"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )"
+
+COMMON_DEPEND="
+	>=media-libs/libsdl2-2.0.9[sound,${MULTILIB_USEDEP}]
+	gstreamer? (
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+		media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+"
+DEPEND="${COMMON_DEPEND}
+"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		"-DCMAKE_INSTALL_BINDIR=bin"
+		"-DCMAKE_INSTALL_INCLUDEDIR=include/${FAUDIO_PN}"
+		"-DCMAKE_INSTALL_LIBDIR=$(get_libdir)"
+		"-DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr"
+		"-DCMAKE_BUILD_TYPE=$(usex debug Debug Release)"
+		"-DFORCE_ENABLE_DEBUGCONFIGURATION=$(usex debug ON OFF)"
+		"-DBUILD_TESTS=$(usex test ON OFF)"
+		"-DBUILD_UTILS=$(usex utils ON OFF)"
+		"-DDUMP_VOICES=$(usex dumpvoices ON OFF)"
+		"-DGSTREAMER=$(usex gstreamer ON OFF)"
+		"-DXNASONG=$(usex xnasong ON OFF)"
+	)
+	cmake-utils_src_configure
+}
+
+src_configure() {
+	cmake-multilib_src_configure
+}
+
+multilib_src_compile() {
+	cmake-utils_src_make
+	emake -C "${BUILD_DIR}" all
+}
+
+multilib_src_install() {
+	# FIXME: do we want to install the FAudio tools?
+	cmake-utils_src_install
+
+	sed -e "s@%LIB%@$(get_libdir)@g" -e "s@%PREFIX%@${EPREFIX}/usr@g" \
+		"${FILESDIR}/faudio.pc" > "${T}/faudio.pc" \
+		|| die "sed failed"
+	insinto "/usr/$(get_libdir)/pkgconfig"
+	doins "${T}/faudio.pc"
+
+	if use test; then
+		mkdir -p "${T}/$(get_libdir)" || die
+		cp "${BUILD_DIR}/faudio_tests" "${T}/$(get_libdir)/" || die "cp failed"
+	fi
+}
+
+faudio_test() {
+	XDG_RUNTIME_DIR="/run/user/0" virtx "${T}/$(get_libdir)/faudio_tests"
+}
+
+pkg_postinst() {
+	use test || return
+
+	# FIXME: FAudio tests are broken and also don't appear to work
+	# in the Portage sandbox.
+	multilib_foreach_abi faudio_test
+}
diff --git a/app-emulation/faudio/faudio-9999.ebuild b/app-emulation/faudio/faudio-9999.ebuild
index 5c40e2e..52c652a 100644
--- a/app-emulation/faudio/faudio-9999.ebuild
+++ b/app-emulation/faudio/faudio-9999.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # shellcheck disable=SC2034
 EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="emake"
+MULTILIB_COMPAT=( abi_x86_{32,64} )
 
-inherit cmake-multilib virtualx
+inherit cmake-multilib virtualx multilib-build
 
 FAUDIO_PN="FAudio"
 FAUDIO_PV="${PV}"
@@ -17,7 +18,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/FNA-XNA/${FAUDIO_PN}.git"
 else
 	SRC_URI="https://github.com/FNA-XNA/${FAUDIO_PN}/archive/${FAUDIO_PV}.tar.gz -> ${FAUDIO_P}.tar.gz"
-	KEYWORDS="-* ~amd64 ~x86"
+	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${FAUDIO_P}"
 fi
 
@@ -26,12 +27,16 @@ HOMEPAGE="https://fna-xna.github.io/"
 LICENSE="ZLIB"
 SLOT="0"
 
-IUSE="+abi_x86_32 +abi_x86_64 debug ffmpeg xnasong test utils"
+IUSE="+abi_x86_32 +abi_x86_64 debug dumpvoices gstreamer xnasong test utils"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )"
 
 COMMON_DEPEND="
 	>=media-libs/libsdl2-2.0.9[sound,${MULTILIB_USEDEP}]
-	ffmpeg? ( media-video/ffmpeg:=[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+		media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
+	)
 "
 RDEPEND="${COMMON_DEPEND}
 "
@@ -43,17 +48,15 @@ multilib_src_configure() {
 		"-DCMAKE_INSTALL_BINDIR=bin"
 		"-DCMAKE_INSTALL_INCLUDEDIR=include/${FAUDIO_PN}"
 		"-DCMAKE_INSTALL_LIBDIR=$(get_libdir)"
-		"-DCMAKE_INSTALL_PREFIX=${EPREFIX%/}/usr"
+		"-DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr"
 		"-DCMAKE_BUILD_TYPE=$(usex debug Debug Release)"
 		"-DFORCE_ENABLE_DEBUGCONFIGURATION=$(usex debug ON OFF)"
 		"-DBUILD_TESTS=$(usex test ON OFF)"
 		"-DBUILD_UTILS=$(usex utils ON OFF)"
-		"-DFFMPEG=$(usex ffmpeg ON OFF)"
+		"-DDUMP_VOICES=$(usex dumpvoices ON OFF)"
+		"-DGSTREAMER=$(usex gstreamer ON OFF)"
 		"-DXNASONG=$(usex xnasong ON OFF)"
 	)
-	if use ffmpeg; then
-		mycmakeargs+=( "-DFFmpeg_LIBRARY_DIRS=${EPREFIX%/}/usr/$(get_libdir)"  )
-	fi
 	cmake-utils_src_configure
 }
 
@@ -77,7 +80,7 @@ multilib_src_install() {
 	doins "${T}/faudio.pc"
 
 	if use test; then
-		mkdir -p "${T}/$(get_libdir)"
+		mkdir -p "${T}/$(get_libdir)" || die
 		cp "${BUILD_DIR}/faudio_tests" "${T}/$(get_libdir)/" || die "cp failed"
 	fi
 }