diff --git a/srcpkgs/ppsspp/patches/0fd4ea8826a0a11fc67bd438a53ea234a9b217ae.patch b/srcpkgs/ppsspp/patches/0fd4ea8826a0a11fc67bd438a53ea234a9b217ae.patch deleted file mode 100644 index d7de1c386ec..00000000000 --- a/srcpkgs/ppsspp/patches/0fd4ea8826a0a11fc67bd438a53ea234a9b217ae.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 7a7c655615a4f607ea2e6bc58dc8ca3e4b535eca Mon Sep 17 00:00:00 2001 -From: Jan Beich -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); diff --git a/srcpkgs/ppsspp/template b/srcpkgs/ppsspp/template index eeea7c6f113..813455f5789 100644 --- a/srcpkgs/ppsspp/template +++ b/srcpkgs/ppsspp/template @@ -1,38 +1,47 @@ # Template file for 'ppsspp' pkgname=ppsspp -version=1.6.3 -revision=3 +version=1.7.1 +revision=1 build_wrksrc="ppsspp-${version}" build_style=cmake -configure_args="-DHEADLESS=1 -DUSE_SYSTEM_FFMPEG=1 -DUNITTEST=ON" -hostmakedepends="pkg-config" -makedepends="zlib-devel glew-devel SDL2-devel ffmpeg-devel libzip-devel - snappy-devel" +configure_args="-DHEADLESS=1 -DUSE_SYSTEM_FFMPEG=1 -DUNITTEST=ON + -DUSING_QT_UI=$(vopt_if qt ON OFF)" +hostmakedepends="pkg-config $(vopt_if qt qt5-host-tools)" +makedepends="zlib-devel glew-devel ffmpeg-devel libzip-devel + snappy-devel rapidjson + $(vopt_if sdl2 SDL2-devel) $(vopt_if wayland wayland-devel) + $(vopt_if qt 'qt5-devel qt5-multimedia-devel')" depends="desktop-file-utils" short_desc="A fast and portable PSP emulator" -maintainer="John " +maintainer="John " license="GPL-2.0-or-later" 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 - https://github.com/hrydgard/glslang/archive/2edde6665d.tar.gz - https://github.com/KhronosGroup/SPIRV-Cross/archive/90966d50f5.tar.gz - https://github.com/Kingcom/armips/archive/8b4cadaf62.tar.gz" -checksum="366f8b3c545071d919e1f51a5c4e0da48ba55cf1c15ff8d78a90985b3d5e8eb3 - 5a97d1a2949482082bb4e7dff7704cb0fe8263a828cc66773e1d70c7bce472dc - 5e20a5758c13cc3967a2c31e7017fe4d8135c005733662be4585d9d19b5d8f34 - 282d1f17bd3003162dd945b8ba5c5a10cb5738a7750949a8200ff6555f10ff28 - c4a2bdc231d8e30fb9a19467b7cc9854e844fb3aafc83449e31152b97ace2157" + https://github.com/hrydgard/ppsspp-lang/archive/f60be49.tar.gz + https://github.com/hrydgard/glslang/archive/29619b2.tar.gz + https://github.com/KhronosGroup/SPIRV-Cross/archive/be7425e.tar.gz + https://github.com/Kingcom/armips/archive/9efe336.tar.gz + https://github.com/discordapp/discord-rpc/archive/3d3ae7129d17643bc706da0a2eea85aafd10ab3a.tar.gz" +checksum="4c325d585407f65b7b4012c407e3e2f246e57e821f780c3af12aa2874356f2bd + ac11b688f4fd35b730736af252829ae61bce2b409c7462f487c6c888157e749b + 5125620520d25f9a39c6d62dfcd3e087fd610dc5d163ddff6377365011c8b13f + 21afa0e32dd2d75ee51c4f5c0d16330a9d80d435d6ac9900d0c13bffdfd7b682 + 73b366f30e8f3863501723e13eb5dcaf6d424b80382d17c27635567b79705ca3 + 20fe5dbd7a64f7a8fdbaeb81f8dd485df61121c5054e0f7f917c6193f209ff2e" nocross=yes create_wrksrc=yes +build_options="wayland qt sdl2" +build_options_default="sdl2" + pre_configure() { # copy submodules to right location cp -rup ${wrksrc}/ppsspp-lang-*/* ${wrksrc}/${pkgname}-${version}/assets/lang cp -rup ${wrksrc}/armips-*/* ${wrksrc}/${pkgname}-${version}/ext/armips cp -rup ${wrksrc}/glslang-*/* ${wrksrc}/${pkgname}-${version}/ext/glslang cp -rup ${wrksrc}/SPIRV-Cross-*/* ${wrksrc}/${pkgname}-${version}/ext/SPIRV-Cross + cp -rup ${wrksrc}/discord-rpc-*/* ${wrksrc}/${pkgname}-${version}/ext/discord-rpc # disable git versioning sed 's|find_package(Git)|# &|' -i ${wrksrc}/${pkgname}-${version}/git-version.cmake @@ -43,11 +52,16 @@ 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/PPSSPPSDL ppsspp-sdl vbin build/PPSSPPHeadless ppsspp-headless vmkdir usr/share/ppsspp vcopy build/assets usr/share/ppsspp/ - sed -e 's,^Exec=.*,Exec=/usr/bin/ppsspp-sdl,' -i $DESTDIR/usr/share/applications/PPSSPP.desktop + if [ $build_option_sdl2 ]; then + vbin build/PPSSPPSDL ppsspp-sdl + sed -e 's,^Exec=.*,Exec=/usr/bin/ppsspp-sdl,' -i $DESTDIR/usr/share/applications/PPSSPP.desktop + elif [ $build_option_qt ] ;then + vbin build/PPSSPPQt ppsspp-qt + sed -e 's,^Exec=.*,Exec=/usr/bin/ppsspp-qt,' -i $DESTDIR/usr/share/applications/PPSSPP.desktop + fi sed -e 's,^Icon=.*,Icon=/usr/share/pixmaps/ppsspp.svg,' -i $DESTDIR/usr/share/applications/PPSSPP.desktop }