commit: 75336163d935fdba3faeaa1e7b59d28f7d64cb4f
Author: Maciej Barć <xgqt <AT> protonmail <DOT> com>
AuthorDate: Sat Nov 28 08:42:09 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Nov 28 08:45:34 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75336163
games-emulation/ppsspp: remove old
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Maciej Barć <xgqt <AT> protonmail.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
games-emulation/ppsspp/Manifest | 9 --
.../ppsspp/files/ppsspp-1.4.2-assets-lookup.patch | 13 ---
.../ppsspp/files/ppsspp-1.5.4-ffmpeg-4.patch | 34 --------
.../ppsspp/files/ppsspp-1.5.4-stdint-gcc-10.patch | 10 ---
games-emulation/ppsspp/ppsspp-1.5.4-r2.ebuild | 99 ----------------------
games-emulation/ppsspp/ppsspp-9999.ebuild | 81 ------------------
6 files changed, 246 deletions(-)
diff --git a/games-emulation/ppsspp/Manifest b/games-emulation/ppsspp/Manifest
index d1bd5fdbf15..d589d7a9e2a 100644
--- a/games-emulation/ppsspp/Manifest
+++ b/games-emulation/ppsspp/Manifest
@@ -7,12 +7,3 @@ DIST ppsspp-1.10.3-ext_native_tools_prebuilt.tar.gz 897571
BLAKE2B b1c959a0cd1c6
DIST ppsspp-1.10.3-ext_rapidjson.tar.gz 1054419 BLAKE2B
40b8ba0884943de2179b21d7a56716efed2ec5b4098aa33c061e52703b0952930fe2f1bda8cb6ec4a75b947753011e9d06fda953a3862e321d2a0187cd60385d
SHA512
3472e129e710bf5343b8b27a61581a1480c8096493e466440b62702d8b5353745d561931f72b5405a736ad92525be3843ea1cf4b5ea5839721cc6d6b358f19bc
DIST ppsspp-1.10.3-ffmpeg.tar.gz 387126903 BLAKE2B
fd838039dda32f1b9d16649bd7e5a5d6fb3db74a8032d51973b01e567dd97c06c3d16b82a5176cb5828178f47619d767e1e0473a31484ab957636502a5172fa0
SHA512
74a8ee678c16578af63af3a6dd11dbd7bba265bc6581ff78c19269cff1b2896e236c6468175eb19c3c321ee67ebe1d62b4ff179163bb7162089c953a18483cf7
DIST ppsspp-1.10.3.tar.gz 16956980 BLAKE2B
3f02abaf68a3a2acbaf71936fe70904a5065eb5c8afc8ec00804c325c597c4bf57fb4b9c7e1df7b302c085043a0ad210ca0d6ed2be89dd6ed28c9c635afff8db
SHA512
522b2014810bd39a8554920b6d9bec7c47334d51537a7ca41482f629622b9e2d3dddfaaa5389b3c6c7dda8d7d3212b7ce9f6bd6e6d8498ffe370cf2cc58aac30
-DIST ppsspp-1.5.4-assets_lang.tar.gz 347859 BLAKE2B
648915773856a64dafb5d159e0917b4345ff99dba7b7dae4f343ecd81e1d835cb958766ab8928118ae4768564414e3dcceba474e05e99be23d56c9447c59786b
SHA512
72983f01c51900fa133ca83d226a5daec78153c9d70fc1ca6233b531f3c5d5da5e307e377560789cecccad7a98ba8f66da104cc4375f51576f90c535dc980b98
-DIST ppsspp-1.5.4-dx9sdk.tar.gz 14582591 BLAKE2B
12a370e262d045bab6f85237160189921e0bc9992726bb60d241c20a5714128995cf110bb5889c530f8cc3497a34645a96ff31b7b61fb3004279f26b15287435
SHA512
2c54b441b0a31f63ecab1bd2ab14254fb2047d35d2765262d43277330a8428fbf4c8848d5f730456a033cf84258f6b60a467213f8339289b3ab83ed7e94c65b7
-DIST ppsspp-1.5.4-ext_SPIRV-Cross.tar.gz 228943 BLAKE2B
0b4ed8a751737bf6fce9fa766f0b8dc0671b49a6adf026c369ebd3776d9d8c23acd08b6d3f41666a6e23410ffb243917a844d9de85e3eca5ce04935421aaca98
SHA512
5fe2f772b571da0627fb9d9c424bea2b4ea1c0563e36ff455ddaf1b92ea3d5ee636e039a0619e0971478ce10e163b45258e9b03d2610c573f74d1cfd08549bb8
-DIST ppsspp-1.5.4-ext_armips.tar.gz 191245 BLAKE2B
8bfeb8828bc2496c0222b22547820f00c5a695dc9469a2ce6b8fe7bc15e72af862a957e632af1829bfdd4cf663a586baa10495896971b9b138780ddc387aae9b
SHA512
9ab376b928fadcbff7256ff10d6581e4960e00e48a93f47f7e90b1998022a8d03cadef20880aa020fe6b62e4fa43cf28fc68dc5b10e93b1212fd6788ae493dba
-DIST ppsspp-1.5.4-ext_armips_ext_tinyformat.tar.gz 22284 BLAKE2B
d37c35efeb42e3998603127f8758cec29103b5f7700ff465d5234e032822965e9249b6d183dba9962a76bed06abeaf0c40ab701425d1fb4d64ffd83c9987fe8d
SHA512
fb063ea9b632c8a9a0203c181830cb2feed9142fcf4d69c11cc0a3e8dcbb3cea51dde6bb351df567b3f105a4da99fd2e72ba3572d3fc0e9a45364f4115d6c3d1
-DIST ppsspp-1.5.4-ext_glslang.tar.gz 1944927 BLAKE2B
a9bfae046335f8cba72fc92208fd0370d1808d242c00964c5507ce7d6aab2ad10ef839e8f46c46ba9ac039e11469e26877f89a51843ad035f33b434212a18317
SHA512
333a93707e067ac1d98c69533c2d206675d75aa54195326accf33e8401ac2fb412d2e2525b0ee1313f141872aa6ea430ae5424e8712483c59f77dc3adbcb4f59
-DIST ppsspp-1.5.4-ffmpeg.tar.gz 311610961 BLAKE2B
e01b203ff1f230a27b02dab0596dedbc26e049190fa1607903b70023865c50de4fb7361de33c1bd1c5de305124ea02f2ba9ac854bf2f40f3e79259663cdfa4ec
SHA512
d4bdb3c5a13bc64d7b22e38b416355d302a4401a1d8f6bd57a4d8502823dc9a2987df92b8e781ddab6de8ded9b59b268ef1b33f8f43a0be7b1c57d4ffbee6871
-DIST ppsspp-1.5.4-pspautotests.tar.gz 36005395 BLAKE2B
fa92d1acb0adfecb23f55132c4e85843c3c04c73e4bc8cfb054cfa8e0b67fe1c03c4a83032892bc534a78a64bf190da00db91fd49df4c3838e5b8d0396cce15b
SHA512
1485eace5526f53f6c41200e63d6d5d0ff217f22ec4788d58b33a33c64e344609f95bf2b73a8f35fd395914b33910b38a0348b35b488dadbdd43e24ac0bfed9f
-DIST ppsspp-1.5.4.tar.gz 19008538 BLAKE2B
10ca63a3f05757bd091a66b6563e34b3ca3c9c4df12a0b7796e42776d54997bec581582ee16706d5fb3630ebb8c0bcd1a5c0040856d94330865932b3d1ada2db
SHA512
dbf4d2e9cc94a64908d5006ad562da72860fd12dadac66b0bdc6903d4cad4c81436963e24017517aa261440fd15efff6e5cab6ed7801928e107d7982d1604714
diff --git a/games-emulation/ppsspp/files/ppsspp-1.4.2-assets-lookup.patch
b/games-emulation/ppsspp/files/ppsspp-1.4.2-assets-lookup.patch
deleted file mode 100644
index 2a136a39e8d..00000000000
--- a/games-emulation/ppsspp/files/ppsspp-1.4.2-assets-lookup.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp
-index 717177ef81ff..22239782210d 100644
---- a/UI/NativeApp.cpp
-+++ b/UI/NativeApp.cpp
-@@ -317,7 +317,7 @@ void NativeInit(int argc, const char *argv[], const char
*savegame_dir, const ch
-
- // We want this to be FIRST.
- #ifdef USING_QT_UI
-- VFSRegister("", new AssetsAssetReader());
-+ VFSRegister("", new DirectoryAssetReader("/usr/share/ppsspp/assets/"));
- #elif defined(IOS)
- // Packed assets are included in app
- VFSRegister("", new DirectoryAssetReader(external_dir));
diff --git a/games-emulation/ppsspp/files/ppsspp-1.5.4-ffmpeg-4.patch
b/games-emulation/ppsspp/files/ppsspp-1.5.4-ffmpeg-4.patch
deleted file mode 100644
index d738d4bc56c..00000000000
--- a/games-emulation/ppsspp/files/ppsspp-1.5.4-ffmpeg-4.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 70c54a7d1ab15c0cf84a205b944db7e0339242e0 Mon Sep 17 00:00:00 2001
-From: Greg V <[email protected]>
-Date: Sat, 21 Apr 2018 16:44:45 +0300
-Subject: [PATCH] Fix build with ffmpeg 4.0
-
----
- Core/HLE/sceMpeg.cpp | 11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/Core/HLE/sceMpeg.cpp b/Core/HLE/sceMpeg.cpp
-index 592320515e..ae309d7b2e 100644
---- a/Core/HLE/sceMpeg.cpp
-+++ b/Core/HLE/sceMpeg.cpp
-@@ -884,13 +884,16 @@ class H264Frames{
- }
- };
- #ifndef USE_FFMPEG
--#define FF_INPUT_BUFFER_PADDING_SIZE 16
-+#define AV_INPUT_BUFFER_PADDING_SIZE 16
-+#endif
-+#ifndef AV_INPUT_BUFFER_PADDING_SIZE
-+#define AV_INPUT_BUFFER_PADDING_SIZE FF_INPUT_BUFFER_PADDING_SIZE
- #endif
- void addpadding(){
-- u8* str = new u8[size + FF_INPUT_BUFFER_PADDING_SIZE];
-+ u8* str = new u8[size + AV_INPUT_BUFFER_PADDING_SIZE];
- memcpy(str, stream, size);
-- memset(str + size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
-- size += FF_INPUT_BUFFER_PADDING_SIZE;
-+ memset(str + size, 0, AV_INPUT_BUFFER_PADDING_SIZE);
-+ size += AV_INPUT_BUFFER_PADDING_SIZE;
- delete[] stream;
- stream = str;
- }
diff --git a/games-emulation/ppsspp/files/ppsspp-1.5.4-stdint-gcc-10.patch
b/games-emulation/ppsspp/files/ppsspp-1.5.4-stdint-gcc-10.patch
deleted file mode 100644
index 0a7c45a810b..00000000000
--- a/games-emulation/ppsspp/files/ppsspp-1.5.4-stdint-gcc-10.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/Common/Hashmaps.h
-+++ b/Common/Hashmaps.h
-@@ -2,6 +2,7 @@
-
- #include <cstring>
- #include <vector>
-+#include <stdint.h> /* uint32_t */
-
- #include "ext/xxhash.h"
- #include "Common/CommonFuncs.h"
diff --git a/games-emulation/ppsspp/ppsspp-1.5.4-r2.ebuild
b/games-emulation/ppsspp/ppsspp-1.5.4-r2.ebuild
deleted file mode 100644
index e83d7dac012..00000000000
--- a/games-emulation/ppsspp/ppsspp-1.5.4-r2.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils desktop
-
-DESCRIPTION="A PSP emulator written in C++"
-HOMEPAGE="https://www.ppsspp.org/";
-SRC_URI="
- https://github.com/hrydgard/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
- !system-ffmpeg? (
https://github.com/hrydgard/ppsspp-ffmpeg/archive/a2e98d7ba4c7c5cac08608732c3058cb46e3e0ef.tar.gz
-> ${P}-ffmpeg.tar.gz )
-
https://github.com/hrydgard/ppsspp-lang/archive/1e3e4a0ba0ca8c0a092e027dfb7c1c4778366db5.tar.gz
-> ${P}-assets_lang.tar.gz
-
https://github.com/hrydgard/pspautotests/archive/d02ba7407050f445edf9e908374ad4bf3b2f237b.tar.gz
-> ${P}-pspautotests.tar.gz
-
https://github.com/hrydgard/minidx9/archive/7751cf73f5c06f1be21f5f31c3e2d9a7bacd3a93.tar.gz
-> ${P}-dx9sdk.tar.gz
-
https://github.com/hrydgard/glslang/archive/2edde6665d9a56ead5ea0e55b4e64d9a803e6164.tar.gz
-> ${P}-ext_glslang.tar.gz
-
https://github.com/Kingcom/armips/archive/8b4cadaf62d7de42d374056fc6aafc555f2bc7dc.tar.gz
-> ${P}-ext_armips.tar.gz
-
https://github.com/Kingcom/tinyformat/archive/b7f5a22753c81d834ab5133d655f1fd525280765.tar.gz
-> ${P}-ext_armips_ext_tinyformat.tar.gz
-
https://github.com/KhronosGroup/SPIRV-Cross/archive/90966d50f57608587bafd95b4e345b02b814754a.tar.gz
-> ${P}-ext_SPIRV-Cross.tar.gz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="headless +qt5 sdl +system-ffmpeg"
-REQUIRED_USE="!qt5? ( sdl )"
-
-RDEPEND="
- app-arch/snappy:=
- dev-libs/libzip:=
- media-libs/glew:=
- sys-libs/zlib:=
- virtual/opengl
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtopengl:5
- dev-qt/qtwidgets:5
- !sdl? ( dev-qt/qtmultimedia:5 )
- )
- sdl? ( media-libs/libsdl2 )
- system-ffmpeg? ( media-video/ffmpeg:= )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.4.2-assets-lookup.patch
- "${FILESDIR}"/${PN}-1.4-O2.patch
- "${FILESDIR}"/${P}-ffmpeg-4.patch
- "${FILESDIR}"/${P}-stdint-gcc-10.patch
-)
-
-src_unpack() {
- unpack "${P}.tar.gz"
- cd "${S}" || die
- local i list=( assets_lang pspautotests dx9sdk ext_glslang ext_armips
ext_SPIRV-Cross ext_armips_ext_tinyformat )
- if ! use system-ffmpeg; then
- list+=( ffmpeg )
- fi
- for i in "${list[@]}"; do
- tar xf "${DISTDIR}/${P}-${i}.tar.gz" --strip-components 1 -C
"${i//_//}" || die "Failed to unpack ${P}-${i}.tar.gz"
- done
-}
-
-src_prepare() {
- if ! use system-ffmpeg; then
- sed -i -e "s#-O3#-O2#g;" "${S}"/ffmpeg/linux_*.sh || die
- fi
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DHEADLESS=$(usex headless)
- -DUSING_QT_UI=$(usex qt5)
- $(cmake-utils_use_find_package sdl SDL2)
- -DUSE_SYSTEM_FFMPEG=$(usex system-ffmpeg)
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- use headless && dobin "${BUILD_DIR}/PPSSPPHeadless"
- insinto /usr/share/"${PN}"
- doins -r "${BUILD_DIR}/assets"
- dobin "${BUILD_DIR}/PPSSPP$(usex qt5 Qt SDL)"
- local i
- for i in 16 24 32 48 64 96 128 256 512 ; do
- doicon -s ${i} "icons/hicolor/${i}x${i}/apps/${PN}.png"
- done
- make_desktop_entry "PPSSPP$(usex qt5 Qt SDL)" "PPSSPP ($(usex qt5 Qt
SDL))" "${PN}" "Game"
-}
-
-pkg_postinst() {
- if use system-ffmpeg; then
- ewarn "system-ffmpeg USE flag is enabled, some bugs might arise
due to it."
- ewarn "See https://github.com/hrydgard/ppsspp/issues/9026 for
more informations."
- fi
-}
diff --git a/games-emulation/ppsspp/ppsspp-9999.ebuild
b/games-emulation/ppsspp/ppsspp-9999.ebuild
deleted file mode 100644
index 1f03ec0b1d0..00000000000
--- a/games-emulation/ppsspp/ppsspp-9999.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils desktop git-r3
-
-DESCRIPTION="A PSP emulator written in C++"
-HOMEPAGE="https://www.ppsspp.org/";
-EGIT_REPO_URI="https://github.com/hrydgard/${PN}.git";
-EGIT_SUBMODULES=( '*' )
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="headless +qt5 sdl +system-ffmpeg"
-REQUIRED_USE="!qt5? ( sdl )"
-
-RDEPEND="
- app-arch/snappy:=
- dev-libs/libzip:=
- media-libs/glew:=
- sys-libs/zlib:=
- virtual/opengl
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtopengl:5
- dev-qt/qtwidgets:5
- !sdl? ( dev-qt/qtmultimedia:5 )
- )
- sdl? ( media-libs/libsdl2 )
- system-ffmpeg? ( media-video/ffmpeg:= )
-"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
- use system-ffmpeg && EGIT_SUBMODULES+=( '-ffmpeg' )
- git-r3_src_unpack
-}
-
-src_prepare() {
- #
https://github.com/hrydgard/ppsspp/blob/150619c5a341f372266bec86fd874ac5a1343a43/UI/NativeApp.cpp#L318
- # patch ppsspp to use /usr/share instead of working dir to find the
assets
- sed -i 's|VFSRegister("", new AssetsAssetReader());|VFSRegister("", new
DirectoryAssetReader("/usr/share/ppsspp/assets/"));|g' UI/NativeApp.cpp || die
"Patching qt assets path failed"
-
- sed -i -e "s#-O3#-O2#g;" "${S}"/CMakeLists.txt || die
- if ! use system-ffmpeg; then
- sed -i -e "s#-O3#-O2#g;" "${S}"/ffmpeg/linux_*.sh || die
- fi
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DHEADLESS=$(usex headless)
- -DUSING_QT_UI=$(usex qt5)
- $(cmake-utils_use_find_package sdl SDL2)
- -DUSE_SYSTEM_FFMPEG=$(usex system-ffmpeg)
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- use headless && dobin "${BUILD_DIR}/PPSSPPHeadless"
- insinto /usr/share/"${PN}"
- doins -r "${BUILD_DIR}/assets"
- dobin "${BUILD_DIR}/PPSSPP$(usex qt5 Qt SDL)"
- local i
- for i in 16 24 32 48 64 96 128 256 512 ; do
- doicon -s ${i} "icons/hicolor/${i}x${i}/apps/${PN}.png"
- done
- make_desktop_entry "PPSSPP$(usex qt5 Qt SDL)" "PPSSPP ($(usex qt5 Qt
SDL))" "${PN}" "Game"
-}
-
-pkg_postinst() {
- if use system-ffmpeg; then
- ewarn "system-ffmpeg USE flag is enabled, some bugs might arise
due to it."
- ewarn "See https://github.com/hrydgard/ppsspp/issues/9026 for
more informations."
- fi
-}
