Commit 3b11c9c5 authored by Kevin Reinholz's avatar Kevin Reinholz Committed by Daniel Engberg
Browse files

emulators/ppsspp: Update to 1.20.2 

* Remove emulators/ppsspp-qt5 due to Qt 5 being end of life
* Unbundle freetype, libchdr and rapidjson
* Remove redundant -msse2 compiler flag on amd64 as this is enabled
  by default

Changes submitted upstream, https://github.com/hrydgard/ppsspp/pull/21428

PR:		293572
parent 3ef6f7f7

emulators/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -111,7 +111,6 @@ 
    SUBDIR += pcsx2

    SUBDIR += playonbsd

    SUBDIR += ppsspp

    SUBDIR += ppsspp-qt5

    SUBDIR += py-gns3-converter

    SUBDIR += py-m64py

    SUBDIR += py-unicorn

emulators/ppsspp-qt5/Makefile

deleted100644 → 0
+0 −9
Original line number Diff line number Diff line 
PKGNAMESUFFIX=	-qt5



MASTERDIR=	${.CURDIR}/../ppsspp



# XXX No VULKAN per https://github.com/hrydgard/ppsspp/blob/v1.10/Qt/QtMain.cpp#L711-L712

OPTIONS_EXCLUDE=	${OPTIONS_DEFINE}

OPTIONS_SLAVE=		QT5



.include "${MASTERDIR}/Makefile"

emulators/ppsspp/Makefile

+19 −21
Original line number Diff line number Diff line 
PORTNAME=	ppsspp

DISTVERSIONPREFIX=	v

DISTVERSION?=	1.19.3

PORTREVISION=	1

DISTVERSION?=	1.20.2

CATEGORIES=	emulators



MAINTAINER=	kreinholz@gmail.com
@@ -17,13 +16,16 @@ NOT_FOR_ARCHS= mips mips64 powerpc powerpc64 powerpcspe 
NOT_FOR_ARCHS_REASON=	only little-endian is supported, see \

		https://github.com/hrydgard/ppsspp/issues/8823



BUILD_DEPENDS=	${LOCALBASE}/ffmpeg3/lib/libavcodec.a:multimedia/ffmpeg3

BUILD_DEPENDS=	${LOCALBASE}/ffmpeg3/lib/libavcodec.a:multimedia/ffmpeg3 \

		rapidjson>0:devel/rapidjson



LIB_DEPENDS=	libzip.so:archivers/libzip \

		libsnappy.so:archivers/snappy \

		libzstd.so:archivers/zstd \

		libminiupnpc.so:net/miniupnpc \

		libopenxr_loader.so:graphics/openxr

		libopenxr_loader.so:graphics/openxr \

		libfreetype.so:print/freetype2 \

		libchdr.so:devel/libchdr

RUN_DEPENDS=	xdg-open:devel/xdg-utils



USES=		cmake compiler:c++11-lib gl localbase:ldflags pkgconfig \
@@ -33,19 +35,21 @@ GH_ACCOUNT= hrydgard 
GH_TUPLE?=	Kingcom:armips:v0.11.0-195-ga8d71f0:armips/ext/armips \

                hrydgard:glslang:2.3-3991-g50e0708e:glslang/ext/glslang \

                KhronosGroup:SPIRV-Cross:4212eef67ed0ca048cb726a6767185504e7695e5:SPIRVCross/ext/SPIRV-Cross \

		Tencent:rapidjson:73063f5002612c6bf64fe24f851cd5cc0d83eef9:rapidjson/ext/rapidjson \

		unknownbrackets:ppsspp-debugger:9776332f720c854ef26f325a0cf9e32c02115a9c:ppssppdebugger/assets/debugger \

		google:cpu_features:v0.4.1-211-gfd4ffc1:cpu_features/ext/cpu_features \

		RetroAchievements:rcheevos:v11.6.0-61-gef0e22b:rcheevos/ext/rcheevos \

		rtissera:libchdr:26d27ca:libchdr/ext/libchdr \

		RetroAchievements:rcheevos:v12.3.0:rcheevos/ext/rcheevos \

		erkkah:naett:5f695cfa9fcbf30668a4d3ac4b4abf1cd89a1302:naett/ext/naett \

		hrydgard:ppsspp-lua:7648485f14e8e5ee45e8e39b1eb4d3206dbd405a:ppsspplua/ext/lua \

		Kingcom:filesystem:v1.1.2-171-g3f1c185:filesystem/ext/armips/ext/filesystem



		hrydgard:nanosvg:478dbb8f7ed11c3d9b20b3986a8ee2283f483ef7:nanosvg/ext/nanosvg \

		Kethen:aemu_postoffice:f5ae0ce8cac89cfc592047925f2064a84536eeb4:aemu_postoffice/ext/aemu_postoffice \

		Kingcom:filesystem:v1.3.2-12-g3f1c185:filesystem/ext/armips/ext/filesystem \

		libretro:libretro-common:76a3d54feb0ee0ce9d59b90aa24694f3782063d3:libretrocommon/libretro/libretro-common

