From owner-svn-ports-branches@freebsd.org Sun Apr 19 17:21:08 2020 Return-Path: <owner-svn-ports-branches@freebsd.org> Delivered-To: svn-ports-branches@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 2127A27BC9E; Sun, 19 Apr 2020 17:21:08 +0000 (UTC) (envelope-from rodrigo@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 494xSN05Wlz4dGk; Sun, 19 Apr 2020 17:21:08 +0000 (UTC) (envelope-from rodrigo@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 F27C215A2; Sun, 19 Apr 2020 17:21:07 +0000 (UTC) (envelope-from rodrigo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 03JHL7Wt014207; Sun, 19 Apr 2020 17:21:07 GMT (envelope-from rodrigo@FreeBSD.org) Received: (from rodrigo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03JHL7uf014205; Sun, 19 Apr 2020 17:21:07 GMT (envelope-from rodrigo@FreeBSD.org) Message-Id: <202004191721.03JHL7uf014205@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rodrigo set sender to rodrigo@FreeBSD.org using -f From: Rodrigo Osorio <rodrigo@FreeBSD.org> Date: Sun, 19 Apr 2020 17:21:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r532136 - in branches/2020Q2/emulators/emu64: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: rodrigo X-SVN-Commit-Paths: in branches/2020Q2/emulators/emu64: . files X-SVN-Commit-Revision: 532136 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree <svn-ports-branches.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-branches>, <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/> List-Post: <mailto:svn-ports-branches@freebsd.org> List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sun, 19 Apr 2020 17:21:08 -0000 Author: rodrigo Date: Sun Apr 19 17:21:07 2020 New Revision: 532136 URL: https://svnweb.freebsd.org/changeset/ports/532136 Log: MFH: r532092 emulators/emu64: extend patch to fix an issue with OSS This update is require to unbreak the port under FreeBSD. The issue was reported to upstream and the fix will be available in future releases. Background: In the upstream issue, it was revealed that the whole C64 emulation depends on the audio stream (for best sync) and initializing the audio stream failed when the SDL backend was OSS, because it needs a fragment size that is a power of two. The attached patch is the minimal change to 5.0.18 from the upstream commit that solved the problem. PR: 245395 Submitted by: Ingo <hylaios@online.de> Approved by: Felix Palmen <felix@palmen-it.de> (maintainer) Approved by: ports-secteam@ Modified: branches/2020Q2/emulators/emu64/Makefile branches/2020Q2/emulators/emu64/files/patch-src_c64__class.cpp Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/emulators/emu64/Makefile ============================================================================== --- branches/2020Q2/emulators/emu64/Makefile Sun Apr 19 16:12:35 2020 (r532135) +++ branches/2020Q2/emulators/emu64/Makefile Sun Apr 19 17:21:07 2020 (r532136) @@ -3,6 +3,7 @@ PORTNAME= emu64 PORTVERSION= 5.0.18 +PORTREVISION= 1 CATEGORIES= emulators MAINTAINER= felix@palmen-it.de Modified: branches/2020Q2/emulators/emu64/files/patch-src_c64__class.cpp ============================================================================== --- branches/2020Q2/emulators/emu64/files/patch-src_c64__class.cpp Sun Apr 19 16:12:35 2020 (r532135) +++ branches/2020Q2/emulators/emu64/files/patch-src_c64__class.cpp Sun Apr 19 17:21:07 2020 (r532136) @@ -1,5 +1,17 @@ ---- src/c64_class.cpp.orig 2020-04-03 11:33:28 UTC +--- src/c64_class.cpp.orig 2020-04-11 10:05:13 UTC +++ src/c64_class.cpp +@@ -27,9 +27,9 @@ int SDLThreadWarp(void *userdat); + #define C64Takt 985248 // 50,124542Hz (Original C64 PAL) + + #ifdef _WIN32 +- #define AudioPufferSize (882) // 882 bei 44.100 Khz ++ #define AudioPufferSize (1024) // 882 bei 44.100 Khz + #else +- #define AudioPufferSize (882) // 882 bei 44.100 Khz ++ #define AudioPufferSize (1024) // 882 bei 44.100 Khz + #endif + + #define RecPollingWaitStart 20 @@ -1757,7 +1757,7 @@ void C64Class::SetFullscreenAspectRatio(bool enable) void C64Class::AnalyzeSDLEvent(SDL_Event *event) {