From nobody Tue Feb 14 20:23:50 2023 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 4PGXjL30S2z3pxR5; Tue, 14 Feb 2023 20:23:50 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PGXjL1s2Wz40PJ; Tue, 14 Feb 2023 20:23:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676406230; 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=RxhhrMaYeiUiLs4G106xP1TFadBPk8Dz3ehCOMrOAO4=; b=LgGLwYUOHd6ynAIihiOaZLkj8jsDO0olG6HKtWVp9gL7WFpA5TvKyuJelT2tGNHgwGw4CA Arny1vJceUfFP4V7Tl+pnK6YjXRTOXegShKF34hgdWG1otsYpN7a0gFPdscqB84ZBIUc4N U+FSB51RRniKv3L2S0rE1goFGEyHTsMlfOuN6Ucd9eQ96K/D3uZhyoUSdQMAMPXwTJ2Etq lWshQ9t0Behj3Kqljq4yftzjMqTQBNRvzi9KHzMVRS7OFUbYUYNwz9zSNw2N9PUSmelOkm 4iju0xjBQeG7FqvUIDLWuWA/HAfqxJAehJLyc+yE7KISxhnzHln8zL16ovbd1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676406230; 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=RxhhrMaYeiUiLs4G106xP1TFadBPk8Dz3ehCOMrOAO4=; b=qjfau6rNv2CjJXNeRLjsBCxt8FX0kYFkbwe0keRVl4FIL9TEgksB0or1eNmoApXJrtn3rf l11NNLCIDbKO73Tip5gMAavyCbMv3oqGHD8iOsqL1xulTS2DBPLdUtiGB9doOU73VfAzIt OoYWzMI9nDQyhVQmn6mbDm3VA19XPQZMnManOONItHx7g7fYge5TvFd+TN0u9I3HWkgaEe 5y0CndWNU8X/2b+Kk/RVn2ik0uv1rZkTufqcP0KPxLq/ta9B/Ev+zumZFZ+s47gVD9cuMC tm+niYcLrzP+hcFVE0nBN5LT/8XEOiKlZ7vu/ChpT5e7x68ZSk0SN3blZY9AeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676406230; a=rsa-sha256; cv=none; b=ao1NtyvCDNYtKVg0OWHBlf5A4rG1wRbQm2c3ltrP7aK87V+Tj2n4P+q7BkKE6Qa7RWRVT6 zhbG7A72xXEkku2w/pL/o6RuecbLfBrzQFLgZFBku4NuFbJhjNldJza0IEUgk4RPg+CGRs W1r06mrfVo7LPnIWVe2Iz5r14E8s0VsqcF6Ikf3tA0UWbh7qvdqpyU3nGtUvHmXPPKc75/ J0PXOWIENsZkcta4e1LqwOADT5zu2MeSgAgK2RJt3TjlI5N3EiWFyFPnhs6ZfQc9kiUkRC HfnmrOEsqoP8mm8fmQvPZCO7R39i7Kua0cjtUUKHsWF6KxkuxsxhexNPwZ9maw== 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 4PGXjL0vlPz1CF4; Tue, 14 Feb 2023 20:23:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31EKNoGb059709; Tue, 14 Feb 2023 20:23:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31EKNoel059708; Tue, 14 Feb 2023 20:23:50 GMT (envelope-from git) Date: Tue, 14 Feb 2023 20:23:50 GMT Message-Id: <202302142023.31EKNoel059708@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: 09490acc3fef - main - emulators/fceux: Update to 2.6.5 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 09490acc3fef0a0a6dfdb264f78965e2738175bd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=09490acc3fef0a0a6dfdb264f78965e2738175bd commit 09490acc3fef0a0a6dfdb264f78965e2738175bd Author: Robert Clausecker AuthorDate: 2023-02-09 16:25:27 +0000 Commit: Robert Clausecker CommitDate: 2023-02-14 20:18:58 +0000 emulators/fceux: Update to 2.6.5 An interim release, gathering bug fixes and improvements from the past year. - move REINPLACE_CMD usage to pre-configure to make make makepatch easier to use. - commit 2d34c2b for PR #262886 has changed the package list to ship a man page we explicitly did not want to ship. Fix the post-install target and pkg-plist to continue not shipping the man page. Changelog: https://fceux.com/web/pressrelease-2.6.5.html Approved by: eduardo (mentor) Differential Revision: https://reviews.freebsd.org/D38517 --- emulators/fceux/Makefile | 12 +++++++----- emulators/fceux/distinfo | 6 +++--- emulators/fceux/files/patch-src_drivers_Qt_keyscan.cpp | 11 +++++++++++ emulators/fceux/pkg-plist | 1 - 4 files changed, 21 insertions(+), 9 deletions(-) diff --git a/emulators/fceux/Makefile b/emulators/fceux/Makefile index e3c46481c044..f92005edff42 100644 --- a/emulators/fceux/Makefile +++ b/emulators/fceux/Makefile @@ -1,8 +1,7 @@ PORTNAME= fceux -DISTVERSION= 2.6.4 -PORTREVISION= 1 +DISTVERSIONPREFIX= v +DISTVERSION= 2.6.5 CATEGORIES= emulators games -MASTER_SITES= SF/fceultra/Source%20Code/${DISTVERSION}%20src/ MAINTAINER= fuz@FreeBSD.org COMMENT= NES emulator @@ -18,6 +17,9 @@ USE_GL= gl glu USE_QT= buildtools:build core gui opengl qmake:build widgets USE_SDL= sdl2 +USE_GITHUB= yes +GH_ACCOUNT= TASEmulators + CFLAGS+= -DPUBLIC_RELEASE CMAKE_ON= GLVND @@ -29,7 +31,7 @@ FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg X264_LIB_DEPENDS= libx264.so:multimedia/libx264 X265_LIB_DEPENDS= libx265.so:multimedia/x265 -post-patch: +pre-configure: ${REINPLACE_CMD} -e 's,/usr,${PREFIX},' ${WRKSRC}/fceux.desktop ${REINPLACE_CMD} -e 's:%%PKGNAME%%:${PKGNAME}:' ${WRKSRC}/scripts/genGitHdr.sh ${REINPLACE_CMD} -e 's,/usr,${PREFIX},' ${WRKSRC}/src/drivers/Qt/HelpPages.cpp @@ -41,6 +43,6 @@ post-install: ${RM} ${STAGEDIR}${DATADIR}/*.dll ${RM} ${STAGEDIR}${DATADIR}/*.chm # currently broken and not shipped - ${RM} ${STAGEDIR}${PREFIX}/man/man6/fceux-net-server.6 + ${RM} ${STAGEDIR}${PREFIX}/share/man/man6/fceux-net-server.6 .include diff --git a/emulators/fceux/distinfo b/emulators/fceux/distinfo index f2c4bd836766..3d914f5dca23 100644 --- a/emulators/fceux/distinfo +++ b/emulators/fceux/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1648120308 -SHA256 (fceux-2.6.4.tar.gz) = cc2f153076af0969cec2d8ab33077af98f820ef89bfcea7f72c50cb2c2a22df6 -SIZE (fceux-2.6.4.tar.gz) = 23372193 +TIMESTAMP = 1676212323 +SHA256 (TASEmulators-fceux-v2.6.5_GH0.tar.gz) = 78156f3685c55849351178773940871ed607bc4fc37f233fdab58c232e3208fa +SIZE (TASEmulators-fceux-v2.6.5_GH0.tar.gz) = 23299626 diff --git a/emulators/fceux/files/patch-src_drivers_Qt_keyscan.cpp b/emulators/fceux/files/patch-src_drivers_Qt_keyscan.cpp new file mode 100644 index 000000000000..11b7ed196d1f --- /dev/null +++ b/emulators/fceux/files/patch-src_drivers_Qt_keyscan.cpp @@ -0,0 +1,11 @@ +--- src/drivers/Qt/keyscan.cpp.orig 2023-02-13 00:05:10 UTC ++++ src/drivers/Qt/keyscan.cpp +@@ -46,7 +46,7 @@ static uint32_t AltKeyCodeR = VK_RMENU; + static uint32_t MetaKeyCodeR = VK_RWIN; + static BYTE keyBuf[256]; + +-#elif defined(__linux__) ++#elif defined(__linux__) || defined(__FreeBSD__) + + #if defined(_HAS_XKB) + #include diff --git a/emulators/fceux/pkg-plist b/emulators/fceux/pkg-plist index d4a44cdb3370..40b8fb8afad0 100644 --- a/emulators/fceux/pkg-plist +++ b/emulators/fceux/pkg-plist @@ -1,7 +1,6 @@ bin/fceux share/applications/fceux.desktop share/man/man6/fceux.6.gz -share/man/man6/fceux-net-server.6.gz %%PORTDOCS%%%%DATADIR%%/fceux.qch %%PORTDOCS%%%%DATADIR%%/fceux.qhc %%PORTDOCS%%%%DATADIR%%/fceux.qhp