Re: UPDATE: ppsspp 1.15.4

ping.

On 2023-05-29 2:05 a.m., Brad Smith wrote:
> Here is an update to ppsspp 1.15.4.
>
>
> https://www.ppsspp.org/news/
>
>
> Index: Makefile
> ===================================================================
> RCS file: /home/cvs/ports/emulators/ppsspp/Makefile,v
> retrieving revision 1.20
> diff -u -p -u -p -r1.20 Makefile
> --- Makefile 25 Apr 2023 15:33:02 -0000 1.20
> +++ Makefile 28 May 2023 06:45:26 -0000
> @@ -3,10 +3,10 @@ NOT_FOR_ARCHS = ${BE_ARCHS}
>
> # FakeJit fallback broken in (at least) 1.10.3
> # ppsspp-1.10.3/Core/MIPS/JitCommon/JitCommon.cpp:75:10: error: cannot initialize return object of type 'MIPSComp::JitInterface *' with an rvalue of type 'MIPSComp::FakeJit *'
> -PPSSPP_JIT_ARCHS = arm aarch64 i386 amd64
> +PPSSPP_JIT_ARCHS = aarch64 amd64 arm i386
> ONLY_FOR_ARCHS = ${PPSSPP_JIT_ARCHS}
>
> -V = 1.14.4
> +V = 1.15.4
> DISTNAME = ppsspp-$V
>
> COMMENT = Sony PlayStation Portable emulator
> Index: distinfo
> ===================================================================
> RCS file: /home/cvs/ports/emulators/ppsspp/distinfo,v
> retrieving revision 1.10
> diff -u -p -u -p -r1.10 distinfo
> --- distinfo 25 Apr 2023 15:33:02 -0000 1.10
> +++ distinfo 24 May 2023 04:35:59 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (ppsspp/ppsspp-1.14.4.tar.xz) = VO3kGvVpEW2cKE97FX0USdzROURnXmDCh1vzo5lPXdo=
> -SIZE (ppsspp/ppsspp-1.14.4.tar.xz) = 46405556
> +SHA256 (ppsspp/ppsspp-1.15.4.tar.xz) = ogvSe0zagR1s0hgvv80W9wktal0H/LvQDMcjBTC99ow=
> +SIZE (ppsspp/ppsspp-1.15.4.tar.xz) = 51947468
> Index: patches/patch-CMakeLists_txt
> ===================================================================
> RCS file: /home/cvs/ports/emulators/ppsspp/patches/patch-CMakeLists_txt,v
> retrieving revision 1.9
> diff -u -p -u -p -r1.9 patch-CMakeLists_txt
> --- patches/patch-CMakeLists_txt 13 May 2023 08:22:02 -0000 1.9
> +++ patches/patch-CMakeLists_txt 28 May 2023 07:02:55 -0000
> @@ -1,21 +1,24 @@
> -- fix includes
> -- honor CFLAGS and DEBUG
> -- set _POSIX_C_SOURCE=200809L for locale_t (build fails otherwise)
> -- use system libpng on arm platforms
> +- Fix building on OpenBSD
> + 94aed7a1011ef48e6524fb16bfb7dfb025dc0746
> +
> +- Fix includes
> +- Honor CFLAGS and DEBUG
> +- Use system libpng on arm platforms
>
> Index: CMakeLists.txt
> --- CMakeLists.txt.orig
> +++ CMakeLists.txt
> -@@ -252,6 +252,8 @@ endif()
> - if(NOT LIBRETRO AND NOT IOS)
> - find_package(SDL2)
> +@@ -258,6 +258,9 @@ if(MACOSX AND NOT IOS)
> + endif()
> endif()
> +
> +include_directories(${X11BASE}/include)
> +include_directories(${LOCALBASE}/lib/libzip/include)
> ++
> include(FindThreads)
>
> if(APPLE)
> -@@ -351,13 +353,13 @@ if(NOT MSVC)
> +@@ -358,13 +361,13 @@ if(NOT MSVC)
> endif()
> endif()
>
> @@ -33,15 +36,16 @@ Index: CMakeLists.txt
> set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -O2 -g -D_NDEBUG")
>
> # Enable checking printf-like format strings (also works for logging functions)
> -@@ -388,7 +390,6 @@ if(NOT MSVC)
> - if(NOT ${CMAKE_C_COMPILER_ID} STREQUAL "Intel" AND NOT ${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
> +@@ -404,7 +407,7 @@ if(NOT MSVC)
> add_definitions(-Wno-psabi)
> endif()
> -- add_definitions(-D_XOPEN_SOURCE=700)
> - add_definitions(-D_XOPEN_SOURCE_EXTENDED -D__BSD_VISIBLE=1)
> + add_definitions(-D_XOPEN_SOURCE=700)
> +- add_definitions(-D_XOPEN_SOURCE_EXTENDED -D__BSD_VISIBLE=1)
> ++ add_definitions(-D_XOPEN_SOURCE_EXTENDED -D__BSD_VISIBLE=1 -D_BSD_SOURCE)
> add_definitions(-D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64)
> elseif(ANDROID)
> -@@ -900,6 +901,7 @@ endif()
> + add_definitions(-fsigned-char)
> +@@ -933,6 +936,7 @@ endif()
> find_package(LIBZIP)
> if(LIBZIP_FOUND AND USE_SYSTEM_LIBZIP)
> add_definitions(-DSHARED_LIBZIP)
> @@ -49,7 +53,7 @@ Index: CMakeLists.txt
> else()
> add_library(libzip STATIC
> ext/libzip/zip_add.c
> -@@ -1037,7 +1039,7 @@ else()
> +@@ -1070,7 +1074,7 @@ else()
> endif()
>
> # Arm platforms require at least libpng17.
> @@ -58,12 +62,3 @@ Index: CMakeLists.txt
> set(PNG_REQUIRED_VERSION 1.7)
> else()
> set(PNG_REQUIRED_VERSION 1.6)
> -@@ -2123,7 +2125,7 @@ if(USE_MINIUPNPC)
> -
> - if (NOT WIN32)
> - add_definitions (-DMINIUPNPC_SET_SOCKET_TIMEOUT)
> -- add_definitions (-D_BSD_SOURCE -D_DEFAULT_SOURCE -D_POSIX_C_SOURCE=200112L)
> -+ add_definitions (-D_BSD_SOURCE -D_DEFAULT_SOURCE -D_POSIX_C_SOURCE=200809L)
> - endif()
> - if (MACOSX)
> - add_definitions (-D_DARWIN_C_SOURCE)
> Index: patches/patch-Core_AVIDump_cpp
> ===================================================================
> RCS file: patches/patch-Core_AVIDump_cpp
> diff -N patches/patch-Core_AVIDump_cpp
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-Core_AVIDump_cpp 20 May 2023 00:45:57 -0000
> @@ -0,0 +1,14 @@
> +Deal with newer FFmpeg API.
> +
> +Index: Core/AVIDump.cpp
> +--- Core/AVIDump.cpp.orig
> ++++ Core/AVIDump.cpp
> +@@ -91,7 +91,7 @@ bool AVIDump::Start(int w, int h)
> +
> + bool AVIDump::CreateAVI() {
> + #ifdef USE_FFMPEG
> +- AVCodec *codec = nullptr;
> ++ const AVCodec *codec = nullptr;
> +
> + // Use gameID_EmulatedTimestamp for filename
> + std::string discID = g_paramSFO.GetDiscID();
> Index: patches/patch-Core_HLE_proAdhoc_cpp
> ===================================================================
> RCS file: patches/patch-Core_HLE_proAdhoc_cpp
> diff -N patches/patch-Core_HLE_proAdhoc_cpp
> --- patches/patch-Core_HLE_proAdhoc_cpp 25 Apr 2023 15:33:02 -0000 1.3
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,14 +0,0 @@
> -support compilation without TCP_KEEPALIVE support
> -
> -Index: Core/HLE/proAdhoc.cpp
> ---- Core/HLE/proAdhoc.cpp.orig
> -+++ Core/HLE/proAdhoc.cpp
> -@@ -2087,7 +2087,7 @@ int setSockKeepAlive(int sock, bool keepalive, const i
> - int optval = keepalive ? 1 : 0;
> - int optlen = sizeof(optval);
> - int result = setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE, (char*)&optval, optlen);
> --#if !PPSSPP_PLATFORM(SWITCH)
> -+#if !PPSSPP_PLATFORM(SWITCH) && !PPSSPP_PLATFORM(OPENBSD)
> - if (result == 0 && keepalive) {
> - if (getsockopt(sock, SOL_SOCKET, SO_TYPE, (char*)&optval, (socklen_t*)&optlen) == 0 && optval == SOCK_STREAM) {
> - optlen = sizeof(optval);
> Index: patches/patch-Core_HLE_sceAtrac_cpp
> ===================================================================
> RCS file: patches/patch-Core_HLE_sceAtrac_cpp
> diff -N patches/patch-Core_HLE_sceAtrac_cpp
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-Core_HLE_sceAtrac_cpp 20 May 2023 00:49:28 -0000
> @@ -0,0 +1,13 @@
> +Deal with newer FFmpeg API.
> +
> +Index: Core/HLE/sceAtrac.cpp
> +--- Core/HLE/sceAtrac.cpp.orig
> ++++ Core/HLE/sceAtrac.cpp
> +@@ -123,6 +123,7 @@ static const int atracDecodeDelay = 2300;
> + #ifdef USE_FFMPEG
> +
> + extern "C" {
> ++#include "libavcodec/avcodec.h"
> + #include "libavformat/avformat.h"
> + #include "libswresample/swresample.h"
> + #include "libavutil/samplefmt.h"
> Index: patches/patch-Core_HLE_sceMpeg_cpp
> ===================================================================
> RCS file: patches/patch-Core_HLE_sceMpeg_cpp
> diff -N patches/patch-Core_HLE_sceMpeg_cpp
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-Core_HLE_sceMpeg_cpp 20 May 2023 00:51:34 -0000
> @@ -0,0 +1,22 @@
> +Deal with newer FFmpeg API.
> +
> +Index: Core/HLE/sceMpeg.cpp
> +--- Core/HLE/sceMpeg.cpp.orig
> ++++ Core/HLE/sceMpeg.cpp
> +@@ -108,6 +108,7 @@ static bool useRingbufferPutCallbackMulti = true;
> + #ifdef USE_FFMPEG
> +
> + extern "C" {
> ++#include "libavcodec/avcodec.h"
> + #include "libavformat/avformat.h"
> + #include "libavutil/imgutils.h"
> + #include "libswscale/swscale.h"
> +@@ -801,7 +802,7 @@ static bool InitPmp(MpegContext * ctx){
> + pmp_want_pix_fmt = AV_PIX_FMT_RGBA;
> +
> + // Create H264 video codec
> +- AVCodec * pmp_Codec = avcodec_find_decoder(AV_CODEC_ID_H264);
> ++ const AVCodec * pmp_Codec = avcodec_find_decoder(AV_CODEC_ID_H264);
> + if (pmp_Codec == NULL){
> + ERROR_LOG(ME, "Can not find H264 codec, please update ffmpeg");
> + return false;
> Index: patches/patch-Core_HLE_sceNetAdhoc_cpp
> ===================================================================
> RCS file: patches/patch-Core_HLE_sceNetAdhoc_cpp
> diff -N patches/patch-Core_HLE_sceNetAdhoc_cpp
> --- patches/patch-Core_HLE_sceNetAdhoc_cpp 25 Apr 2023 15:33:02 -0000 1.3
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,13 +0,0 @@
> -ensure that u_int32_t and friends are defined
> -
> -Index: Core/HLE/sceNetAdhoc.cpp
> ---- Core/HLE/sceNetAdhoc.cpp.orig
> -+++ Core/HLE/sceNetAdhoc.cpp
> -@@ -21,6 +21,7 @@
> -