ppsspp: fix ffmpeg compatibility

resolves #1266
This commit is contained in:
John 2018-07-28 23:06:08 +02:00 committed by maxice8
parent 6e0c87dd95
commit 631a16efa9
2 changed files with 31 additions and 3 deletions

View file

@ -0,0 +1,28 @@
From 7a7c655615a4f607ea2e6bc58dc8ca3e4b535eca Mon Sep 17 00:00:00 2001
From: Jan Beich <jbeich@FreeBSD.org>
Date: Wed, 13 Jun 2018 11:51:43 +0000
Subject: [PATCH] MediaEngine: adjust for AVStream.codec deprecation
---
Core/HW/MediaEngine.cpp | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git ppsspp-1.6.3/Core/HW/MediaEngine.cpp Core/HW/MediaEngine.cpp
index 1da8800240..62832f65c9 100644
--- ppsspp-1.6.3/Core/HW/MediaEngine.cpp
+++ Core/HW/MediaEngine.cpp
@@ -455,6 +455,14 @@ bool MediaEngine::setVideoStream(int streamNum, bool force) {
return false;
}
AVCodecContext *m_pCodecCtx = m_pFormatCtx->streams[streamNum]->codec;
+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(57,33,100)
+ AVCodecParameters *m_pCodecPar = m_pFormatCtx->streams[streamNum]->codecpar;
+
+ // Update from deprecated public codec context
+ if (avcodec_parameters_from_context(m_pCodecPar, m_pCodecCtx) < 0) {
+ return false;
+ }
+#endif
// Find the decoder for the video stream
AVCodec *pCodec = avcodec_find_decoder(m_pCodecCtx->codec_id);

View file

@ -1,7 +1,7 @@
# Template file for 'ppsspp'
pkgname=ppsspp
version=1.6.3
revision=2
revision=3
build_wrksrc="ppsspp-${version}"
build_style=cmake
configure_args="-DHEADLESS=1 -DUSE_SYSTEM_FFMPEG=1 -DUNITTEST=ON"
@ -10,9 +10,9 @@ makedepends="zlib-devel glew-devel SDL2-devel ffmpeg-devel libzip-devel
snappy-devel"
depends="desktop-file-utils"
short_desc="A fast and portable PSP emulator"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
maintainer="John <jojhnz@posteo.net>"
license="GPL-2.0-or-later"
homepage="http://www.ppsspp.org/"
homepage="https://www.ppsspp.org/"
distfiles="
https://github.com/hrydgard/ppsspp/archive/v${version}.tar.gz
https://github.com/hrydgard/ppsspp-lang/archive/c2c4ad9c38c5f5e97ff022a703c470fcd53da249.tar.gz