Date: Thu, 22 Jul 2021 00:22:38 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 12d271da6d06 - main - emulators/rpcs3: switch to system faudio Message-ID: <202107220022.16M0Mclx039746@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=12d271da6d06a911ec3986b5b3be6eb933a647bc commit 12d271da6d06a911ec3986b5b3be6eb933a647bc Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2021-07-21 23:39:49 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2021-07-22 00:21:10 +0000 emulators/rpcs3: switch to system faudio --- emulators/rpcs3/Makefile | 5 ++--- ...ch-3rdparty_FAudio_src_FAudio__platform__sdl2.c | 23 ---------------------- 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/emulators/rpcs3/Makefile b/emulators/rpcs3/Makefile index 211c0e0ad1c0..eae18c2f408d 100644 --- a/emulators/rpcs3/Makefile +++ b/emulators/rpcs3/Makefile @@ -56,9 +56,8 @@ EVDEV_BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto EVDEV_LIB_DEPENDS= libevdev.so:devel/libevdev FAUDIO_DESC= FAudio audio support -FAUDIO_USES= sdl -FAUDIO_USE= SDL=sdl2 -FAUDIO_CMAKE_BOOL= USE_FAUDIO +FAUDIO_LIB_DEPENDS= libFAudio.so:audio/faudio +FAUDIO_CMAKE_BOOL= USE_FAUDIO USE_SYSTEM_FAUDIO PULSEAUDIO_LIB_DEPENDS= libpulse-simple.so:audio/pulseaudio PULSEAUDIO_CMAKE_BOOL= USE_PULSE diff --git a/emulators/rpcs3/files/patch-3rdparty_FAudio_src_FAudio__platform__sdl2.c b/emulators/rpcs3/files/patch-3rdparty_FAudio_src_FAudio__platform__sdl2.c deleted file mode 100644 index 0371764cfcb9..000000000000 --- a/emulators/rpcs3/files/patch-3rdparty_FAudio_src_FAudio__platform__sdl2.c +++ /dev/null @@ -1,23 +0,0 @@ -https://github.com/FNA-XNA/FAudio/issues/183 - ---- 3rdparty/FAudio/src/FAudio_platform_sdl2.c.orig 2020-04-01 14:55:30 UTC -+++ 3rdparty/FAudio/src/FAudio_platform_sdl2.c -@@ -100,6 +100,18 @@ void FAudio_PlatformInit( - want.samples = want.freq / 100; - } - -+ /* SDL audio with arts/dsp backends expect ^2, so round up. -+ * For 48KHz this should be 512. -+ * https://graphics.stanford.edu/~seander/bithacks.html#RoundUpPowerOf2 -+ */ -+ want.samples--; -+ want.samples |= want.samples >> 1; -+ want.samples |= want.samples >> 2; -+ want.samples |= want.samples >> 4; -+ want.samples |= want.samples >> 8; -+ want.samples |= want.samples >> 16; -+ want.samples++; -+ - /* Open the device (or at least try to) */ - iosretry: - device = SDL_OpenAudioDevice(
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202107220022.16M0Mclx039746>