3 files changed, 31 insertions, 37 deletions
diff --git a/emulators/ppsspp/files/patch-cmake_Modules_FindFFmpeg.cmake b/emulators/ppsspp/files/patch-cmake_Modules_FindFFmpeg.cmake
index 2cbf2cfee23d..69f59462eb5d 100644
--- a/emulators/ppsspp/files/patch-cmake_Modules_FindFFmpeg.cmake
+++ b/emulators/ppsspp/files/patch-cmake_Modules_FindFFmpeg.cmake
@@ -7,7 +7,7 @@
 -  if(DEFINED ENV{FFMPEG_DIR})
 -    set(FFMPEG_DIR $ENV{FFMPEG_DIR})
 -  endif()
-+  set(FFMPEG_DIR /usr/local/ffmpeg3)
++  set(FFMPEG_DIR %%LOCALBASE%%/ffmpeg3)
  
    if(FFMPEG_DIR)
      list(APPEND INCLUDE_PATHS
@@ -22,15 +22,15 @@
 -      /usr/include/lib${LIBNAME}
 -      /usr/include/ffmpeg/lib${LIBNAME}
 +    list(SET INCLUDE_PATHS
-+      /usr/local/ffmpeg3/include/ffmpeg
-+      /usr/local/ffmpeg3/include/lib${LIBNAME}
++      %%LOCALBASE%%/ffmpeg3/include/ffmpeg
++      %%LOCALBASE%%/ffmpeg3/include/lib${LIBNAME}
      )
  
 -    list(APPEND LIB_PATHS
 -      /usr/local/lib
 -      /usr/lib
 +    list(SET LIB_PATHS
-+      /usr/local/ffmpeg3/lib
++      %%LOCALBASE%%/ffmpeg3/lib
      )
    endif()
  
diff --git a/emulators/ppsspp/files/patch-no-egl b/emulators/ppsspp/files/patch-no-egl
new file mode 100644
index 000000000000..9ddc70081066
--- /dev/null
+++ b/emulators/ppsspp/files/patch-no-egl
@@ -0,0 +1,27 @@
+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}")
diff --git a/emulators/ppsspp/files/patch-no-egl-plus-warnings-fix b/emulators/ppsspp/files/patch-no-egl-plus-warnings-fix
deleted file mode 100644
index 14da15c4d6e8..000000000000
--- a/emulators/ppsspp/files/patch-no-egl-plus-warnings-fix
+++ /dev/null
@@ -1,33 +0,0 @@
-EGL hangs on X11 and doesn't build without GLESv2.
-https://github.com/hrydgard/ppsspp/issues/10626
-
---- CMakeLists.txt.orig	2024-11-04 16:16:10 UTC
-+++ CMakeLists.txt
-@@ -79,12 +79,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_definitions(-D__STDC_CONSTANT_MACROS)
-@@ -383,8 +377,12 @@ if(NOT MSVC)
- 	add_definitions(-DPNG_ARM_NEON_OPT=0)
- 
- 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror=return-type -Wno-unused-function -Wno-sign-compare -Wno-unused-but-set-variable -Wno-reorder -Wno-unknown-pragmas -Wno-unused-value -Wno-unused-variable")
--	# This one is very useful but has many false positives.
--	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-class-memaccess")
-+	if(NOT CLANG)
-+		# This one is very useful but has many false positives.
-+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-class-memaccess")
-+	else()
-+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations")
-+	endif()
- 
- 	if(ANDROID)
- 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++17")