public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/proj/wine:master commit in: app-emulation/faudio/
@ 2019-09-15 15:24 Nick Sarnie
  0 siblings, 0 replies; 6+ messages in thread
From: Nick Sarnie @ 2019-09-15 15:24 UTC (permalink / raw
  To: gentoo-commits

commit:     d2acd255464a0f374c31dc5905756003b25ee8d1
Author:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 15 15:24:06 2019 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Sun Sep 15 15:24:06 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=d2acd255

app-emulation/faudio: Sync with ::gentoo and port to 9999

Fixes: https://bugs.gentoo.org/693404
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>

 app-emulation/faudio/faudio-19.06.ebuild | 6 +++---
 app-emulation/faudio/faudio-9999.ebuild  | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app-emulation/faudio/faudio-19.06.ebuild b/app-emulation/faudio/faudio-19.06.ebuild
index 295da56..a8490f1 100644
--- a/app-emulation/faudio/faudio-19.06.ebuild
+++ b/app-emulation/faudio/faudio-19.06.ebuild
@@ -52,7 +52,7 @@ multilib_src_configure() {
 		"-DXNASONG=$(usex xnasong ON OFF)"
 	)
 	if use ffmpeg; then
-		mycmakeargs+=( "-DFFmpeg_LIBRARY_DIRS=${PREFIX%/}/usr/$(get_libdir)"  )
+		mycmakeargs+=( "-DFFmpeg_LIBRARY_DIRS=${EPREFIX%/}/usr/$(get_libdir)"  )
 	fi
 	cmake-utils_src_configure
 }
@@ -70,8 +70,8 @@ multilib_src_install() {
 	# FIXME: do we want to install the FAudio tools?
 	cmake-utils_src_install
 
-	sed -e "s/%LIB%/$(get_libdir)/g" "${FILESDIR}/faudio.pc" \
-		> "${T}/faudio.pc" \
+	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"

diff --git a/app-emulation/faudio/faudio-9999.ebuild b/app-emulation/faudio/faudio-9999.ebuild
index bd6b12f..a8490f1 100644
--- a/app-emulation/faudio/faudio-9999.ebuild
+++ b/app-emulation/faudio/faudio-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # shellcheck disable=SC2034
@@ -52,7 +52,7 @@ multilib_src_configure() {
 		"-DXNASONG=$(usex xnasong ON OFF)"
 	)
 	if use ffmpeg; then
-		mycmakeargs+=( "-DFFmpeg_LIBRARY_DIRS=${PREFIX%/}/usr/$(get_libdir)"  )
+		mycmakeargs+=( "-DFFmpeg_LIBRARY_DIRS=${EPREFIX%/}/usr/$(get_libdir)"  )
 	fi
 	cmake-utils_src_configure
 }
@@ -70,8 +70,8 @@ multilib_src_install() {
 	# FIXME: do we want to install the FAudio tools?
 	cmake-utils_src_install
 
-	sed -e "s/%LIB%/$(get_libdir)/g" "${FILESDIR}/faudio.pc" \
-		> "${T}/faudio.pc" \
+	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"


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/proj/wine:master commit in: app-emulation/faudio/
@ 2021-01-10  0:20 Nick Sarnie
  0 siblings, 0 replies; 6+ messages in thread
From: Nick Sarnie @ 2021-01-10  0:20 UTC (permalink / raw
  To: gentoo-commits

commit:     76359a6d2339f4a8632364d297088f094ce328e7
Author:     Maxime Lombard <berillions <AT> gmail <DOT> com>
AuthorDate: Sat Jan  9 23:57:39 2021 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Sun Jan 10 00:19:38 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=76359a6d

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

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

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

 app-emulation/faudio/Manifest                      |  1 +
 .../{faudio-9999.ebuild => faudio-21.01.ebuild}    | 25 ++++++++++++----------
 app-emulation/faudio/faudio-9999.ebuild            | 25 ++++++++++++----------
 3 files changed, 29 insertions(+), 22 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-9999.ebuild b/app-emulation/faudio/faudio-21.01.ebuild
similarity index 78%
copy from app-emulation/faudio/faudio-9999.ebuild
copy to app-emulation/faudio/faudio-21.01.ebuild
index 5c40e2e..52c652a 100644
--- a/app-emulation/faudio/faudio-9999.ebuild
+++ b/app-emulation/faudio/faudio-21.01.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
 }

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
 }


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/proj/wine:master commit in: app-emulation/faudio/
@ 2019-10-01  1:16 Nick Sarnie
  0 siblings, 0 replies; 6+ messages in thread
