From nobody Wed Dec 06 15:26:42 2023 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 4Slh8Z6k7dz53ZwL for ; Wed, 6 Dec 2023 15:26:54 +0000 (UTC) (envelope-from developer@lorenzosalvadore.it) Received: from mail-4317.proton.ch (mail-4317.proton.ch [185.70.43.17]) (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 "protonmail.com", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Slh8Z3Z4nz4NHs for ; Wed, 6 Dec 2023 15:26:54 +0000 (UTC) (envelope-from developer@lorenzosalvadore.it) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lorenzosalvadore.it; s=protonmail3; t=1701876409; x=1702135609; bh=JDYnHMPRLbq4SykJh5H+E9D3WjfmtI/eMEb+AUE39AE=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=uaVP+DuEvqdVlVk4BToIzGmn10lSq7VUls4X5Uv+WdHDHNLN0kKBXfSpg88rbhkEY 7WUr5008lTHGSJkOzcS9EJ7caNlDxUwRPQrEp6U0KR/UBtiPSFqmxLjquJuvoHXQnV rhauqYhMm8HIc8m8ojzXirXeELF5V6h4oI1mMMDf9ZJum+m2+sECJph3TdnzNp/p1z K8x+qy05JxXW1Pzf6F8soGf+V1bdmteITUeGBUdMjsbVVuTM5R+9GtMm5+9HX947hr 6EnDgvm1yQn/L5aYJw3kWGEF2C8SoOF3bsA/z61HX4kkQqnAKEPUQo9DrEHaxu0zgT rYRKmzf6bwHxA== Date: Wed, 06 Dec 2023 15:26:42 +0000 To: Lorenzo Salvadore From: Lorenzo Salvadore Cc: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: Re: git: 597ca5a01e38 - main - emulators/higan: Update to v110 Message-ID: In-Reply-To: <202312061501.3B6F1sFO082524@gitrepo.freebsd.org> References: <202312061501.3B6F1sFO082524@gitrepo.freebsd.org> Feedback-ID: 53711648:user:proton 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: quoted-printable X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:62371, ipnet:185.70.43.0/24, country:CH] X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4Slh8Z3Z4nz4NHs On Wednesday, December 6th, 2023 at 16:01, Lorenzo Salvadore wrote: >=20 >=20 > The branch main has been updated by salvadore: >=20 > URL: https://cgit.FreeBSD.org/ports/commit/?id=3D597ca5a01e3893880470afdd= 10a9cc4a0cdaa93a >=20 > commit 597ca5a01e3893880470afdd10a9cc4a0cdaa93a > Author: Lorenzo Salvadore salvadore@FreeBSD.org >=20 > AuthorDate: 2023-11-18 12:02:56 +0000 > Commit: Lorenzo Salvadore salvadore@FreeBSD.org >=20 > CommitDate: 2023-12-06 15:01:49 +0000 >=20 > emulators/higan: Update to v110 >=20 > Moreover, >=20 > - 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. >=20 > PR: 273678 This should have been PR: 273677. > Approved by: Naram Qashat cyberbotx@cyberbotx.com (maintainer) >=20 > --- > 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(-) >=20 > 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=3D higan > -PORTVERSION=3D 106 > -PORTREVISION=3D 12 > +DISTVERSIONPREFIX=3D v > +DISTVERSION=3D 110 > CATEGORIES=3D emulators games > -MASTER_SITES=3D http://download.byuu.org/ \ > - http://www.cyberbotx.com/higan/ > -DISTNAME=3D ${PORTNAME}_v${PORTVERSION}-source >=20 > MAINTAINER=3D cyberbotx@cyberbotx.com > COMMENT=3D Nintendo multi-system emulator > -WWW=3D http://byuu.org/higan/ > +WWW=3D https://github.com/higan-emu/higan > + > +LICENSE=3D GPLv3+ > +LICENSE_FILE=3D ${WRKSRC}/LICENSE.txt >=20 > ONLY_FOR_ARCHS=3D amd64 i386 powerpc powerpc64 powerpc64le >=20 > LIB_DEPENDS=3D libfontconfig.so:x11-fonts/fontconfig \ > - libfreetype.so:print/freetype2 > + libfreetype.so:print/freetype2 \ > + libharfbuzz.so:print/harfbuzz >=20 > -USES=3D 7z compiler:c++14-lang gettext gmake gnome pkgconfig xorg > +USES=3D compiler:c++14-lang gettext gmake gnome pkgconfig xorg > USE_GNOME=3D cairo gdkpixbuf2 gtk20 gtksourceview2 > -USE_XORG=3D x11 xext > +USE_XORG=3D x11 xext xrandr > USE_CSTD=3D c99 > USE_CXXSTD=3D c++14 > -USE_GCC=3D yes > + > +USE_GITHUB=3D yes > +GH_ACCOUNT=3D higan-emu >=20 > MAKEFILE=3D GNUmakefile > -MAKE_ENV=3D compiler=3D"${CXX}" hiro=3D"gtk" > +MAKE_ENV=3D compiler=3D"${CXX}" hiro=3D"gtk2" >=20 > OPTIONS_DEFINE=3D DEBUG > OPTIONS_MULTI=3D VIDEO SOUND INPUT > @@ -31,7 +34,7 @@ OPTIONS_MULTI_VIDEO=3D GLX SDL XSHM XV > OPTIONS_MULTI_SOUND=3D AO OPENAL OSS PULSEAUDIO > OPTIONS_MULTI_INPUT=3D INPUT_SDL INPUT_X > OPTIONS_DEFAULT=3D GLX XSHM XV SDL \ > - OSS INPUT_SDL INPUT_X > + OPENAL INPUT_SDL INPUT_X >=20 > XSHM_DESC=3D Build XShm video driver > XV_DESC=3D Build Xv video driver > @@ -43,7 +46,7 @@ GLX_USE=3D GL=3Dgl > GLX_VARS=3D VIDEO_DRIVER+=3Dvideo.glx >=20 > SDL_USES=3D sdl > -SDL_USE=3D XORG=3Dxv SDL=3Dsdl > +SDL_USE=3D XORG=3Dxv SDL=3Dsdl2 > SDL_VARS=3D VIDEO_DRIVER+=3Dvideo.sdl >=20 > XSHM_USE=3D XORG=3Dxext > @@ -70,11 +73,6 @@ INPUT_SDL_VARS=3D INPUT_DRIVER+=3Dinput.sdl > INPUT_X_VARS=3D INPUT_DRIVER+=3Dinput.xlib >=20 > 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 >=20 > @@ -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}/sha= re/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 ${STAGE= DIR}${PREFIX}/share/pixmaps/ > + ${INSTALL_DATA} ${WRKSRC}/higan/target-higan/resource/higan.desktop ${S= TAGEDIR}${PREFIX}/share/applications/ > + (cd ${WRKSRC}/higan/System && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}= /) > (cd ${WRKSRC}/icarus/Database && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}= /share/icarus/Database/) >=20 > .include >=20 > 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 =3D 1516118942 > -SHA256 (higan_v106-source.7z) =3D 6564f91f232040c46c052de763dc139e94005e= 0f2376959fdacbb6ccd3fd6d18 > -SIZE (higan_v106-source.7z) =3D 830639 > +TIMESTAMP =3D 1700308663 > +SHA256 (higan-emu-higan-v110_GH0.tar.gz) =3D 18457ac2608ab548983c3266ae3= 8e6397d1801773969a796a672e2d9c56c69c5 > +SIZE (higan-emu-higan-v110_GH0.tar.gz) =3D 1661896 > diff --git a/emulators/higan/files/patch-higan_GNUmakefile b/emulators/hi= gan/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 +=3D -fopenmp > - link +=3D -fopenmp > - ifeq ($(binary),application) > -- flags +=3D -march=3Dnative > - link +=3D -Wl,-export-dynamic > - link +=3D -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 +=3D audio.oss audio.alsa audio.openal audio.pulseaudio audio.puls= eaudiosimple audio.ao > - ruby +=3D input.sdl input.xlib input.udev > - else ifeq ($(platform),bsd) > -- ruby +=3D video.glx video.xvideo video.xshm video.sdl > -- ruby +=3D audio.oss audio.openal > -- ruby +=3D input.sdl input.xlib > -+ ruby +=3D %%VIDEO%% > -+ ruby +=3D %%AUDIO%% > -+ ruby +=3D %%INPUT%% > - endif > - > - # ruby > diff --git a/emulators/higan/files/patch-higan_target-tomoko_presentation= _presentation.cpp b/emulators/higan/files/patch-higan_target-tomoko_present= ation_presentation.cpp > deleted file mode 100644 > index bc30b6dc349c..000000000000 > --- a/emulators/higan/files/patch-higan_target-tomoko_presentation_presen= tation.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() -> >=20 > - } > - > - auto Presentation::loadShaders() -> void { >=20 > -- auto pathname =3D locate("Video Shaders/"); > -+ auto pathname =3D locateShared("Video Shaders/"); > - > - if(settings["Video/Driver"].text() =3D=3D "OpenGL") { > - for(auto shader : directory::folders(pathname, "*.shader")) { > diff --git a/emulators/higan/files/patch-higan_target-tomoko_program_medi= um.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 { >=20 > - auto Program::loadMedium(Emulator::Interface& interface, const Emulator= ::Interface::Medium& medium) -> void { >=20 > - unloadMedium(); > - > -- mediumPaths.append(locate({medium.name, ".sys/"})); > -+ mediumPaths.append(locateShared({medium.name, ".sys/"})); > - > - Emulator::audio.reset(2, audio->get(Audio::Frequency).get(44100))= ; >=20 > - inputManager->bind(emulator =3D &interface); >=20 > 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