From nobody Wed Jul 17 13:38:45 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WPH8Q1MJ7z5RLLf; Wed, 17 Jul 2024 13:38:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WPH8Q0pm6z4pfy; Wed, 17 Jul 2024 13:38:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721223526; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fTRuvQLXfEM8Rq6alTEd5hfEZty8C/TVLyH1+weu/c8=; b=d052hG/bcqISmka8UTb36TCy+a7bL2zgiH2U/HozqHIIeXAKj7DX2wqITPcfIH85qKmNA1 kApiTnhqHRJTjqo9j7SfXZgjGT2OgySR3h8W0W9J4NSn3W57YCh52Gvmnmi48dP2KQTsjT j1TbEcikEB1pw62mY3uXP6c4KcHeZuM91kK6O4+XioyDMGY7JIpnttQXfHOKaKRvIozuzt tNcZGjIcszhaJf9ESZZzJOWn78qm4Gj0O5rBYi38J37fOh0BoGatGUzCqmD079HAAg8BLC nD3olZulFBob4sSyT4Vmxp20M4sMgPvE1nVfuWMRxvNMZXe9qoZQnX1s5Hc7tA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721223526; a=rsa-sha256; cv=none; b=kVddSv/9Hm5MAodf+XVKhhkGe4DG/wcue44ned8OPyepTRXweuRrR/Q5gGsbN20QkfsShz spWNSIPGU9Vo4/3S0EuhFosr6mo8/8nby+ZM1+H1fACrmMOHCtJw7jR150D2lznqeKC2v9 rMDCK4Hjjc6rdSC8DS2ZzgAaMNmUe57X9j7wzwA+JMAAxnfU/in8Et9u/IykUlwRK/q39U bT2qlkq0eyEfg25K/pUHRteaO6fVT2AABv+M+hCEYkU6dobWMJ3pXDdtNRjQjzHC6uNZ3b HWnGp+GvRrXMcsbv/EjyrbAtv8fXz9DGwRkXI2RvChk/LI6/xZvR/5xH5A6akQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721223526; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fTRuvQLXfEM8Rq6alTEd5hfEZty8C/TVLyH1+weu/c8=; b=MNaJy8oR3ag4saZULaZ/8uR1z0ftYU9wA+VgdjkWpv15STcj6E/vYJbkPXZjZd2m2a0EW3 XA4RDRJSn7zQPBESez/bFeUllwfZJsf+tUYCxtHOuvF4WN8tU7a7eSf8qDYyzOxAGEiI6N wE6vKc/pKMqjQYTElxLeW/04tqVhm2HuT3gF1W5JFE0dvvkj5ZUcheZEibr3UfEIa3rZsQ oSTnVzGQM6QTrAG/fqYqlOziTJ+jB70fQXloI0ReCJbb5TqzDGC2fV+AE7eh8fE3ZqawlU eVhN3tzwGcrtOOUBVwnAKa/ON8NDGMyhSBnjtCQjtuexi9my3Ay904gVRJ4u7Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WPH8Q0QDXz1Ls4; Wed, 17 Jul 2024 13:38:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46HDcjEN048169; Wed, 17 Jul 2024 13:38:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46HDcjVF048166; Wed, 17 Jul 2024 13:38:45 GMT (envelope-from git) Date: Wed, 17 Jul 2024 13:38:45 GMT Message-Id: <202407171338.46HDcjVF048166@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: 57569e0b98a8 - main - emulators/{,libretro-}ppsspp{,-qt5}: Fix build with miniupnpc-2.2.8 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 57569e0b98a87e08032fe64c106958b8e439ebd7 Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=57569e0b98a87e08032fe64c106958b8e439ebd7 commit 57569e0b98a87e08032fe64c106958b8e439ebd7 Author: Vladimir Druzenko AuthorDate: 2024-07-17 13:31:55 +0000 Commit: Vladimir Druzenko CommitDate: 2024-07-17 13:31:55 +0000 emulators/{,libretro-}ppsspp{,-qt5}: Fix build with miniupnpc-2.2.8 Upstream bug report: https://github.com/hrydgard/ppsspp/issues/19333 While here fix plist error in libretro-ppsspp and pet portclippy. PR: 280298 --- emulators/libretro-ppsspp/Makefile | 6 +- emulators/ppsspp-qt5/Makefile | 6 +- emulators/ppsspp/Makefile | 78 +++++++++++----------- .../ppsspp/files/patch-Core_Util_PortManager.cpp | 25 +++++++ 4 files changed, 69 insertions(+), 46 deletions(-) diff --git a/emulators/libretro-ppsspp/Makefile b/emulators/libretro-ppsspp/Makefile index 59effea19ca9..add5ff86a07a 100644 --- a/emulators/libretro-ppsspp/Makefile +++ b/emulators/libretro-ppsspp/Makefile @@ -1,9 +1,9 @@ -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMEPREFIX= libretro- MASTERDIR= ${.CURDIR}/../ppsspp -OPTIONS_SLAVE= LIBRETRO -OPTIONS_EXCLUDE=${OPTIONS_DEFINE} +OPTIONS_EXCLUDE= ${OPTIONS_DEFINE} +OPTIONS_SLAVE= LIBRETRO .include "${MASTERDIR}/Makefile" diff --git a/emulators/ppsspp-qt5/Makefile b/emulators/ppsspp-qt5/Makefile index 2b5cf472f7e3..71f2a24b5d82 100644 --- a/emulators/ppsspp-qt5/Makefile +++ b/emulators/ppsspp-qt5/Makefile @@ -1,10 +1,10 @@ -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= -qt5 MASTERDIR= ${.CURDIR}/../ppsspp -OPTIONS_SLAVE= QT5 # XXX No VULKAN per https://github.com/hrydgard/ppsspp/blob/v1.10/Qt/QtMain.cpp#L711-L712 -OPTIONS_EXCLUDE=${OPTIONS_DEFINE} +OPTIONS_EXCLUDE= ${OPTIONS_DEFINE} +OPTIONS_SLAVE= QT5 .include "${MASTERDIR}/Makefile" diff --git a/emulators/ppsspp/Makefile b/emulators/ppsspp/Makefile index 1dfb83ec39ad..826d848ebefc 100644 --- a/emulators/ppsspp/Makefile +++ b/emulators/ppsspp/Makefile @@ -26,6 +26,7 @@ LIB_DEPENDS= libzip.so:archivers/libzip \ libminiupnpc.so:net/miniupnpc RUN_DEPENDS= xdg-open:devel/xdg-utils +USES= cmake compiler:c++11-lib gl localbase:ldflags pkgconfig USE_GITHUB= yes GH_ACCOUNT= hrydgard GH_TUPLE?= hrydgard:glslang:8.13.3743-948-gb34f619e:glslang/ext/glslang \ @@ -37,68 +38,65 @@ GH_TUPLE?= hrydgard:glslang:8.13.3743-948-gb34f619e:glslang/ext/glslang \ Kingcom:filesystem:v1.3.2-12-g3f1c185:filesystem/ext/armips/ext/filesystem \ RetroAchievements:rcheevos:v11.0.0-26-ge7989c3:rcheevos/ext/rcheevos \ Tencent:rapidjson:v1.1.0-415-g73063f50:rapidjson/ext/rapidjson - -CONFLICTS_INSTALL= ${PORTNAME}-* - -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 MINIUPNPC SNAPPY ZSTD:L:S/^/USE_SYSTEM_/} USE_VULKAN_DISPLAY_KHR CMAKE_OFF= USE_DISCORD LDFLAGS+= -Wl,--as-needed # ICE/SM/X11/Xext, Qt5Network +CONFLICTS_INSTALL= ${PORTNAME}-* +DESKTOP_ENTRIES= "PPSSPP" \ + "" \ + "${PORTNAME}" \ + "${PORTNAME} %f" \ + "Game;Emulator;" \ + "" +EXTRACT_AFTER_ARGS= ${EXCLUDE:S,^,--exclude ,} SUB_FILES= pkg-message PORTDATA= assets -DESKTOP_ENTRIES="PPSSPP" \ - "" \ - "${PORTNAME}" \ - "${PORTNAME} %f" \ - "Game;Emulator;" \ - "" - -OPTIONS_DEFINE= VULKAN -OPTIONS_DEFAULT=VULKAN -OPTIONS_SINGLE= GUI +OPTIONS_DEFINE= VULKAN +OPTIONS_DEFAULT= VULKAN +OPTIONS_SINGLE= GUI OPTIONS_SINGLE_GUI= LIBRETRO QT5 SDL -OPTIONS_SLAVE?= SDL OPTIONS_EXCLUDE:= ${OPTIONS_EXCLUDE} ${OPTIONS_SINGLE_GUI} +OPTIONS_SLAVE?= SDL -LIBRETRO_DESC= libretro core for games/retroarch +LIBRETRO_DESC= libretro core for games/retroarch +VULKAN_DESC= Vulkan renderer +LIBRETRO_LIB_DEPENDS= libpng.so:graphics/png LIBRETRO_CMAKE_BOOL= LIBRETRO LIBRETRO_PLIST_FILES= lib/libretro/${PORTNAME}_libretro.so -LIBRETRO_VARS= CONFLICTS_INSTALL= DESKTOP_ENTRIES= PLIST= PORTDATA= PKGMESSAGE= SUB_FILES= -QT5_USES= elfctl qt:5 sdl -QT5_USE= QT=qmake:build,buildtools:build,linguisttools:build,gui,multimedia,opengl,widgets -QT5_USE+= SDL=sdl2 # audio, joystick -QT5_CMAKE_BOOL= USING_QT_UI -QT5_VARS= EXENAME=PPSSPPQt ELF_FEATURES=+wxneeded:PPSSPPQt +LIBRETRO_VARS= CONFLICTS_INSTALL= DESKTOP_ENTRIES= PLIST= PORTDATA= PKGMESSAGE= SUB_FILES= +QT5_LIB_DEPENDS= libpng.so:graphics/png +QT5_USES= desktop-file-utils elfctl qt:5 shared-mime-info sdl +QT5_USE= QT=qmake:build,buildtools:build,linguisttools:build,core,gui,multimedia,opengl,widgets +QT5_USE+= SDL=sdl2 # audio, joystick +QT5_CMAKE_BOOL= USING_QT_UI +QT5_VARS= EXENAME=PPSSPPQt ELF_FEATURES=+wxneeded:PPSSPPQt SDL_CATEGORIES= wayland -SDL_BUILD_DEPENDS= png>=1.6:graphics/png SDL_LIB_DEPENDS= libpng.so:graphics/png -SDL_USES= elfctl sdl -SDL_USE= SDL=sdl2 -SDL_VARS= EXENAME=PPSSPPSDL ELF_FEATURES=+wxneeded:PPSSPPSDL -VULKAN_DESC= Vulkan renderer +SDL_USES= elfctl shared-mime-info sdl +SDL_USE= SDL=sdl2 +SDL_VARS= EXENAME=PPSSPPSDL ELF_FEATURES=+wxneeded:PPSSPPSDL VULKAN_RUN_DEPENDS= ${LOCALBASE}/lib/libvulkan.so:graphics/vulkan-loader post-patch: - @${REINPLACE_CMD} -e 's/Linux/${OPSYS}/' \ - ${WRKSRC}/assets/gamecontrollerdb.txt - @${REINPLACE_CMD} -e 's,/usr/share,${PREFIX}/share,' \ - ${WRKSRC}/UI/NativeApp.cpp - @${REINPLACE_CMD} -e 's/"unknown"/"${DISTVERSIONFULL}"/' \ - ${WRKSRC}/git-version.cmake - -do-install-QT5-on do-install-SDL-on: - ${MV} ${STAGEDIR}${PREFIX}/bin/${EXENAME} \ - ${STAGEDIR}${PREFIX}/bin/${PORTNAME} - ${INSTALL_MAN} ${_DISTDIR}/${PORTNAME}.1 \ - ${STAGEDIR}${PREFIX}/share/man/man1 + @${REINPLACE_CMD} -e 's/Linux/${OPSYS}/' ${WRKSRC}/assets/gamecontrollerdb.txt + @${REINPLACE_CMD} -e 's,/usr/share,${PREFIX}/share,' ${WRKSRC}/UI/NativeApp.cpp + @${REINPLACE_CMD} -e 's/"unknown"/"${DISTVERSIONFULL}"/' ${WRKSRC}/git-version.cmake do-install-LIBRETRO-on: ${MKDIR} ${STAGEDIR}${PREFIX}/${LIBRETRO_PLIST_FILES:H} ${INSTALL_LIB} ${BUILD_WRKSRC}/lib/${LIBRETRO_PLIST_FILES:T} \ ${STAGEDIR}${PREFIX}/${LIBRETRO_PLIST_FILES:H} +.if ${OPTIONS_SLAVE} == LIBRETRO +. for d in applications icons man mime ${PORTNAME} + ${RM} -r ${STAGEDIR}${PREFIX}/share/${d} +. endfor +.endif + +do-install-QT5-on do-install-SDL-on: + ${MV} ${STAGEDIR}${PREFIX}/bin/${EXENAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} + ${INSTALL_MAN} ${_DISTDIR}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/share/man/man1 .include diff --git a/emulators/ppsspp/files/patch-Core_Util_PortManager.cpp b/emulators/ppsspp/files/patch-Core_Util_PortManager.cpp new file mode 100644 index 000000000000..e2b3ae859c67 --- /dev/null +++ b/emulators/ppsspp/files/patch-Core_Util_PortManager.cpp @@ -0,0 +1,25 @@ +--- Core/Util/PortManager.cpp.orig 2024-02-04 13:08:02 UTC ++++ Core/Util/PortManager.cpp +@@ -161,7 +161,21 @@ bool PortManager::Initialize(const unsigned int timeou + + // Get LAN IP address that connects to the router + char lanaddr[64] = "unset"; +- int status = UPNP_GetValidIGD(devlist, urls, datas, lanaddr, sizeof(lanaddr)); //possible "status" values, 0 = NO IGD found, 1 = A valid connected IGD has been found, 2 = A valid IGD has been found but it reported as not connected, 3 = an UPnP device has been found but was not recognized as an IGD ++/* ++possible "status" values: ++-1 = Internal error ++ 0 = NO IGD found ++ 1 = A valid connected IGD has been found ++ 2 = A valid connected IGD has been found but its IP address is reserved (non routable) ++ 3 = A valid IGD has been found but it reported as not connected ++ 4 = an UPnP device has been found but was not recognized as an IGD ++*/ ++ int status = ++#if (MINIUPNPC_API_VERSION >= 18) ++ UPNP_GetValidIGD(devlist, urls, datas, lanaddr, sizeof(lanaddr), nullptr, 0); ++#else ++ UPNP_GetValidIGD(devlist, urls, datas, lanaddr, sizeof(lanaddr)); ++#endif + m_lanip = std::string(lanaddr); + INFO_LOG(SCENET, "PortManager - Detected LAN IP: %s", m_lanip.c_str()); +