Update to ppsspp-1.7.

Changelog: https://github.com/hrydgard/ppsspp#whats-new-in-170
2018-10-30 06:35:23 +00:00 · 2018-10-30 06:35:23 +00:00 · 73afe54c50
commit 73afe54c50
parent f27dee7f5d
6 changed files with 53 additions and 52 deletions
--- a/emulators/ppsspp/Makefile
+++ b/emulators/ppsspp/Makefile
@ -1,29 +1,26 @@
-# $OpenBSD: Makefile,v 1.4 2018/06/15 08:12:31 bentley Exp $
+# $OpenBSD: Makefile,v 1.5 2018/10/30 06:35:23 bentley Exp $

 COMMENT =	Sony PlayStation Portable emulator

 GH_ACCOUNT =	hrydgard
 GH_PROJECT =	ppsspp
-GH_TAGNAME =	v1.6.3
+GH_TAGNAME =	v1.7

-GLSLANG =	2edde6665d9a56ead5ea0e55b4e64d9a803e6164
-PPSSPP_LANG =	1153a4293006db9d2a6e701df72df843b98234b5
-SPIRV_CROSS =	90966d50f57608587bafd95b4e345b02b814754a
-ARMIPS =	0.9
-TINYFORMAT =	b7f5a22753c81d834ab5133d655f1fd525280765
+GLSLANG =	29619b2312f7bc862221749f3f4d37c3e6a0dee2
+PPSSPP_LANG =	cbad73fae5bbc18c6f5541852bbdfc4dd97a9c83
+SPIRV_CROSS =	be7425ef70231ab82930331959ab487d605d0482
+ARMIPS =	9efe3367284d2d1eeb14fc302a2c12c36e3e255e

 MASTER_SITES0 =	https://github.com/hrydgard/glslang/archive/
 MASTER_SITES1 =	https://github.com/hrydgard/ppsspp-lang/archive/
 MASTER_SITES2 =	https://github.com/hrydgard/SPIRV-Cross/archive/
 MASTER_SITES3 =	https://github.com/Kingcom/armips/archive/
-MASTER_SITES4 =	https://github.com/Kingcom/tinyformat/archive/

 DISTFILES =	${DISTNAME}${EXTRACT_SUFX} \
 		${GLSLANG}.tar.gz:0 \
 		${PPSSPP_LANG}.tar.gz:1 \
 		${SPIRV_CROSS}.tar.gz:2 \
-		v${ARMIPS}.tar.gz:3 \
-		${TINYFORMAT}.tar.gz:4
+		${ARMIPS}.tar.gz:3

 CATEGORIES =	emulators

@ -48,10 +45,11 @@ LIB_DEPENDS =		archivers/snappy \
 			graphics/glew
 COMPILER =		base-clang ports-gcc

-CONFIGURE_ARGS =	-DUSE_SYSTEM_FFMPEG=ON \
-			-DCMAKE_CXX_FLAGS="-I${X11BASE}/include" \
+CONFIGURE_ARGS =	-DCMAKE_CXX_FLAGS="-I${X11BASE}/include" \
 			-DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
-			-DUSE_SYSTEM_LIBZIP=ON
+			-DUSE_SYSTEM_FFMPEG=ON \
+			-DUSE_SYSTEM_LIBZIP=ON \
+			-DUSE_SYSTEM_SNAPPY=ON

 NO_TEST =		Yes

@ -59,14 +57,11 @@ post-extract:
 	rmdir	${WRKSRC}/assets/lang \
 		${WRKSRC}/ext/armips \
 		${WRKSRC}/ext/glslang \
-		${WRKSRC}/ext/SPIRV-Cross \
-		${WRKDIR}/armips-${ARMIPS}/ext/tinyformat
+		${WRKSRC}/ext/SPIRV-Cross
 	ln -s ${WRKDIR}/ppsspp-lang-${PPSSPP_LANG} ${WRKSRC}/assets/lang
 	ln -s ${WRKDIR}/armips-${ARMIPS} ${WRKSRC}/ext/armips
 	ln -s ${WRKDIR}/glslang-${GLSLANG} ${WRKSRC}/ext/glslang
 	ln -s ${WRKDIR}/SPIRV-Cross-${SPIRV_CROSS} ${WRKSRC}/ext/SPIRV-Cross
-	ln -s ${WRKDIR}/tinyformat-${TINYFORMAT} \
-		${WRKDIR}/armips-${ARMIPS}/ext/tinyformat

 pre-configure:
 	${SUBST_CMD} ${WRKSRC}/CMakeLists.txt ${WRKSRC}/UI/NativeApp.cpp