EXCLUDE=	libzip zlib

USE_GL=		glew opengl

CMAKE_ON=	${LIBZIP MINIUPNPC SNAPPY ZSTD:L:S/^/USE_SYSTEM_/} USE_VULKAN_DISPLAY_KHR

CMAKE_ON=	${FREETYPE LIBCHDR LIBZIP MINIUPNPC RAPIDJSON SNAPPY \

		ZSTD:L:S/^/USE_SYSTEM_/} USE_VULKAN_DISPLAY_KHR

CMAKE_OFF=	USE_DISCORD

LDFLAGS+=	-Wl,--as-needed # ICE/SM/X11/Xext, Qt5Network

LDFLAGS+=	-Wl,--as-needed # ICE/SM/X11/Xext

CONFLICTS_INSTALL=	${PORTNAME}-*

DESKTOP_ENTRIES=	"PPSSPP" \

			"" \
@@ -60,7 +64,7 @@ PORTDATA= assets 
OPTIONS_DEFINE=		VULKAN

OPTIONS_DEFAULT=	VULKAN

OPTIONS_SINGLE=		GUI

OPTIONS_SINGLE_GUI=	LIBRETRO QT5 SDL

OPTIONS_SINGLE_GUI=	LIBRETRO SDL

OPTIONS_EXCLUDE:=	${OPTIONS_EXCLUDE} ${OPTIONS_SINGLE_GUI}

OPTIONS_SLAVE?=		SDL
@@ -70,12 +74,6 @@ LIBRETRO_LIB_DEPENDS= libpng.so:graphics/png 
LIBRETRO_CMAKE_BOOL=	LIBRETRO

LIBRETRO_PLIST_FILES=	lib/libretro/${PORTNAME}_libretro.so

LIBRETRO_VARS=		CONFLICTS_INSTALL= DESKTOP_ENTRIES= PLIST= PORTDATA= PKGMESSAGE= SUB_FILES=

QT5_LIB_DEPENDS=	libpng.so:graphics/png

QT5_USES=		desktop-file-utils qt:5 shared-mime-info sdl

QT5_USE=		QT=qmake:build,buildtools:build,linguisttools:build,core,gui,multimedia,opengl,widgets

QT5_USE+=		SDL=sdl2 # audio, joystick

QT5_CMAKE_BOOL=		USING_QT_UI

QT5_VARS=		EXENAME=PPSSPPQt

SDL_CATEGORIES=		wayland

SDL_LIB_DEPENDS=	libpng.so:graphics/png

SDL_USES=		shared-mime-info sdl
@@ -99,7 +97,7 @@ do-install-LIBRETRO-on: 
.  endfor

.endif



do-install-QT5-on do-install-SDL-on:

do-install-SDL-on:

