From nobody Sun Jan 23 04:14:48 2022 X-Original-To: dev-commits-ports-main@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 AED85196AC5E; Sun, 23 Jan 2022 04:14:48 +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 4JhKWr3TVYz3RB7; Sun, 23 Jan 2022 04:14:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642911288; 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=4b5CGj3YfA2mv6leoE5FePOu1iYr7VAwyK/v7Tqn3SM=; b=IntnSvBs9HZfwO2F/IaDKwCNwi+IH4aszbh5I1IYx9hvlauqsexR/UIkpNm6jDruxyZ9rw D9vMYEVqeAkGPb9rapmeGiZGvqHcHokUQ4p7LSvjohjBb8UEdz9KQYVlzp9LIZNQyw+nX5 5qPVrfY95BThT8ipJeeWi0REZKktG/5shzSHjHSBPkAvzMSFs7upRz63Jk2VDoqQLmKCjj AB0q7rY3n7LQh63AUXmusyyW4SgwlbLtSKXPCIzT5qL32C0rEm3Ff1LzvToAMcVgrFiiIb yoKRGXr2Kqfa2v9YngU2axMaChSBSvz6QQtcaCNnl4wZhjbYigRzpAG5iVjAZg== 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 522721BB39; Sun, 23 Jan 2022 04:14:48 +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 20N4Emxu094818; Sun, 23 Jan 2022 04:14:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20N4EmJi094817; Sun, 23 Jan 2022 04:14:48 GMT (envelope-from git) Date: Sun, 23 Jan 2022 04:14:48 GMT Message-Id: <202201230414.20N4EmJi094817@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Joseph Mingrone Subject: git: f6185e251d10 - main - emulators/fceux: revive port List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f6185e251d1035799cccde4a68bdd2f514ae699b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642911288; 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=4b5CGj3YfA2mv6leoE5FePOu1iYr7VAwyK/v7Tqn3SM=; b=oLT262R6pyFKo2xe1h1+y08yC7w8UdvuFEFHpfpEsUBonQsmaCgbs751i3hT7cf/pXhvud 8XvQfylLhnYdlMmrQyqDwhwBd8hJBfDZhJr36a2k6qy4YUPp/KfUQCRmmNUyGUQyZsz1Ok 20BYiirNRrueJXHVG+hqUtFWPpj/uQhcBHtlqFxRfF43USmMvj2Lxh0bYN9xjk5b67Q10e WfuL4madAqZePQRLsaaTcVPKYa6k5hKY+VRbrGMf1wP66P+b+0dH2tsenMKDSpRLmfU5iw Yq73jwFpeK3e5rKFrJVTqwiN6y0xmyoq4GNzgWykAXmGNKcYX2iCSVZUgEmkTw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642911288; a=rsa-sha256; cv=none; b=et5uDiky8P6D8+aFaG1qNYGSSgfTSt8AirpBlijW2sO74O2aVv45oXxaWOhzeftG5Lu6oW osDFXn1Xxxw4cJj80o44dnO6qgO47WNXsovsAfDEm+HDgP/yGuun5vJ2cOLhgdnv3Y2fow Te8MUVWtXMxmYoGxguVGhOL/aImi4rHK5Q+RkOaMPkZAbZuHBwQon1yCp6xe9Nr6Kzj7sa FcIS72b8GSLBrak5U6Ei+RiSBfpdud51qsjzB4bi/U2McWqr2D4PGV6veqvjy85jD8LFIW yl+MwH57xFtJC7Mq/Dn3GQ/Mso7PxSjvRJ6KS3jRFuipaFCZMlIB1tmINC0ZVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/ports/commit/?id=f6185e251d1035799cccde4a68bdd2f514ae699b commit f6185e251d1035799cccde4a68bdd2f514ae699b Author: Robert Clausecker AuthorDate: 2022-01-21 22:01:50 +0000 Commit: Joseph Mingrone CommitDate: 2022-01-23 04:14:17 +0000 emulators/fceux: revive port Now that the build system no longer requires python27, this port can be revived. The port has been completely redone from scratch based on the current upstream version. PR: 261402 --- MOVED | 1 - emulators/Makefile | 1 + emulators/fceux/Makefile | 44 ++++++++++ emulators/fceux/distinfo | 3 + emulators/fceux/files/patch-scripts_genGitHdr.sh | 19 +++++ .../fceux/files/patch-scripts_unix__make__docs.sh | 18 ++++ .../fceux/files/patch-src_drivers_Qt_sdl-sound.cpp | 12 +++ emulators/fceux/pkg-descr | 20 +++++ emulators/fceux/pkg-plist | 96 ++++++++++++++++++++++ 9 files changed, 213 insertions(+), 1 deletion(-) diff --git a/MOVED b/MOVED index ac970b27df57..c33750712c58 100644 --- a/MOVED +++ b/MOVED @@ -15906,7 +15906,6 @@ databases/arangodb33||2021-01-02|Has expired: Uses Python 2.7 which is EOLed ups devel/bzr||2021-01-02|Has expired: Uses Python 2.7 which is EOLed upstream devel/chromium-gn|devel/gn|2021-01-02|Has expired: Uses deprecated version of python, use devel/gn instead devel/mongo-cxx-driver||2021-01-02|Has expired: Uses Python 2.7 version of scons, and Python 2.7 which is EOLed upstream -emulators/fceux||2021-01-02|Has expired: Uses Python 2.7 version of scons, and Python 2.7 which is EOLed upstream emulators/gem5||2021-01-02|Has expired: Uses Python 2.7 version of scons, and Python 2.7 which is EOLed upstream emulators/nonpareil||2021-01-02|Has expired: Uses Python 2.7 version of scons, and Python 2.7 which is EOLed upstream games/freera||2021-01-02|Has expired: Uses Python 2.7 version of scons, and Python 2.7 which is EOLed upstream diff --git a/emulators/Makefile b/emulators/Makefile index 61674dd70ad5..a23b925c5ad7 100644 --- a/emulators/Makefile +++ b/emulators/Makefile @@ -29,6 +29,7 @@ SUBDIR += elliott-803 SUBDIR += emu64 SUBDIR += emulationstation + SUBDIR += fceux SUBDIR += fmsx SUBDIR += frodo SUBDIR += fs-uae diff --git a/emulators/fceux/Makefile b/emulators/fceux/Makefile new file mode 100644 index 000000000000..47ac7a49edf9 --- /dev/null +++ b/emulators/fceux/Makefile @@ -0,0 +1,44 @@ +PORTNAME= fceux +DISTVERSION= 2.6.1 +CATEGORIES= emulators games +MASTER_SITES= SF/fceultra/Source%20Code/${DISTVERSION}%20src/ + +MAINTAINER= fuz@fuz.su +COMMENT= NES emulator + +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING + +LIB_DEPENDS= libminizip.so:archivers/minizip + +USES= cmake desktop-file-utils gl lua:51 pkgconfig qt:5 sdl +USE_GL= gl glu +USE_QT= buildtools_build core gui opengl qmake_build sql widgets +USE_SDL= sdl2 + +CFLAGS+= -DPUBLIC_RELEASE +CMAKE_ON= GLVND + +OPTIONS_DEFINE= DOCS FFMPEG X264 X265 +OPTIONS_DEFAULT= FFMPEG X264 X265 +DOCS_CMAKE_BOOL= QHELP +DOCS_USE= qt=help,sql +FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg +X264_LIB_DEPENDS= libx264.so:multimedia/libx264 +X265_LIB_DEPENDS= libx265.so:multimedia/x265 + +post-patch: + ${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 + +pre-build-DOCS-on: + ${SETENV} QHELPGENERATOR=${QHELPGENERATOR} PROJECT_ROOT=${WRKSRC} ${SH} ${WRKSRC}/scripts/unix_make_docs.sh + +post-install: + ${RM} ${STAGEDIR}${DATADIR}/*.dll + ${RM} ${STAGEDIR}${DATADIR}/*.chm + # currently broken and not shipped + ${RM} ${STAGEDIR}${PREFIX}/man/man6/fceux-net-server.6 + +.include diff --git a/emulators/fceux/distinfo b/emulators/fceux/distinfo new file mode 100644 index 000000000000..d19da94da8fb --- /dev/null +++ b/emulators/fceux/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1642789615 +SHA256 (fceux-2.6.1.tar.gz) = 3a845dfe97975b5c5fd2e9637fe31e79ddc2f337d99a61296134d82c641d02d6 +SIZE (fceux-2.6.1.tar.gz) = 23326768 diff --git a/emulators/fceux/files/patch-scripts_genGitHdr.sh b/emulators/fceux/files/patch-scripts_genGitHdr.sh new file mode 100644 index 000000000000..9351d3f6ffb6 --- /dev/null +++ b/emulators/fceux/files/patch-scripts_genGitHdr.sh @@ -0,0 +1,19 @@ +--- scripts/genGitHdr.sh.orig 2022-01-17 18:50:37 UTC ++++ scripts/genGitHdr.sh +@@ -3,12 +3,13 @@ + OUTPUT_DIR=$1; + + FILE="fceux_git_info.cpp" +-TMP_FILE="/tmp/$FILE"; ++TMP_FILE="`mktemp /tmp/$FILE.XXXXXX`"; + + echo "Output File: $OUTPUT_DIR/$FILE"; + +-GIT_URL=`git config --get remote.origin.url`; +-GIT_REV=`git rev-parse HEAD`; ++# print useful information in lieu of a git revision we don't have ++GIT_URL="FreeBSD Ports Collection"; ++GIT_REV="%%PKGNAME%%"; + + echo "// fceux_git_info.cpp -- DO NOT EDIT: This file is auto-generated at build" >| $TMP_FILE; + echo "#include \"Qt/fceux_git_info.h\" " >> $TMP_FILE; diff --git a/emulators/fceux/files/patch-scripts_unix__make__docs.sh b/emulators/fceux/files/patch-scripts_unix__make__docs.sh new file mode 100644 index 000000000000..e8b03dad001d --- /dev/null +++ b/emulators/fceux/files/patch-scripts_unix__make__docs.sh @@ -0,0 +1,18 @@ +--- scripts/unix_make_docs.sh.orig 2022-01-21 21:26:16 UTC ++++ scripts/unix_make_docs.sh +@@ -1,13 +1,8 @@ + #!/bin/bash + +-PROJECT_ROOT=$( cd "$(dirname ${BASH_SOURCE[0]})"/.. && pwd ) ++cd $PROJECT_ROOT/web + +-echo $PROJECT_ROOT; +-echo "Building for OS: $OSTYPE"; +- +-cd $PROJECT_ROOT/web; +- +-qhelpgenerator fceux.qhcp -o fceux.qhc ++${QHELPGENERATOR} fceux.qhcp -o fceux.qhc + + cp -f fceux.qhc $PROJECT_ROOT/output + cp -f fceux.qch $PROJECT_ROOT/output diff --git a/emulators/fceux/files/patch-src_drivers_Qt_sdl-sound.cpp b/emulators/fceux/files/patch-src_drivers_Qt_sdl-sound.cpp new file mode 100644 index 000000000000..011c34595a3c --- /dev/null +++ b/emulators/fceux/files/patch-src_drivers_Qt_sdl-sound.cpp @@ -0,0 +1,12 @@ +--- src/drivers/Qt/sdl-sound.cpp.orig 2022-01-21 20:48:31 UTC ++++ src/drivers/Qt/sdl-sound.cpp +@@ -219,8 +219,7 @@ InitSound() + spec.freq = s_SampleRate = soundrate; + spec.format = AUDIO_S16SYS; + spec.channels = 1; +- //spec.samples = 512; +- spec.samples = (int)( ( (double)s_SampleRate / getBaseFrameRate() ) ); ++ spec.samples = 512; + spec.callback = fillaudio; + spec.userdata = 0; + diff --git a/emulators/fceux/pkg-descr b/emulators/fceux/pkg-descr new file mode 100644 index 000000000000..cd4b3fc9d015 --- /dev/null +++ b/emulators/fceux/pkg-descr @@ -0,0 +1,20 @@ +FCEUX is a Nintendo Entertainment System (NES), Famicom, Famicom Disk +System (FDS), and Dendy emulator. It supports NTSC (USA/JPN), PAL +(European), and NTSC-PAL Hybrid modes. + +The FCEUX concept is that of an "all in one" emulator that offers +accurate emulation and the best options for both casual play and a +variety of more advanced emulator functions. For pro users, FCEUX +offers tools for debugging, rom-hacking, map making, Tool-assisted +movies, and Lua scripting + +FCEUX is an evolution of the original FCE Ultra emulator. Over time +FCE Ultra had separated into many distinct branches. The concept behind +FCEUX is to merge elements from FCEU Ultra, FCEU rerecording, FCEUXD, +FCEUXDSP, FCEUXDSP CE, and FCEU-mm into a single branch of FCEU. + +As the X implies, it is an all-encompassing version of the FCEU emulator +that provides the best of all worlds for the general player, the +ROM-hacking community, and the Tool-Assisted Speedrun Community. + +WWW: https://fceux.com diff --git a/emulators/fceux/pkg-plist b/emulators/fceux/pkg-plist new file mode 100644 index 000000000000..97655b2af6f2 --- /dev/null +++ b/emulators/fceux/pkg-plist @@ -0,0 +1,96 @@ +bin/fceux +man/man6/fceux.6.gz +share/applications/fceux.desktop +%%PORTDOCS%%%%DATADIR%%/fceux.qch +%%PORTDOCS%%%%DATADIR%%/fceux.qhc +%%PORTDOCS%%%%DATADIR%%/fceux.qhp +%%DATADIR%%/luaScripts/AVI-HeadsUpDisplay.lua +%%DATADIR%%/luaScripts/BoulderDash_AmoebaAI.lua +%%DATADIR%%/luaScripts/BugsBunnyBirthdayBlowout.lua +%%DATADIR%%/luaScripts/ButtonCount.lua +%%DATADIR%%/luaScripts/CustomLagIndicator_RvT.lua +%%DATADIR%%/luaScripts/Excitingbike-speedometeronly.lua +%%DATADIR%%/luaScripts/Excitingbike.lua +%%DATADIR%%/luaScripts/FRKfunctions.lua +%%DATADIR%%/luaScripts/GUI-iup_button.lua +%%DATADIR%%/luaScripts/GUI-iup_example.lua +%%DATADIR%%/luaScripts/Galaxian.lua +%%DATADIR%%/luaScripts/Gradius-BulletHell.lua +%%DATADIR%%/luaScripts/JumpingFCEUXWindow.lua +%%DATADIR%%/luaScripts/Luabot.lua +%%DATADIR%%/luaScripts/Machrider.lua +%%DATADIR%%/luaScripts/MegamanII-LaserEyes.lua +%%DATADIR%%/luaScripts/MemoryWatch.lua +%%DATADIR%%/luaScripts/Multitrack.lua +%%DATADIR%%/luaScripts/Multitrack2.lua +%%DATADIR%%/luaScripts/NightmareElmStreet-4Player.lua +%%DATADIR%%/luaScripts/PunchOutChallenge.lua +%%DATADIR%%/luaScripts/PunchOutStats.lua +%%DATADIR%%/luaScripts/PunchOutTraining.lua +%%DATADIR%%/luaScripts/RBIBaseball.lua +%%DATADIR%%/luaScripts/Registerfind(CheatSearch).lua +%%DATADIR%%/luaScripts/Rewinder.lua +%%DATADIR%%/luaScripts/SMB-AreaScrambler.lua +%%DATADIR%%/luaScripts/SMB-CompetitionRecorder.lua +%%DATADIR%%/luaScripts/SMB-HitBoxes.lua +%%DATADIR%%/luaScripts/SMB-Jetpack.lua +%%DATADIR%%/luaScripts/SMB-Lives&HPDisplay.lua +%%DATADIR%%/luaScripts/SMB-Mouse.lua +%%DATADIR%%/luaScripts/SMB-Snow.lua +%%DATADIR%%/luaScripts/SMB2U.lua +%%DATADIR%%/luaScripts/SMB3-RainbowRiding.lua +%%DATADIR%%/luaScripts/ShowPalette.lua +%%DATADIR%%/luaScripts/SoundDisplay.lua +%%DATADIR%%/luaScripts/SoundDisplay2.lua +%%DATADIR%%/luaScripts/Sprites.lua +%%DATADIR%%/luaScripts/SpritesSimple.lua +%%DATADIR%%/luaScripts/Subtitler.lua +%%DATADIR%%/luaScripts/TeenageMutantNinjaTurtles.lua +%%DATADIR%%/luaScripts/UsingLuaBot-Documentation.txt +%%DATADIR%%/luaScripts/UsingLuaScripting-Documentation.txt +%%DATADIR%%/luaScripts/UsingLuaScripting-ListofFunctions.txt +%%DATADIR%%/luaScripts/ZapperDisplay.lua +%%DATADIR%%/luaScripts/ZapperFun.lua +%%DATADIR%%/luaScripts/auxlib.lua +%%DATADIR%%/luaScripts/luabot_framework.lua +%%DATADIR%%/luaScripts/m_utils.lua +%%DATADIR%%/luaScripts/scrolling-pitch-display.lua +%%DATADIR%%/luaScripts/shapedefs.lua +%%DATADIR%%/luaScripts/taseditor/InputDisplay_for_Selection.lua +%%DATADIR%%/luaScripts/taseditor/InvertSelection.lua +%%DATADIR%%/luaScripts/taseditor/RecordBackwards.lua +%%DATADIR%%/luaScripts/taseditor/ShowNotes.lua +%%DATADIR%%/luaScripts/taseditor/Swap1P2P.lua +%%DATADIR%%/luaScripts/taseditor/TrackNoise.lua +%%DATADIR%%/luaScripts/tetris.lua +%%DATADIR%%/luaScripts/vnb.lua +%%DATADIR%%/luaScripts/x_functions.lua +%%DATADIR%%/luaScripts/x_interface.lua +%%DATADIR%%/luaScripts/x_smb1enemylist.lua +%%DATADIR%%/palettes/ASQ_realityA.pal +%%DATADIR%%/palettes/ASQ_realityB.pal +%%DATADIR%%/palettes/BMF_final2.pal +%%DATADIR%%/palettes/BMF_final3.pal +%%DATADIR%%/palettes/Composite_Direct_FBX.pal +%%DATADIR%%/palettes/FCEU-13-default_nitsuja.pal +%%DATADIR%%/palettes/FCEU-15-nitsuja_new.pal +%%DATADIR%%/palettes/FCEUX.pal +%%DATADIR%%/palettes/NES_Classic_FBX.pal +%%DATADIR%%/palettes/NRS_NTSC.pal +%%DATADIR%%/palettes/NRS_PAL.pal +%%DATADIR%%/palettes/PC-10.pal +%%DATADIR%%/palettes/PVM_Style_D93_FBX.pal +%%DATADIR%%/palettes/RP2C03.pal +%%DATADIR%%/palettes/RP2C04_0001.pal +%%DATADIR%%/palettes/RP2C04_0002.pal +%%DATADIR%%/palettes/RP2C04_0003.pal +%%DATADIR%%/palettes/RP2C04_0004.pal +%%DATADIR%%/palettes/SONY_CXA2025AS_US.pal +%%DATADIR%%/palettes/Smooth_FBX.pal +%%DATADIR%%/palettes/Unsaturated-V6.pal +%%DATADIR%%/palettes/Wavebeam.pal +%%DATADIR%%/palettes/nestopia_rgb.pal +%%DATADIR%%/palettes/nestopia_yuv.pal +%%DATADIR%%/palettes/r57shell_PAL.pal +%%DATADIR%%/tools/taseditor_patterns.txt +share/pixmaps/fceux1.png