From owner-svn-ports-head@freebsd.org Sat Apr 11 13:00:41 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 598B52B9621; Sat, 11 Apr 2020 13:00:41 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48zw3Y1Xhzz4c11; Sat, 11 Apr 2020 13:00:41 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2C9651872C; Sat, 11 Apr 2020 13:00:41 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 03BD0f57064696; Sat, 11 Apr 2020 13:00:41 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03BD0ePX064694; Sat, 11 Apr 2020 13:00:40 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202004111300.03BD0ePX064694@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 11 Apr 2020 13:00:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r531422 - in head/emulators/rpcs3: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head/emulators/rpcs3: . files X-SVN-Commit-Revision: 531422 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Apr 2020 13:00:41 -0000 Author: jbeich Date: Sat Apr 11 13:00:40 2020 New Revision: 531422 URL: https://svnweb.freebsd.org/changeset/ports/531422 Log: 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. Added: head/emulators/rpcs3/files/patch-3rdparty_FAudio_src_FAudio__platform__sdl2.c (contents, props changed) Modified: head/emulators/rpcs3/Makefile (contents, props changed) Modified: head/emulators/rpcs3/Makefile ============================================================================== --- head/emulators/rpcs3/Makefile Sat Apr 11 12:24:07 2020 (r531421) +++ head/emulators/rpcs3/Makefile Sat Apr 11 13:00:40 2020 (r531422) @@ -4,6 +4,7 @@ PORTNAME= rpcs3 DISTVERSIONPREFIX= v DISTVERSION= 0.0.9-10152 # git rev-list --count HEAD DISTVERSIONSUFFIX= -gcce946f10 +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 Added: head/emulators/rpcs3/files/patch-3rdparty_FAudio_src_FAudio__platform__sdl2.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/rpcs3/files/patch-3rdparty_FAudio_src_FAudio__platform__sdl2.c Sat Apr 11 13:00:40 2020 (r531422) @@ -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(