git: 5ddc7415808f - main - emulators/higan: Return to pool

From: Zsolt Udvari <uzsolt_at_FreeBSD.org>
Date: Sun, 08 Jun 2025 18:23:48 UTC
The branch main has been updated by uzsolt:

URL: https://cgit.FreeBSD.org/ports/commit/?id=5ddc7415808f45c74181dff048cc910d9c924732

commit 5ddc7415808f45c74181dff048cc910d9c924732
Author:     Zsolt Udvari <uzsolt@FreeBSD.org>
AuthorDate: 2025-06-08 18:16:31 +0000
Commit:     Zsolt Udvari <uzsolt@FreeBSD.org>
CommitDate: 2025-06-08 18:23:13 +0000

    emulators/higan: Return to pool
    
    While I'm here:
    - remove AUDO_DRIVER, INPUT_DRIVER and VIDEO_DRIVER variables, they was used to
      patch target-tomoko/GNUMakefile. This directory doesn't exist and the
      relevant REINPLACE_CMD removed at commit 597ca5a01e3893880470afdd10a9cc4a0cdaa93a.
    - remove unused options: OSS, INPUT_X. The OSS doesn't exist and INPUT_X
      sets only INPUT_DRIVER variable (see above).
    - pet portlint, portfmt, portclippy
    
    PR:             286810
---
 emulators/higan/Makefile | 62 ++++++++++++++++--------------------------------
 1 file changed, 21 insertions(+), 41 deletions(-)

diff --git a/emulators/higan/Makefile b/emulators/higan/Makefile
index 279e937599c9..f70e30b97169 100644
--- a/emulators/higan/Makefile
+++ b/emulators/higan/Makefile
@@ -4,7 +4,7 @@ DISTVERSION=	110
 PORTREVISION=	1
 CATEGORIES=	emulators games
 
-MAINTAINER=	cyberbotx@cyberbotx.com
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Nintendo multi-system emulator
 WWW=		https://github.com/higan-emu/higan
 
@@ -18,60 +18,40 @@ LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libharfbuzz.so:print/harfbuzz
 
 USES=		compiler:c++14-lang gettext gmake gnome pkgconfig xorg
-USE_GNOME=	cairo gdkpixbuf gtk20 gtksourceview2
-USE_XORG=	x11 xext xrandr
 USE_CSTD=	c99
 USE_CXXSTD=	c++14
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	higan-emu
 
+USE_GNOME=	cairo gdkpixbuf gtk20 gtksourceview2
+USE_XORG=	x11 xext xrandr
+
 MAKEFILE=	GNUmakefile
 MAKE_ENV=	compiler="${CXX}" hiro="gtk2"
 
 OPTIONS_DEFINE=		DEBUG
-OPTIONS_MULTI=		VIDEO SOUND INPUT
+OPTIONS_DEFAULT=	GLX INPUT_SDL OPENAL SDL XSHM XV
+OPTIONS_MULTI=		INPUT SOUND VIDEO
+OPTIONS_MULTI_INPUT=	INPUT_SDL
+OPTIONS_MULTI_SOUND=	AO OPENAL PULSEAUDIO
 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 \
-			OPENAL INPUT_SDL INPUT_X
-
-XSHM_DESC=		Build XShm video driver
-XV_DESC=		Build Xv video driver
-INPUT_SDL_DESC=		Build SDL input driver
-INPUT_X_DESC=		Build X input driver
-
-GLX_USES=	gl
-GLX_USE=	GL=gl
-GLX_VARS=	VIDEO_DRIVER+=video.glx
 
-SDL_USES=	sdl
-SDL_USE=	XORG=xv SDL=sdl2
-SDL_VARS=	VIDEO_DRIVER+=video.sdl
-
-XSHM_USE=	XORG=xext
-XSHM_VARS=	VIDEO_DRIVER+=video.xshm
-
-XV_USE=		XORG=xv
-XV_VARS=	VIDEO_DRIVER+=video.xvideo
-
-AO_LIB_DEPENDS=	libao.so:audio/libao
-AO_VARS=	AUDIO_DRIVER+=audio.ao
-
-OPENAL_USES=	openal:al
-OPENAL_VARS=	AUDIO_DRIVER+=audio.openal
-
-OSS_VARS=	AUDIO_DRIVER+=audio.oss
+INPUT_SDL_DESC=	Build SDL input driver
+XSHM_DESC=	Build XShm video driver
+XV_DESC=	Build Xv video driver
 
+AO_LIB_DEPENDS=		libao.so:audio/libao
+GLX_USES=		gl
+GLX_USE=		GL=gl
+INPUT_SDL_USES=		sdl
+INPUT_SDL_USE=		SDL=sdl
+OPENAL_USES=		openal:al
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
-PULSEAUDIO_VARS=	AUDIO_DRIVER+=audio.pulseaudio
-
-INPUT_SDL_USES=	sdl
-INPUT_SDL_USE=	SDL=sdl
-INPUT_SDL_VARS=	INPUT_DRIVER+=input.sdl
-
-INPUT_X_VARS=	INPUT_DRIVER+=input.xlib
+SDL_USES=		sdl
+SDL_USE=		SDL=sdl2 XORG=xv
+XSHM_USE=		XORG=xext
+XV_USE=			XORG=xv
 
 post-patch:
 	${REINPLACE_CMD} -e 's|/usr/share/|${PREFIX}/share/|' \