From: Nick Sarnie @ 2019-10-01  1:16 UTC (permalink / raw
  To: gentoo-commits

commit:     1272ae90975b7da59f3b740799c898c710e4deb1
Author:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  1 01:15:52 2019 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Tue Oct  1 01:15:52 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=1272ae90

app-emulation/faudio: Bump to 19.09

Closes: https://bugs.gentoo.org/695884
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>

 app-emulation/faudio/Manifest            |  1 +
 app-emulation/faudio/faudio-19.09.ebuild | 95 ++++++++++++++++++++++++++++++++
 2 files changed, 96 insertions(+)

diff --git a/app-emulation/faudio/Manifest b/app-emulation/faudio/Manifest
index e01739f..5a15e42 100644
--- a/app-emulation/faudio/Manifest
+++ b/app-emulation/faudio/Manifest
@@ -2,3 +2,4 @@ DIST FAudio-19.01.tar.gz 885398 BLAKE2B 00b9c05cf67ed540a503937184d1c05faa957765
 DIST FAudio-19.02.tar.gz 885974 BLAKE2B f8b2402f4005125c583637482a595da9f1a05ffb8c2836498fa5abed1bdae17aa1f1c2c28eb58e0e311bc82f47d48bcb3c626801942f18ecac2eab46c5913e3b SHA512 f3ea82aae5f90bbac286b8e72c1cb6a70e41fdf86f9c1043b465cb242f1232574e59e0ec724f3c317ed4c44a12d4dde87c8b1bc03832e1b011b4e61d9f70da39
 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

diff --git a/app-emulation/faudio/faudio-19.09.ebuild b/app-emulation/faudio/faudio-19.09.ebuild
new file mode 100644
index 0000000..a8490f1
--- /dev/null
+++ b/app-emulation/faudio/faudio-19.09.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# shellcheck disable=SC2034
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+
+inherit cmake-multilib virtualx
+
+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 ~x86-fbsd"
+	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 ffmpeg xnasong test utils"
+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}] )
+"
+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)"
+		"-DFFMPEG=$(usex ffmpeg ON OFF)"
+		"-DXNASONG=$(usex xnasong ON OFF)"
+	)
+	if use ffmpeg; then
+		mycmakeargs+=( "-DFFmpeg_LIBRARY_DIRS=${EPREFIX%/}/usr/$(get_libdir)"  )
+	fi
+	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)"
+		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
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/proj/wine:master commit in: app-emulation/faudio/
@ 2019-06-16 14:19 Nick Sarnie
  0 siblings, 0 replies; 6+ messages in thread
From: Nick Sarnie @ 2019-06-16 14:19 UTC (permalink / raw
  To: gentoo-commits

commit:     010d5c5416a7799ab16a2529393bf87267f92d39
Author:     Maxime Lombard <berillions <AT> gmail <DOT> com>
AuthorDate: Sun Jun 16 14:17:25 2019 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Sun Jun 16 14:18:26 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=010d5c54

app-emulation/faudio: Bump to 19.06

Fixes: https://bugs.gentoo.org/688148
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>

 app-emulation/faudio/Manifest            |  1 +
 app-emulation/faudio/faudio-19.06.ebuild | 95 ++++++++++++++++++++++++++++++++
 2 files changed, 96 insertions(+)

diff --git a/app-emulation/faudio/Manifest b/app-emulation/faudio/Manifest
index 4a77183..e01739f 100644
--- a/app-emulation/faudio/Manifest
+++ b/app-emulation/faudio/Manifest
@@ -1,3 +1,4 @@
 DIST FAudio-19.01.tar.gz 885398 BLAKE2B 00b9c05cf67ed540a503937184d1c05faa957765c903473f94fddb0aa467efe79d90eb6f4fc88f61376849126104096e4b1204a6de6a31a74368cb991e8e44c0 SHA512 59447368eae94fc8a4bc1724a826bb4d8d53f65e4e5efa1f68fe0f7ea168f2c139e775975d93b26180b687cfb7419ec04bd2b285142a1fddb59e9575cc53e375
 DIST FAudio-19.02.tar.gz 885974 BLAKE2B f8b2402f4005125c583637482a595da9f1a05ffb8c2836498fa5abed1bdae17aa1f1c2c28eb58e0e311bc82f47d48bcb3c626801942f18ecac2eab46c5913e3b SHA512 f3ea82aae5f90bbac286b8e72c1cb6a70e41fdf86f9c1043b465cb242f1232574e59e0ec724f3c317ed4c44a12d4dde87c8b1bc03832e1b011b4e61d9f70da39
 DIST FAudio-19.03.tar.gz 886621 BLAKE2B 0cf0b60766d48472c72dc2aa9bbdb9a99db27836f38eccacb4be4bd98cf387b6009998018438e46835a9b9616d426b8a2c9f3c200b377bce2dc9bc18e42b0d37 SHA512 94e3e4f3f023879ef821d657e5a73ac25aab55c7be6a0afe77d75cabe644c9da083ae3c6a240b71af542da53a3eb34804e6a3193a0e619f89fcc20ff7d6ef095
+DIST FAudio-19.06.tar.gz 899089 BLAKE2B a59ad9613bcfa71e1fc8be1f2d389f56b8f96430c354b7c7148d1e1e084102b6d8559cd258f3ab6969a4ac93e55ea2397b18dc417857e9ee0f022ea0dae65c0e SHA512 ba3ee18b47d8d85dc39e777c420522349f9873cf1528dd6c266f7254fe27cdb5bb6ab5bcbeab870938b509bfd006590d2380908b7d1e3fd679d2a434ce82eca6

diff --git a/app-emulation/faudio/faudio-19.06.ebuild b/app-emulation/faudio/faudio-19.06.ebuild
new file mode 100644
index 0000000..295da56
--- /dev/null
+++ b/app-emulation/faudio/faudio-19.06.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# shellcheck disable=SC2034
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+
+inherit cmake-multilib virtualx
+
+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 ~x86-fbsd"
+	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 ffmpeg xnasong test utils"
+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}] )
+"
+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)"
+		"-DFFMPEG=$(usex ffmpeg ON OFF)"
+		"-DXNASONG=$(usex xnasong ON OFF)"
+	)
+	if use ffmpeg; then
+		mycmakeargs+=( "-DFFmpeg_LIBRARY_DIRS=${PREFIX%/}/usr/$(get_libdir)"  )
+	fi
+	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" "${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)"
+		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
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/proj/wine:master commit in: app-emulation/faudio/
@ 2019-03-17 14:14 Nick Sarnie
  0 siblings, 0 replies; 6+ messages in thread
