[gentoo-commits] repo/gentoo:master commit in: games-emulation/ppsspp/, games-emulation/ppsspp/files/

[Patrice Clement]

commit:     07dcd0e1a674de8b3c71b2e5b34335b3f555eb9f
Author:     soredake <fdsfgs <AT> krutt <DOT> org>
AuthorDate: Tue Apr  4 13:17:54 2017 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Apr  4 21:13:58 2017 +0000
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 00000000000..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 00000000000..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 -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")
+ 	#TODO: Remove this and include the file properly everywhere it makes sense
+ 	# First step is too use the macros everywhere
+@@ -509,10 +509,10 @@ include_directories(ext/cityhash)
+ 
+ if (NOT MSVC)
+ 	# These can be fast even for debug.
+-	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-1.4-assets-lookup.patch b/games-emulation/ppsspp/files/ppsspp-1.4-assets-lookup.patch
new file mode 100644
index 00000000000..6f75d5ec31c
--- /dev/null
+++ b/games-emulation/ppsspp/files/ppsspp-1.4-assets-lookup.patch
@@ -0,0 +1,13 @@
+diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp
+index 8452d4d61d5f..3d5a4bbd2aa4 100644
+--- a/UI/NativeApp.cpp
++++ b/UI/NativeApp.cpp
+@@ -316,7 +316,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/metadata.xml b/games-emulation/ppsspp/metadata.xml
index 64bc4892f9d..ee086732926 100644
--- a/games-emulation/ppsspp/metadata.xml
+++ b/games-emulation/ppsspp/metadata.xml
@@ -5,14 +5,16 @@
 		<email>robin9800xt@×××××.com</email>
 		<name>RobinDX</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>fdsfgs@×××××.org</email>
+		<name>soredake</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@g.o</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<use>
-		<flag name="qt4">Adds support for the Qt GUI/Application Toolkit version 4.x</flag>
-		<flag name="qt5">Adds support for the Qt GUI/Application Toolkit version 5.x</flag>
-		<flag name="sdl">Adds support for Simple Direct Layer (media library)</flag>
+		<flag name="headless">Build headless version of the PPSSPP</flag>
 	</use>
 	<upstream>
 		<bugs-to>https://github.com/hrydgard/ppsspp/issues</bugs-to>

diff --git a/games-emulation/ppsspp/ppsspp-1.4.ebuild b/games-emulation/ppsspp/ppsspp-1.4.ebuild
new file mode 100644
index 00000000000..1879b5ea6f3
--- /dev/null
+++ b/games-emulation/ppsspp/ppsspp-1.4.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils cmake-utils
+
+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/hrydgard/ppsspp-lang/archive/ed0bbfb389da213bd891d179d1d92e95b8f05e43.tar.gz -> ${P}-assets_lang.tar.gz
+	https://github.com/hrydgard/pspautotests/archive/905c3018d01af9dfb511c87e65e07a49257a33ac.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/b16f7e6819267e57c3c244808d1981f0ce34acbc.tar.gz -> ${P}-ext_glslang.tar.gz
+	https://github.com/Kingcom/armips/archive/770365d44df35d6e675c58bb2a774ca412278ef5.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/6381b2ff9c0d975af8fd2974c97aa12a69ab6cc6.tar.gz -> ${P}-ext_SPIRV-Cross.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+qt5 sdl headless libav"
+REQUIRED_USE="
+	!headless? ( || ( qt5 sdl ) )
+	?? ( qt5 sdl )
+"
+
+RDEPEND="sys-libs/zlib
+	!libav? ( media-video/ffmpeg:= )
+	libav? ( media-video/libav:= )
+	sdl? (
+		media-libs/libsdl
+		media-libs/libsdl2
+	)
+	qt5? (
+		dev-db/sqlite
+		dev-qt/assistant:5
+		dev-qt/qtcore:5
+		dev-qt/qtdeclarative:5
+		dev-qt/qtgui:5
+		dev-qt/qtmultimedia:5
+		dev-qt/qtopengl:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwebkit:5
+		dev-qt/qtwidgets:5
+	)"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-assets-lookup.patch
+	"${FILESDIR}"/${P}-O2.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 )
+	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=(
+		-DUSING_QT_UI=$(usex qt5)
+		-DUSE_SYSTEM_FFMPEG=ON
+		-DHEADLESS=$(usex headless)
+		)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	use headless && dobin "${BUILD_DIR}/PPSSPPHeadless"
+	insinto /usr/share/"${PN}"
+	doins -r "${BUILD_DIR}/assets"
+	if use qt5 || use sdl ; then
+		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"
+	fi
+}