Skip to content

Commit

Permalink
ppsspp: revbump for ffmpeg6
Browse files Browse the repository at this point in the history
  • Loading branch information
zlice committed Jul 22, 2024
1 parent de3e96f commit 679adb1
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 3 deletions.
15 changes: 15 additions & 0 deletions srcpkgs/ppsspp/patches/ffmpeg6.patch
Original file line number Diff line number Diff line change
@@ -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));

5 changes: 2 additions & 3 deletions srcpkgs/ppsspp/template
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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')"
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 679adb1

Please sign in to comment.