.if exists(/usr/bin/elfctl)

	${ELFCTL} -e +wxneeded ${STAGEDIR}${PREFIX}/bin/*

.endif

emulators/ppsspp/distinfo

+15 −11
Original line number Diff line number Diff line 
TIMESTAMP = 1752627057

SHA256 (hrydgard-ppsspp-v1.19.3_GH0.tar.gz) = 2e02c3e0a7f5a2311f6e37f3e2fc9760d14eb7af5051bc251f168505f1ca9ad8

SIZE (hrydgard-ppsspp-v1.19.3_GH0.tar.gz) = 38805948

TIMESTAMP = 1773182792

SHA256 (hrydgard-ppsspp-v1.20.2_GH0.tar.gz) = c145f8da40575506b93ca97ba80b2fb72dc1a6c80b8629a878d87558c28cdf65

SIZE (hrydgard-ppsspp-v1.20.2_GH0.tar.gz) = 38231035

SHA256 (Kingcom-armips-v0.11.0-195-ga8d71f0_GH0.tar.gz) = 8a46d92b070de90cefcd89c2894344d040481e1cf6216b31f4a5e531254fed88

SIZE (Kingcom-armips-v0.11.0-195-ga8d71f0_GH0.tar.gz) = 223306

SHA256 (hrydgard-glslang-2.3-3991-g50e0708e_GH0.tar.gz) = 720e01f16e5ee2f7ada49ba0464232380bf71339c836cc4fabbabef2a741818b

SIZE (hrydgard-glslang-2.3-3991-g50e0708e_GH0.tar.gz) = 3689100

SHA256 (KhronosGroup-SPIRV-Cross-4212eef67ed0ca048cb726a6767185504e7695e5_GH0.tar.gz) = a7adf77b5680795302aee160309c6cb81b0da341d92bd7face01f9a156b65aeb

SIZE (KhronosGroup-SPIRV-Cross-4212eef67ed0ca048cb726a6767185504e7695e5_GH0.tar.gz) = 1703767

SHA256 (Tencent-rapidjson-73063f5002612c6bf64fe24f851cd5cc0d83eef9_GH0.tar.gz) = 896eb817fb2bc62a0a84ca65fac3e3c385b410e6dbf70d69c411e25776663e39

SIZE (Tencent-rapidjson-73063f5002612c6bf64fe24f851cd5cc0d83eef9_GH0.tar.gz) = 1054419

SHA256 (unknownbrackets-ppsspp-debugger-9776332f720c854ef26f325a0cf9e32c02115a9c_GH0.tar.gz) = 495db15fa9716d78c4958004df5a1487a94155694cceabd61fb40a2d0090fea3

SIZE (unknownbrackets-ppsspp-debugger-9776332f720c854ef26f325a0cf9e32c02115a9c_GH0.tar.gz) = 810347

SHA256 (google-cpu_features-v0.4.1-211-gfd4ffc1_GH0.tar.gz) = 20115fd59cf2db71594d71acf3dacfdaf6c1bdf54c1656f781fce4844a803e08

SIZE (google-cpu_features-v0.4.1-211-gfd4ffc1_GH0.tar.gz) = 109042

SHA256 (RetroAchievements-rcheevos-v11.6.0-61-gef0e22b_GH0.tar.gz) = 11c12a5ce2e61917edbd4634fc0623528267c51dae2303bfc55cbbb7ee7299fa

SIZE (RetroAchievements-rcheevos-v11.6.0-61-gef0e22b_GH0.tar.gz) = 417819

SHA256 (rtissera-libchdr-26d27ca_GH0.tar.gz) = 49e028fadd0640926da158408c9eafb22fc89ccb0de69c67b167ef0a11f6a0c5

SIZE (rtissera-libchdr-26d27ca_GH0.tar.gz) = 4274377

SHA256 (RetroAchievements-rcheevos-v12.3.0_GH0.tar.gz) = bc7ab9985aee7b6a29e3d65492de9371c866236c5873a1c4493ec9cb6d2603d2

SIZE (RetroAchievements-rcheevos-v12.3.0_GH0.tar.gz) = 436181

SHA256 (erkkah-naett-5f695cfa9fcbf30668a4d3ac4b4abf1cd89a1302_GH0.tar.gz) = 65b68d645290ecd7478747d52feebf73b390021137a10897cc2a692bf6446afe

SIZE (erkkah-naett-5f695cfa9fcbf30668a4d3ac4b4abf1cd89a1302_GH0.tar.gz) = 88388

SHA256 (hrydgard-ppsspp-lua-7648485f14e8e5ee45e8e39b1eb4d3206dbd405a_GH0.tar.gz) = ee31027159979d7be564e19710e10339179992f6d663d38337e78340dd31987b

SIZE (hrydgard-ppsspp-lua-7648485f14e8e5ee45e8e39b1eb4d3206dbd405a_GH0.tar.gz) = 239843

SHA256 (Kingcom-filesystem-v1.1.2-171-g3f1c185_GH0.tar.gz) = 9f3866efc8b8b29cd9ff51c0cce8a281ff88cd34694d8da0d064cb82d95b8b71

SIZE (Kingcom-filesystem-v1.1.2-171-g3f1c185_GH0.tar.gz) = 163405
 
SHA256 (hrydgard-nanosvg-478dbb8f7ed11c3d9b20b3986a8ee2283f483ef7_GH0.tar.gz) = 0f5702795d506807c82a3d933827a3988cf4b9ffa6032cb67538de90791fc0a6

SIZE (hrydgard-nanosvg-478dbb8f7ed11c3d9b20b3986a8ee2283f483ef7_GH0.tar.gz) = 298163

SHA256 (Kethen-aemu_postoffice-f5ae0ce8cac89cfc592047925f2064a84536eeb4_GH0.tar.gz) = f41fe40e4e4548e182442b35350fba72aa028146758ca47fb94a75a76f0c80ff

SIZE (Kethen-aemu_postoffice-f5ae0ce8cac89cfc592047925f2064a84536eeb4_GH0.tar.gz) = 29798

SHA256 (Kingcom-filesystem-v1.3.2-12-g3f1c185_GH0.tar.gz) = 9fa5a690e341bea1935a7f6b256e1bbd864abee988f834f10307f646dc38e604

SIZE (Kingcom-filesystem-v1.3.2-12-g3f1c185_GH0.tar.gz) = 163401

SHA256 (libretro-libretro-common-76a3d54feb0ee0ce9d59b90aa24694f3782063d3_GH0.tar.gz) = da3c61d2d47df12536a7977443387c1c3d7a750fe8c916c943860788b590db7e

SIZE (libretro-libretro-common-76a3d54feb0ee0ce9d59b90aa24694f3782063d3_GH0.tar.gz) = 769418

emulators/ppsspp/files/patch-no-egl

deleted100644 → 0
+0 −27
Original line number Diff line number Diff line 
EGL hangs on X11 and doesn't build without GLESv2.

https://github.com/hrydgard/ppsspp/issues/10626



--- CMakeLists.txt.orig	2025-05-30 21:23:20 UTC

+++ CMakeLists.txt

@@ -83,12 +83,6 @@ endif()

 	set(USE_SYSTEM_FFMPEG ON)

 endif()

 

-if(NOT ANDROID AND NOT IOS)

-	if(ARM_DEVICE OR SIMULATOR)

-		set(USING_EGL ON)

-	endif()

-endif()

-

 if(${CMAKE_SYSTEM_NAME} MATCHES "Linux" AND NOT USE_LIBNX)

 	set(LINUX ON)

 	add_compile_definitions(__STDC_CONSTANT_MACROS)

@@ -1009,6 +1003,8 @@ if(USE_FFMPEG)

 				elseif(X86)

 					set(PLATFORM_ARCH "Windows/x86")

 				endif()

+			else()

+				set(PLATFORM_ARCH "FreeBSD/%%ARCH%%")

 			endif()

 			if(PLATFORM_ARCH)

 				set(FFMPEG_DIR "ffmpeg/${PLATFORM_ARCH}")