pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Add ppsspp version 1.15.4



Module Name:	pkgsrc-wip
Committed By:	Charlotte Koch <charlotte%NetBSD.org@localhost>
Pushed By:	cfkoch
Date:		Fri Jun 30 23:46:20 2023 -0700
Changeset:	b7ee08eb9d0439fc2d768092bd4bace30fb10b99

Modified Files:
	Makefile
Added Files:
	ppsspp/DESCR
	ppsspp/Makefile
	ppsspp/PLIST
	ppsspp/TODO
	ppsspp/distinfo
	ppsspp/patches/patch-CMakeLists.txt
	ppsspp/patches/patch-Core_HLE_proAdhoc.cpp
	ppsspp/patches/patch-ppsspp_config.h

Log Message:
Add ppsspp version 1.15.4

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b7ee08eb9d0439fc2d768092bd4bace30fb10b99

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Makefile                                   |   1 +
 ppsspp/DESCR                               |   4 +
 ppsspp/Makefile                            |  41 ++++++++
 ppsspp/PLIST                               | 163 +++++++++++++++++++++++++++++
 ppsspp/TODO                                |   2 +
 ppsspp/distinfo                            |   8 ++
 ppsspp/patches/patch-CMakeLists.txt        |  17 +++
 ppsspp/patches/patch-Core_HLE_proAdhoc.cpp |  28 +++++
 ppsspp/patches/patch-ppsspp_config.h       |  15 +++
 9 files changed, 279 insertions(+)

diffs:
diff --git a/Makefile b/Makefile
index 4ba66567bf..ba5cf004e2 100644
--- a/Makefile
+++ b/Makefile
@@ -3233,6 +3233,7 @@ SUBDIR+=	powerline
 SUBDIR+=	powwow
 SUBDIR+=	ppp
 SUBDIR+=	ppr
+SUBDIR+=	ppsspp
 SUBDIR+=	praat
 SUBDIR+=	preload
 SUBDIR+=	premake
