[gentoo-commits] repo/gentoo:master commit in: games-emulation/ppsspp/, games-emulation/ppsspp/files/
commit: 5c1e0c4e25bdc6f7640850d33c3c43d4ea3c0156
Author: Maciej Barć gentoo org>
AuthorDate: Mon Feb 5 11:19:02 2024 +
Commit: Maciej Barć gentoo org>
CommitDate: Mon Feb 5 11:28:32 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c1e0c4e
games-emulation/ppsspp: bump to 1.17.1
Signed-off-by: Maciej Barć gentoo.org>
games-emulation/ppsspp/Manifest| 1 +
.../ppsspp/files/ppsspp-1.17.1-avcodec-18825.patch | 176 +
.../ppsspp/files/ppsspp-1.17.1-ccache-18826.patch | 33
.../ppsspp/files/ppsspp-1.17.1-cmake-cxx.patch | 11 ++
games-emulation/ppsspp/ppsspp-1.17.1.ebuild| 84 ++
5 files changed, 305 insertions(+)
diff --git a/games-emulation/ppsspp/Manifest b/games-emulation/ppsspp/Manifest
index ed30d9e1197e..58cc3e9dbdae 100644
--- a/games-emulation/ppsspp/Manifest
+++ b/games-emulation/ppsspp/Manifest
@@ -1,3 +1,4 @@
DIST ppsspp-1.15.4.tar.xz 51947468 BLAKE2B
c6a5e621b02556b791ec41389f17dede63811c87ff628b8f1304ac950071b365ecc9be05f4042e4e3b81e77f5a14b6931577f08b0174fec821350a1d7eca4d6a
SHA512
9d2c140b0d633e5ca6191aaf276b7e4f6d029f29d1313a45fb78ee3879fec09f57d816604c51474ab6fe9cde713787d5769e87466d3c3015fe6a9b195ff198d2
DIST ppsspp-1.16.4.tar.xz 51110488 BLAKE2B
061090bfd646b0839de7aed8e4b249ac86353c8742cd293c8df5ffc0d93a67f960ff4836bc13b534ba34871719cea2dc485b7d14deaa17aa5ff3dd6f8663687e
SHA512
6364bb821a456409c9ee20eb589d761aef02d7756063bd5faa035b856ca551db0675a65767a9ad09dc8eba5fda6ede8ea3eb384b6770570bd4925e11b8c05ac5
DIST ppsspp-1.16.tar.xz 50656132 BLAKE2B
5149bd859134a76a191e0f144bdcefc4c521276ebb1390fe5e24eeeb1227b77bab0458a760f29aed5ba169d566f12d5226f2b50a19e44172f1ad98c4eb8f400f
SHA512
d65a8c9fb5d7ff45a99f5852d1071029bc51c1e8bdb45b3e78d961a46587553db4465bbd97b301db54a94b60772359929524047f08de3067cd3336f5f7717826
+DIST ppsspp-1.17.1.tar.xz 54663108 BLAKE2B
91c4964c9f334d42e090f59485e2f02ba8edb780903d2fa46e1a9cea77f6cc9e1a0605310d76445738259c0e99d5d1ca0764ef5f5565e781b482d5d5274620e5
SHA512
eaa0046f5d8e529efd8238690fa242638aa88630172abe59c4b7ffb16b1e18eeb38fcaf8e70ef76dbd2304b226d1f33e10cde709abe00fa2a5baff16c1883c31
diff --git a/games-emulation/ppsspp/files/ppsspp-1.17.1-avcodec-18825.patch
b/games-emulation/ppsspp/files/ppsspp-1.17.1-avcodec-18825.patch
new file mode 100644
index ..a3003660dd74
--- /dev/null
+++ b/games-emulation/ppsspp/files/ppsspp-1.17.1-avcodec-18825.patch
@@ -0,0 +1,176 @@
+From a8ae43dfd4f06a48a275a684aafee021e591d75e Mon Sep 17 00:00:00 2001
+From: Andrew Udvare
+Date: Sun, 4 Feb 2024 18:26:06 -0500
+Subject: [PATCH] ffmpeg: Improved fix for checking if const AVCodec* is
+ necessary
+
+---
+ CMakeLists.txt | 21 +
+ Core/AVIDump.cpp | 4 +---
+ Core/FFMPEGCompat.h| 8
+ Core/HLE/sceAtrac.cpp | 5 +
+ Core/HLE/sceMpeg.cpp | 4 +---
+ Core/HW/MediaEngine.cpp| 4 +---
+ Core/HW/SimpleAudioDec.cpp | 1 +
+ Core/HW/SimpleAudioDec.h | 7 +++
+ 8 files changed, 37 insertions(+), 17 deletions(-)
+ create mode 100644 Core/FFMPEGCompat.h
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 33570d09c024..f7e5ce1d337c 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -953,6 +953,23 @@ if(USE_FFMPEG)
+ endif()
+
+ find_package(FFmpeg REQUIRED avcodec avformat avutil swresample swscale)
++ # Check if we need to use avcodec_(alloc|free)_frame instead of
av_frame_(alloc|free)
++ # Check if we need to use const AVCodec
++ set(CMAKE_REQUIRED_LIBRARIES avcodec;avformat)
++ set(CMAKE_REQUIRED_FLAGS "-pedantic -Wall -Werror -Wno-unused-variable")
++ check_cxx_source_compiles("extern \"C\" {
++ #include
++ #include
++ }
++ static AVCodecContext *s_codec_context = NULL;
++ int main() {
++ const AVCodec *codec =
avcodec_find_encoder(s_codec_context->codec_id);
++ return 0;
++ }
++ " HAVE_LIBAVCODEC_CONST_AVCODEC FAIL_REGEX "invalid conversion")
++
++ # Check if we need to use avcodec_alloc_context3 instead of
stream->codec
++ # Check if we need to use av_frame_get_buffer instead of
avcodec_default_get_buffer
+ endif(USE_FFMPEG)
+
+ find_package(ZLIB)
+@@ -2024,6 +2041,7 @@ add_library(${CoreLibName} ${CoreLinkType}
+ Core/ELF/PrxDecrypter.h
+ Core/ELF/ParamSFO.cpp
+ Core/ELF/ParamSFO.h
++ Core/FFMPEGCompat.h
+ Core/FileSystems/tlzrc.cpp
+ Core/FileSystems/BlobFileSystem.cpp
+ Core/FileSystems/BlobFileSystem.h
+@@ -2358,6 +2376,9 @@ target_compile_features(${CoreLibName} PUBLIC cxx_std_17)
+
+ if(FFmpeg_FOUND)
+ target_compile_definitions(${CoreLibName} PRIVATE USE_FFMPEG=1)
++ if (HAVE_LIBAVCODEC_CONST_AVCODEC)
++ target_compile_definitions(${CoreLibName} PRIVATE
HAVE_LIBAVCODEC_CONST_AVCODEC=1)
++
[gentoo-commits] repo/gentoo:master commit in: games-emulation/ppsspp/, games-emulation/ppsspp/files/
commit: 0dec1bfaf26acac6c5ddce2dc685f0bd32d669f5
Author: Maciej Barć gentoo org>
AuthorDate: Sat Sep 9 14:27:41 2023 +
Commit: Maciej Barć gentoo org>
CommitDate: Sat Sep 9 18:13:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dec1bfa
games-emulation/ppsspp: bump to 1.16
Signed-off-by: Maciej Barć gentoo.org>
games-emulation/ppsspp/Manifest| 1 +
.../ppsspp-1.16-MIPSTables-fix-includes.patch | 10 +++
games-emulation/ppsspp/ppsspp-1.16.ebuild | 76 ++
3 files changed, 87 insertions(+)
diff --git a/games-emulation/ppsspp/Manifest b/games-emulation/ppsspp/Manifest
index 258d22f1a536..0f39c295f736 100644
--- a/games-emulation/ppsspp/Manifest
+++ b/games-emulation/ppsspp/Manifest
@@ -1,2 +1,3 @@
DIST ppsspp-1.15.4.tar.xz 51947468 BLAKE2B
c6a5e621b02556b791ec41389f17dede63811c87ff628b8f1304ac950071b365ecc9be05f4042e4e3b81e77f5a14b6931577f08b0174fec821350a1d7eca4d6a
SHA512
9d2c140b0d633e5ca6191aaf276b7e4f6d029f29d1313a45fb78ee3879fec09f57d816604c51474ab6fe9cde713787d5769e87466d3c3015fe6a9b195ff198d2
DIST ppsspp-1.15.tar.xz 52176784 BLAKE2B
f0733edd114e09c3dfc4910fb48b7c5687af06faf39ed9184429d5f9ad0af3149a9270426b92eccbe97f61e436e7399c49e4feb0db05ce9df4d4177d091d7a08
SHA512
88e97f964e826cf791725ed62178dbfa456094af06a1c896df640b24a4e2ae8ed79e0ae63cb29cc6a92e83ecd63ab60013ddf32333fb1e8b5024a6e3fce6b71f
+DIST ppsspp-1.16.tar.xz 50656132 BLAKE2B
5149bd859134a76a191e0f144bdcefc4c521276ebb1390fe5e24eeeb1227b77bab0458a760f29aed5ba169d566f12d5226f2b50a19e44172f1ad98c4eb8f400f
SHA512
d65a8c9fb5d7ff45a99f5852d1071029bc51c1e8bdb45b3e78d961a46587553db4465bbd97b301db54a94b60772359929524047f08de3067cd3336f5f7717826
diff --git
a/games-emulation/ppsspp/files/ppsspp-1.16-MIPSTables-fix-includes.patch
b/games-emulation/ppsspp/files/ppsspp-1.16-MIPSTables-fix-includes.patch
new file mode 100644
index ..87e85f5bc878
--- /dev/null
+++ b/games-emulation/ppsspp/files/ppsspp-1.16-MIPSTables-fix-includes.patch
@@ -0,0 +1,10 @@
+--- a/Core/MIPS/MIPSTables.h
b/Core/MIPS/MIPSTables.h
+@@ -18,6 +18,7 @@
+ #pragma once
+
+ #include
++#include
+ #include "Common/CommonTypes.h"
+ #include "Core/MIPS/MIPS.h"
+
diff --git a/games-emulation/ppsspp/ppsspp-1.16.ebuild
b/games-emulation/ppsspp/ppsspp-1.16.ebuild
new file mode 100644
index ..a8cbd4c208f8
--- /dev/null
+++ b/games-emulation/ppsspp/ppsspp-1.16.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit python-any-r1 xdg cmake
+
+DESCRIPTION="A PSP emulator written in C++"
+HOMEPAGE="https://www.ppsspp.org/
+ https://github.com/hrydgard/ppsspp/;
+
+if [[ ${PV} == ** ]] ; 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"
+RESTRICT="test"
+
+RDEPEND="
+ app-arch/snappy:=
+ app-arch/zstd:=
+ dev-libs/libzip:=
+ 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}
+"
+BDEPEND="
+ ${PYTHON_DEPS}
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.16-MIPSTables-fix-includes.patch
+ "${FILESDIR}"/${PN}-CMakeLists-flags.patch
+ "${FILESDIR}"/${PN}-disable-ccache-autodetection.patch
+)
+
+pkg_setup() {
+ python-any-r1_pkg_setup
+}
+
+src_configure() {
+ local -a mycmakeargs=(
+ -DBUILD_SHARED_LIBS=OFF
+ -DCMAKE_SKIP_RPATH=ON
+ -DHEADLESS=false
+ -DUSE_SYSTEM_FFMPEG=ON
+ -DUSE_SYSTEM_LIBZIP=ON
+ -DUSE_SYSTEM_SNAPPY=ON
+ -DUSE_SYSTEM_ZSTD=ON
+ -DUSE_DISCORD=$(usex discord)
+ -DUSING_QT_UI=$(usex qt5)
+ )
+ cmake_src_configure
+}
[gentoo-commits] repo/gentoo:master commit in: games-emulation/ppsspp/, games-emulation/ppsspp/files/
commit: b17bb391e163ea65d1ba219c6981b46518ec77b7
Author: Sam James gentoo org>
AuthorDate: Wed Apr 19 03:20:02 2023 +
Commit: Sam James gentoo org>
CommitDate: Wed Apr 19 03:20:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b17bb391
games-emulation/ppsspp: fix build w/ gcc 13
Closes: https://bugs.gentoo.org/898910
Signed-off-by: Sam James gentoo.org>
.../ppsspp/files/ppsspp-1.14.4-gcc13.patch | 58 ++
games-emulation/ppsspp/ppsspp-1.14.4-r2.ebuild | 1 +
2 files changed, 59 insertions(+)
diff --git a/games-emulation/ppsspp/files/ppsspp-1.14.4-gcc13.patch
b/games-emulation/ppsspp/files/ppsspp-1.14.4-gcc13.patch
new file mode 100644
index ..c4888f0efb6f
--- /dev/null
+++ b/games-emulation/ppsspp/files/ppsspp-1.14.4-gcc13.patch
@@ -0,0 +1,58 @@
+https://bugs.gentoo.org/898910
+https://github.com/hrydgard/ppsspp/commit/9874737087e8d24ea72b3f08b4975031b54a80a5
+
+From 822592c6b1441f7110e1cb15dcc5cd2ea1de8099 Mon Sep 17 00:00:00 2001
+From: Andreas Stieger
+Date: Wed, 5 Apr 2023 00:20:14 +0200
+Subject: [PATCH] Fix build with GCC13: various standard includes
+
+--- a/Common/Data/Format/IniFile.h
b/Common/Data/Format/IniFile.h
+@@ -8,6 +8,7 @@
+ #include
+ #include
+ #include
++#include
+
+ #include "Common/File/Path.h"
+
+--- a/Common/GPU/OpenGL/GLFeatures.h
b/Common/GPU/OpenGL/GLFeatures.h
+@@ -5,6 +5,7 @@
+ #pragma once
+
+ #include
++#include
+
+ // TODO: Replace with thin3d's vendor enum.
+ enum {
+--- a/Common/Net/NetBuffer.h
b/Common/Net/NetBuffer.h
+@@ -1,5 +1,7 @@
+ #pragma once
+
++#include
++
+ #include "Common/Buffer.h"
+
+ namespace net {
+--- a/Core/Reporting.h
b/Core/Reporting.h
+@@ -19,6 +19,7 @@
+
+ #include
+ #include
++#include
+
+ #include "Common/CommonTypes.h"
+ #include "Common/File/Path.h"
+--- a/ext/vma/vk_mem_alloc.h
b/ext/vma/vk_mem_alloc.h
+@@ -2624,6 +2624,7 @@ VMA_CALL_PRE void VMA_CALL_POST vmaFreeStatsString(
+ #include
+ #include
+ #include
++#include
+
+ #ifdef _MSC_VER
+ #include // For functions like __popcnt, _BitScanForward etc.
diff --git a/games-emulation/ppsspp/ppsspp-1.14.4-r2.ebuild
b/games-emulation/ppsspp/ppsspp-1.14.4-r2.ebuild
index 653f672374ea..c908641d14a1 100644
--- a/games-emulation/ppsspp/ppsspp-1.14.4-r2.ebuild
+++ b/games-emulation/ppsspp/ppsspp-1.14.4-r2.ebuild
@@ -43,6 +43,7 @@ BDEPEND="${PYTHON_DEPS}"
PATCHES=(
"${FILESDIR}"/${PN}-CMakeLists-flags.patch
"${FILESDIR}"/${PN}-disable-ccache-autodetection.patch
+ "${FILESDIR}"/${P}-gcc13.patch
)
pkg_setup() {
[gentoo-commits] repo/gentoo:master commit in: games-emulation/ppsspp/, games-emulation/ppsspp/files/
commit: 403b41336f08a7c0bb4217fc41ea9095594ca3bb
Author: Azamat H. Hackimov gmail com>
AuthorDate: Sun Aug 28 18:26:18 2022 +
Commit: Maciej Barć gentoo org>
CommitDate: Sun Aug 28 20:56:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=403b4133
games-emulation/ppsspp: update build-system
Added support for system zstd library.
Remove ccache autodetection, build system automagically detects ccache and use
it in situations where it shouldn't do that.
Signed-off-by: Azamat H. Hackimov gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/27047
Signed-off-by: Maciej Barć gentoo.org>
.../ppsspp-disable-ccache-autodetection.patch | 26 ++
games-emulation/ppsspp/ppsspp-1.13-r1.ebuild | 102 +
2 files changed, 128 insertions(+)
diff --git
a/games-emulation/ppsspp/files/ppsspp-disable-ccache-autodetection.patch
b/games-emulation/ppsspp/files/ppsspp-disable-ccache-autodetection.patch
new file mode 100644
index ..007e64774c20
--- /dev/null
+++ b/games-emulation/ppsspp/files/ppsspp-disable-ccache-autodetection.patch
@@ -0,0 +1,26 @@
+From ca18b1b578ec7215277a73b6658753ff35e677ea Mon Sep 17 00:00:00 2001
+From: "Azamat H. Hackimov"
+Date: Sun, 28 Aug 2022 17:53:05 +0300
+Subject: [PATCH] Disable ccache autodetection
+
+Build system automagically detects ccache and use it in situations where
+it should'nt do that.
+---
+ CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 376e2c5ad..8c382ce5c 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -111,7 +111,6 @@ if(MACOSX AND NOT USE_SYSTEM_LIBSDL2)
+ set(SDL2_LIBRARY ${CMAKE_SOURCE_DIR}/SDL/macOS/SDL2.framework)
+ endif()
+
+-include(ccache)
+ include(GNUInstallDirs)
+
+ add_definitions(-DASSETS_DIR="${CMAKE_INSTALL_FULL_DATADIR}/ppsspp/assets/")
+--
+2.35.1
+
diff --git a/games-emulation/ppsspp/ppsspp-1.13-r1.ebuild
b/games-emulation/ppsspp/ppsspp-1.13-r1.ebuild
new file mode 100644
index ..3b1688d5a6d4
--- /dev/null
+++ b/games-emulation/ppsspp/ppsspp-1.13-r1.ebuild
@@ -0,0 +1,102 @@
+# 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/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:=
+ app-arch/zstd:=
+ 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"
+ "${FILESDIR}/${PN}-disable-ccache-autodetection.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
+ )
+ 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
[gentoo-commits] repo/gentoo:master commit in: games-emulation/ppsspp/, games-emulation/ppsspp/files/
commit: 32373aba633556a1bec4314e2309089a587ded43
Author: Sergei Trofimovich gentoo org>
AuthorDate: Sat Jan 25 13:40:16 2020 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sat Jan 25 13:40:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32373aba
games-emulation/ppsspp: tweak for gcc-10
Package-Manager: Portage-2.3.85, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich gentoo.org>
games-emulation/ppsspp/files/ppsspp-1.5.4-stdint-gcc-10.patch | 10 ++
games-emulation/ppsspp/ppsspp-1.5.4-r2.ebuild | 3 ++-
2 files changed, 12 insertions(+), 1 deletion(-)
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
new file mode 100644
index 000..0a7c45a810b
--- /dev/null
+++ b/games-emulation/ppsspp/files/ppsspp-1.5.4-stdint-gcc-10.patch
@@ -0,0 +1,10 @@
+--- a/Common/Hashmaps.h
b/Common/Hashmaps.h
+@@ -2,6 +2,7 @@
+
+ #include
+ #include
++#include /* 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
index 4e7f8f7f027..8de0ecaf747 100644
--- a/games-emulation/ppsspp/ppsspp-1.5.4-r2.ebuild
+++ b/games-emulation/ppsspp/ppsspp-1.5.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -50,6 +50,7 @@ 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() {
[gentoo-commits] repo/gentoo:master commit in: games-emulation/ppsspp/, games-emulation/ppsspp/files/
commit: 31db0c7ea6a88d1bde34a0ab231132c7a0a6b5f5 Author: soredake krutt org> AuthorDate: Sat Nov 4 16:47:48 2017 + Commit: Patrice Clement gentoo org> CommitDate: Wed Nov 8 22:48:50 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31db0c7e games-emulation/ppsspp: version bump to 1.4.2. Closes: https://github.com/gentoo/gentoo/pull/6120 games-emulation/ppsspp/Manifest| 9 ++ .../ppsspp/files/ppsspp-1.4.2-assets-lookup.patch | 13 +++ games-emulation/ppsspp/ppsspp-1.4.2.ebuild | 107 + 3 files changed, 129 insertions(+) diff --git a/games-emulation/ppsspp/Manifest b/games-emulation/ppsspp/Manifest index 50368322c2c..e9f7a228fc3 100644 --- a/games-emulation/ppsspp/Manifest +++ b/games-emulation/ppsspp/Manifest @@ -6,4 +6,13 @@ DIST ppsspp-1.4-ext_armips_ext_tinyformat.tar.gz 22284 SHA256 9db9bc16e9fafede49 DIST ppsspp-1.4-ext_glslang.tar.gz 1685246 SHA256 c7e41726e2d9d6c47e7e2654d4354b1a61527e86158c9ad5e8a9e8f9d7f6a788 SHA512 3605fb8a3c5dafcab97578030be4af3703f1475c8e9fd58412a514dcaa0ea6c7bf3a279510759496ab34b979a3d260d3da3d6f00d504c9c5e0f9a7b5a61399bc WHIRLPOOL e78e25b94cb3724e0e013203b27c757896b858779a8f85900dcaa2919482d146f64465166deb25749865d67b66fe2c37876061fd3cc6fcc796d9767ebbb51da3 DIST ppsspp-1.4-ffmpeg.tar.gz 311610961 SHA256 b75ccf7f740577c1eb6c66c0551919cea5cd71c56cd100a31ae1524803b40236 SHA512 d4bdb3c5a13bc64d7b22e38b416355d302a4401a1d8f6bd57a4d8502823dc9a2987df92b8e781ddab6de8ded9b59b268ef1b33f8f43a0be7b1c57d4ffbee6871 WHIRLPOOL 656d08ad6c2654498cd662ec6a73fb5e2b559a0c69158d8a42d8cc8ba7b7387d8dd210bf31821870b9fd5171830dd6bbf244e7d3139d6a9c5f8a7083350a2430 DIST ppsspp-1.4-pspautotests.tar.gz 34389722 SHA256 e25ec80dcb50c7a7816afecda5cbe9c15c5fc23dbbc063d697378dcb4134c845 SHA512 70b0c4ee9775ee8179d7993b0162a8fb95aa6b0bf1c2cc49e6e6ec03be6d72c615a8a233235028ce29e715e0ba64f9d60efcb2fadd1b9e6d92a9f435e0c86bbf WHIRLPOOL b108707bf73b4e82808b10cad98992a5026c1c5013908c71bb19c58883cec131f643c333f0b93d29d97157921f842f3be863100032748e021024c0e50791df41 +DIST ppsspp-1.4.2-assets_lang.tar.gz 273563 SHA256 9903d6473c77c115ca24efcf698d88d80bec0822541c85cf329e1651cd4af3bc SHA512 b252e3335c84bedd24764caab15909f31dd8de60578b2c32ceab200a53de5689d8e82e1853c921d8835b780cefda10ea2ebe5e98e2afb4ba44204cc2b5209a5a WHIRLPOOL a2930ea6b3409fa338a90ff30eda44ad3c04e897b76d0217c77cfd4617033f54f44caad8e7684d3f50575b5debbd753dc59114e2646eae98313938330bc17daf +DIST ppsspp-1.4.2-dx9sdk.tar.gz 14582591 SHA256 122340e099fb90d16414a741cc9d569f1a1110ff5d243748eea06e6d58140f17 SHA512 2c54b441b0a31f63ecab1bd2ab14254fb2047d35d2765262d43277330a8428fbf4c8848d5f730456a033cf84258f6b60a467213f8339289b3ab83ed7e94c65b7 WHIRLPOOL 09890402cb3f7c3483b08fbecb2abac82fa413443b5435d43f9438df0fe1c021c5d40cad2d69319ac19b85fd804cb85b32b4a1f7d9d4b379f86b8570959e87bf +DIST ppsspp-1.4.2-ext_SPIRV-Cross.tar.gz 193267 SHA256 00737747996ebfa09d9d5d66e292ee8e8be512bda9f0d09f9209500d28141f81 SHA512 0b24d28c9e98b170dc4ae51269dce04c100f9116e5fb66268b23878eab4ee7bfc28d257208e094fedf23be89a488e9497bb246d369711b72bf5e39332225d7bf WHIRLPOOL a811a5d19a839bdd57ad6fa55f6363b4d917db3bfd64e501821c814f4d73c9a3f429aa2ab9683a43cbff85b357638e8f50d7af900775c9cdff7b92f3bba07d54 +DIST ppsspp-1.4.2-ext_armips.tar.gz 163666 SHA256 a5cc0e9aa3bdf4bb4334def685751f03aaed0aa0d23f317dc2a242bd60be1c64 SHA512 9423bdbc1428700979c13276a427975733a07908fdf021dc6ab88cec0d37e9523aacd4a2a03eef23638070293dde3f1641647c47095ef2751982b9f9893c1baa WHIRLPOOL b5f2201e8e3b604282818a946a729f73ed538cd8f98e57c1fffad8ba219569bf47b1f6714c9af9dfd483b1b71eb045533e0be58a664a8a934ab0b4651fbbcbf6 +DIST ppsspp-1.4.2-ext_armips_ext_tinyformat.tar.gz 22284 SHA256 9db9bc16e9fafede493b5890b935a57ee6e5e284a9d6e8fa6d9329790a96b8c6 SHA512 fb063ea9b632c8a9a0203c181830cb2feed9142fcf4d69c11cc0a3e8dcbb3cea51dde6bb351df567b3f105a4da99fd2e72ba3572d3fc0e9a45364f4115d6c3d1 WHIRLPOOL 18135420bab7b06a10941ca5039b67899f90e7d2a175eae9ebadf579c1838cb60744d08fd40bb3fe859d108b7af8a17335ce77979ff9e083cc341dd629d7682e +DIST ppsspp-1.4.2-ext_glslang.tar.gz 1685246 SHA256 c7e41726e2d9d6c47e7e2654d4354b1a61527e86158c9ad5e8a9e8f9d7f6a788 SHA512 3605fb8a3c5dafcab97578030be4af3703f1475c8e9fd58412a514dcaa0ea6c7bf3a279510759496ab34b979a3d260d3da3d6f00d504c9c5e0f9a7b5a61399bc WHIRLPOOL e78e25b94cb3724e0e013203b27c757896b858779a8f85900dcaa2919482d146f64465166deb25749865d67b66fe2c37876061fd3cc6fcc796d9767ebbb51da3 +DIST ppsspp-1.4.2-ffmpeg.tar.gz 311610961 SHA256 b75ccf7f740577c1eb6c66c0551919cea5cd71c56cd100a31ae1524803b40236 SHA512 d4bdb3c5a13bc64d7b22e38b416355d302a4401a1d8f6bd57a4d8502823dc9a2987df92b8e781ddab6de8ded9b59b268ef1b33f8f43a0be7b1c57d4ffbee6871 WHIRLPOOL 656d08ad6c2654498cd662ec6a73fb5e2b559a0c69158d8a42d8cc8ba7b7387d8dd210bf31821870b9fd5171830dd6bbf244e7d3139d6a9c5f8a7083350a2430 +DIST ppsspp-1.4.2-pspautotests.tar.gz 35084214 SHA256
[gentoo-commits] repo/gentoo:master commit in: games-emulation/ppsspp/, games-emulation/ppsspp/files/
commit: e225e256cbf0d118303693015c91e68b361066d3
Author: soredake krutt org>
AuthorDate: Sat Apr 1 20:11:58 2017 +
Commit: Patrice Clement gentoo org>
CommitDate: Tue Apr 4 21:14:00 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e225e256
games-emulation/ppsspp: clean up old.
Closes: https://github.com/gentoo/gentoo/pull/4342
games-emulation/ppsspp/files/ppsspp | 3 -
games-emulation/ppsspp/files/ppsspp.desktop | 7 --
games-emulation/ppsspp/ppsspp-1.2.2.ebuild | 128
3 files changed, 138 deletions(-)
diff --git a/games-emulation/ppsspp/files/ppsspp
b/games-emulation/ppsspp/files/ppsspp
deleted file mode 100644
index 7e3da1317ab..000
--- a/games-emulation/ppsspp/files/ppsspp
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-cd /usr/share/games/ppsspp
-./PPSSPPSDL
diff --git a/games-emulation/ppsspp/files/ppsspp.desktop
b/games-emulation/ppsspp/files/ppsspp.desktop
deleted file mode 100644
index a50ed06e145..000
--- a/games-emulation/ppsspp/files/ppsspp.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=PPSSPP
-Comment=A PSP emulator
-Exec=/usr/games/bin/ppsspp
-Icon=ppsspp-icon
-Categories=Game;
diff --git a/games-emulation/ppsspp/ppsspp-1.2.2.ebuild
b/games-emulation/ppsspp/ppsspp-1.2.2.ebuild
deleted file mode 100644
index d0209042c6b..000
--- a/games-emulation/ppsspp/ppsspp-1.2.2.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils cmake-utils qt4-r2 git-r3
-
-DESCRIPTION="A PSP emulator written in C++."
-HOMEPAGE="http://www.ppsspp.org/;
-EGIT_REPO_URI="git://github.com/hrydgard/${PN}.git"
-EGIT_COMMIT="v${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="qt4 qt5 +sdl"
-REQUIRED_USE="
- ?? ( qt4 qt5 sdl )
-"
-
-RDEPEND=""
-
-DEPEND="
- sys-libs/zlib
- sdl? (
- dev-util/cmake
- media-libs/libsdl
- media-libs/libsdl2
- )
- qt4? (
- dev-qt/qtsvg:4
- dev-qt/qtgui:4
- dev-qt/qtcore:4
- dev-qt/qtopengl:4
- dev-qt/qtmultimedia:4
- dev-qt/qt-mobility[multimedia]
- )
- qt5? (
- dev-qt/qtsvg:5
- dev-qt/qtgui:5
- dev-qt/qtcore:5
- dev-qt/qtopengl:5
- dev-qt/qtmultimedia:5
- dev-qt/qtwidgets:5
- dev-qt/qt-mobility[multimedia]
- )
-"
-
-src_unpack() {
- git-r3_fetch
- git-r3_checkout
- if use qt4 ; then
- cd "${WORKDIR}"/"${P}"/Qt || die
- qt4-r2_src_unpack
- elif use qt5 ; then
- cd "${WORKDIR}"/"${P}"/Qt || die
- qt4-r2_src_unpack
- fi
-}
-
-src_prepare() {
- sed -i -e "s#-O3#-O2#g;" "${S}"/CMakeLists.txt || die
- sed -i -e "s#-O3#-O2#g;" "${S}"/Qt/Settings.pri || die
- sed -i -e "s#-O3#-O2#g;" "${S}"/ffmpeg/linux_*.sh || die
-
- if use qt4 ; then
- cd "${WORKDIR}"/"${P}"/Qt || die
- qt4-r2_src_prepare
- elif use qt5 ; then
- cd "${WORKDIR}"/"${P}"/Qt || die
- qt4-r2_src_prepare
- else
- cmake-utils_src_prepare
- fi
-}
-
-src_configure() {
- if use qt4 ; then
- cd "${WORKDIR}"/"${P}"/Qt || die
- qt4-r2_src_configure
- eqmake4 "${WORKDIR}"/"${P}"/Qt/PPSSPPQt.pro
- elif use qt5 ; then
- cd "${WORKDIR}"/"${P}"/Qt || die
- qt4-r2_src_configure
- eqmake5 "${WORKDIR}"/"${P}"/Qt/PPSSPPQt.pro
- else
- cmake-utils_src_configure
- fi
-}
-
-src_compile() {
- if use qt4 ; then
- cd "${WORKDIR}"/"${P}"/Qt || die
- qt4-r2_src_compile
- elif use qt5 ; then
- cd "${WORKDIR}"/"${P}"/Qt || die
- qt4-r2_src_compile
- else
- cmake-utils_src_compile
- fi
-}
-
-src_install() {
- if use qt4 ; then
- exeinto /usr/games/bin
- newexe "${WORKDIR}"/"${P}"/Qt/ppsspp ppsspp
- elif use qt5 ; then
- exeinto /usr/games/bin
- newexe "${WORKDIR}"/"${P}"/Qt/ppsspp ppsspp
- else
- exeinto /usr/games
- dobin "${FILESDIR}"/ppsspp
- exeinto /usr/share/games/"${PN}"
- doexe "${WORKDIR}"/"${P}"_build/PPSSPPSDL
- insinto /usr/share/games/"${PN}"
- doins -r "${WORKDIR}"/"${P}"_build/assets
- doins -r "${WORKDIR}"/"${P}"/lang
- fi
- insinto /usr/share/icons/
- newins "${WORKDIR}"/"${P}"/source_assets/image/icon_regular_72.png
ppsspp-icon.png
- domenu "${FILESDIR}"/ppsspp.desktop
-}
-
-pkg_postinst() {
-
[gentoo-commits] repo/gentoo:master commit in: games-emulation/ppsspp/, games-emulation/ppsspp/files/
commit: 07dcd0e1a674de8b3c71b2e5b34335b3f555eb9f
Author: soredake krutt org>
AuthorDate: Tue Apr 4 13:17:54 2017 +
Commit: Patrice Clement gentoo org>
CommitDate: Tue Apr 4 21:13:58 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07dcd0e1
games-emulation/ppsspp: version bump to 1.4.
Gentoo-Bug: https://bugs.gentoo.org/583818
Gentoo-Bug: https://bugs.gentoo.org/612826
Gentoo-Bug: https://bugs.gentoo.org/587342
Gentoo-Bug: https://bugs.gentoo.org/574118
Gentoo-Bug: https://bugs.gentoo.org/585722
Closes: https://github.com/gentoo/gentoo/pull/4342
games-emulation/ppsspp/Manifest| 8 ++
games-emulation/ppsspp/files/ppsspp-1.4-O2.patch | 32
.../ppsspp/files/ppsspp-1.4-assets-lookup.patch| 13
games-emulation/ppsspp/metadata.xml| 8 +-
games-emulation/ppsspp/ppsspp-1.4.ebuild | 87 ++
5 files changed, 145 insertions(+), 3 deletions(-)
diff --git a/games-emulation/ppsspp/Manifest b/games-emulation/ppsspp/Manifest
new file mode 100644
index 000..7e6ecd2e242
--- /dev/null
+++ b/games-emulation/ppsspp/Manifest
@@ -0,0 +1,8 @@
+DIST ppsspp-1.4-assets_lang.tar.gz 268473 SHA256
5fe868340c0730d6f73395176ea61c41676052ea04a94f37608eadc6591257ff SHA512
7af7eb05c81fcb7a22b4acac55507958a6fb5f508d67d4de65104eae1bfacd3bfcad087f00a47b3fc3bcf644983d84b5b877750bda9350ab70cb83e326371931
WHIRLPOOL
b00e1b3b43678bcbc4d39c48c65806680998dac30743498c42cbf4c91b84a27af77ac4615b36b47e4ac2796a92de4a658df2166eeb255b86e71d85b0c926edba
+DIST ppsspp-1.4-dx9sdk.tar.gz 14582591 SHA256
122340e099fb90d16414a741cc9d569f1a1110ff5d243748eea06e6d58140f17 SHA512
2c54b441b0a31f63ecab1bd2ab14254fb2047d35d2765262d43277330a8428fbf4c8848d5f730456a033cf84258f6b60a467213f8339289b3ab83ed7e94c65b7
WHIRLPOOL
09890402cb3f7c3483b08fbecb2abac82fa413443b5435d43f9438df0fe1c021c5d40cad2d69319ac19b85fd804cb85b32b4a1f7d9d4b379f86b8570959e87bf
+DIST ppsspp-1.4-ext_SPIRV-Cross.tar.gz 193267 SHA256
00737747996ebfa09d9d5d66e292ee8e8be512bda9f0d09f9209500d28141f81 SHA512
0b24d28c9e98b170dc4ae51269dce04c100f9116e5fb66268b23878eab4ee7bfc28d257208e094fedf23be89a488e9497bb246d369711b72bf5e39332225d7bf
WHIRLPOOL
a811a5d19a839bdd57ad6fa55f6363b4d917db3bfd64e501821c814f4d73c9a3f429aa2ab9683a43cbff85b357638e8f50d7af900775c9cdff7b92f3bba07d54
+DIST ppsspp-1.4-ext_armips.tar.gz 163666 SHA256
a5cc0e9aa3bdf4bb4334def685751f03aaed0aa0d23f317dc2a242bd60be1c64 SHA512
9423bdbc1428700979c13276a427975733a07908fdf021dc6ab88cec0d37e9523aacd4a2a03eef23638070293dde3f1641647c47095ef2751982b9f9893c1baa
WHIRLPOOL
b5f2201e8e3b604282818a946a729f73ed538cd8f98e57c1fffad8ba219569bf47b1f6714c9af9dfd483b1b71eb045533e0be58a664a8a934ab0b4651fbbcbf6
+DIST ppsspp-1.4-ext_armips_ext_tinyformat.tar.gz 22284 SHA256
9db9bc16e9fafede493b5890b935a57ee6e5e284a9d6e8fa6d9329790a96b8c6 SHA512
fb063ea9b632c8a9a0203c181830cb2feed9142fcf4d69c11cc0a3e8dcbb3cea51dde6bb351df567b3f105a4da99fd2e72ba3572d3fc0e9a45364f4115d6c3d1
WHIRLPOOL
18135420bab7b06a10941ca5039b67899f90e7d2a175eae9ebadf579c1838cb60744d08fd40bb3fe859d108b7af8a17335ce77979ff9e083cc341dd629d7682e
+DIST ppsspp-1.4-ext_glslang.tar.gz 1685246 SHA256
c7e41726e2d9d6c47e7e2654d4354b1a61527e86158c9ad5e8a9e8f9d7f6a788 SHA512
3605fb8a3c5dafcab97578030be4af3703f1475c8e9fd58412a514dcaa0ea6c7bf3a279510759496ab34b979a3d260d3da3d6f00d504c9c5e0f9a7b5a61399bc
WHIRLPOOL
e78e25b94cb3724e0e013203b27c757896b858779a8f85900dcaa2919482d146f64465166deb25749865d67b66fe2c37876061fd3cc6fcc796d9767ebbb51da3
+DIST ppsspp-1.4-pspautotests.tar.gz 34389722 SHA256
e25ec80dcb50c7a7816afecda5cbe9c15c5fc23dbbc063d697378dcb4134c845 SHA512
70b0c4ee9775ee8179d7993b0162a8fb95aa6b0bf1c2cc49e6e6ec03be6d72c615a8a233235028ce29e715e0ba64f9d60efcb2fadd1b9e6d92a9f435e0c86bbf
WHIRLPOOL
b108707bf73b4e82808b10cad98992a5026c1c5013908c71bb19c58883cec131f643c333f0b93d29d97157921f842f3be863100032748e021024c0e50791df41
+DIST ppsspp-1.4.tar.gz 18909397 SHA256
d801fbdc0063cd351392af488a65fc66021f45eb1edbabe7bce069ce0d68d5a6 SHA512
986bb4cf9756dba3874838bed9cf5721a2025c19d5c7c936aa8f7dca7848102a10dc924f1900b0ab90a5742ef2b96e3895f085f4ffb471648fb15135c1947580
WHIRLPOOL
a02c594378ca01199423596440bdd052c2a75ea61036895c214dd73dad5ffeb95e5f44546939c9a3a812e1cb208ef9ef6e84164f8177f87e02900ca8f7122edc
diff --git a/games-emulation/ppsspp/files/ppsspp-1.4-O2.patch
b/games-emulation/ppsspp/files/ppsspp-1.4-O2.patch
new file mode 100644
index 000..55954c7c738
--- /dev/null
+++ b/games-emulation/ppsspp/files/ppsspp-1.4-O2.patch
@@ -0,0 +1,32 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 19038c88a436..bf50f5cf52fb 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -195,11 +195,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} -O3
[gentoo-commits] repo/gentoo:master commit in: games-emulation/ppsspp/, games-emulation/ppsspp/files/
commit: ebaaaf60aac4c9545ded42534b1355b93ea43552
Author: RobinDX gmail com>
AuthorDate: Sun Feb 21 03:04:26 2016 +
Commit: Patrice Clement gentoo org>
CommitDate: Sun Feb 21 03:06:12 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebaaaf60
games-emulation/ppsspp: remove old
.../ppsspp/files/ppsspp-ffmpeg-x86.patch | 11 --
.../ppsspp/files/ppsspp-ffmpeg-x86_64.patch| 11 --
games-emulation/ppsspp/files/ppsspp-qt.patch | 11 --
games-emulation/ppsspp/ppsspp-1.1.0-r2.ebuild | 132 -
games-emulation/ppsspp/ppsspp-1.1.1-r2.ebuild | 132 -
5 files changed, 297 deletions(-)
diff --git a/games-emulation/ppsspp/files/ppsspp-ffmpeg-x86.patch
b/games-emulation/ppsspp/files/ppsspp-ffmpeg-x86.patch
deleted file mode 100644
index c9e755d..000
--- a/games-emulation/ppsspp/files/ppsspp-ffmpeg-x86.patch
+++ /dev/null
@@ -1,11 +0,0 @@
ffmpeg/linux_x86.sh.orig 2016-01-04 21:44:11.540084990 +0800
-+++ ffmpeg/linux_x86.sh2016-01-04 21:44:56.560085770 +0800
-@@ -72,7 +72,7 @@
- ./configure \
- --prefix=./linux/${ARCH} \
- ${GENERAL} \
----extra-cflags="-D__STDC_CONSTANT_MACROS -O3" \
-+--extra-cflags="-D__STDC_CONSTANT_MACROS -O2" \
- --enable-zlib \
- --disable-yasm \
- --disable-everything \
diff --git a/games-emulation/ppsspp/files/ppsspp-ffmpeg-x86_64.patch
b/games-emulation/ppsspp/files/ppsspp-ffmpeg-x86_64.patch
deleted file mode 100644
index 45bd877..000
--- a/games-emulation/ppsspp/files/ppsspp-ffmpeg-x86_64.patch
+++ /dev/null
@@ -1,11 +0,0 @@
ffmpeg/linux_x86-64.sh.orig2016-01-04 21:42:14.220082959 +0800
-+++ ffmpeg/linux_x86-64.sh 2016-01-04 21:42:31.940083265 +0800
-@@ -71,7 +71,7 @@
- ./configure \
- --prefix=./linux/${ARCH} \
- ${GENERAL} \
----extra-cflags="-D__STDC_CONSTANT_MACROS -O3" \
-+--extra-cflags="-D__STDC_CONSTANT_MACROS -O2" \
- --enable-zlib \
- --enable-pic \
- --disable-yasm \
diff --git a/games-emulation/ppsspp/files/ppsspp-qt.patch
b/games-emulation/ppsspp/files/ppsspp-qt.patch
deleted file mode 100644
index e372f15..000
--- a/games-emulation/ppsspp/files/ppsspp-qt.patch
+++ /dev/null
@@ -1,11 +0,0 @@
Qt/Settings.pri.orig 2016-01-04 21:37:36.600078151 +0800
-+++ Qt/Settings.pri2016-01-04 21:37:57.430078511 +0800
-@@ -64,7 +64,7 @@
- else: QMAKE_CXXFLAGS += -std=c++11
- QMAKE_CFLAGS_RELEASE ~= s/-O.*/
- QMAKE_CXXFLAGS_RELEASE ~= s/-O.*/
-- QMAKE_ALLFLAGS_RELEASE += -O3 -ffast-math
-+ QMAKE_ALLFLAGS_RELEASE += -O2 -ffast-math
- }
-
- contains(QT_CONFIG, opengles.) {
diff --git a/games-emulation/ppsspp/ppsspp-1.1.0-r2.ebuild
b/games-emulation/ppsspp/ppsspp-1.1.0-r2.ebuild
deleted file mode 100644
index 4d8db28..000
--- a/games-emulation/ppsspp/ppsspp-1.1.0-r2.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils cmake-utils qt4-r2 git-r3
-
-DESCRIPTION="A PSP emulator written in C++."
-HOMEPAGE="http://www.ppsspp.org/;
-EGIT_REPO_URI="git://github.com/hrydgard/${PN}.git"
-EGIT_COMMIT="v${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="qt4 qt5 +sdl"
-REQUIRED_USE="
- ?? ( qt4 qt5 sdl )
-"
-
-RDEPEND=""
-
-DEPEND="
- sys-libs/zlib
- sdl? (
- dev-util/cmake
- media-libs/libsdl
- media-libs/libsdl2
- )
- qt4? (
- dev-qt/qtsvg:4
- dev-qt/qtgui:4
- dev-qt/qtcore:4
- dev-qt/qtopengl:4
- dev-qt/qtmultimedia:4
- dev-qt/qt-mobility[multimedia]
- )
- qt5? (
- dev-qt/qtsvg:5
- dev-qt/qtgui:5
- dev-qt/qtcore:5
- dev-qt/qtopengl:5
- dev-qt/qtmultimedia:5
- dev-qt/qtwidgets:5
- dev-qt/qt-mobility[multimedia]
- )
-"
-
-src_unpack() {
- git-r3_fetch
- git-r3_checkout
- if use qt4 ; then
- cd "${WORKDIR}"/"${P}"/Qt || die
- qt4-r2_src_unpack
- elif use qt5 ; then
- cd "${WORKDIR}"/"${P}"/Qt || die
- qt4-r2_src_unpack
- fi
-}
-
-src_prepare() {
- # Bug 574000
- sed -i -e "s#-O3#-O2#g;" "${S}"/CMakeLists.txt || die
-
- epatch "$FILESDIR"/ppsspp-ffmpeg-x86_64.patch
- epatch "$FILESDIR"/ppsspp-ffmpeg-x86.patch
- epatch "$FILESDIR"/ppsspp-qt.patch
-
- if use qt4 ; then
- cd "${WORKDIR}"/"${P}"/Qt || die
- qt4-r2_src_prepare
- elif use qt5 ; then
- cd "${WORKDIR}"/"${P}"/Qt || die
- qt4-r2_src_prepare
- else
- cmake-utils_src_prepare
- fi
-}
-
-src_configure() {
- if use qt4 ; then
- cd
[gentoo-commits] repo/gentoo:master commit in: games-emulation/ppsspp/, games-emulation/ppsspp/files/
commit: 76de7b7fd59422898dd599f7dba5817e9023732a
Author: Patrice Clement gentoo org>
AuthorDate: Sun Feb 7 10:50:18 2016 +
Commit: Patrice Clement gentoo org>
CommitDate: Sun Feb 7 10:51:18 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76de7b7f
games-emulation/ppsspp: Remove bogus patch. Fix install directory (typo).
Also taken into consideration in this commit is the sed command pruning all -O2
flags in favour of -O3, courtesy of Michał Ziąbkowski o2.pl>.
Gentoo-Bug: 574000
Package-Manager: portage-2.2.26
Signed-off-by: Patrice Clement gentoo.org>
games-emulation/ppsspp/files/ppsspp-cmake.patch| 32 --
...sspp-1.1.1-r1.ebuild => ppsspp-1.1.0-r2.ebuild} | 7 +++--
...sspp-1.1.0-r1.ebuild => ppsspp-1.1.1-r2.ebuild} | 5 +++-
games-emulation/ppsspp/ppsspp-.ebuild | 7 +++--
4 files changed, 14 insertions(+), 37 deletions(-)
diff --git a/games-emulation/ppsspp/files/ppsspp-cmake.patch
b/games-emulation/ppsspp/files/ppsspp-cmake.patch
deleted file mode 100644
index 4a0a036..000
--- a/games-emulation/ppsspp/files/ppsspp-cmake.patch
+++ /dev/null
@@ -1,32 +0,0 @@
CMakeLists.txt.orig2016-01-04 20:44:44.010023206 +0800
-+++ CMakeLists.txt 2016-01-04 20:45:34.910024088 +0800
-@@ -219,11 +219,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} -O3 -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_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} -O3 -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")
-
- # Disable some warnings
-@@ -634,12 +634,12 @@
- if (NOT MSVC)
- # These can be fast even for debug.
- if(NOT SNAPPY_FOUND)
-- set_target_properties(snappy PROPERTIES COMPILE_FLAGS "-O3")
-+ set_target_properties(snappy PROPERTIES COMPILE_FLAGS "-O2")
- endif()
-- set_target_properties(udis86 PROPERTIES COMPILE_FLAGS "-O3")
-- set_target_properties(cityhash PROPERTIES COMPILE_FLAGS "-O3")
-+ set_target_properties(udis86 PROPERTIES COMPILE_FLAGS "-O2")
-+ set_target_properties(cityhash PROPERTIES COMPILE_FLAGS "-O2")
- if(NOT ZLIB_FOUND)
-- set_target_properties(zlib PROPERTIES COMPILE_FLAGS "-O3")
-+ set_target_properties(zlib PROPERTIES COMPILE_FLAGS "-O2")
- endif()
- endif()
diff --git a/games-emulation/ppsspp/ppsspp-1.1.1-r1.ebuild
b/games-emulation/ppsspp/ppsspp-1.1.0-r2.ebuild
similarity index 96%
rename from games-emulation/ppsspp/ppsspp-1.1.1-r1.ebuild
rename to games-emulation/ppsspp/ppsspp-1.1.0-r2.ebuild
index 19baa10..4d8db28 100644
--- a/games-emulation/ppsspp/ppsspp-1.1.1-r1.ebuild
+++ b/games-emulation/ppsspp/ppsspp-1.1.0-r2.ebuild
@@ -60,10 +60,13 @@ src_unpack() {
}
src_prepare() {
- epatch "$FILESDIR"/ppsspp-cmake.patch
+ # Bug 574000
+ sed -i -e "s#-O3#-O2#g;" "${S}"/CMakeLists.txt || die
+
epatch "$FILESDIR"/ppsspp-ffmpeg-x86_64.patch
epatch "$FILESDIR"/ppsspp-ffmpeg-x86.patch
epatch "$FILESDIR"/ppsspp-qt.patch
+
if use qt4 ; then
cd "${WORKDIR}"/"${P}"/Qt || die
qt4-r2_src_prepare
@@ -103,7 +106,7 @@ src_compile() {
src_install() {
if use qt4 ; then
- into /usr/games/bin
+ exeinto /usr/games/bin
newexe "${WORKDIR}"/"${P}"/Qt/ppsspp ppsspp
elif use qt5 ; then
exeinto /usr/games/bin
diff --git a/games-emulation/ppsspp/ppsspp-1.1.0-r1.ebuild
b/games-emulation/ppsspp/ppsspp-1.1.1-r2.ebuild
similarity index 97%
rename from games-emulation/ppsspp/ppsspp-1.1.0-r1.ebuild
rename to games-emulation/ppsspp/ppsspp-1.1.1-r2.ebuild
index 19baa10..3e3854f 100644
--- a/games-emulation/ppsspp/ppsspp-1.1.0-r1.ebuild
+++ b/games-emulation/ppsspp/ppsspp-1.1.1-r2.ebuild
@@ -60,10 +60,13 @@ src_unpack() {
}
src_prepare() {
- epatch "$FILESDIR"/ppsspp-cmake.patch
+ # Bug 574000
+ sed -i -e "s#-O3#-O2#g;" "${S}"/CMakeLists.txt || die
+
epatch "$FILESDIR"/ppsspp-ffmpeg-x86_64.patch
epatch "$FILESDIR"/ppsspp-ffmpeg-x86.patch
epatch "$FILESDIR"/ppsspp-qt.patch
+
if use qt4 ; then
cd "${WORKDIR}"/"${P}"/Qt || die
qt4-r2_src_prepare
diff --git a/games-emulation/ppsspp/ppsspp-.ebuild
[gentoo-commits] repo/gentoo:master commit in: games-emulation/ppsspp/, games-emulation/ppsspp/files/
commit: 32516e83e04f3ad49438df03b9e0642484a0e262
Author: RobinDX gmail com>
AuthorDate: Tue Jan 19 11:10:43 2016 +
Commit: Patrice Clement gentoo org>
CommitDate: Tue Jan 19 11:11:15 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32516e83
games-emulation/ppsspp:new ebuild
games-emulation/ppsspp/Manifest| 0
games-emulation/ppsspp/files/ppsspp| 3 +
games-emulation/ppsspp/files/ppsspp-cmake.patch| 32
.../ppsspp/files/ppsspp-ffmpeg-x86.patch | 11 +++
.../ppsspp/files/ppsspp-ffmpeg-x86_64.patch| 11 +++
games-emulation/ppsspp/files/ppsspp-qt.patch | 11 +++
games-emulation/ppsspp/files/ppsspp.desktop| 7 ++
games-emulation/ppsspp/metadata.xml| 17
games-emulation/ppsspp/ppsspp-1.1.0.ebuild | 92 ++
games-emulation/ppsspp/ppsspp-1.1.1.ebuild | 92 ++
games-emulation/ppsspp/ppsspp-.ebuild | 92 ++
11 files changed, 368 insertions(+)
diff --git a/games-emulation/ppsspp/Manifest b/games-emulation/ppsspp/Manifest
new file mode 100644
index 000..e69de29
diff --git a/games-emulation/ppsspp/files/ppsspp
b/games-emulation/ppsspp/files/ppsspp
new file mode 100644
index 000..7e3da13
--- /dev/null
+++ b/games-emulation/ppsspp/files/ppsspp
@@ -0,0 +1,3 @@
+#!/bin/bash
+cd /usr/share/games/ppsspp
+./PPSSPPSDL
diff --git a/games-emulation/ppsspp/files/ppsspp-cmake.patch
b/games-emulation/ppsspp/files/ppsspp-cmake.patch
new file mode 100644
index 000..4a0a036
--- /dev/null
+++ b/games-emulation/ppsspp/files/ppsspp-cmake.patch
@@ -0,0 +1,32 @@
+--- CMakeLists.txt.orig2016-01-04 20:44:44.010023206 +0800
CMakeLists.txt 2016-01-04 20:45:34.910024088 +0800
+@@ -219,11 +219,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} -O3 -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_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} -O3 -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")
+
+ # Disable some warnings
+@@ -634,12 +634,12 @@
+ if (NOT MSVC)
+ # These can be fast even for debug.
+ if(NOT SNAPPY_FOUND)
+- set_target_properties(snappy PROPERTIES COMPILE_FLAGS "-O3")
++ set_target_properties(snappy PROPERTIES COMPILE_FLAGS "-O2")
+ endif()
+- set_target_properties(udis86 PROPERTIES COMPILE_FLAGS "-O3")
+- set_target_properties(cityhash PROPERTIES COMPILE_FLAGS "-O3")
++ set_target_properties(udis86 PROPERTIES COMPILE_FLAGS "-O2")
++ set_target_properties(cityhash PROPERTIES COMPILE_FLAGS "-O2")
+ if(NOT ZLIB_FOUND)
+- set_target_properties(zlib PROPERTIES COMPILE_FLAGS "-O3")
++ set_target_properties(zlib PROPERTIES COMPILE_FLAGS "-O2")
+ endif()
+ endif()
diff --git a/games-emulation/ppsspp/files/ppsspp-ffmpeg-x86.patch
b/games-emulation/ppsspp/files/ppsspp-ffmpeg-x86.patch
new file mode 100644
index 000..c9e755d
--- /dev/null
+++ b/games-emulation/ppsspp/files/ppsspp-ffmpeg-x86.patch
@@ -0,0 +1,11 @@
+--- ffmpeg/linux_x86.sh.orig 2016-01-04 21:44:11.540084990 +0800
ffmpeg/linux_x86.sh2016-01-04 21:44:56.560085770 +0800
+@@ -72,7 +72,7 @@
+ ./configure \
+ --prefix=./linux/${ARCH} \
+ ${GENERAL} \
+---extra-cflags="-D__STDC_CONSTANT_MACROS -O3" \
++--extra-cflags="-D__STDC_CONSTANT_MACROS -O2" \
+ --enable-zlib \
+ --disable-yasm \
+ --disable-everything \
diff --git a/games-emulation/ppsspp/files/ppsspp-ffmpeg-x86_64.patch
b/games-emulation/ppsspp/files/ppsspp-ffmpeg-x86_64.patch
new file mode 100644
index 000..45bd877
--- /dev/null
+++ b/games-emulation/ppsspp/files/ppsspp-ffmpeg-x86_64.patch
@@ -0,0 +1,11 @@
+--- ffmpeg/linux_x86-64.sh.orig2016-01-04 21:42:14.220082959 +0800
ffmpeg/linux_x86-64.sh 2016-01-04 21:42:31.940083265 +0800
+@@ -71,7 +71,7 @@
+ ./configure \
+ --prefix=./linux/${ARCH} \
+ ${GENERAL} \
+---extra-cflags="-D__STDC_CONSTANT_MACROS -O3" \
++--extra-cflags="-D__STDC_CONSTANT_MACROS -O2" \
+ --enable-zlib \
+ --enable-pic \
+ --disable-yasm \
diff --git a/games-emulation/ppsspp/files/ppsspp-qt.patch
b/games-emulation/ppsspp/files/ppsspp-qt.patch
new file mode 100644
index 000..e372f15
--- /dev/null
