git: 2896515d224b - main - emulators/ppsspp: unbundle net/miniupnpc after 30529d609400

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Jan Beich <jbeich_at_FreeBSD.org>
Date: Mon, 25 Sep 2023 13:29:16 UTC
The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=2896515d224b6ad2e8e5512cce9c93f4b0169302

commit 2896515d224b6ad2e8e5512cce9c93f4b0169302
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2023-09-25 13:10:08 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2023-09-25 13:28:39 +0000

    emulators/ppsspp: unbundle net/miniupnpc after 30529d609400
    
    PPSSPP fork appears to be miniupnpc_2_2_2-6-g3a87be3 snapshot,
    thus a subset of system version after 529426676b2b.
    
    https://github.com/hrydgard/ppsspp/commit/521b04452efc
---
 emulators/libretro-ppsspp/Makefile | 2 +-
 emulators/ppsspp-qt5/Makefile      | 2 +-
 emulators/ppsspp/Makefile          | 8 ++++----
 emulators/ppsspp/distinfo          | 2 --
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/emulators/libretro-ppsspp/Makefile b/emulators/libretro-ppsspp/Makefile
index 59effea19ca9..f4ad77bc1aa2 100644
--- a/emulators/libretro-ppsspp/Makefile
+++ b/emulators/libretro-ppsspp/Makefile
@@ -1,4 +1,4 @@
-PORTREVISION=	0
+PORTREVISION=	1
 PKGNAMEPREFIX=	libretro-
 
 MASTERDIR=	${.CURDIR}/../ppsspp
diff --git a/emulators/ppsspp-qt5/Makefile b/emulators/ppsspp-qt5/Makefile
index 2b5cf472f7e3..41539a191451 100644
--- a/emulators/ppsspp-qt5/Makefile
+++ b/emulators/ppsspp-qt5/Makefile
@@ -1,4 +1,4 @@
-PORTREVISION=	0
+PORTREVISION=	1
 PKGNAMESUFFIX=	-qt5
 
 MASTERDIR=	${.CURDIR}/../ppsspp
diff --git a/emulators/ppsspp/Makefile b/emulators/ppsspp/Makefile
index 2164d6c0579c..698aa2190b12 100644
--- a/emulators/ppsspp/Makefile
+++ b/emulators/ppsspp/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	ppsspp
 DISTVERSIONPREFIX=	v
 DISTVERSION?=	1.16.4
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	emulators
 # XXX Get from Debian once #697821 lands
 MASTER_SITES=	https://bazaar.launchpad.net/~sergio-br2/${PORTNAME}/debian-sdl/download/5/${PORTNAME}.1-20140802045408-dd26dik367ztj5xg-8/:manpage
@@ -22,13 +22,13 @@ NOT_FOR_ARCHS_REASON=	only little-endian is supported, see \
 LIB_DEPENDS=	libzip.so:archivers/libzip \
 		libsnappy.so:archivers/snappy \
 		libzstd.so:archivers/zstd \
-		libavcodec.so:multimedia/ffmpeg
+		libavcodec.so:multimedia/ffmpeg \
+		libminiupnpc.so:net/miniupnpc
 RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	hrydgard
 GH_TUPLE?=	hrydgard:glslang:8.13.3743-948-gb34f619e:glslang/ext/glslang \
-		hrydgard:miniupnp:miniupnpd_2_1-502-g3a87be3:miniupnp/ext/miniupnp \
 		google:cpu_features:v0.8.0-27-gfd4ffc1:cpu_features/ext/cpu_features \
 		unknownbrackets:ppsspp-debugger:9776332:debugger/assets/debugger \
 		KhronosGroup:SPIRV-Cross:sdk-1.3.239.0:SPIRV/ext/SPIRV-Cross \
@@ -43,7 +43,7 @@ USES=		cmake compiler:c++11-lib gl localbase:ldflags pkgconfig shared-mime-info
 EXCLUDE=	libzip zlib
 EXTRACT_AFTER_ARGS=${EXCLUDE:S,^,--exclude ,}
 USE_GL=		glew opengl
-CMAKE_ON=	${FFMPEG LIBZIP SNAPPY ZSTD:L:S/^/USE_SYSTEM_/} USE_VULKAN_DISPLAY_KHR
+CMAKE_ON=	${FFMPEG LIBZIP MINIUPNPC SNAPPY ZSTD:L:S/^/USE_SYSTEM_/} USE_VULKAN_DISPLAY_KHR
 CMAKE_OFF=	USE_DISCORD
 LDFLAGS+=	-Wl,--as-needed # ICE/SM/X11/Xext, Qt5Network
 SUB_FILES=	pkg-message
diff --git a/emulators/ppsspp/distinfo b/emulators/ppsspp/distinfo
index b2ce37b5f04f..bba991f6b221 100644
--- a/emulators/ppsspp/distinfo
+++ b/emulators/ppsspp/distinfo
@@ -5,8 +5,6 @@ SHA256 (hrydgard-ppsspp-v1.16.4_GH0.tar.gz) = 5220b2ec2cd87fb9ff1079e189d14c24ce
 SIZE (hrydgard-ppsspp-v1.16.4_GH0.tar.gz) = 41508396
 SHA256 (hrydgard-glslang-8.13.3743-948-gb34f619e_GH0.tar.gz) = 8f002c902a5bc5a9d3c7e58b82ba2a6845ee08a01b756eaf4afefff806d109c7
 SIZE (hrydgard-glslang-8.13.3743-948-gb34f619e_GH0.tar.gz) = 3689872
-SHA256 (hrydgard-miniupnp-miniupnpd_2_1-502-g3a87be3_GH0.tar.gz) = 3aefaee9eb86e5f44267aa9e8d37b46d2be8f1c72879cebefa365690a9348190
-SIZE (hrydgard-miniupnp-miniupnpd_2_1-502-g3a87be3_GH0.tar.gz) = 448853
 SHA256 (google-cpu_features-v0.8.0-27-gfd4ffc1_GH0.tar.gz) = 0bcb1a537b8fc184b9df9ddde9d15868efe7f651139ea84d3e20ac9900a43c60
 SIZE (google-cpu_features-v0.8.0-27-gfd4ffc1_GH0.tar.gz) = 109044
 SHA256 (unknownbrackets-ppsspp-debugger-9776332_GH0.tar.gz) = adc88664cb127b7797b03ffe07274096ac8ac037f143bf636b6208084c47e4d7