[gentoo-commits] repo/gentoo:master commit in: games-emulation/ppsspp/files/

[gentoo-commits] repo/gentoo:master commit in: games-emulation/ppsspp/files/

[Patrice Clement]

commit:     41c1f455d680976af2ca70542f5e207da6da7651
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed Dec 27 08:41:46 2017 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sat Dec 30 21:29:47 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41c1f455

games-emulation/ppsspp: remove unused patch.

Closes: https://github.com/gentoo/gentoo/pull/6656

 games-emulation/ppsspp/files/ppsspp-1.4-assets-lookup.patch | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/games-emulation/ppsspp/files/ppsspp-1.4-assets-lookup.patch b/games-emulation/ppsspp/files/ppsspp-1.4-assets-lookup.patch
deleted file mode 100644
index 6f75d5ec31c..00000000000
--- a/games-emulation/ppsspp/files/ppsspp-1.4-assets-lookup.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp
-index 8452d4d61d5f..3d5a4bbd2aa4 100644
---- a/UI/NativeApp.cpp
-+++ b/UI/NativeApp.cpp
-@@ -316,7 +316,7 @@ void NativeInit(int argc, const char *argv[], const char *savegame_dir, const ch
- 
- 	// We want this to be FIRST.
- #ifdef USING_QT_UI
--	VFSRegister("", new AssetsAssetReader());
-+	VFSRegister("", new DirectoryAssetReader("/usr/share/ppsspp/assets/"));
- #elif defined(IOS)
- 	// Packed assets are included in app
- 	VFSRegister("", new DirectoryAssetReader(external_dir));

[gentoo-commits] repo/gentoo:master commit in: games-emulation/ppsspp/files/

[Joonas Niilola]

commit:     8a87f61d02b82defc45b0fbe05c6d78b9c7c7d52
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Mar 22 08:44:55 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Mar 22 14:01:27 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a87f61d

games-emulation/ppsspp: remove unused patch(es)

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/20054
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 games-emulation/ppsspp/files/ppsspp-1.4-O2.patch | 32 ------------------------
 1 file changed, 32 deletions(-)

diff --git a/games-emulation/ppsspp/files/ppsspp-1.4-O2.patch b/games-emulation/ppsspp/files/ppsspp-1.4-O2.patch
deleted file mode 100644
index 55954c7c738..00000000000
--- a/games-emulation/ppsspp/files/ppsspp-1.4-O2.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 19038c88a436..bf50f5cf52fb 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -195,11 +195,11 @@ if(NOT MSVC)
- 
- 	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g -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} -O2 -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_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} -O2 -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
-@@ -509,10 +509,10 @@ include_directories(ext/cityhash)
- 
- if (NOT MSVC)
- 	# These can be fast even for debug.
--	set_target_properties(udis86 PROPERTIES COMPILE_FLAGS "-O3")
--	set_target_properties(cityhash PROPERTIES COMPILE_FLAGS "-O3")
-+	set_target_properties(udis86 PROPERTIES COMPILE_FLAGS "-O2")
-+	set_target_properties(cityhash PROPERTIES COMPILE_FLAGS "-O2")
- 	if(NOT ZLIB_FOUND)
--		set_target_properties(zlib PROPERTIES COMPILE_FLAGS "-O3")
-+		set_target_properties(zlib PROPERTIES COMPILE_FLAGS "-O2")
- 	endif()
- endif()
- 

[gentoo-commits] repo/gentoo:master commit in: games-emulation/ppsspp/files/

[Maciej Barć]

commit:     0b7ffa25b17baba37ff0f627b306f0edac4b50e8
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Jun 26 17:16:46 2023 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Mon Jun 26 17:42:33 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b7ffa25

games-emulation/ppsspp: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/31626
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 .../ppsspp/files/ppsspp-1.14.4-gcc13.patch         | 58 ----------------------
 1 file changed, 58 deletions(-)

