From nobody Wed Dec 6 15:01:54 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 4Slgbk3bWCz53YZc; Wed, 6 Dec 2023 15:01:54 +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 4Slgbk3K6gz4LdJ; Wed, 6 Dec 2023 15:01:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701874914; 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=YkompyEWOCDRuW7lkAfuYzcQmb2i3VdzJ5KAr5sCVY0=; b=nN+zagsV95QBKpwKSFGS28zXtK5HHyjlsDqmt+tWi+tGa9gC/WLUkt0ANo/uHS60K4lCVj MZqcWVMEiZQHVwSnSMk48vPfmZglXVtklXDe/31R209dd0uydT9yVZheHlRMviakZ85DOS NKa+uaGAq6mwDKfeCc1T5amg+2iU9JMXecCVhv1GuJF4XOpBpYnWFw5hawi3FxLglUtM8T x7Q81xPIMrF0zun3qFYRmb1ze57SkEQk4maRfYsu+osmIMnNen8b8G3vmAIv+9CSgKPaRl sBUQcSTPLM9+Wc0l7FFdt2CM+2ru4rIxMKV/EF/s002R5XcLPdifW7mUC+LCFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701874914; a=rsa-sha256; cv=none; b=f2acIStpJAemFdAbYQ3EuBDdbH7+K65aYWSTvMS0ZLr/NG9t+CvLQsoO3uMGq+ifVQlWaC Z7jSVBcdpta1IIcRoa7MD18a/VrPmzKJ0i9I0ldzusqcQApXLdghCIiNPeaGZpTxN1roH6 1ZV0aQN/hfaOdGUnDvU8fyq587CoQ2D2MqNXAleED11f6878YOHZaBCKHLPuapGaW200B9 sM9OCWz8/u6nu3DP2gdKivKbUQaSdaPjO+67M8wJbExvl7Y7KWJhq6NqRK/iaMHk7MdzVH kDyQZxH5MrD3w86vfE35UClNBtksd0kNO84ZpEgKIYpgAIIxxW8c1BgPxMW3SA== 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=1701874914; 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=YkompyEWOCDRuW7lkAfuYzcQmb2i3VdzJ5KAr5sCVY0=; b=MUgG3194+oKY89oeGOguHPEQBrE17E5mih8ABnENob862mRp2XegBPMQXITbuXoisIC+nP 9xJbaJnRgfz8X4OJUDXqdHeozyAehQHtOMFT7abzZYTyQleXRhWHrDuaZvmSl5S7+j25VV /ybijOkAjR+YtKB6MLpfN734MtD8/fxlef/wzDJWagN+AaARUn1bCBNl1AZbvSzmxtVeWZ bcZLEAK//1qH9HUanneVKBLtc8MeLaIrm6Ur9ehkZKX88TM8IfM29DkI5Cj1/jCkxO0K3T XOM2TvEEIGZNC7YPT9+6Jh/5R2UVw4U4ZU9VtDWRXshxkqxLeLUAaNacLGRwfA== 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 4Slgbk2NXFzxhl; Wed, 6 Dec 2023 15:01:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B6F1sWU082527; Wed, 6 Dec 2023 15:01:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B6F1sFO082524; Wed, 6 Dec 2023 15:01:54 GMT (envelope-from git) Date: Wed, 6 Dec 2023 15:01:54 GMT Message-Id: <202312061501.3B6F1sFO082524@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Lorenzo Salvadore Subject: git: 597ca5a01e38 - main - emulators/higan: Update to v110 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: salvadore X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 597ca5a01e3893880470afdd10a9cc4a0cdaa93a Auto-Submitted: auto-generated The branch main has been updated by salvadore: URL: https://cgit.FreeBSD.org/ports/commit/?id=597ca5a01e3893880470afdd10a9cc4a0cdaa93a commit 597ca5a01e3893880470afdd10a9cc4a0cdaa93a Author: Lorenzo Salvadore AuthorDate: 2023-11-18 12:02:56 +0000 Commit: Lorenzo Salvadore CommitDate: 2023-12-06 15:01:49 +0000 emulators/higan: Update to v110 Moreover, - Switch to USE_GITHUB, since the sources are now available only there. - Replace WWW with the GitHub repository link, since the site in WWW does not exist anymore. - Change default sound option from OSS to OPENAL: OSS does not work. - Do not require GCC anymore. PR: 273678 Approved by: Naram Qashat (maintainer) --- emulators/higan/Makefile | 40 ++++++++++------------ emulators/higan/distinfo | 6 ++-- emulators/higan/files/patch-higan_GNUmakefile | 10 ------ .../files/patch-higan_target-tomoko_GNUmakefile | 15 -------- ...gan_target-tomoko_presentation_presentation.cpp | 11 ------ .../patch-higan_target-tomoko_program_medium.cpp | 11 ------ .../files/patch-higan_target-tomoko_tomoko.cpp | 23 ------------- .../files/patch-higan_target-tomoko_tomoko.hpp | 8 ----- ...ch-higan_target-tomoko_tools_cheat-database.cpp | 11 ------ emulators/higan/files/patch-icarus_core_core.cpp | 35 ------------------- emulators/higan/files/patch-icarus_icarus.cpp | 23 ------------- emulators/higan/pkg-plist | 35 ++++++++++--------- 12 files changed, 41 insertions(+), 187 deletions(-) diff --git a/emulators/higan/Makefile b/emulators/higan/Makefile index ca16f7cd8ace..37e3518c56ad 100644 --- a/emulators/higan/Makefile +++ b/emulators/higan/Makefile @@ -1,29 +1,32 @@ PORTNAME= higan -PORTVERSION= 106 -PORTREVISION= 12 +DISTVERSIONPREFIX= v +DISTVERSION= 110 CATEGORIES= emulators games -MASTER_SITES= http://download.byuu.org/ \ - http://www.cyberbotx.com/higan/ -DISTNAME= ${PORTNAME}_v${PORTVERSION}-source MAINTAINER= cyberbotx@cyberbotx.com COMMENT= Nintendo multi-system emulator -WWW= http://byuu.org/higan/ +WWW= https://github.com/higan-emu/higan + +LICENSE= GPLv3+ +LICENSE_FILE= ${WRKSRC}/LICENSE.txt ONLY_FOR_ARCHS= amd64 i386 powerpc powerpc64 powerpc64le LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 + libfreetype.so:print/freetype2 \ + libharfbuzz.so:print/harfbuzz -USES= 7z compiler:c++14-lang gettext gmake gnome pkgconfig xorg +USES= compiler:c++14-lang gettext gmake gnome pkgconfig xorg USE_GNOME= cairo gdkpixbuf2 gtk20 gtksourceview2 -USE_XORG= x11 xext +USE_XORG= x11 xext xrandr USE_CSTD= c99 USE_CXXSTD= c++14 -USE_GCC= yes + +USE_GITHUB= yes +GH_ACCOUNT= higan-emu MAKEFILE= GNUmakefile -MAKE_ENV= compiler="${CXX}" hiro="gtk" +MAKE_ENV= compiler="${CXX}" hiro="gtk2" OPTIONS_DEFINE= DEBUG OPTIONS_MULTI= VIDEO SOUND INPUT @@ -31,7 +34,7 @@ OPTIONS_MULTI_VIDEO= GLX SDL XSHM XV OPTIONS_MULTI_SOUND= AO OPENAL OSS PULSEAUDIO OPTIONS_MULTI_INPUT= INPUT_SDL INPUT_X OPTIONS_DEFAULT= GLX XSHM XV SDL \ - OSS INPUT_SDL INPUT_X + OPENAL INPUT_SDL INPUT_X XSHM_DESC= Build XShm video driver XV_DESC= Build Xv video driver @@ -43,7 +46,7 @@ GLX_USE= GL=gl GLX_VARS= VIDEO_DRIVER+=video.glx SDL_USES= sdl -SDL_USE= XORG=xv SDL=sdl +SDL_USE= XORG=xv SDL=sdl2 SDL_VARS= VIDEO_DRIVER+=video.sdl XSHM_USE= XORG=xext @@ -70,11 +73,6 @@ INPUT_SDL_VARS= INPUT_DRIVER+=input.sdl INPUT_X_VARS= INPUT_DRIVER+=input.xlib post-patch: - ${REINPLACE_CMD} \ - -e 's|%%VIDEO%%|${VIDEO_DRIVER}|' \ - -e 's|%%AUDIO%%|${AUDIO_DRIVER}|' \ - -e 's|%%INPUT%%|${INPUT_DRIVER}|' \ - ${WRKSRC}/higan/target-tomoko/GNUmakefile ${REINPLACE_CMD} -e 's|/usr/share/|${PREFIX}/share/|' \ ${WRKSRC}/nall/path.hpp @@ -91,9 +89,9 @@ do-build: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/higan/out/higan ${STAGEDIR}${PREFIX}/bin/ ${INSTALL_PROGRAM} ${WRKSRC}/icarus/out/icarus ${STAGEDIR}${PREFIX}/bin/ - ${INSTALL_DATA} ${WRKSRC}/higan/data/higan.png ${STAGEDIR}${PREFIX}/share/pixmaps/ - ${INSTALL_DATA} ${WRKSRC}/higan/data/higan.desktop ${STAGEDIR}${PREFIX}/share/applications/ - (cd ${WRKSRC}/higan/systems && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/) + ${INSTALL_DATA} ${WRKSRC}/higan/target-higan/resource/higan.png ${STAGEDIR}${PREFIX}/share/pixmaps/ + ${INSTALL_DATA} ${WRKSRC}/higan/target-higan/resource/higan.desktop ${STAGEDIR}${PREFIX}/share/applications/ + (cd ${WRKSRC}/higan/System && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/) (cd ${WRKSRC}/icarus/Database && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share/icarus/Database/) .include diff --git a/emulators/higan/distinfo b/emulators/higan/distinfo index f976c88f3721..2338ce694466 100644 --- a/emulators/higan/distinfo +++ b/emulators/higan/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1516118942 -SHA256 (higan_v106-source.7z) = 6564f91f232040c46c052de763dc139e94005e0f2376959fdacbb6ccd3fd6d18 -SIZE (higan_v106-source.7z) = 830639 +TIMESTAMP = 1700308663 +SHA256 (higan-emu-higan-v110_GH0.tar.gz) = 18457ac2608ab548983c3266ae38e6397d1801773969a796a672e2d9c56c69c5 +SIZE (higan-emu-higan-v110_GH0.tar.gz) = 1661896 diff --git a/emulators/higan/files/patch-higan_GNUmakefile b/emulators/higan/files/patch-higan_GNUmakefile deleted file mode 100644 index 86cf95a2f544..000000000000 --- a/emulators/higan/files/patch-higan_GNUmakefile +++ /dev/null @@ -1,10 +0,0 @@ ---- higan/GNUmakefile.orig 2020-02-08 23:13:45 UTC -+++ higan/GNUmakefile -@@ -26,7 +26,6 @@ else ifneq ($(filter $(platform),linux bsd),) - flags += -fopenmp - link += -fopenmp - ifeq ($(binary),application) -- flags += -march=native - link += -Wl,-export-dynamic - link += -lX11 -lXext - else ifeq ($(binary),library) diff --git a/emulators/higan/files/patch-higan_target-tomoko_GNUmakefile b/emulators/higan/files/patch-higan_target-tomoko_GNUmakefile deleted file mode 100644 index 1b8131a40d9d..000000000000 --- a/emulators/higan/files/patch-higan_target-tomoko_GNUmakefile +++ /dev/null @@ -1,15 +0,0 @@ ---- higan/target-tomoko/GNUmakefile.orig 2017-09-23 21:35:23 UTC -+++ higan/target-tomoko/GNUmakefile -@@ -30,9 +30,9 @@ else ifeq ($(platform),linux) - ruby += audio.oss audio.alsa audio.openal audio.pulseaudio audio.pulseaudiosimple audio.ao - ruby += input.sdl input.xlib input.udev - else ifeq ($(platform),bsd) -- ruby += video.glx video.xvideo video.xshm video.sdl -- ruby += audio.oss audio.openal -- ruby += input.sdl input.xlib -+ ruby += %%VIDEO%% -+ ruby += %%AUDIO%% -+ ruby += %%INPUT%% - endif - - # ruby diff --git a/emulators/higan/files/patch-higan_target-tomoko_presentation_presentation.cpp b/emulators/higan/files/patch-higan_target-tomoko_presentation_presentation.cpp deleted file mode 100644 index bc30b6dc349c..000000000000 --- a/emulators/higan/files/patch-higan_target-tomoko_presentation_presentation.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- higan/target-tomoko/presentation/presentation.cpp.orig 2017-01-13 17:52:31 UTC -+++ higan/target-tomoko/presentation/presentation.cpp -@@ -278,7 +278,7 @@ auto Presentation::toggleFullScreen() -> - } - - auto Presentation::loadShaders() -> void { -- auto pathname = locate("Video Shaders/"); -+ auto pathname = locateShared("Video Shaders/"); - - if(settings["Video/Driver"].text() == "OpenGL") { - for(auto shader : directory::folders(pathname, "*.shader")) { diff --git a/emulators/higan/files/patch-higan_target-tomoko_program_medium.cpp b/emulators/higan/files/patch-higan_target-tomoko_program_medium.cpp deleted file mode 100644 index 6c898cd0f699..000000000000 --- a/emulators/higan/files/patch-higan_target-tomoko_program_medium.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- higan/target-tomoko/program/medium.cpp.orig 2017-01-13 10:43:46 UTC -+++ higan/target-tomoko/program/medium.cpp -@@ -17,7 +17,7 @@ auto Program::loadMedium() -> void { - auto Program::loadMedium(Emulator::Interface& interface, const Emulator::Interface::Medium& medium) -> void { - unloadMedium(); - -- mediumPaths.append(locate({medium.name, ".sys/"})); -+ mediumPaths.append(locateShared({medium.name, ".sys/"})); - - Emulator::audio.reset(2, audio->get(Audio::Frequency).get(44100)); - inputManager->bind(emulator = &interface); diff --git a/emulators/higan/files/patch-higan_target-tomoko_tomoko.cpp b/emulators/higan/files/patch-higan_target-tomoko_tomoko.cpp deleted file mode 100644 index e3790ab98982..000000000000 --- a/emulators/higan/files/patch-higan_target-tomoko_tomoko.cpp +++ /dev/null @@ -1,23 +0,0 @@ ---- higan/target-tomoko/tomoko.cpp.orig 2016-07-01 08:21:27 UTC -+++ higan/target-tomoko/tomoko.cpp -@@ -4,6 +4,20 @@ unique_pointer