From 679adb1b33f04d71ef809f0bfb3cbbbe89a37ea7 Mon Sep 17 00:00:00 2001 From: zlice Date: Wed, 22 Mar 2023 20:01:50 -0400 Subject: [PATCH] ppsspp: revbump for ffmpeg6 --- srcpkgs/ppsspp/patches/ffmpeg6.patch | 15 +++++++++++++++ srcpkgs/ppsspp/template | 5 ++--- 2 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/ppsspp/patches/ffmpeg6.patch diff --git a/srcpkgs/ppsspp/patches/ffmpeg6.patch b/srcpkgs/ppsspp/patches/ffmpeg6.patch new file mode 100644 index 00000000000000..5803c7bf227309 --- /dev/null +++ b/srcpkgs/ppsspp/patches/ffmpeg6.patch @@ -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)); + diff --git a/srcpkgs/ppsspp/template b/srcpkgs/ppsspp/template index 2238a7601c0af8..e929fd18122c7c 100644 --- a/srcpkgs/ppsspp/template +++ b/srcpkgs/ppsspp/template @@ -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