From owner-svn-ports-branches@freebsd.org Sat Jun 27 23:25:31 2020 Return-Path: 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 0B3B335EDFD; Sat, 27 Jun 2020 23:25:31 +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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49vVGy6V4wz4bc4; Sat, 27 Jun 2020 23:25:30 +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 D9FE4D310; Sat, 27 Jun 2020 23:25:30 +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 05RNPUkI010672; Sat, 27 Jun 2020 23:25:30 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05RNPUUn010671; Sat, 27 Jun 2020 23:25:30 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202006272325.05RNPUUn010671@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 27 Jun 2020 23:25:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r540657 - branches/2020Q2/emulators/ppsspp/files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2020Q2/emulators/ppsspp/files X-SVN-Commit-Revision: 540657 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.33 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Jun 2020 23:25:31 -0000 Author: jbeich Date: Sat Jun 27 23:25:30 2020 New Revision: 540657 URL: https://svnweb.freebsd.org/changeset/ports/540657 Log: MFH: r540655 emulators/ppsspp: unbreak OLDJOY after r512863 SDL/SDLJoystick.cpp:24:13: error: no member named 'bPS3Controller' in 'Config' g_Config.bPS3Controller = true; ~~~~~~~~ ^ SDL/SDLJoystick.cpp:27:22: error: no member named 'bPS3Controller' in 'Config' if (g_Config.bPS3Controller) ~~~~~~~~ ^ Approved by: ports-secteam blanket Modified: branches/2020Q2/emulators/ppsspp/files/extra-patch-old-joy Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/emulators/ppsspp/files/extra-patch-old-joy ============================================================================== --- branches/2020Q2/emulators/ppsspp/files/extra-patch-old-joy Sat Jun 27 23:24:36 2020 (r540656) +++ branches/2020Q2/emulators/ppsspp/files/extra-patch-old-joy Sat Jun 27 23:25:30 2020 (r540657) @@ -8,8 +8,19 @@ https://github.com/hrydgard/ppsspp/commit/d6b81236626f https://github.com/hrydgard/ppsspp/commit/b058b987ad0f https://github.com/hrydgard/ppsspp/commit/1b699363ca4d https://github.com/hrydgard/ppsspp/commit/ac0052c6af92 +https://github.com/hrydgard/ppsspp/commit/53daa0d844af ---- SDL/SDLJoystick.cpp.orig 2017-10-04 19:26:40 UTC +--- Core/Config.h.orig 2019-10-16 19:38:27 UTC ++++ Core/Config.h +@@ -83,6 +83,7 @@ struct Config { (public) + bool bPauseExitsEmulator; + + bool bPauseMenuExitsEmulator; ++ bool bPS3Controller; + + // Core + bool bIgnoreBadMemAccess; +--- SDL/SDLJoystick.cpp.orig 2019-10-16 19:38:27 UTC +++ SDL/SDLJoystick.cpp @@ -1,13 +1,8 @@ #include "SDL/SDLJoystick.h" @@ -324,11 +335,11 @@ https://github.com/hrydgard/ppsspp/commit/ac0052c6af92 - return it->second; + return -1; } ---- SDL/SDLJoystick.h.orig 2017-10-04 19:26:40 UTC +--- SDL/SDLJoystick.h.orig 2019-10-16 19:38:27 UTC +++ SDL/SDLJoystick.h @@ -1,9 +1,11 @@ #pragma once - #ifdef _WIN32 + #ifdef _MSC_VER #include "SDL/SDL.h" +#include "SDL/SDL_joystick.h" #include "SDL/SDL_thread.h" @@ -464,3 +475,25 @@ https://github.com/hrydgard/ppsspp/commit/ac0052c6af92 + + int getDeviceIndex(int instanceId); }; +--- SDL/SDLMain.cpp.orig 2019-10-16 19:38:27 UTC ++++ SDL/SDLMain.cpp +@@ -417,7 +417,7 @@ int main(int argc, char *argv[]) { + NativeGetAppInfo(&app_name, &app_name_nice, &landscape, &version); + + bool joystick_enabled = true; +- if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_GAMECONTROLLER | SDL_INIT_AUDIO) < 0) { ++ if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_AUDIO) < 0) { + fprintf(stderr, "Failed to initialize SDL with joystick support. Retrying without.\n"); + joystick_enabled = false; + if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO) < 0) { +--- UI/NativeApp.cpp.orig 2019-10-16 19:38:27 UTC ++++ UI/NativeApp.cpp +@@ -555,6 +555,8 @@ void NativeInit(int argc, const char *argv[], const ch + fileToLog = argv[i] + strlen("--log="); + if (!strncmp(argv[i], "--state=", strlen("--state=")) && strlen(argv[i]) > strlen("--state=")) + stateToLoad = argv[i] + strlen("--state="); ++ if (!strncmp(argv[1], "--PS3", strlen("--PS3"))) ++ g_Config.bPS3Controller = true; + #if !defined(MOBILE_DEVICE) + if (!strncmp(argv[i], "--escape-exit", strlen("--escape-exit"))) + g_Config.bPauseExitsEmulator = true;