ppsspp: revbump for ffmpeg6

This commit is contained in:
zlice 2023-03-22 20:01:50 -04:00 committed by classabbyamp
parent 1bb8ba20d1
commit 449d0f870c
No known key found for this signature in database
GPG Key ID: 6BE0755918A4C7F5
2 changed files with 17 additions and 3 deletions

View File

@ -0,0 +1,15 @@
--- a/Core/HW/SimpleAudioDec.cpp 2024-02-04 08:08:02.000000000 -0500
+++ b/Core/HW/SimpleAudioDec.cpp 2024-02-15 14:48:27.114362051 -0500
@@ -81,7 +81,11 @@
return;
}
// Find decoder
+#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(58, 18, 100)
codec_ = avcodec_find_decoder((AVCodecID)audioCodecId);
+#else // this is a macro to const in the header
+ codec_ = (AVCodec*)avcodec_find_decoder((AVCodecID)audioCodecId);
+#endif
if (!codec_) {
// Eh, we shouldn't even have managed to compile. But meh.
ERROR_LOG(ME, "This version of FFMPEG does not support AV_CODEC_ctx for audio (%s). Update your submodule.", GetCodecName(audioType));

View File

@ -1,7 +1,7 @@
# Template file for 'ppsspp'
pkgname=ppsspp
version=1.17.1
revision=1
revision=2
_glslang_commit=b34f619e1c85810dcb3c578107d2e48ba4ee2b37
_SPIRV_Cross_commit=4212eef67ed0ca048cb726a6767185504e7695e5
_armips_commit=a8d71f0f279eb0d30ecf6af51473b66ae0cf8e8d
@ -15,7 +15,7 @@ configure_args="-DHEADLESS=1 -DUSE_SYSTEM_FFMPEG=1 -DUNITTEST=ON
-DUSING_QT_UI=$(vopt_if qt ON OFF) -DUSE_SYSTEM_ZSTD=ON
-DARMIPS_USE_STD_FILESYSTEM=ON"
hostmakedepends="pkg-config python3 $(vopt_if qt qt5-host-tools)"
makedepends="zlib-devel glew-devel ffmpeg-devel libzip-devel
makedepends="zlib-devel glew-devel ffmpeg6-devel libzip-devel
snappy-devel rapidjson libpng-devel libzstd-devel
$(vopt_if sdl2 'SDL2_ttf-devel SDL2-devel') wayland-devel
$(vopt_if qt 'qt5-devel qt5-multimedia-devel')"
@ -91,7 +91,6 @@ post_configure() {
}
do_install() {
vlicense LICENSE.TXT
vinstall icons/icon.svg 644 usr/share/pixmaps ppsspp.svg
vinstall Qt/PPSSPP.desktop 644 usr/share/applications
vbin build/PPSSPPHeadless ppsspp-headless