--- a/emulators/ppsspp/distinfo
+++ b/emulators/ppsspp/distinfo
@ -1,12 +1,10 @@
-SHA256 (ppsspp/1153a4293006db9d2a6e701df72df843b98234b5.tar.gz) = s9IXWNG+XnWwvPZXH/FiR+wDmxIXR+H5Kj9FOsGJGWU=
-SHA256 (ppsspp/2edde6665d9a56ead5ea0e55b4e64d9a803e6164.tar.gz) = XiCldYwTzDlnosMecBf+TYE1wAVzNmK+RYXZ0ZtdjzQ=
-SHA256 (ppsspp/90966d50f57608587bafd95b4e345b02b814754a.tar.gz) = KC0fF70wAxYt2UW4ulxaEMtXOKd1CUmoIA/2VV8Q/yg=
-SHA256 (ppsspp/b7f5a22753c81d834ab5133d655f1fd525280765.tar.gz) = nbm8Fun6/t5JO1iQuTWlfubl4oSp1uj6bZMpeQqWuMY=
-SHA256 (ppsspp/ppsspp-1.6.3.tar.gz) = Nm+LPFRQcdkZ4fUaXE4NpIulXPHBX/jXipCYWz1ejrM=
-SHA256 (ppsspp/v0.9.tar.gz) = x1boXdcRpBjzO3IOGSb3gOCxZMhIpOdPtyWOGMMvzZQ=
-SIZE (ppsspp/1153a4293006db9d2a6e701df72df843b98234b5.tar.gz) = 478393
-SIZE (ppsspp/2edde6665d9a56ead5ea0e55b4e64d9a803e6164.tar.gz) = 1944927
-SIZE (ppsspp/90966d50f57608587bafd95b4e345b02b814754a.tar.gz) = 228943
-SIZE (ppsspp/b7f5a22753c81d834ab5133d655f1fd525280765.tar.gz) = 22284
-SIZE (ppsspp/ppsspp-1.6.3.tar.gz) = 19477643
-SIZE (ppsspp/v0.9.tar.gz) = 154427
+SHA256 (ppsspp/29619b2312f7bc862221749f3f4d37c3e6a0dee2.tar.gz) = USViBSDSX5o5xtYt/NPgh/1hDcXRY93/Y3c2UBHIsT8=
+SHA256 (ppsspp/9efe3367284d2d1eeb14fc302a2c12c36e3e255e.tar.gz) = c7Nm8w6POGNQFyPhPrXcr21CS4A4LRfCdjVWe3lwXKM=
+SHA256 (ppsspp/be7425ef70231ab82930331959ab487d605d0482.tar.gz) = Ia+g4y3S117lHE9cDRYzCp2A1DXWrJkA0ME7/9/XtoI=
+SHA256 (ppsspp/cbad73fae5bbc18c6f5541852bbdfc4dd97a9c83.tar.gz) = vnMjIQJdvnz9TBclrdxyjXWJz5MDCjXQoMOeyANWjR0=
+SHA256 (ppsspp/ppsspp-1.7.tar.gz) = IFW+7RxVnuSIfkX42LaYAn625ousuQ7gnElo69Jfh10=
+SIZE (ppsspp/29619b2312f7bc862221749f3f4d37c3e6a0dee2.tar.gz) = 2355082
+SIZE (ppsspp/9efe3367284d2d1eeb14fc302a2c12c36e3e255e.tar.gz) = 197127
+SIZE (ppsspp/be7425ef70231ab82930331959ab487d605d0482.tar.gz) = 537422
+SIZE (ppsspp/cbad73fae5bbc18c6f5541852bbdfc4dd97a9c83.tar.gz) = 530580
+SIZE (ppsspp/ppsspp-1.7.tar.gz) = 19483290
--- a/emulators/ppsspp/patches/patch-CMakeLists_txt
+++ b/emulators/ppsspp/patches/patch-CMakeLists_txt
@ -1,9 +1,9 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.1.1.1 2017/11/05 22:06:29 bentley Exp $
+$OpenBSD: patch-CMakeLists_txt,v 1.2 2018/10/30 06:35:23 bentley Exp $

 Index: CMakeLists.txt
 --- CMakeLists.txt.orig
 +++ CMakeLists.txt
-@@ -134,6 +134,8 @@ if(NOT OPENGL_LIBRARIES)
+@@ -194,6 +194,8 @@ if(NOT OPENGL_LIBRARIES)
 endif()
 
 find_package(SDL2)
