mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
games-emulation/ppsspp: drop old 1.19
Signed-off-by: Maciej Barć <xgqt@gentoo.org>
This commit is contained in:
Maciej Barć
@@ -1,2 +1 @@
|
||||
DIST ppsspp-1.19.3.tar.xz 58144916 BLAKE2B 7799613c360fe1b9e597a28a6b89edcdb8160ebf861ea39d95273e6dfbf49abd8de5d708b552b3b06417e7ac9dd1575767e614f449fea2c0fcb4ef4e174013ee SHA512 03d75dc4fa488a659570c8c9d8c94e1c59c1d94c2f71edb54adae8807ad4322b4d7e6d8b94193a90c335cb7b3a889cc4f5bde604d0bc577b9407249913f4c04f
|
||||
DIST ppsspp-1.19.tar.xz 57827660 BLAKE2B 53efc9f5d1eac5e4d97f7cd5dea42d92065df04bf81045018ed6175c37c01c1897c263c59c55a23143097d7bbd31aefdf38657ee625f5de8fad1aae82130e60d SHA512 3423778a8b45fd77078ea17c1bbd17b692eda9d094433ab2184805c1da74cf6034a8cb242f8f937b3466d8ba247b97f629a3be4ba39454767a22b08340cb22d0
|
||||
|
||||
@@ -1,74 +0,0 @@
|
||||
From bd84c7bf7dcefc991aa2af14ca1f42f2c842c54b Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
|
||||
Date: Thu, 9 Jan 2025 20:58:50 +0100
|
||||
Subject: [PATCH 1/2] Buildfix for new SDL.
|
||||
|
||||
Fixes #19839
|
||||
---
|
||||
Common/Render/Text/draw_text_sdl.h | 7 +++----
|
||||
1 file changed, 3 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/Common/Render/Text/draw_text_sdl.h b/Common/Render/Text/draw_text_sdl.h
|
||||
index 267028638f87..7e0ddd9b422f 100644
|
||||
--- a/Common/Render/Text/draw_text_sdl.h
|
||||
+++ b/Common/Render/Text/draw_text_sdl.h
|
||||
@@ -9,8 +9,7 @@
|
||||
#include <fontconfig/fontconfig.h>
|
||||
#endif
|
||||
|
||||
-// SDL2_ttf's TTF_Font is a typedef of _TTF_Font.
|
||||
-struct _TTF_Font;
|
||||
+struct TTF_Font;
|
||||
|
||||
class TextDrawerSDL : public TextDrawer {
|
||||
public:
|
||||
@@ -32,9 +31,9 @@ class TextDrawerSDL : public TextDrawer {
|
||||
uint32_t CheckMissingGlyph(std::string_view text);
|
||||
int FindFallbackFonts(uint32_t missingGlyph, int ptSize);
|
||||
|
||||
- std::map<uint32_t, _TTF_Font *> fontMap_;
|
||||
+ std::map<uint32_t, TTF_Font *> fontMap_;
|
||||
|
||||
- std::vector<_TTF_Font *> fallbackFonts_;
|
||||
+ std::vector<TTF_Font *> fallbackFonts_;
|
||||
std::vector<std::pair<std::string, int>> fallbackFontPaths_; // path and font face index
|
||||
|
||||
std::map<int, int> glyphFallbackFontIndex_;
|
||||
|
||||
From 1ba304d83f5b3154928cff4169e812f4eedc3b6e Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
|
||||
Date: Thu, 9 Jan 2025 21:12:00 +0100
|
||||
Subject: [PATCH 2/2] Alternate buildfix
|
||||
|
||||
---
|
||||
Common/Render/Text/draw_text_sdl.h | 9 +++++++--
|
||||
1 file changed, 7 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Common/Render/Text/draw_text_sdl.h b/Common/Render/Text/draw_text_sdl.h
|
||||
index 7e0ddd9b422f..7c073a8290f7 100644
|
||||
--- a/Common/Render/Text/draw_text_sdl.h
|
||||
+++ b/Common/Render/Text/draw_text_sdl.h
|
||||
@@ -5,12 +5,15 @@
|
||||
#include <map>
|
||||
#include "Common/Render/Text/draw_text.h"
|
||||
|
||||
+#if defined(USE_SDL2_TTF)
|
||||
+
|
||||
+#include "SDL2/SDL.h"
|
||||
+#include "SDL2/SDL_ttf.h"
|
||||
+
|
||||
#if defined(USE_SDL2_TTF_FONTCONFIG)
|
||||
#include <fontconfig/fontconfig.h>
|
||||
#endif
|
||||
|
||||
-struct TTF_Font;
|
||||
-
|
||||
class TextDrawerSDL : public TextDrawer {
|
||||
public:
|
||||
TextDrawerSDL(Draw::DrawContext *draw);
|
||||
@@ -42,3 +45,5 @@ class TextDrawerSDL : public TextDrawer {
|
||||
FcConfig *config;
|
||||
#endif
|
||||
};
|
||||
+
|
||||
+#endif
|
||||
@@ -1,16 +0,0 @@
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -336,11 +336,11 @@ if(NOT MSVC)
|
||||
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g -D_DEBUG")
|
||||
set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} -Os -D_NDEBUG")
|
||||
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2 -D_NDEBUG")
|
||||
- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O2 -g -D_NDEBUG")
|
||||
+ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -D_NDEBUG")
|
||||
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g -D_DEBUG")
|
||||
set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} -Os -D_NDEBUG")
|
||||
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O2 -D_NDEBUG")
|
||||
- set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -O2 -g -D_NDEBUG")
|
||||
+ set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -D_NDEBUG")
|
||||
|
||||
# Disable some warnings
|
||||
add_definitions(-Wno-multichar)
|
||||
@@ -1,97 +0,0 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
PYTHON_COMPAT=( python3_{11..13} )
|
||||
|
||||
inherit ffmpeg-compat flag-o-matic python-any-r1 xdg cmake
|
||||
|
||||
DESCRIPTION="A PSP emulator written in C++"
|
||||
HOMEPAGE="https://www.ppsspp.org/
|
||||
https://github.com/hrydgard/ppsspp/"
|
||||
|
||||
if [[ "${PV}" == *9999* ]] ; then
|
||||
inherit git-r3
|
||||
|
||||
EGIT_REPO_URI="https://github.com/hrydgard/${PN}.git"
|
||||
else
|
||||
SRC_URI="https://github.com/hrydgard/${PN}/releases/download/v${PV}/${P}.tar.xz"
|
||||
|
||||
KEYWORDS="~amd64"
|
||||
fi
|
||||
|
||||
LICENSE="Apache-2.0 BSD BSD-2 GPL-2 JSON MIT"
|
||||
SLOT="0"
|
||||
IUSE="discord qt5 test wayland"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
RDEPEND="
|
||||
>=media-libs/sdl2-ttf-2.24.0
|
||||
app-arch/snappy:=
|
||||
app-arch/zstd:=
|
||||
dev-libs/libzip:=
|
||||
media-libs/glew:=
|
||||
media-libs/libpng:=
|
||||
media-libs/libsdl2[joystick]
|
||||
media-video/ffmpeg-compat:6=
|
||||
sys-libs/zlib:=
|
||||
virtual/opengl
|
||||
qt5? (
|
||||
dev-qt/qtcore:5
|
||||
dev-qt/qtgui:5[-gles2-only]
|
||||
dev-qt/qtmultimedia:5[-gles2-only]
|
||||
dev-qt/qtopengl:5[-gles2-only]
|
||||
dev-qt/qtwidgets:5[-gles2-only]
|
||||
)
|
||||
!qt5? (
|
||||
media-libs/libsdl2[X,opengl,sound,video,wayland?]
|
||||
)
|
||||
"
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
"
|
||||
BDEPEND="
|
||||
${PYTHON_DEPS}
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-1.17.1-SpvBuilder-cstdint.patch"
|
||||
"${FILESDIR}/${PN}-1.17.1-cmake-cxx.patch"
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
python-any-r1_pkg_setup
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# bug https://bugs.gentoo.org/926079
|
||||
filter-lto
|
||||
|
||||
local -a mycmakeargs=(
|
||||
-DBUILD_SHARED_LIBS="OFF"
|
||||
-DCMAKE_SKIP_RPATH="ON"
|
||||
-DHEADLESS="OFF"
|
||||
-DUSE_CCACHE="OFF"
|
||||
-DUSE_SYSTEM_FFMPEG="ON"
|
||||
-DUSE_SYSTEM_LIBZIP="ON"
|
||||
-DUSE_SYSTEM_SNAPPY="ON"
|
||||
-DUSE_SYSTEM_ZSTD="ON"
|
||||
-DUSE_DISCORD="$(usex discord)"
|
||||
-DUSE_WAYLAND_WSI="$(usex wayland)"
|
||||
-DUSING_QT_UI="$(usex qt5)"
|
||||
-DUNITTEST="$(usex test)"
|
||||
)
|
||||
|
||||
# TODO: fix with >=ffmpeg-7 then drop compat (bug #948816).
|
||||
# Unfortunately not using pkg-config and needs both flags and dir.
|
||||
ffmpeg_compat_setup 6
|
||||
ffmpeg_compat_add_flags
|
||||
mycmakeargs+=( -DFFMPEG_DIR="${SYSROOT}$(ffmpeg_compat_get_prefix 6)" )
|
||||
|
||||
cmake_src_configure
|
||||
}
|
||||
|
||||
src_test() {
|
||||
cmake_src_test -E glslang-testsuite
|
||||
}
|
||||
Reference in New Issue
Block a user