From: Nick Sarnie @ 2019-03-17 14:14 UTC (permalink / raw
  To: gentoo-commits

commit:     c0c82b41bbc899bcbeb3a1dafb42ec9025b6d2f7
Author:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 17 14:13:51 2019 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Sun Mar 17 14:13:51 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=c0c82b41

app-emulation/faudio: Fix typo

Spotted by [Arfrever]

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>

 app-emulation/faudio/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/faudio/metadata.xml b/app-emulation/faudio/metadata.xml
index 74da266..5b15313 100644
--- a/app-emulation/faudio/metadata.xml
+++ b/app-emulation/faudio/metadata.xml
@@ -21,7 +21,7 @@ Project Website: http://fna-xna.github.io/
 		<flag name="xnasong">Build support for optional XNG_SONG component (note: this not required by
 			<pkg>app-emulation/wine-staging</pkg>, <pkg>app-emulation/wine-vanilla</pkg> for faudio XAudio support).</flag>
 		<flag name="test">Build and run faudio testsuite.</flag>
-		<flag name="utils">Build all faudio utilties.</flag>
+		<flag name="utils">Build all faudio utilities.</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">FNA-XNA/FAudio</remote-id>


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/proj/wine:master commit in: app-emulation/faudio/
@ 2019-03-16 20:47 Nick Sarnie
  0 siblings, 0 replies; 6+ messages in thread
From: Nick Sarnie @ 2019-03-16 20:47 UTC (permalink / raw
  To: gentoo-commits

commit:     d8795e07f55ec8abeadd1aab7d28cfacf307da62
Author:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 16 20:47:12 2019 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Sat Mar 16 20:47:12 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=d8795e07

app-emulation/faudio: Fix typo

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>

 app-emulation/faudio/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/faudio/metadata.xml b/app-emulation/faudio/metadata.xml
index 466588e..74da266 100644
--- a/app-emulation/faudio/metadata.xml
+++ b/app-emulation/faudio/metadata.xml
@@ -19,7 +19,7 @@ Project Website: http://fna-xna.github.io/
 		<flag name="ffmpeg">FAudio has optional support for decoding xWMA resources using FFmpeg, requiring:
 			<pkg>media-video/ffmpeg</pkg> (note: this feature is not supported by <pkg>media-video/libav</pkg>).</flag>
 		<flag name="xnasong">Build support for optional XNG_SONG component (note: this not required by
-			<pkg>app-emuatlon/wine-staging</pkg>, <pkg>app-emuatlon/wine-vanilla</pkg> for faudio XAudio support).</flag>
+			<pkg>app-emulation/wine-staging</pkg>, <pkg>app-emulation/wine-vanilla</pkg> for faudio XAudio support).</flag>
 		<flag name="test">Build and run faudio testsuite.</flag>
 		<flag name="utils">Build all faudio utilties.</flag>
 	</use>


^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2021-01-10  0:20 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-09-15 15:24 [gentoo-commits] repo/proj/wine:master commit in: app-emulation/faudio/ Nick Sarnie
  -- strict thread matches above, loose matches on Subject: below --
2021-01-10  0:20 Nick Sarnie
2019-10-01  1:16 Nick Sarnie
2019-06-16 14:19 Nick Sarnie
2019-03-17 14:14 Nick Sarnie
2019-03-16 20:47 Nick Sarnie

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox