summaryrefslogtreecommitdiff
path: root/app-emulation/faudio
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-03-12 21:55:15 +0000
committerV3n3RiX <venerix@redcorelinux.org>2021-03-12 21:55:15 +0000
commit7218e1b46bceac05841e90472501742d905fb3fc (patch)
tree56fae051db521b8fce8014cbc8b11484885b14b3 /app-emulation/faudio
parent6d691ad5b6239929063441bbd14c489e92e7396e (diff)
gentoo resync : 12.03.2021
Diffstat (limited to 'app-emulation/faudio')
-rw-r--r--app-emulation/faudio/Manifest4
-rw-r--r--app-emulation/faudio/faudio-21.01.ebuild17
-rw-r--r--app-emulation/faudio/faudio-9999.ebuild15
3 files changed, 15 insertions, 21 deletions
diff --git a/app-emulation/faudio/Manifest b/app-emulation/faudio/Manifest
index 0078b2be2602..5d6a69585576 100644
--- a/app-emulation/faudio/Manifest
+++ b/app-emulation/faudio/Manifest
@@ -8,6 +8,6 @@ EBUILD faudio-19.06.ebuild 2404 BLAKE2B 5072aaf0495eee4f0f29ae915818c4f3e5e11101
EBUILD faudio-19.09.ebuild 2404 BLAKE2B 5072aaf0495eee4f0f29ae915818c4f3e5e11101f027a76a6b086b0841eb8155c69bfd1f3ee2ee32fa02950ce5e2a1138ffe007fc1d7c7709dc4e51b8610b916 SHA512 0f70626817ed31c8b226d7bfdb04f1beb9a51c104c3fa2ef8fa3fb115eed43c518d7f6e21c98cac534a3d3f2b4471fd32b32583347547176afa4b20283c5dbca
EBUILD faudio-20.02.ebuild 2506 BLAKE2B a313fbda2f0ed92df9bd0452f7a872e8701c093c5e9d847bda62cd673ce55f22f5768b4d22e28e9021e4501ee6dbee64dc5d6727ce6f42f0b629f1be9e6c18a0 SHA512 c5bd2e5fdb42e47802e4cc244fbcbd20ff77de4cd864c64968d437c0ef2e0d590924b1c5cf6813f3edb8534713fcf5a80cb039cbbeb0e0c1cb0893b9d74c06de
EBUILD faudio-20.09.ebuild 2483 BLAKE2B 944768d0ef945ff0c31c4c4ddbde47738cf0cc7ff1615b2dc80849d265043c7dd389b64345d6170d9b07fe2bac3ad26a880714dbd950d988f4472bb703a023ae SHA512 9fff1096c2dc131f16424ac2d0d6b3b6f97d4521d8f2aeadcdb1419264d0803be9fc8900280058d3477bf6cba01b0cd59fb814f7ffb0461a4b1295a9148e8e9f
-EBUILD faudio-21.01.ebuild 2531 BLAKE2B 49e1c0290fdd96c80571b5d32d1827db3474bafe0f57b7120134c20b31c25b6387dcf4a38ec134fda021ad6a4a499019b88be5e5853cef613a719a9a4f0d58bb SHA512 f076c1bff74c910500054e106d1b635123acdb9637aa884478d77b42c29e0b4deca495cc67c14a8a21c061a3551aabff7e5b85b899859af40a3ade2155e6553d
-EBUILD faudio-9999.ebuild 2531 BLAKE2B 49e1c0290fdd96c80571b5d32d1827db3474bafe0f57b7120134c20b31c25b6387dcf4a38ec134fda021ad6a4a499019b88be5e5853cef613a719a9a4f0d58bb SHA512 f076c1bff74c910500054e106d1b635123acdb9637aa884478d77b42c29e0b4deca495cc67c14a8a21c061a3551aabff7e5b85b899859af40a3ade2155e6553d
+EBUILD faudio-21.01.ebuild 2443 BLAKE2B f3a98e771a7a547ef82e5fae209fad3fb1501aa63d186f0e87d04ad2b6e5bc644e43b05ce693e8d16306cac4790542057d153ba57972fb31fbe66dc943f39c5b SHA512 c4b171617d51df15087d6e95627f6eb83c087994fd8f8166ffd3151c60a39d75547250e4686ba59b3df6e550b4e25a6dc41afa3f61390cb212439b3b7c03c67c
+EBUILD faudio-9999.ebuild 2445 BLAKE2B ae0a98508607c24dcc8769453a44edb0d8490f624724ac36151530e14c09fb344ffec5e581d90b4d90f452819c68f373de3d2022f86bb699bac4bc6368f4ffda SHA512 b736d81a07e2219d5734ded7dc72d5fef8c26db8e0f5c19c0fa0a99598789284f25f49e47f6040de1b6faa9ac600f5783d766ed845bbe9470316a9a8b3ca20c2
MISC metadata.xml 1414 BLAKE2B 5780361588a5f05dd9cc4d935642aeb7f89c28fb126b1e8bec0a09044eb9386b742e57fd06523babdfdb0d0a0b68a05a9ca7d5c4b53dee6e4bb3e10b14e11e25 SHA512 8cd27251e176ae48c50cb0cf6b632fee1178903c832e60a6afc74119fe8fd55328a92ad7d4f16e23a27812d98efdc5b21fb2e118da04e34dbf62b1843e039471
diff --git a/app-emulation/faudio/faudio-21.01.ebuild b/app-emulation/faudio/faudio-21.01.ebuild
index 52c652a59596..de43fa552706 100644
--- a/app-emulation/faudio/faudio-21.01.ebuild
+++ b/app-emulation/faudio/faudio-21.01.ebuild
@@ -4,6 +4,7 @@
# shellcheck disable=SC2034
EAPI=7
+CMAKE_ECLASS=cmake
CMAKE_MAKEFILE_GENERATOR="emake"
MULTILIB_COMPAT=( abi_x86_{32,64} )
@@ -18,7 +19,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
@@ -31,24 +32,20 @@ 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="
+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}
-"
+RDEPEND="${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)"
@@ -57,7 +54,7 @@ multilib_src_configure() {
"-DGSTREAMER=$(usex gstreamer ON OFF)"
"-DXNASONG=$(usex xnasong ON OFF)"
)
- cmake-utils_src_configure
+ cmake_src_configure
}
src_configure() {
@@ -65,13 +62,13 @@ src_configure() {
}
multilib_src_compile() {
- cmake-utils_src_make
+ cmake_build
emake -C "${BUILD_DIR}" all
}
multilib_src_install() {
# FIXME: do we want to install the FAudio tools?
- cmake-utils_src_install
+ cmake_src_install
sed -e "s@%LIB%@$(get_libdir)@g" -e "s@%PREFIX%@${EPREFIX}/usr@g" \
"${FILESDIR}/faudio.pc" > "${T}/faudio.pc" \
diff --git a/app-emulation/faudio/faudio-9999.ebuild b/app-emulation/faudio/faudio-9999.ebuild
index 52c652a59596..51ecd606fc26 100644
--- a/app-emulation/faudio/faudio-9999.ebuild
+++ b/app-emulation/faudio/faudio-9999.ebuild
@@ -4,6 +4,7 @@
# shellcheck disable=SC2034
EAPI=7
+CMAKE_ECLASS=cmake
CMAKE_MAKEFILE_GENERATOR="emake"
MULTILIB_COMPAT=( abi_x86_{32,64} )
@@ -31,24 +32,20 @@ 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="
+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}
-"
+RDEPEND="${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)"
@@ -57,7 +54,7 @@ multilib_src_configure() {
"-DGSTREAMER=$(usex gstreamer ON OFF)"
"-DXNASONG=$(usex xnasong ON OFF)"
)
- cmake-utils_src_configure
+ cmake_src_configure
}
src_configure() {
@@ -65,13 +62,13 @@ src_configure() {
}
multilib_src_compile() {
- cmake-utils_src_make
+ cmake_build
emake -C "${BUILD_DIR}" all
}
multilib_src_install() {
# FIXME: do we want to install the FAudio tools?
- cmake-utils_src_install
+ cmake_src_install
sed -e "s@%LIB%@$(get_libdir)@g" -e "s@%PREFIX%@${EPREFIX}/usr@g" \
"${FILESDIR}/faudio.pc" > "${T}/faudio.pc" \
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 13:58:17 +0000