Hi, Here's an update to ppsspp-1.8.0.
Release notes visible on the homepage: https://ppsspp.org/ A couple of patch changes: - Upstream added an option to disable discord so we no longer have to patch it out - Remove -O3 Test reports greatly appreciated. Index: Makefile =================================================================== RCS file: /cvs/ports/emulators/ppsspp/Makefile,v retrieving revision 1.7 diff -u -p -r1.7 Makefile --- Makefile 7 Mar 2019 07:22:19 -0000 1.7 +++ Makefile 15 Mar 2019 07:23:54 -0000 @@ -4,12 +4,12 @@ COMMENT = Sony PlayStation Portable emul GH_ACCOUNT = hrydgard GH_PROJECT = ppsspp -GH_TAGNAME = v1.7.1 +GH_TAGNAME = v1.8.0 -GLSLANG = 29619b2312f7bc862221749f3f4d37c3e6a0dee2 -PPSSPP_LANG = f60be494a43a49fd7ff61603e132c1e24c160d88 +GLSLANG = 9983f99e87ab0b6608b236ea59bcf873f90e1435 +PPSSPP_LANG = 18e0d460e187556e9510e2e9b5ae85fa435cefd9 SPIRV_CROSS = be7425ef70231ab82930331959ab487d605d0482 -ARMIPS = 9efe3367284d2d1eeb14fc302a2c12c36e3e255e +ARMIPS = 7885552b208493a6a0f21663770c446c3ba65576 MASTER_SITES0 = https://github.com/hrydgard/glslang/archive/ MASTER_SITES1 = https://github.com/hrydgard/ppsspp-lang/archive/ @@ -50,6 +50,7 @@ CONFIGURE_ARGS = -DCMAKE_CXX_FLAGS="-I${ -DUSE_SYSTEM_FFMPEG=ON \ -DUSE_SYSTEM_LIBZIP=ON \ -DUSE_SYSTEM_SNAPPY=ON \ + -DUSE_DISCORD=OFF \ -DUSING_EGL=OFF NO_TEST = Yes Index: distinfo =================================================================== RCS file: /cvs/ports/emulators/ppsspp/distinfo,v retrieving revision 1.5 diff -u -p -r1.5 distinfo --- distinfo 10 Nov 2018 17:55:30 -0000 1.5 +++ distinfo 15 Mar 2019 07:23:54 -0000 @@ -1,10 +1,10 @@ -SHA256 (ppsspp/29619b2312f7bc862221749f3f4d37c3e6a0dee2.tar.gz) = USViBSDSX5o5xtYt/NPgh/1hDcXRY93/Y3c2UBHIsT8= -SHA256 (ppsspp/9efe3367284d2d1eeb14fc302a2c12c36e3e255e.tar.gz) = c7Nm8w6POGNQFyPhPrXcr21CS4A4LRfCdjVWe3lwXKM= +SHA256 (ppsspp/18e0d460e187556e9510e2e9b5ae85fa435cefd9.tar.gz) = PTExcLs4fUZuK/Jnsj3VaJF0NVU39yi0Kpn56nevDTc= +SHA256 (ppsspp/7885552b208493a6a0f21663770c446c3ba65576.tar.gz) = +KA5BhNftvKTK4C371mR85zKxGs27DaQd2+zjGl3XD0= +SHA256 (ppsspp/9983f99e87ab0b6608b236ea59bcf873f90e1435.tar.gz) = 6lw8oQG5Y1UIBS4PUpZjA+j8lO31ZOz9D9oUe3RiXJo= SHA256 (ppsspp/be7425ef70231ab82930331959ab487d605d0482.tar.gz) = Ia+g4y3S117lHE9cDRYzCp2A1DXWrJkA0ME7/9/XtoI= -SHA256 (ppsspp/f60be494a43a49fd7ff61603e132c1e24c160d88.tar.gz) = rBG2iPT9Nbcwc2ryUoKa5hvOK0CcdGL0h8bIiBV+dJs= -SHA256 (ppsspp/ppsspp-1.7.1.tar.gz) = TDJdWFQH9lt7QBLEB+Pi8kblfoIfeAw68Sqih0NW8r0= -SIZE (ppsspp/29619b2312f7bc862221749f3f4d37c3e6a0dee2.tar.gz) = 2355082 -SIZE (ppsspp/9efe3367284d2d1eeb14fc302a2c12c36e3e255e.tar.gz) = 197127 +SHA256 (ppsspp/ppsspp-1.8.0.tar.gz) = pwEf6wSAo1LWDmo8k52I1NLjoudmIIhrGDqiyzb5EN4= +SIZE (ppsspp/18e0d460e187556e9510e2e9b5ae85fa435cefd9.tar.gz) = 538330 +SIZE (ppsspp/7885552b208493a6a0f21663770c446c3ba65576.tar.gz) = 197263 +SIZE (ppsspp/9983f99e87ab0b6608b236ea59bcf873f90e1435.tar.gz) = 2497419 SIZE (ppsspp/be7425ef70231ab82930331959ab487d605d0482.tar.gz) = 537422 -SIZE (ppsspp/f60be494a43a49fd7ff61603e132c1e24c160d88.tar.gz) = 535225 -SIZE (ppsspp/ppsspp-1.7.1.tar.gz) = 19484840 +SIZE (ppsspp/ppsspp-1.8.0.tar.gz) = 19636576 Index: patches/patch-CMakeLists_txt =================================================================== RCS file: /cvs/ports/emulators/ppsspp/patches/patch-CMakeLists_txt,v retrieving revision 1.2 diff -u -p -r1.2 patch-CMakeLists_txt --- patches/patch-CMakeLists_txt 30 Oct 2018 06:35:23 -0000 1.2 +++ patches/patch-CMakeLists_txt 15 Mar 2019 07:23:54 -0000 @@ -3,7 +3,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.2 201 Index: CMakeLists.txt --- CMakeLists.txt.orig +++ CMakeLists.txt -@@ -194,6 +194,8 @@ if(NOT OPENGL_LIBRARIES) +@@ -182,6 +182,8 @@ if(USING_EGL) endif() find_package(SDL2) @@ -12,15 +12,33 @@ Index: CMakeLists.txt include(FindThreads) if(APPLE) -@@ -307,7 +309,6 @@ if(NOT MSVC) - if (NOT ${CMAKE_C_COMPILER_ID} STREQUAL "Intel" AND NOT ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang") +@@ -247,13 +249,13 @@ if(NOT MSVC) + add_definitions(-DUSE_ADDRESS_SANITIZER) + endif() + +- set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g -D_DEBUG") ++ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG") + set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} -Os -D_NDEBUG") +- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -D_NDEBUG") ++ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -D_NDEBUG") + set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O2 -g -D_NDEBUG") +- set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g -D_DEBUG") ++ set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG") + set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} -Os -D_NDEBUG") +- set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3 -D_NDEBUG") ++ set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -D_NDEBUG") + set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -O2 -g -D_NDEBUG") + #TODO: Remove this and include the file properly everywhere it makes sense + # First step is too use the macros everywhere +@@ -293,7 +295,6 @@ if(NOT MSVC) + if(NOT ${CMAKE_C_COMPILER_ID} STREQUAL "Intel" AND NOT ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang") add_definitions(-Wno-psabi) endif() - add_definitions(-D_XOPEN_SOURCE=700) add_definitions(-D_XOPEN_SOURCE_EXTENDED -D__BSD_VISIBLE=1) add_definitions(-D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64) elseif(ANDROID) -@@ -601,6 +602,7 @@ endif() +@@ -594,6 +595,7 @@ endif() find_package(LibZip) if(LIBZIP_FOUND AND USE_SYSTEM_LIBZIP) add_definitions(-DSHARED_LIBZIP) @@ -28,15 +46,3 @@ Index: CMakeLists.txt else() add_library(libzip STATIC ext/native/ext/libzip/zip.h -@@ -1767,11 +1769,6 @@ if(FFmpeg_FOUND) - FFmpeg::swscale - ${ZLIB_LIBRARY} - ) --endif() -- --# Discord integration --if(NOT IOS) --target_link_libraries(${CoreLibName} discord-rpc) - endif() - - setup_target_project(${CoreLibName} Core) Index: patches/patch-UI_NativeApp_cpp =================================================================== RCS file: /cvs/ports/emulators/ppsspp/patches/patch-UI_NativeApp_cpp,v retrieving revision 1.2 diff -u -p -r1.2 patch-UI_NativeApp_cpp --- patches/patch-UI_NativeApp_cpp 30 Oct 2018 06:35:23 -0000 1.2 +++ patches/patch-UI_NativeApp_cpp 15 Mar 2019 07:23:54 -0000 @@ -3,7 +3,7 @@ $OpenBSD: patch-UI_NativeApp_cpp,v 1.2 2 Index: UI/NativeApp.cpp --- UI/NativeApp.cpp.orig +++ UI/NativeApp.cpp -@@ -443,7 +443,7 @@ void NativeInit(int argc, const char *argv[], const ch +@@ -446,7 +446,7 @@ void NativeInit(int argc, const char *argv[], const ch #if !defined(MOBILE_DEVICE) && !defined(_WIN32) VFSRegister("", new DirectoryAssetReader((File::GetExeDirectory() + "assets/").c_str())); VFSRegister("", new DirectoryAssetReader((File::GetExeDirectory()).c_str())); Index: patches/patch-ext_CMakeLists_txt =================================================================== RCS file: patches/patch-ext_CMakeLists_txt diff -N patches/patch-ext_CMakeLists_txt --- patches/patch-ext_CMakeLists_txt 30 Oct 2018 06:35:23 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-ext_CMakeLists_txt,v 1.1 2018/10/30 06:35:23 bentley Exp $ - -Index: ext/CMakeLists.txt ---- ext/CMakeLists.txt.orig -+++ ext/CMakeLists.txt -@@ -12,6 +12,3 @@ add_subdirectory(glslang) - add_subdirectory(snappy) - add_subdirectory(udis86) - add_subdirectory(SPIRV-Cross-build) --if(NOT IOS) --add_subdirectory(discord-rpc-build) --endif()