@ -12,7 +12,7 @@ Index: CMakeLists.txt
 include(FindThreads)
 
 if(APPLE)
-@@ -234,7 +236,6 @@ if(NOT MSVC)
+@@ -307,7 +309,6 @@ if(NOT MSVC)
 		if (NOT ${CMAKE_C_COMPILER_ID} STREQUAL "Intel" AND NOT ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
 			add_definitions(-Wno-psabi)
 		endif()
@ -20,11 +20,23 @@ Index: CMakeLists.txt
 		add_definitions(-D_XOPEN_SOURCE_EXTENDED -D__BSD_VISIBLE=1)
 		add_definitions(-D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64)
 	elseif(ANDROID)
-@@ -520,6 +521,7 @@ endif()
+@@ -601,6 +602,7 @@ endif()
 find_package(LibZip)
- if(LIBZIP_FOUND)
+ if(LIBZIP_FOUND AND USE_SYSTEM_LIBZIP)
 	add_definitions(-DSHARED_LIBZIP)
 +	include_directories(${LIBZIP_INCLUDE_DIRS})
 else()
 	add_library(libzip STATIC
 		ext/native/ext/libzip/zip.h
+@@ -1767,11 +1769,6 @@ if(FFmpeg_FOUND)
+     FFmpeg::swscale
+     ${ZLIB_LIBRARY}
+   )
+-endif()
+-
+-# Discord integration
+-if(NOT IOS)
+-target_link_libraries(${CoreLibName} discord-rpc)
+ endif()
+ 
+ setup_target_project(${CoreLibName} Core)
--- a/emulators/ppsspp/patches/patch-UI_NativeApp_cpp
+++ b/emulators/ppsspp/patches/patch-UI_NativeApp_cpp
@ -1,9 +1,9 @@
-$OpenBSD: patch-UI_NativeApp_cpp,v 1.1.1.1 2017/11/05 22:06:29 bentley Exp $
+$OpenBSD: patch-UI_NativeApp_cpp,v 1.2 2018/10/30 06:35:23 bentley Exp $

 Index: UI/NativeApp.cpp
 --- UI/NativeApp.cpp.orig
 +++ UI/NativeApp.cpp
-@@ -325,7 +325,7 @@ void NativeInit(int argc, const char *argv[], const ch
+@@ -443,7 +443,7 @@ void NativeInit(int argc, const char *argv[], const ch
 #if !defined(MOBILE_DEVICE) && !defined(_WIN32)
 	VFSRegister("", new DirectoryAssetReader((File::GetExeDirectory() + "assets/").c_str()));
 	VFSRegister("", new DirectoryAssetReader((File::GetExeDirectory()).c_str()));
--- a/emulators/ppsspp/patches/patch-ext_CMakeLists_txt
+++ b/emulators/ppsspp/patches/patch-ext_CMakeLists_txt
@ -0,0 +1,12 @@
+$OpenBSD: patch-ext_CMakeLists_txt,v 1.1 2018/10/30 06:35:23 bentley Exp $
+
+Index: ext/CMakeLists.txt
+--- ext/CMakeLists.txt.orig
+++ ext/CMakeLists.txt
+@@ -12,6 +12,3 @@ add_subdirectory(glslang)
+ add_subdirectory(snappy)
+ add_subdirectory(udis86)
+ add_subdirectory(SPIRV-Cross-build)
+-if(NOT IOS)
+-add_subdirectory(discord-rpc-build)
+-endif()
--- a/emulators/ppsspp/patches/patch-ext_armips_Util_Util_cpp
+++ b/emulators/ppsspp/patches/patch-ext_armips_Util_Util_cpp
@ -1,16 +0,0 @@
-$OpenBSD: patch-ext_armips_Util_Util_cpp,v 1.1.1.1 2017/11/05 22:06:29 bentley Exp $
-
-Index: ext/armips/Util/Util.cpp
--- ext/armips/Util/Util.cpp.orig
-+++ ext/armips/Util/Util.cpp
-@@ -171,8 +171,8 @@ u64 fileSize(const std::wstring& fileName)
- 	return ((u64) attr.nFileSizeHigh << 32) | (u64) attr.nFileSizeLow;
- #else	
- 	std::string utf8 = convertWStringToUtf8(fileName);
-	struct stat64 fileStat;
-	int err = stat64(utf8.c_str(),&fileStat);
-+	struct stat fileStat;
-+	int err = stat(utf8.c_str(),&fileStat);
- 	if (0 != err)
- 		return 0; 
- 	return fileStat.st_size;