commit: ffc61d50a7c80ec368a93c53d888e3117ae7df11
Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 10 00:20:59 2021 +0000
Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Sun Jan 10 00:21:17 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffc61d50
app-emulation/faudio: Sync with ::wine
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>
app-emulation/faudio/Manifest | 1 +
.../{faudio-9999.ebuild => faudio-21.01.ebuild} | 23 ++++++++++++----------
app-emulation/faudio/faudio-9999.ebuild | 23 ++++++++++++----------
3 files changed, 27 insertions(+), 20 deletions(-)
diff --git a/app-emulation/faudio/Manifest b/app-emulation/faudio/Manifest
index 1b0ddff6572..5a99bb140a2 100644
--- a/app-emulation/faudio/Manifest
+++ b/app-emulation/faudio/Manifest
@@ -2,3 +2,4 @@ DIST FAudio-19.06.tar.gz 899089 BLAKE2B
a59ad9613bcfa71e1fc8be1f2d389f56b8f96430
DIST FAudio-19.09.tar.gz 901659 BLAKE2B
8bb99c67b6da2660e71c7a8a70f83130738a07e7f4ddd2001fb857c81a593935506a8c1fe6d24bfd064537ea4a5a603973c32d839228d7b3f45c9c300ba15147
SHA512
127f975c68e2b449fa7cadae0723925f35ca7a2841ea3fd85037febe964331de4b2e3031ab09c292ee5f40d90902dcf78c75cc3fe7fbe4d6f37a822b4d9eb966
DIST FAudio-20.02.tar.gz 908051 BLAKE2B
7f9323e7528949680b39469b3549adbef9acafe6f293c643676117648fd6871639fa8c7a47fdc0e1232c0533c0af9e89953415a0935fa4ad7b831aa8a8243f30
SHA512
69995fa1fb9ea41182e47f8143252db517adf4e9dc4a0556c9032af5c867259cc7edc81196b10ef043e6118a2e3687b34368f3ac8ffe9294398c5143b9928476
DIST FAudio-20.09.tar.gz 1133191 BLAKE2B
519467051e8ce82a8e3b7dcea13ad2b076510bdef363e2170373030a1cc8cc600c0a9627dcb38923e33588eb74081ab161d7596bbb7efe02961e9a38a2e36197
SHA512
a4f06cbb07e7baa0dcf59f93412f364a70a6757079cb21b51808dafed256e557e18866974e5145d0a8509b7a4f4a68bc130a49d6704571e0a43913e73abbd984
+DIST FAudio-21.01.tar.gz 1134752 BLAKE2B
3acf80172744bfdc6fb44e373ee2a159ed4d49713fec38a8c6447d66c345445a435e1eb1656552289a634e3a628cfcf7df979a2d155edca1aef0c0334629424e
SHA512
69405a28fdf3ff5026992bdd1d40d61653b834dac3ef2697a0e794deac2fa6257fe74b19d2fe225ce25a1ae3caec7082106f5ab6ea6109cc61e520b903d35b80
diff --git a/app-emulation/faudio/faudio-9999.ebuild
b/app-emulation/faudio/faudio-21.01.ebuild
similarity index 80%
copy from app-emulation/faudio/faudio-9999.ebuild
copy to app-emulation/faudio/faudio-21.01.ebuild
index 93b1440ba5b..52c652a5959 100644
--- a/app-emulation/faudio/faudio-9999.ebuild
+++ b/app-emulation/faudio/faudio-21.01.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2020 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,13 +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}
"
@@ -44,16 +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_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
}
diff --git a/app-emulation/faudio/faudio-9999.ebuild
b/app-emulation/faudio/faudio-9999.ebuild
index 93b1440ba5b..52c652a5959 100644
--- a/app-emulation/faudio/faudio-9999.ebuild
+++ b/app-emulation/faudio/faudio-9999.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2020 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,13 +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}
"
@@ -44,16 +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_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
}