diff --git a/ppsspp/DESCR b/ppsspp/DESCR
new file mode 100644
index 0000000000..296ffdc0e5
--- /dev/null
+++ b/ppsspp/DESCR
@@ -0,0 +1,4 @@
+PPSSPP is a fast and portable PSP emulator.
+
+No BIOS file required to play, PPSSPP is an "HLE" emulator. Default settings
+balance good compatibility and speed.
diff --git a/ppsspp/Makefile b/ppsspp/Makefile
new file mode 100644
index 0000000000..3c3f636375
--- /dev/null
+++ b/ppsspp/Makefile
@@ -0,0 +1,41 @@
+# $NetBSD$
+
+DISTNAME=	ppsspp-1.15.4
+CATEGORIES=	emulators
+MASTER_SITES=	${MASTER_SITE_GITHUB:=hrydgard/}
+GITHUB_RELEASE=	v${PKGVERSION_NOREV}
+EXTRACT_SUFX=	.tar.xz
+
+MAINTAINER=	charlotte%NetBSD.org@localhost
+HOMEPAGE=	https://www.ppsspp.org/
+COMMENT=	PSP emulator
+LICENSE=	gnu-gpl-v2
+
+USE_CMAKE=	yes
+USE_LANGUAGES=	c c++17
+USE_TOOLS+=	pkg-config
+.include "../../lang/python/tool.mk"
+
+ONLY_FOR_PLATFORM=	*-*-*arm* *-*-x86_64 *-*-i386
+
+CMAKE_ARGS+=	-DUSE_DISCORD=OFF
+CMAKE_ARGS+=	-DUSE_SYSTEM_FFMPEG=ON
+CMAKE_ARGS+=	-DUSE_SYSTEM_LIBPNG=ON
+CMAKE_ARGS+=	-DUSE_SYSTEM_LIBSDL2=ON
+CMAKE_ARGS+=	-DUSE_SYSTEM_LIBZIP=ON
+CMAKE_ARGS+=	-DUSE_SYSTEM_MINIUPNPC=ON
+CMAKE_ARGS+=	-DUSE_SYSTEM_SNAPPY=ON
+CMAKE_ARGS+=	-DUSE_SYSTEM_ZSTD=ON
+
+NOT_PAX_MPROTECT_SAFE+=	bin/PPSSPPSDL
+
+.include "../../archivers/libzip/buildlink3.mk"
+.include "../../archivers/zstd/buildlink3.mk"
+.include "../../devel/SDL2/buildlink3.mk"
+.include "../../devel/snappy/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/glew/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../multimedia/ffmpeg3/buildlink3.mk"
+.include "../../net/miniupnpc/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/ppsspp/PLIST b/ppsspp/PLIST
new file mode 100644
index 0000000000..1e8e43ebd9
--- /dev/null
+++ b/ppsspp/PLIST
@@ -0,0 +1,163 @@
+@comment $NetBSD$
+bin/PPSSPPSDL
+share/applications/PPSSPPSDL.desktop
+share/icons/hicolor/128x128/apps/ppsspp.png
+share/icons/hicolor/16x16/apps/ppsspp.png
+share/icons/hicolor/24x24/apps/ppsspp.png
+share/icons/hicolor/256x256/apps/ppsspp.png
+share/icons/hicolor/32x32/apps/ppsspp.png
+share/icons/hicolor/48x48/apps/ppsspp.png
+share/icons/hicolor/512x512/apps/ppsspp.png
+share/icons/hicolor/64x64/apps/ppsspp.png
+share/icons/hicolor/96x96/apps/ppsspp.png
+share/icons/hicolor/scalable/apps/ppsspp.svg
+share/mime/packages/ppsspp.xml
+share/ppsspp/assets/7z.png
+share/ppsspp/assets/Roboto-Condensed.ttf
+share/ppsspp/assets/asciifont_atlas.meta
+share/ppsspp/assets/asciifont_atlas.zim
+share/ppsspp/assets/compat.ini
+share/ppsspp/assets/compatvr.ini
+share/ppsspp/assets/debugger/.nojekyll
+share/ppsspp/assets/debugger/asset-manifest.json
+share/ppsspp/assets/debugger/favicon.ico
+share/ppsspp/assets/debugger/index.html
+share/ppsspp/assets/debugger/manifest.json
+share/ppsspp/assets/debugger/static/css/main.3eab8a01.css
+share/ppsspp/assets/debugger/static/css/main.3eab8a01.css.map
+share/ppsspp/assets/debugger/static/js/main.fe87e942.js
+share/ppsspp/assets/debugger/static/js/main.fe87e942.js.LICENSE.txt
+share/ppsspp/assets/debugger/static/js/main.fe87e942.js.map
+share/ppsspp/assets/debugger/static/media/logo.94f885ce93dfb6d29a122402a15cccca.svg
+share/ppsspp/assets/flash0/font/jpn0.pgf
+share/ppsspp/assets/flash0/font/kr0.pgf
+share/ppsspp/assets/flash0/font/ltn0.pgf
+share/ppsspp/assets/flash0/font/ltn1.pgf
+share/ppsspp/assets/flash0/font/ltn10.pgf
+share/ppsspp/assets/flash0/font/ltn11.pgf
+share/ppsspp/assets/flash0/font/ltn12.pgf
+share/ppsspp/assets/flash0/font/ltn13.pgf
+share/ppsspp/assets/flash0/font/ltn14.pgf
+share/ppsspp/assets/flash0/font/ltn15.pgf
+share/ppsspp/assets/flash0/font/ltn2.pgf
+share/ppsspp/assets/flash0/font/ltn3.pgf
+share/ppsspp/assets/flash0/font/ltn4.pgf
+share/ppsspp/assets/flash0/font/ltn5.pgf
+share/ppsspp/assets/flash0/font/ltn6.pgf
+share/ppsspp/assets/flash0/font/ltn7.pgf
+share/ppsspp/assets/flash0/font/ltn8.pgf
+share/ppsspp/assets/flash0/font/ltn9.pgf
+share/ppsspp/assets/font_atlas.meta
+share/ppsspp/assets/font_atlas.zim
+share/ppsspp/assets/gamecontrollerdb.txt
+share/ppsspp/assets/icon_regular_72.png
+share/ppsspp/assets/knownfuncs.ini
+share/ppsspp/assets/lang/ar_AE.ini
+share/ppsspp/assets/lang/az_AZ.ini
+share/ppsspp/assets/lang/bg_BG.ini
+share/ppsspp/assets/lang/ca_ES.ini
+share/ppsspp/assets/lang/cz_CZ.ini
+share/ppsspp/assets/lang/da_DK.ini
+share/ppsspp/assets/lang/de_DE.ini
+share/ppsspp/assets/lang/dr_ID.ini
+share/ppsspp/assets/lang/en_US.ini
+share/ppsspp/assets/lang/es_ES.ini
+share/ppsspp/assets/lang/es_LA.ini
+share/ppsspp/assets/lang/fa_IR.ini
+share/ppsspp/assets/lang/fi_FI.ini
+share/ppsspp/assets/lang/fr_FR.ini
+share/ppsspp/assets/lang/gl_ES.ini
+share/ppsspp/assets/lang/gr_EL.ini
+share/ppsspp/assets/lang/he_IL.ini
+share/ppsspp/assets/lang/he_IL_invert.ini
+share/ppsspp/assets/lang/hr_HR.ini
+share/ppsspp/assets/lang/hu_HU.ini
+share/ppsspp/assets/lang/id_ID.ini
+share/ppsspp/assets/lang/it_IT.ini
+share/ppsspp/assets/lang/ja_JP.ini
+share/ppsspp/assets/lang/jv_ID.ini
+share/ppsspp/assets/lang/ko_KR.ini
+share/ppsspp/assets/lang/lo_LA.ini
+share/ppsspp/assets/lang/lt-LT.ini
+share/ppsspp/assets/lang/ms_MY.ini
+share/ppsspp/assets/lang/nl_NL.ini
+share/ppsspp/assets/lang/no_NO.ini
+share/ppsspp/assets/lang/pl_PL.ini
+share/ppsspp/assets/lang/pt_BR.ini
+share/ppsspp/assets/lang/pt_PT.ini
+share/ppsspp/assets/lang/ro_RO.ini
+share/ppsspp/assets/lang/ru_RU.ini
+share/ppsspp/assets/lang/sv_SE.ini
+share/ppsspp/assets/lang/tg_PH.ini
+share/ppsspp/assets/lang/th_TH.ini
+share/ppsspp/assets/lang/tr_TR.ini
+share/ppsspp/assets/lang/uk_UA.ini
+share/ppsspp/assets/lang/vi_VN.ini
+share/ppsspp/assets/lang/zh_CN.ini
+share/ppsspp/assets/lang/zh_TW.ini
+share/ppsspp/assets/langregion.ini
+share/ppsspp/assets/logo.png
+share/ppsspp/assets/ppge_atlas.meta
+share/ppsspp/assets/ppge_atlas.zim
+share/ppsspp/assets/rargray.png
+share/ppsspp/assets/sfx_back.wav
+share/ppsspp/assets/sfx_confirm.wav
+share/ppsspp/assets/sfx_select.wav
+share/ppsspp/assets/sfx_toggle_off.wav
+share/ppsspp/assets/sfx_toggle_on.wav
+share/ppsspp/assets/shaders/4xhqglsl.fsh
+share/ppsspp/assets/shaders/4xhqglsl.vsh
+share/ppsspp/assets/shaders/5xBR-lv2.fsh
+share/ppsspp/assets/shaders/5xBR.fsh
+share/ppsspp/assets/shaders/5xBR.vsh
+share/ppsspp/assets/shaders/GaussianDownscale.fsh
+share/ppsspp/assets/shaders/aacolor.fsh
+share/ppsspp/assets/shaders/aacolor.vsh
+share/ppsspp/assets/shaders/bloom.fsh
+share/ppsspp/assets/shaders/cartoon.fsh
+share/ppsspp/assets/shaders/cartoon.vsh
+share/ppsspp/assets/shaders/checkers.fsh
+share/ppsspp/assets/shaders/colorcorrection.fsh
+share/ppsspp/assets/shaders/crt.fsh
+share/ppsspp/assets/shaders/defaultshaders.ini
+share/ppsspp/assets/shaders/fxaa.fsh
+share/ppsspp/assets/shaders/fxaa.vsh
+share/ppsspp/assets/shaders/natural.fsh
+share/ppsspp/assets/shaders/natural.vsh
+share/ppsspp/assets/shaders/naturalA.fsh
+share/ppsspp/assets/shaders/naturalA.vsh
+share/ppsspp/assets/shaders/persistence.fsh
+share/ppsspp/assets/shaders/psp_color.fsh
+share/ppsspp/assets/shaders/scanlines.fsh
+share/ppsspp/assets/shaders/sharpen.fsh
+share/ppsspp/assets/shaders/stereo_red_blue.fsh
+share/ppsspp/assets/shaders/stereo_sbs.fsh
+share/ppsspp/assets/shaders/tex_2xbrz.csh
+share/ppsspp/assets/shaders/tex_4xbrz.csh
+share/ppsspp/assets/shaders/tex_mmpx.csh
+share/ppsspp/assets/shaders/upscale_bicubic.fsh
+share/ppsspp/assets/shaders/upscale_bicubic.vsh
+share/ppsspp/assets/shaders/upscale_spline36.fsh
+share/ppsspp/assets/shaders/upscale_spline36.vsh
+share/ppsspp/assets/shaders/videoAA.fsh
+share/ppsspp/assets/shaders/vignette.fsh
+share/ppsspp/assets/themes/defaultthemes.ini
+share/ppsspp/assets/ui_atlas.meta
+share/ppsspp/assets/ui_atlas.zim
+share/ppsspp/assets/unknown.png
+share/ppsspp/assets/vfpu/vfpu_asin_lut65536.dat
+share/ppsspp/assets/vfpu/vfpu_asin_lut_deltas.dat
+share/ppsspp/assets/vfpu/vfpu_asin_lut_indices.dat
+share/ppsspp/assets/vfpu/vfpu_exp2_lut.dat
+share/ppsspp/assets/vfpu/vfpu_exp2_lut65536.dat
+share/ppsspp/assets/vfpu/vfpu_log2_lut.dat
+share/ppsspp/assets/vfpu/vfpu_log2_lut65536.dat
+share/ppsspp/assets/vfpu/vfpu_log2_lut65536_quadratic.dat
+share/ppsspp/assets/vfpu/vfpu_rcp_lut.dat
+share/ppsspp/assets/vfpu/vfpu_rsqrt_lut.dat
+share/ppsspp/assets/vfpu/vfpu_sin_lut8192.dat
+share/ppsspp/assets/vfpu/vfpu_sin_lut_delta.dat
+share/ppsspp/assets/vfpu/vfpu_sin_lut_exceptions.dat
+share/ppsspp/assets/vfpu/vfpu_sin_lut_interval_delta.dat
+share/ppsspp/assets/vfpu/vfpu_sqrt_lut.dat
+share/ppsspp/assets/zip.png
diff --git a/ppsspp/TODO b/ppsspp/TODO
new file mode 100644
index 0000000000..3a6d61eca8
--- /dev/null
+++ b/ppsspp/TODO
@@ -0,0 +1,2 @@
+- audio problems on NetBSD
+- segfaults caused by mprotect problems? 
diff --git a/ppsspp/distinfo b/ppsspp/distinfo
new file mode 100644
index 0000000000..e1ce3c158b
--- /dev/null
+++ b/ppsspp/distinfo
@@ -0,0 +1,8 @@
+$NetBSD$
+
+BLAKE2s (ppsspp-1.15.4.tar.xz) = d44cf41b85ddb81847059235ebbd0cb99e839de6c2915a7057178e698a188dfd
+SHA512 (ppsspp-1.15.4.tar.xz) = 9d2c140b0d633e5ca6191aaf276b7e4f6d029f29d1313a45fb78ee3879fec09f57d816604c51474ab6fe9cde713787d5769e87466d3c3015fe6a9b195ff198d2
+Size (ppsspp-1.15.4.tar.xz) = 51947468 bytes
+SHA1 (patch-CMakeLists.txt) = 1b746704a416f65552b99e9244638c0f03502d80
+SHA1 (patch-Core_HLE_proAdhoc.cpp) = 36173e947964545f97eb3405be0666ce7c8ad09e
+SHA1 (patch-ppsspp_config.h) = 26ab11265c16d97904613b8b73ccf85f6258a5b1
diff --git a/ppsspp/patches/patch-CMakeLists.txt b/ppsspp/patches/patch-CMakeLists.txt
new file mode 100644
index 0000000000..05096583a3
--- /dev/null
+++ b/ppsspp/patches/patch-CMakeLists.txt
@@ -0,0 +1,17 @@
+$NetBSD$
+
+Several functions are hidden behind _NETBSD_SOURCE.
+
+--- CMakeLists.txt.orig	2023-05-22 07:27:43.000000000 -0700
++++ CMakeLists.txt	2023-06-29 00:17:35.378577080 -0700
+@@ -13,6 +13,10 @@
+ 
+ add_definitions(-D__STDC_CONSTANT_MACROS)
+ 
++if(${CMAKE_SYSTEM_NAME} STREQUAL "NetBSD")
++  add_definitions(-D_NETBSD_SOURCE)
++endif()
++
+ # Include AppleClang and Clang.
+ if(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
+ 	set(CLANG ON)
diff --git a/ppsspp/patches/patch-Core_HLE_proAdhoc.cpp b/ppsspp/patches/patch-Core_HLE_proAdhoc.cpp
new file mode 100644
index 0000000000..fbbab77810
--- /dev/null
+++ b/ppsspp/patches/patch-Core_HLE_proAdhoc.cpp
@@ -0,0 +1,28 @@
+$NetBSD$
+
+Deal with the fact that, on NetBSD, the s_addr field of a struct sockaddr_in
+is packed. 
+
+--- Core/HLE/proAdhoc.cpp.orig	2023-06-29 00:33:37.275915356 -0700
++++ Core/HLE/proAdhoc.cpp	2023-06-29 00:33:30.317029940 -0700
+@@ -1894,15 +1894,15 @@
+ 	ip_ranges.reserve(5);
+ 
+ 	if (1 == inet_pton(AF_INET, "192.168.0.0", &(saNet.sin_addr)) && 1 == inet_pton(AF_INET, "255.255.0.0", &(saMask.sin_addr)))
+-		ip_ranges.push_back({saNet.sin_addr.s_addr, saMask.sin_addr.s_addr});
++		ip_ranges.push_back({(uint32_t)saNet.sin_addr.s_addr, (uint32_t)saMask.sin_addr.s_addr});
+ 	if (1 == inet_pton(AF_INET, "172.16.0.0", &(saNet.sin_addr)) && 1 == inet_pton(AF_INET, "255.240.0.0", &(saMask.sin_addr)))
+-		ip_ranges.push_back({ saNet.sin_addr.s_addr, saMask.sin_addr.s_addr });
++		ip_ranges.push_back({ (uint32_t)saNet.sin_addr.s_addr, (uint32_t)saMask.sin_addr.s_addr });
+ 	if (1 == inet_pton(AF_INET, "10.0.0.0", &(saNet.sin_addr)) && 1 == inet_pton(AF_INET, "255.0.0.0", &(saMask.sin_addr)))
+-		ip_ranges.push_back({ saNet.sin_addr.s_addr, saMask.sin_addr.s_addr });
++		ip_ranges.push_back({ (uint32_t)saNet.sin_addr.s_addr, (uint32_t)saMask.sin_addr.s_addr });
+ 	if (1 == inet_pton(AF_INET, "127.0.0.0", &(saNet.sin_addr)) && 1 == inet_pton(AF_INET, "255.0.0.0", &(saMask.sin_addr)))
+-		ip_ranges.push_back({ saNet.sin_addr.s_addr, saMask.sin_addr.s_addr });
++		ip_ranges.push_back({ (uint32_t)saNet.sin_addr.s_addr, (uint32_t)saMask.sin_addr.s_addr });
+ 	if (1 == inet_pton(AF_INET, "169.254.0.0", &(saNet.sin_addr)) && 1 == inet_pton(AF_INET, "255.255.0.0", &(saMask.sin_addr)))
+-		ip_ranges.push_back({ saNet.sin_addr.s_addr, saMask.sin_addr.s_addr });
++		ip_ranges.push_back({ (uint32_t)saNet.sin_addr.s_addr, (uint32_t)saMask.sin_addr.s_addr });
+ 
+ 	return ip_ranges;
+ }
diff --git a/ppsspp/patches/patch-ppsspp_config.h b/ppsspp/patches/patch-ppsspp_config.h
new file mode 100644
index 0000000000..ccf44c935a
--- /dev/null
+++ b/ppsspp/patches/patch-ppsspp_config.h
@@ -0,0 +1,15 @@
+$NetBSD$
+
+NetBSD can benefit from the macros which allow PPSSPP to build on OpenBSD.
+
+--- ppsspp_config.h.orig	2023-06-28 20:56:35.580340514 -0700
++++ ppsspp_config.h	2023-06-28 20:56:48.149019856 -0700
+@@ -104,7 +104,7 @@
+     #define PPSSPP_PLATFORM_LINUX 1
+ #elif defined(__linux__)
+     #define PPSSPP_PLATFORM_LINUX 1
+-#elif defined(__OpenBSD__)
++#elif defined(__OpenBSD__) || defined(__NetBSD__)
+     #define PPSSPP_PLATFORM_OPENBSD 1
+ #endif
+ 


Home | Main Index | Thread Index | Old Index