* [gentoo-commits] repo/gentoo:master commit in: games-emulation/ppsspp/files/, games-emulation/ppsspp/
@ 2018-09-16 11:23 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2018-09-16 11:23 UTC (permalink / raw
To: gentoo-commits
commit: 5ba26fd491fabad9dc0557223c1522d0915be009
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 16 10:27:18 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Sep 16 11:23:02 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ba26fd4
games-emulation/ppsspp: Fix build with ffmpeg-4
Closes: https://bugs.gentoo.org/666168
Package-Manager: Portage-2.3.49, Repoman-2.3.10
.../ppsspp/files/ppsspp-1.5.4-ffmpeg-4.patch | 34 ++++++++++++++++++++++
games-emulation/ppsspp/ppsspp-1.5.4-r2.ebuild | 1 +
2 files changed, 35 insertions(+)
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
new file mode 100644
index 00000000000..d738d4bc56c
--- /dev/null
+++ b/games-emulation/ppsspp/files/ppsspp-1.5.4-ffmpeg-4.patch
@@ -0,0 +1,34 @@
+From 70c54a7d1ab15c0cf84a205b944db7e0339242e0 Mon Sep 17 00:00:00 2001
+From: Greg V <greg@unrelenting.technology>
+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/ppsspp-1.5.4-r2.ebuild b/games-emulation/ppsspp/ppsspp-1.5.4-r2.ebuild
index 04fc2542f6a..4e7f8f7f027 100644
--- a/games-emulation/ppsspp/ppsspp-1.5.4-r2.ebuild
+++ b/games-emulation/ppsspp/ppsspp-1.5.4-r2.ebuild
@@ -49,6 +49,7 @@ DEPEND="${RDEPEND}"
PATCHES=(
"${FILESDIR}"/${PN}-1.4.2-assets-lookup.patch
"${FILESDIR}"/${PN}-1.4-O2.patch
+ "${FILESDIR}"/${P}-ffmpeg-4.patch
)
src_unpack() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/ppsspp/files/, games-emulation/ppsspp/
@ 2020-11-28 8:45 Joonas Niilola
0 siblings, 0 replies; 5+ messages in thread
From: Joonas Niilola @ 2020-11-28 8:45 UTC (permalink / raw
To: gentoo-commits
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 <greg@unrelenting.technology>
-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
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/ppsspp/files/, games-emulation/ppsspp/
@ 2022-07-26 21:10 Maciej Barć
0 siblings, 0 replies; 5+ messages in thread
From: Maciej Barć @ 2022-07-26 21:10 UTC (permalink / raw
To: gentoo-commits
commit: 9ee8d753d95a5dfbf3edbbe81e088391b54f42d5
Author: Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 26 20:59:30 2022 +0000
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Tue Jul 26 21:10:13 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ee8d753
games-emulation/ppsspp: bump to 1.13
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>
games-emulation/ppsspp/Manifest | 10 +++
.../ppsspp/files/ppsspp-CMakeLists-flags.patch | 16 ++++
games-emulation/ppsspp/ppsspp-1.13.ebuild | 99 ++++++++++++++++++++++
3 files changed, 125 insertions(+)
diff --git a/games-emulation/ppsspp/Manifest b/games-emulation/ppsspp/Manifest
index e101149e4f00..6299662c187d 100644
--- a/games-emulation/ppsspp/Manifest
+++ b/games-emulation/ppsspp/Manifest
@@ -28,3 +28,13 @@ DIST ppsspp-1.12.3-ext_native_tools_prebuilt.tar.gz 897571 BLAKE2B b1c959a0cd1c6
DIST ppsspp-1.12.3-ext_rapidjson.tar.gz 1054419 BLAKE2B 40b8ba0884943de2179b21d7a56716efed2ec5b4098aa33c061e52703b0952930fe2f1bda8cb6ec4a75b947753011e9d06fda953a3862e321d2a0187cd60385d SHA512 3472e129e710bf5343b8b27a61581a1480c8096493e466440b62702d8b5353745d561931f72b5405a736ad92525be3843ea1cf4b5ea5839721cc6d6b358f19bc
DIST ppsspp-1.12.3-ext_zstd.tar.gz 1868621 BLAKE2B abbd48a18c587fc6c413c3df32aa6b74a1c3d0ed02eacb2e7ad23a4fdab059b092e8df4356cbc799641b42e99587238decc2ae27862142fd8d7be7959ad1fd5e SHA512 659576d0f52d2271b6b53f638b407b873888b1cffe4f014c3149d33a961653c2fcf7ff270bc669a5647205b573ef2809907645a4c89ab6c030ad65bce15547ae
DIST ppsspp-1.12.3.tar.gz 31693022 BLAKE2B a3378efaad9c8aa7b6141e454b6663892fb357c264845edd4ebf3e25fc8f9d76d8cc5a45d220ba0549036dd8d06e825105bb72182c4ba621e7618563d4f806c5 SHA512 fe5f5b150cc06ecca68c592fa19396d9a6e573c67da9be0ba98a3db975b0efcb6de694ac224543beaea2a3eb4952d45459e850d6c2f0fe6668536325dd449d38
+DIST ppsspp-1.13-assets_lang.tar.gz 664123 BLAKE2B 8d96634eb3e930f7f97e8ac24d97eba1e2e7fce3a8f4dbe5a8a4c0c0438a24e981769c3638d7e7770eb1a3af2827a3ece0996fdba8cf668d2c058e3d20741e94 SHA512 691cb38c65ca20700dc5b91c0dc02eec1839f153e042c87f8f4fd480e44c823c0ece9f4752f5e597f2aa4b5cfb22aaf49d76ff990eb2dd5231cc4065dd62566d
+DIST ppsspp-1.13-ext_SPIRV-Cross.tar.gz 1441538 BLAKE2B 011a0bc8fea2a5986b5884f315d877d0de111dbda226cc6aa5eaf11c0b2cb14acfd94c1279fb80f0a48b27d1a2117487f634a0888f7499d733261c0ced94ea89 SHA512 be77131814691dfbe65de3a2d3ea65de98c7169824997056637bbce39485327ff0f64e7eed8588237615948824e1f9dff1d083472b8cbccd3748a52379411e4e
+DIST ppsspp-1.13-ext_armips.tar.gz 197263 BLAKE2B 2b2cbeaabf5fb5f0b5cbf8c93ea61d4546e04054f54be5a7dad081ca0aaacf09d1fe1cc710fd0c66f28c7d4c84b98961a6d96bb9cea941f8b02492c1dff6344d SHA512 2a94e2c7b7280c00a39c8fc92d81ed15fc4b3270a124ef882e3cd8878db6ec827aefa06b0e646a60916636a95e4ebfa886e9878ba70c6bcfcd048def457368be
+DIST ppsspp-1.13-ext_discord-rpc.tar.gz 2108078 BLAKE2B e89ee4a196167cabaecfab82d191516eb0cf0fa89e35f95b6d118d5baad25f5d13d9002a8dcfe4aba099af7b9c1eb72835eb3baa9e4deaedd2754e99687b5967 SHA512 06205287addabfb343ccd9af997b693ed221fe564355d3629d4dee6c003e768b3f65f2b34eb04ef29807a15c5fa34b04c664212b7e0d15b09ad9a4e4be10a560
+DIST ppsspp-1.13-ext_glslang.tar.gz 3300622 BLAKE2B 0f0d8e043662962f13c4277da335def78a88dd1b35ac2e40b0192f0783c43fd97367d63663764591a5b1eef1bc62c681aa54a402e69c36a8dc50b3595e9e8ba9 SHA512 39b7fd1332dc2f6e29c920961e2a48a33cb7fb36753a0ee5ea8897cb2ad11cec67808ec671cd1bdecbb03eb17f4e83a711013bb20a8cc0831879eb9fbe432bcd
+DIST ppsspp-1.13-ext_miniupnp.tar.gz 449099 BLAKE2B b2bcdee23c817cf309dd9516e32e06f7e1eadc9ae24db3519a2b4e3861417fb79c0708d6d67e8baec3de9e6c5c2bb0a6daff648bf63f7c419192729957e9959c SHA512 f86f558699e75e7f8a58bbb5e94c2a32d703432cef05ffeac0da129113a1fe485cc5ad43b1fcfda11ee1ee398fa434511eccc37633eb5d3dfe8af864097669de
+DIST ppsspp-1.13-ext_native_tools_prebuilt.tar.gz 897571 BLAKE2B b1c959a0cd1c61f65b3d7e2c204e9b60fc00e551d72ef3edcb8a3c8851e1e8d1dd3b0f79594ffd0ec767ba0ca34ae7fc8d3a5171ca5b449fcbab8ab9f63e22a9 SHA512 5e1b3d8c0cf581014e6fa375b865725a383128818df6e5135a03b1513807d2b8f615a7e58d37ca805d0603ea75d24e41fe079eaf4f41e94af1077d4c4b0c5a93
+DIST ppsspp-1.13-ext_rapidjson.tar.gz 1054419 BLAKE2B 40b8ba0884943de2179b21d7a56716efed2ec5b4098aa33c061e52703b0952930fe2f1bda8cb6ec4a75b947753011e9d06fda953a3862e321d2a0187cd60385d SHA512 3472e129e710bf5343b8b27a61581a1480c8096493e466440b62702d8b5353745d561931f72b5405a736ad92525be3843ea1cf4b5ea5839721cc6d6b358f19bc
+DIST ppsspp-1.13-ext_zstd.tar.gz 1868621 BLAKE2B abbd48a18c587fc6c413c3df32aa6b74a1c3d0ed02eacb2e7ad23a4fdab059b092e8df4356cbc799641b42e99587238decc2ae27862142fd8d7be7959ad1fd5e SHA512 659576d0f52d2271b6b53f638b407b873888b1cffe4f014c3149d33a961653c2fcf7ff270bc669a5647205b573ef2809907645a4c89ab6c030ad65bce15547ae
+DIST ppsspp-1.13.tar.gz 31675858 BLAKE2B bfad05d3097481699f555ed16582731a512d14ab36214470d76c5437f7d0d634825546a94eb511568cf291e1a785a3ac392222aa3cc01db6a063816d4e7ee551 SHA512 73233c3da6787808696fa961d9c42127e893be088ecb7eb6d2767392b94eccf35b39c476d17973dd2a34891feb17ca33883b50f90f5e90cf9e758bae1a32452f
diff --git a/games-emulation/ppsspp/files/ppsspp-CMakeLists-flags.patch b/games-emulation/ppsspp/files/ppsspp-CMakeLists-flags.patch
new file mode 100644
index 000000000000..cd07a6b35a63
--- /dev/null
+++ b/games-emulation/ppsspp/files/ppsspp-CMakeLists-flags.patch
@@ -0,0 +1,16 @@
+--- 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)
diff --git a/games-emulation/ppsspp/ppsspp-1.13.ebuild b/games-emulation/ppsspp/ppsspp-1.13.ebuild
new file mode 100644
index 000000000000..30e0b99f6390
--- /dev/null
+++ b/games-emulation/ppsspp/ppsspp-1.13.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop xdg cmake
+
+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
+ https://github.com/KhronosGroup/SPIRV-Cross/archive/9acb9ec31f5a8ef80ea6b994bb77be787b08d3d1.tar.gz -> ${P}-ext_SPIRV-Cross.tar.gz
+ https://github.com/Kingcom/armips/archive/7885552b208493a6a0f21663770c446c3ba65576.tar.gz -> ${P}-ext_armips.tar.gz
+ https://github.com/Tencent/rapidjson/archive/73063f5002612c6bf64fe24f851cd5cc0d83eef9.tar.gz -> ${P}-ext_rapidjson.tar.gz
+ https://github.com/facebook/zstd/archive/a488ba114ec17ea1054b9057c26a046fc122b3b6.tar.gz -> ${P}-ext_zstd.tar.gz
+ https://github.com/hrydgard/glslang/archive/dc11adde23c455a24e13dd54de9b4ede8bdd7db8.tar.gz -> ${P}-ext_glslang.tar.gz
+ https://github.com/hrydgard/miniupnp/archive/3a87be33e797ba947b2b2a5f8d087f6c3ff4d93e.tar.gz -> ${P}-ext_miniupnp.tar.gz
+ https://github.com/hrydgard/ppsspp-freetype/archive/cbea79dc8fef4d9210e2bac7e7b9b5ff3388197a.tar.gz -> ${P}-ext_native_tools_prebuilt.tar.gz
+ https://github.com/hrydgard/ppsspp-lang/archive/3bf6b18eb0ae68861fbfbb7b43cd764771ca42a9.tar.gz -> ${P}-assets_lang.tar.gz
+ discord? ( https://github.com/discordapp/discord-rpc/archive/963aa9f3e5ce81a4682c6ca3d136cddda614db33.tar.gz -> ${P}-ext_discord-rpc.tar.gz )
+"
+
+LICENSE="Apache-2.0 BSD BSD-2 GPL-2 JSON MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="discord qt5"
+RESTRICT="test"
+
+RDEPEND="
+ app-arch/snappy:=
+ dev-libs/libzip:=
+ dev-util/glslang:=
+ media-libs/glew:=
+ media-libs/libpng:=
+ media-libs/libsdl2[joystick]
+ media-video/ffmpeg:0/56.58.58
+ 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] )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-CMakeLists-flags.patch )
+
+src_unpack() {
+ unpack ${P}.tar.gz
+
+ cd "${S}" || die
+ local list=(
+ assets_lang
+ ext_SPIRV-Cross
+ ext_armips
+ ext_glslang
+ ext_miniupnp
+ ext_native_tools_prebuilt
+ ext_rapidjson
+ ext_zstd
+ )
+ use discord && list+=( ext_discord-rpc )
+
+ local i
+ 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_configure() {
+ local mycmakeargs=(
+ -DCMAKE_SKIP_RPATH=ON
+ -DHEADLESS=false
+ -DUSE_DISCORD=$(usex discord)
+ -DUSE_SYSTEM_FFMPEG=ON
+ -DUSE_SYSTEM_LIBZIP=ON
+ -DUSE_SYSTEM_SNAPPY=ON
+ -DUSING_QT_UI=$(usex qt5)
+ )
+ cmake_src_configure
+}
+
+src_install() {
+ insinto /usr/share/${PN}
+ doins -r "${BUILD_DIR}/assets"
+
+ 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
+
+ dobin "${BUILD_DIR}/PPSSPP$(usex qt5 Qt SDL)"
+ make_desktop_entry "PPSSPP$(usex qt5 Qt SDL)" "PPSSPP ($(usex qt5 Qt SDL))"
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/ppsspp/files/, games-emulation/ppsspp/
@ 2024-01-15 21:20 Maciej Barć
0 siblings, 0 replies; 5+ messages in thread
From: Maciej Barć @ 2024-01-15 21:20 UTC (permalink / raw
To: gentoo-commits
commit: faab76a3f3d4c86cd071c1889764c7ab31e9dead
Author: Matoro Mahri <matoro_gentoo <AT> matoro <DOT> tk>
AuthorDate: Mon Jan 15 20:15:44 2024 +0000
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Mon Jan 15 21:20:42 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=faab76a3
games-emulation/ppsspp: wire up tests
The one excluded test is pulled in from a submodule.
Bug: https://bugs.gentoo.org/915888
Signed-off-by: Matoro Mahri <matoro_gentoo <AT> matoro.tk>
Closes: https://github.com/gentoo/gentoo/pull/34824
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>
.../files/ppsspp-1.15.4-backport-ce83fec.patch | 23 ++++++++++++++++++++++
games-emulation/ppsspp/ppsspp-1.15.4.ebuild | 12 ++++++++---
games-emulation/ppsspp/ppsspp-1.16.4.ebuild | 12 ++++++++---
games-emulation/ppsspp/ppsspp-1.16.ebuild | 12 ++++++++---
4 files changed, 50 insertions(+), 9 deletions(-)
diff --git a/games-emulation/ppsspp/files/ppsspp-1.15.4-backport-ce83fec.patch b/games-emulation/ppsspp/files/ppsspp-1.15.4-backport-ce83fec.patch
new file mode 100644
index 000000000000..1eaf179142d3
--- /dev/null
+++ b/games-emulation/ppsspp/files/ppsspp-1.15.4-backport-ce83fec.patch
@@ -0,0 +1,23 @@
+https://bugs.gentoo.org/915888
+https://github.com/hrydgard/ppsspp/commit/ce83fec20651222131ef9b88ba2dfb0554b66608
+
+From ce83fec20651222131ef9b88ba2dfb0554b66608 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
+Date: Sun, 29 Oct 2023 23:39:25 -0600
+Subject: [PATCH] Linux buildfix attempt
+
+---
+ unittest/TestThreadManager.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/unittest/TestThreadManager.cpp b/unittest/TestThreadManager.cpp
+index f6a11f2fa363..10a8b581b768 100644
+--- a/unittest/TestThreadManager.cpp
++++ b/unittest/TestThreadManager.cpp
+@@ -1,5 +1,6 @@
+ #include <thread>
+ #include <vector>
++#include <cstdio>
+
+ #include "Common/Log.h"
+ #include "Common/TimeUtil.h"
diff --git a/games-emulation/ppsspp/ppsspp-1.15.4.ebuild b/games-emulation/ppsspp/ppsspp-1.15.4.ebuild
index 653f672374ea..17b358731669 100644
--- a/games-emulation/ppsspp/ppsspp-1.15.4.ebuild
+++ b/games-emulation/ppsspp/ppsspp-1.15.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -15,8 +15,8 @@ SRC_URI="https://github.com/hrydgard/${PN}/releases/download/v${PV}/${P}.tar.xz"
LICENSE="Apache-2.0 BSD BSD-2 GPL-2 JSON MIT"
SLOT="0"
KEYWORDS="amd64"
-IUSE="discord qt5"
-RESTRICT="test"
+IUSE="discord qt5 test"
+RESTRICT="!test? ( test )"
RDEPEND="
app-arch/snappy:=
@@ -43,6 +43,7 @@ BDEPEND="${PYTHON_DEPS}"
PATCHES=(
"${FILESDIR}"/${PN}-CMakeLists-flags.patch
"${FILESDIR}"/${PN}-disable-ccache-autodetection.patch
+ "${FILESDIR}"/${PN}-1.15.4-backport-ce83fec.patch
)
pkg_setup() {
@@ -60,6 +61,11 @@ src_configure() {
-DUSE_SYSTEM_ZSTD=ON
-DUSE_DISCORD=$(usex discord)
-DUSING_QT_UI=$(usex qt5)
+ -DUNITTEST=$(usex test)
)
cmake_src_configure
}
+
+src_test() {
+ cmake_src_test -E glslang-testsuite
+}
diff --git a/games-emulation/ppsspp/ppsspp-1.16.4.ebuild b/games-emulation/ppsspp/ppsspp-1.16.4.ebuild
index 6093ddbdd308..db6295a82e7b 100644
--- a/games-emulation/ppsspp/ppsspp-1.16.4.ebuild
+++ b/games-emulation/ppsspp/ppsspp-1.16.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -21,8 +21,8 @@ fi
LICENSE="Apache-2.0 BSD BSD-2 GPL-2 JSON MIT"
SLOT="0"
-IUSE="discord qt5"
-RESTRICT="test"
+IUSE="discord qt5 test"
+RESTRICT="!test? ( test )"
RDEPEND="
app-arch/snappy:=
@@ -53,6 +53,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-CMakeLists-flags.patch
"${FILESDIR}"/${PN}-disable-ccache-autodetection.patch
+ "${FILESDIR}"/${PN}-1.15.4-backport-ce83fec.patch
)
pkg_setup() {
@@ -70,6 +71,11 @@ src_configure() {
-DUSE_SYSTEM_ZSTD=ON
-DUSE_DISCORD=$(usex discord)
-DUSING_QT_UI=$(usex qt5)
+ -DUNITTEST=$(usex test)
)
cmake_src_configure
}
+
+src_test() {
+ cmake_src_test -E glslang-testsuite
+}
diff --git a/games-emulation/ppsspp/ppsspp-1.16.ebuild b/games-emulation/ppsspp/ppsspp-1.16.ebuild
index a8cbd4c208f8..9b2426f88e9c 100644
--- a/games-emulation/ppsspp/ppsspp-1.16.ebuild
+++ b/games-emulation/ppsspp/ppsspp-1.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -21,8 +21,8 @@ fi
LICENSE="Apache-2.0 BSD BSD-2 GPL-2 JSON MIT"
SLOT="0"
-IUSE="discord qt5"
-RESTRICT="test"
+IUSE="discord qt5 test"
+RESTRICT="!test? ( test )"
RDEPEND="
app-arch/snappy:=
@@ -54,6 +54,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.16-MIPSTables-fix-includes.patch
"${FILESDIR}"/${PN}-CMakeLists-flags.patch
"${FILESDIR}"/${PN}-disable-ccache-autodetection.patch
+ "${FILESDIR}"/${PN}-1.15.4-backport-ce83fec.patch
)
pkg_setup() {
@@ -71,6 +72,11 @@ src_configure() {
-DUSE_SYSTEM_ZSTD=ON
-DUSE_DISCORD=$(usex discord)
-DUSING_QT_UI=$(usex qt5)
+ -DUNITTEST=$(usex test)
)
cmake_src_configure
}
+
+src_test() {
+ cmake_src_test -E glslang-testsuite
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/ppsspp/files/, games-emulation/ppsspp/
@ 2024-11-14 23:40 Maciej Barć
0 siblings, 0 replies; 5+ messages in thread
From: Maciej Barć @ 2024-11-14 23:40 UTC (permalink / raw
To: gentoo-commits
commit: 0e288ff2fc71f2efb259f22473a78a91044fc472
Author: Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 14 23:26:11 2024 +0000
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Thu Nov 14 23:40:54 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e288ff2
games-emulation/ppsspp: patch SpvBuilder - include cstdint
Closes: https://bugs.gentoo.org/938156
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>
.../files/ppsspp-1.17.1-SpvBuilder-cstdint.patch | 23 ++++++++++++++++++++++
...pp-1.17.1-r1.ebuild => ppsspp-1.17.1-r2.ebuild} | 1 +
2 files changed, 24 insertions(+)
diff --git a/games-emulation/ppsspp/files/ppsspp-1.17.1-SpvBuilder-cstdint.patch b/games-emulation/ppsspp/files/ppsspp-1.17.1-SpvBuilder-cstdint.patch
new file mode 100644
index 000000000000..555a0b76fc2d
--- /dev/null
+++ b/games-emulation/ppsspp/files/ppsspp-1.17.1-SpvBuilder-cstdint.patch
@@ -0,0 +1,23 @@
+From 070c7edad68885ab0d7f636140c8c408b490abc4 Mon Sep 17 00:00:00 2001
+From: Ted Rodgers <ted.d.rodgers@gmail.com>
+Date: Thu, 14 Nov 2024 17:29:33 -0500
+Subject: [PATCH] add <cstdint> include to ext/glslang/SPIRV/SpvBuilder.h
+
+---
+ ext/glslang/SPIRV/SpvBuilder.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/ext/glslang/SPIRV/SpvBuilder.h b/ext/glslang/SPIRV/SpvBuilder.h
+index 02e9cf40..40efd59c 100644
+--- a/ext/glslang/SPIRV/SpvBuilder.h
++++ b/ext/glslang/SPIRV/SpvBuilder.h
+@@ -56,6 +56,7 @@ namespace spv {
+ }
+
+ #include <algorithm>
++#include <cstdint>
+ #include <map>
+ #include <memory>
+ #include <set>
+--
+2.47.0
\ No newline at end of file
diff --git a/games-emulation/ppsspp/ppsspp-1.17.1-r1.ebuild b/games-emulation/ppsspp/ppsspp-1.17.1-r2.ebuild
similarity index 97%
rename from games-emulation/ppsspp/ppsspp-1.17.1-r1.ebuild
rename to games-emulation/ppsspp/ppsspp-1.17.1-r2.ebuild
index 9424f517b5a0..db0899e1c0ed 100644
--- a/games-emulation/ppsspp/ppsspp-1.17.1-r1.ebuild
+++ b/games-emulation/ppsspp/ppsspp-1.17.1-r2.ebuild
@@ -55,6 +55,7 @@ BDEPEND="
"
PATCHES=(
+ "${FILESDIR}/${PN}-1.17.1-SpvBuilder-cstdint.patch"
"${FILESDIR}/${PN}-1.17.1-avcodec-18825.patch"
"${FILESDIR}/${PN}-1.17.1-ccache-18826.patch"
"${FILESDIR}/${PN}-1.17.1-cmake-cxx.patch"
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-11-14 23:41 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-09-16 11:23 [gentoo-commits] repo/gentoo:master commit in: games-emulation/ppsspp/files/, games-emulation/ppsspp/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2020-11-28 8:45 Joonas Niilola
2022-07-26 21:10 Maciej Barć
2024-01-15 21:20 Maciej Barć
2024-11-14 23:40 Maciej Barć
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox