Date: Sat, 11 Apr 2020 13:01:16 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r531423 - in branches/2020Q2/emulators/rpcs3: . files Message-ID: <202004111301.03BD1GAe068520@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Sat Apr 11 13:01:16 2020 New Revision: 531423 URL: https://svnweb.freebsd.org/changeset/ports/531423 Log: MFH: r531422 emulators/rpcs3: unbreak audio after r529285 INFO: OpenAudioDevice failed: Fragment size must be a power of two Segfault reading location 00000000000000d4 at 0000000001de1abd. Emu Thread Name: 'cellAudio Thread'. Thread id = 0x89cf05700. Approved by: ports-secteam blanket (crash fix) Added: branches/2020Q2/emulators/rpcs3/files/patch-3rdparty_FAudio_src_FAudio__platform__sdl2.c - copied unchanged from r531422, head/emulators/rpcs3/files/patch-3rdparty_FAudio_src_FAudio__platform__sdl2.c Modified: branches/2020Q2/emulators/rpcs3/Makefile Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/emulators/rpcs3/Makefile ============================================================================== --- branches/2020Q2/emulators/rpcs3/Makefile Sat Apr 11 13:00:40 2020 (r531422) +++ branches/2020Q2/emulators/rpcs3/Makefile Sat Apr 11 13:01:16 2020 (r531423) @@ -4,6 +4,7 @@ PORTNAME= rpcs3 DISTVERSIONPREFIX= v DISTVERSION= 0.0.9-10084 # git rev-list --count HEAD DISTVERSIONSUFFIX= -g85c4321c2 +PORTREVISION= 1 CATEGORIES= emulators MAINTAINER= jbeich@FreeBSD.org @@ -58,7 +59,8 @@ EVDEV_BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto EVDEV_LIB_DEPENDS= libevdev.so:devel/libevdev FAUDIO_DESC= FAudio audio support -FAUDIO_LIB_DEPENDS= libFAudio.so:audio/faudio +FAUDIO_USES= sdl +FAUDIO_USE= SDL=sdl2 FAUDIO_CMAKE_BOOL= USE_FAUDIO PULSEAUDIO_LIB_DEPENDS= libpulse-simple.so:audio/pulseaudio Copied: branches/2020Q2/emulators/rpcs3/files/patch-3rdparty_FAudio_src_FAudio__platform__sdl2.c (from r531422, head/emulators/rpcs3/files/patch-3rdparty_FAudio_src_FAudio__platform__sdl2.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q2/emulators/rpcs3/files/patch-3rdparty_FAudio_src_FAudio__platform__sdl2.c Sat Apr 11 13:01:16 2020 (r531423, copy of r531422, head/emulators/rpcs3/files/patch-3rdparty_FAudio_src_FAudio__platform__sdl2.c) @@ -0,0 +1,23 @@ +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?202004111301.03BD1GAe068520>