diff --git a/games-emulation/ppsspp/files/ppsspp-1.14.4-gcc13.patch b/games-emulation/ppsspp/files/ppsspp-1.14.4-gcc13.patch
deleted file mode 100644
index c4888f0efb6f..000000000000
--- a/games-emulation/ppsspp/files/ppsspp-1.14.4-gcc13.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-https://bugs.gentoo.org/898910
-https://github.com/hrydgard/ppsspp/commit/9874737087e8d24ea72b3f08b4975031b54a80a5
-
-From 822592c6b1441f7110e1cb15dcc5cd2ea1de8099 Mon Sep 17 00:00:00 2001
-From: Andreas Stieger <Andreas.Stieger@gmx.de>
-Date: Wed, 5 Apr 2023 00:20:14 +0200
-Subject: [PATCH] Fix build with GCC13: various standard includes
-
---- a/Common/Data/Format/IniFile.h
-+++ b/Common/Data/Format/IniFile.h
-@@ -8,6 +8,7 @@
- #include <map>
- #include <string>
- #include <vector>
-+#include <cstdint>
- 
- #include "Common/File/Path.h"
- 
---- a/Common/GPU/OpenGL/GLFeatures.h
-+++ b/Common/GPU/OpenGL/GLFeatures.h
-@@ -5,6 +5,7 @@
- #pragma once
- 
- #include <string>
-+#include <cstdint>
- 
- // TODO: Replace with thin3d's vendor enum.
- enum {
---- a/Common/Net/NetBuffer.h
-+++ b/Common/Net/NetBuffer.h
-@@ -1,5 +1,7 @@
- #pragma once
- 
-+#include <cstdint>
-+
- #include "Common/Buffer.h"
- 
- namespace net {
---- a/Core/Reporting.h
-+++ b/Core/Reporting.h
-@@ -19,6 +19,7 @@
- 
- #include <string>
- #include <vector>
-+#include <cstdint>
- 
- #include "Common/CommonTypes.h"
- #include "Common/File/Path.h"
---- a/ext/vma/vk_mem_alloc.h
-+++ b/ext/vma/vk_mem_alloc.h
-@@ -2624,6 +2624,7 @@ VMA_CALL_PRE void VMA_CALL_POST vmaFreeStatsString(
- #include <cstring>
- #include <utility>
- #include <type_traits>
-+#include <cstdio>
- 
- #ifdef _MSC_VER
-     #include <intrin.h> // For functions like __popcnt, _BitScanForward etc.

[gentoo-commits] repo/gentoo:master commit in: games-emulation/ppsspp/files/

[Maciej Barć]

commit:     b14d542df852b2c40f3258e87b2ff1e47c4e6755
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Feb 18 14:00:07 2024 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Fri Feb 23 01:04:40 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b14d542d

games-emulation/ppsspp: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 .../ppsspp/files/ppsspp-1.16-MIPSTables-fix-includes.patch     | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/games-emulation/ppsspp/files/ppsspp-1.16-MIPSTables-fix-includes.patch b/games-emulation/ppsspp/files/ppsspp-1.16-MIPSTables-fix-includes.patch
deleted file mode 100644
index 87e85f5bc878..000000000000
--- a/games-emulation/ppsspp/files/ppsspp-1.16-MIPSTables-fix-includes.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/Core/MIPS/MIPSTables.h
-+++ b/Core/MIPS/MIPSTables.h
-@@ -18,6 +18,7 @@
- #pragma once
- 
- #include <string>
-+#include <stdint.h>
- #include "Common/CommonTypes.h"
- #include "Core/MIPS/MIPS.h"
- 

[gentoo-commits] repo/gentoo:master commit in: games-emulation/ppsspp/files/

[Conrad Kostecki]

commit:     723548287fba5663501e1fce7d56a54845c24d3c
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Thu Apr 18 18:07:06 2024 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Apr 18 19:31:45 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72354828

games-emulation/ppsspp: remove unused patches

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../files/ppsspp-1.15.4-backport-ce83fec.patch     | 23 -------------------
 .../ppsspp-disable-ccache-autodetection.patch      | 26 ----------------------
 2 files changed, 49 deletions(-)

diff --git a/games-emulation/ppsspp/files/ppsspp-1.15.4-backport-ce83fec.patch b/games-emulation/ppsspp/files/ppsspp-1.15.4-backport-ce83fec.patch
deleted file mode 100644
index 1eaf179142d3..000000000000
--- a/games-emulation/ppsspp/files/ppsspp-1.15.4-backport-ce83fec.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://bugs.gentoo.org/915888
-https://github.com/hrydgard/ppsspp/commit/ce83fec20651222131ef9b88ba2dfb0554b66608
-
-From ce83fec20651222131ef9b88ba2dfb0554b66608 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
-Date: Sun, 29 Oct 2023 23:39:25 -0600
-Subject: [PATCH] Linux buildfix attempt
-
----
- unittest/TestThreadManager.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/unittest/TestThreadManager.cpp b/unittest/TestThreadManager.cpp
-index f6a11f2fa363..10a8b581b768 100644
---- a/unittest/TestThreadManager.cpp
-+++ b/unittest/TestThreadManager.cpp
-@@ -1,5 +1,6 @@
- #include <thread>
- #include <vector>
-+#include <cstdio>
- 
- #include "Common/Log.h"
- #include "Common/TimeUtil.h"

diff --git a/games-emulation/ppsspp/files/ppsspp-disable-ccache-autodetection.patch b/games-emulation/ppsspp/files/ppsspp-disable-ccache-autodetection.patch
deleted file mode 100644
index 007e64774c20..000000000000
--- a/games-emulation/ppsspp/files/ppsspp-disable-ccache-autodetection.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From ca18b1b578ec7215277a73b6658753ff35e677ea Mon Sep 17 00:00:00 2001
-From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
-Date: Sun, 28 Aug 2022 17:53:05 +0300
-Subject: [PATCH] Disable ccache autodetection
-
-Build system automagically detects ccache and use it in situations where
-it should'nt do that.
----
- CMakeLists.txt | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 376e2c5ad..8c382ce5c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -111,7 +111,6 @@ if(MACOSX AND NOT USE_SYSTEM_LIBSDL2)
- 	set(SDL2_LIBRARY ${CMAKE_SOURCE_DIR}/SDL/macOS/SDL2.framework)
- endif()
- 
--include(ccache)
- include(GNUInstallDirs)
- 
- add_definitions(-DASSETS_DIR="${CMAKE_INSTALL_FULL_DATADIR}/ppsspp/assets/")
--- 
-2.35.1
-

[gentoo-commits] repo/gentoo:master commit in: games-emulation/ppsspp/files/

[Maciej Barć]

commit:     62bfbb438cf252a39f00b9ac3f5d1b7dbef61d86
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Mar 12 07:22:17 2025 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Thu Mar 20 22:02:51 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62bfbb43

games-emulation/ppsspp: remove unused patches

Bug: https://github.com/gentoo/gentoo/pull/41029
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 .../ppsspp/files/ppsspp-1.17.1-avcodec-18825.patch | 176 ---------------------
 .../ppsspp/files/ppsspp-1.17.1-ccache-18826.patch  |  33 ----
 2 files changed, 209 deletions(-)

diff --git a/games-emulation/ppsspp/files/ppsspp-1.17.1-avcodec-18825.patch b/games-emulation/ppsspp/files/ppsspp-1.17.1-avcodec-18825.patch
deleted file mode 100644
index a3003660dd74..000000000000
--- a/games-emulation/ppsspp/files/ppsspp-1.17.1-avcodec-18825.patch
+++ /dev/null
@@ -1,176 +0,0 @@
-From a8ae43dfd4f06a48a275a684aafee021e591d75e Mon Sep 17 00:00:00 2001
-From: Andrew Udvare <audvare@gmail.com>
-Date: Sun, 4 Feb 2024 18:26:06 -0500
-Subject: [PATCH] ffmpeg: Improved fix for checking if const AVCodec* is
- necessary
-
----
- CMakeLists.txt             | 21 +++++++++++++++++++++
- Core/AVIDump.cpp           |  4 +---
- Core/FFMPEGCompat.h        |  8 ++++++++
- Core/HLE/sceAtrac.cpp      |  5 +----
- Core/HLE/sceMpeg.cpp       |  4 +---
- Core/HW/MediaEngine.cpp    |  4 +---
- Core/HW/SimpleAudioDec.cpp |  1 +
- Core/HW/SimpleAudioDec.h   |  7 +++----
- 8 files changed, 37 insertions(+), 17 deletions(-)
- create mode 100644 Core/FFMPEGCompat.h
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 33570d09c024..f7e5ce1d337c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -953,6 +953,23 @@ if(USE_FFMPEG)
- 	endif()
- 
- 	find_package(FFmpeg REQUIRED avcodec avformat avutil swresample swscale)
-+	# Check if we need to use avcodec_(alloc|free)_frame instead of av_frame_(alloc|free)
-+	# Check if we need to use const AVCodec
-+	set(CMAKE_REQUIRED_LIBRARIES avcodec;avformat)
-+	set(CMAKE_REQUIRED_FLAGS "-pedantic -Wall -Werror -Wno-unused-variable")
-+	check_cxx_source_compiles("extern \"C\" {
-+		#include <libavcodec/avcodec.h>
-+		#include <libavformat/avformat.h>
-+		}
-+		static AVCodecContext *s_codec_context = NULL;
-+		int main() {
-+			const AVCodec *codec = avcodec_find_encoder(s_codec_context->codec_id);
-+			return 0;
-+		}
-+		" HAVE_LIBAVCODEC_CONST_AVCODEC FAIL_REGEX "invalid conversion")
-+
-+	# Check if we need to use avcodec_alloc_context3 instead of stream->codec
-+	# Check if we need to use av_frame_get_buffer instead of avcodec_default_get_buffer
- endif(USE_FFMPEG)
- 
- find_package(ZLIB)
-@@ -2024,6 +2041,7 @@ add_library(${CoreLibName} ${CoreLinkType}
- 	Core/ELF/PrxDecrypter.h
- 	Core/ELF/ParamSFO.cpp
- 	Core/ELF/ParamSFO.h
-+	Core/FFMPEGCompat.h
- 	Core/FileSystems/tlzrc.cpp
- 	Core/FileSystems/BlobFileSystem.cpp
- 	Core/FileSystems/BlobFileSystem.h
-@@ -2358,6 +2376,9 @@ target_compile_features(${CoreLibName} PUBLIC cxx_std_17)
- 
- if(FFmpeg_FOUND)
- 	target_compile_definitions(${CoreLibName} PRIVATE USE_FFMPEG=1)
-+	if (HAVE_LIBAVCODEC_CONST_AVCODEC)
-+		target_compile_definitions(${CoreLibName} PRIVATE HAVE_LIBAVCODEC_CONST_AVCODEC=1)
-+	endif()
- 	set_target_properties(${CoreLibName} PROPERTIES NO_SYSTEM_FROM_IMPORTED true)
- 	target_include_directories(${CoreLibName} BEFORE PUBLIC ${FFmpeg_INCLUDE_avcodec})
- 	target_link_libraries(${CoreLibName}
-diff --git a/Core/AVIDump.cpp b/Core/AVIDump.cpp
-index 7c9576d2922b..aa811650314d 100644
---- a/Core/AVIDump.cpp
-+++ b/Core/AVIDump.cpp
-@@ -45,9 +45,7 @@ extern "C" {
- #define av_frame_free avcodec_free_frame
- #endif
- 
--#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(59, 16, 100)
--#define AVCodec const AVCodec
--#endif
-+#include "FFMPEGCompat.h"
- 
- static AVFormatContext *s_format_context = nullptr;
- static AVCodecContext *s_codec_context = nullptr;
-diff --git a/Core/FFMPEGCompat.h b/Core/FFMPEGCompat.h
-new file mode 100644
-index 000000000000..fed3b1c85392
---- /dev/null
-+++ b/Core/FFMPEGCompat.h
-@@ -0,0 +1,8 @@
-+#ifndef FFMPEG_COMPAT_H
-+#define FFMPEG_COMPAT_H
-+
-+#ifdef HAVE_LIBAVCODEC_CONST_AVCODEC
-+#define AVCodec const AVCodec
-+#endif
-+
-+#endif // FFMPEG_COMPAT_H
-diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp
-index fe0e8a54de6b..f83d9ffdf166 100644
---- a/Core/HLE/sceAtrac.cpp
-+++ b/Core/HLE/sceAtrac.cpp
-@@ -129,10 +129,7 @@ extern "C" {
- #include "libavcodec/avcodec.h"
- #include "libavutil/version.h"
- }
--
--#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(59, 16, 100)
--#define AVCodec const AVCodec
--#endif
-+#include "Core/FFMPEGCompat.h"
- 
- #endif // USE_FFMPEG
- 
-diff --git a/Core/HLE/sceMpeg.cpp b/Core/HLE/sceMpeg.cpp
-index d050d62f3d73..8be78c73e0f8 100644
---- a/Core/HLE/sceMpeg.cpp
-+++ b/Core/HLE/sceMpeg.cpp
-@@ -113,9 +113,7 @@ extern "C" {
- #include "libswscale/swscale.h"
- #include "libavcodec/avcodec.h"
- }
--#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(59, 16, 100)
--#define AVCodec const AVCodec
--#endif
-+#include "Core/FFMPEGCompat.h"
- static AVPixelFormat pmp_want_pix_fmt;
- 
- #endif
-diff --git a/Core/HW/MediaEngine.cpp b/Core/HW/MediaEngine.cpp
-index 0ed957edfd26..7e8b37d4dc9b 100644
---- a/Core/HW/MediaEngine.cpp
-+++ b/Core/HW/MediaEngine.cpp
-@@ -56,9 +56,7 @@ extern "C" {
- 
- #ifdef USE_FFMPEG
- 
--#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(59, 16, 100)
--#define AVCodec const AVCodec
--#endif
-+#include "Core/FFMPEGCompat.h"
- 
- static AVPixelFormat getSwsFormat(int pspFormat)
- {
-diff --git a/Core/HW/SimpleAudioDec.cpp b/Core/HW/SimpleAudioDec.cpp
-index 7994a7f4027a..80397bf6da0a 100644
---- a/Core/HW/SimpleAudioDec.cpp
-+++ b/Core/HW/SimpleAudioDec.cpp
-@@ -33,6 +33,7 @@ extern "C" {
- #include "libavutil/samplefmt.h"
- #include "libavcodec/avcodec.h"
- }
-+#include "Core/FFMPEGCompat.h"
- 
- #endif  // USE_FFMPEG
- 
-diff --git a/Core/HW/SimpleAudioDec.h b/Core/HW/SimpleAudioDec.h
-index 52a78bf3b411..9bf2427a4a15 100644
---- a/Core/HW/SimpleAudioDec.h
-+++ b/Core/HW/SimpleAudioDec.h
-@@ -33,10 +33,6 @@ extern "C" {
- #include "libavutil/version.h"
- };
- 
--#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(59, 16, 100)
--#define AVCodec const AVCodec
--#endif
--
- #endif
- 
- // Wraps FFMPEG for audio decoding in a nice interface.
-@@ -90,6 +86,9 @@ class SimpleAudio {
- 	int wanted_resample_freq; // wanted resampling rate/frequency
- 
- 	AVFrame *frame_;
-+#if HAVE_LIBAVCODEC_CONST_AVCODEC // USE_FFMPEG is implied
-+	const
-+#endif
- 	AVCodec *codec_;
- 	AVCodecContext  *codecCtx_;
- 	SwrContext      *swrCtx_;

diff --git a/games-emulation/ppsspp/files/ppsspp-1.17.1-ccache-18826.patch b/games-emulation/ppsspp/files/ppsspp-1.17.1-ccache-18826.patch
deleted file mode 100644
index af5478f1bf73..000000000000
--- a/games-emulation/ppsspp/files/ppsspp-1.17.1-ccache-18826.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From e1ef901fcc2f0acbdff2671a8e07edab3e473c98 Mon Sep 17 00:00:00 2001
-From: Andrew Udvare <audvare@gmail.com>
-Date: Sun, 4 Feb 2024 18:39:18 -0500
-Subject: [PATCH] Add option to disable ccache detection
-
----
- CMakeLists.txt | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index bfd5e690353e..33570d09c024 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -116,7 +116,6 @@ if(NOT IOS)
- 	list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/sdl)
- endif()
- 
--include(ccache)
- include(GNUInstallDirs)
- 
- add_definitions(-DASSETS_DIR="${CMAKE_INSTALL_FULL_DATADIR}/ppsspp/assets/")
-@@ -173,6 +172,11 @@ option(USE_SYSTEM_ZSTD "Dynamically link against system zstd" ${USE_SYSTEM_ZSTD}
- option(USE_SYSTEM_MINIUPNPC "Dynamically link against system miniUPnPc" ${USE_SYSTEM_MINIUPNPC})
- option(USE_ASAN "Use address sanitizer" OFF)
- option(USE_UBSAN "Use undefined behaviour sanitizer" OFF)
-+option(USE_CCACHE "Use ccache if detected" ON)
-+
-+if(USE_CACHE)
-+	include(ccache)
-+endif()
- 
- if(UNIX AND NOT (APPLE OR ANDROID) AND VULKAN)
- 	if(USING_X11_VULKAN)