ppsspp: Update to 1.17.1

[Charlotte Koch <charlotte%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Charlotte Koch <charlotte%NetBSD.org@localhost>
Pushed By:	cfkoch
Date:		Wed Mar 13 21:47:17 2024 -0700
Changeset:	016ada418ac8dfcaa23688958b0843a4f7c0d274

Modified Files:
	ppsspp/Makefile
	ppsspp/TODO
	ppsspp/distinfo
	ppsspp/patches/patch-ppsspp_config.h
Removed Files:
	ppsspp/patches/patch-Core_HLE_proAdhoc.cpp

Log Message:
ppsspp: Update to 1.17.1

But we have new build problems now

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

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

diffstat:
 ppsspp/Makefile                            |  2 +-
 ppsspp/TODO                                |  3 ++-
 ppsspp/distinfo                            |  9 ++++-----
 ppsspp/patches/patch-Core_HLE_proAdhoc.cpp | 28 ----------------------------
 ppsspp/patches/patch-ppsspp_config.h       |  8 ++++----
 5 files changed, 11 insertions(+), 39 deletions(-)

diffs:
diff --git a/ppsspp/Makefile b/ppsspp/Makefile
index c7c909804d..5d3673a357 100644
--- a/ppsspp/Makefile
+++ b/ppsspp/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-DISTNAME=	ppsspp-1.16.6
+DISTNAME=	ppsspp-1.17.1
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GITHUB:=hrydgard/}
 GITHUB_RELEASE=	v${PKGVERSION_NOREV}
diff --git a/ppsspp/TODO b/ppsspp/TODO
index ca8ee1b0d9..23d202edac 100644
--- a/ppsspp/TODO
+++ b/ppsspp/TODO
@@ -1,3 +1,4 @@
 PPSSPP TODO:
 
-- audio problems on NetBSD
+- Prior to 1.17.x: audio problems on NetBSD
+- 1.17.x and greater: PIC/PIE problems at link-time
diff --git a/ppsspp/distinfo b/ppsspp/distinfo
index 38c790ecf9..0611da38fb 100644
--- a/ppsspp/distinfo
+++ b/ppsspp/distinfo
@@ -1,8 +1,7 @@
 $NetBSD$
 
-BLAKE2s (ppsspp-1.16.6.tar.xz) = 7840739c2e63e55db583295e29af4627d158f6d0b3b0fee26381eb51f51cec52
-SHA512 (ppsspp-1.16.6.tar.xz) = a60e724fc6f297f49d4fca922d8acaf79174332adf4c18a32e1f6b7def86f48b1267df89850f41f8143137e0ac51a19a4c7b69f9065e9e83a91775f6d86f3bf3
-Size (ppsspp-1.16.6.tar.xz) = 51439288 bytes
+BLAKE2s (ppsspp-1.17.1.tar.xz) = 37eca0b1bc7d075ce046036e428a78916830ee44fb15c422dcecc10dfb276c0c
+SHA512 (ppsspp-1.17.1.tar.xz) = eaa0046f5d8e529efd8238690fa242638aa88630172abe59c4b7ffb16b1e18eeb38fcaf8e70ef76dbd2304b226d1f33e10cde709abe00fa2a5baff16c1883c31
+Size (ppsspp-1.17.1.tar.xz) = 54663108 bytes
 SHA1 (patch-CMakeLists.txt) = 57b05b75bff349d929e1242478dbc766c1c6bd49
-SHA1 (patch-Core_HLE_proAdhoc.cpp) = 36173e947964545f97eb3405be0666ce7c8ad09e
-SHA1 (patch-ppsspp_config.h) = 26ab11265c16d97904613b8b73ccf85f6258a5b1
+SHA1 (patch-ppsspp_config.h) = 7ef73657cbd316040d75b0a84248d8a91c6d4e9a
diff --git a/ppsspp/patches/patch-Core_HLE_proAdhoc.cpp b/ppsspp/patches/patch-Core_HLE_proAdhoc.cpp
deleted file mode 100644
index fbbab77810..0000000000
--- a/ppsspp/patches/patch-Core_HLE_proAdhoc.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-$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
index ccf44c935a..6fe107fa2e 100644
--- a/ppsspp/patches/patch-ppsspp_config.h
+++ b/ppsspp/patches/patch-ppsspp_config.h
@@ -1,10 +1,10 @@
 $NetBSD$
 
-NetBSD can benefit from the macros which allow PPSSPP to build on OpenBSD.
+NetBSD can benefit from the functionality provided for 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 @@
+--- ppsspp_config.h.orig	2024-03-13 21:19:45.715917776 -0700
++++ ppsspp_config.h	2024-03-13 21:19:58.391397099 -0700
+@@ -115,7 +115,7 @@
      #define PPSSPP_PLATFORM_LINUX 1
  #elif defined(__linux__)
      #define PPSSPP_PLATFORM_LINUX 1