git: 5adc33d0828c - main - games/retroarch: Update to 1.17.0

From: Emanuel Haupt <ehaupt_at_FreeBSD.org>
Date: Sat, 10 Feb 2024 20:19:35 UTC
The branch main has been updated by ehaupt:

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

commit 5adc33d0828c5c6420b08c76fae86681435a984c
Author:     Emanuel Haupt <ehaupt@FreeBSD.org>
AuthorDate: 2024-02-10 16:48:12 +0000
Commit:     Emanuel Haupt <ehaupt@FreeBSD.org>
CommitDate: 2024-02-10 20:19:31 +0000

    games/retroarch: Update to 1.17.0
    
    - Update to 1.17.0
    - Pacify portlint/portclippy/portfmt
    - Take maintainership
---
 games/retroarch/Makefile                           | 127 ++++++++++-----------
 games/retroarch/distinfo                           |   6 +-
 .../files/patch-gfx_common_wayland__common.c       |   4 +-
 .../patch-libretro-common_features_features__cpu.c |   6 +-
 4 files changed, 71 insertions(+), 72 deletions(-)

diff --git a/games/retroarch/Makefile b/games/retroarch/Makefile
index f3e8b8e33e65..d569bc30e971 100644
--- a/games/retroarch/Makefile
+++ b/games/retroarch/Makefile
@@ -1,101 +1,100 @@
 PORTNAME=	RetroArch
-DISTVERSION=	1.16.0.3
-PORTREVISION=	1
 DISTVERSIONPREFIX=	v
+DISTVERSION=	1.17.0
 CATEGORIES=	games emulators
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Cross-platform entertainment system based on libretro API
 WWW=		https://github.com/libretro/RetroArch
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	vulkan-loader>0:graphics/vulkan-loader \
-		${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers
-LIB_DEPENDS=	libxkbcommon.so:x11/libxkbcommon \
+BUILD_DEPENDS=	${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers \
+		vulkan-loader>0:graphics/vulkan-loader
+LIB_DEPENDS=	libass.so:multimedia/libass \
 		libdrm.so:graphics/libdrm \
-		libass.so:multimedia/libass \
+		libfontconfig.so:x11-fonts/fontconfig \
 		libfribidi.so:converters/fribidi \
-		libfontconfig.so:x11-fonts/fontconfig
+		libxkbcommon.so:x11/libxkbcommon
 RUN_DEPENDS=	retroarch-assets<=0:games/retroarch-assets
 
 USES=		compiler:c++11-lib cpe gmake pkgconfig python shebangfix ssl
 CPE_VENDOR=	libretro
 USE_GITHUB=	yes
 GH_ACCOUNT=	libretro
+
 SHEBANG_FILES=	libretro-common/glsym/glgen.py libretro-common/glsym/rglgen.py \
 		tools/cg2glsl.py tools/vulkan_loader_generator.py
 
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS+=--enable-threads --disable-discord \
-		--sysconfdir=${LOCALBASE}/etc
-CONFIGURE_ENV+=	MAN_DIR=${PREFIX}/share/man
+HAS_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--disable-discord \
+			--enable-threads \
+			--sysconfdir=${LOCALBASE}/etc
+CONFIGURE_ENV+=		MAN_DIR=${PREFIX}/share/man
+
 LDFLAGS_i386=	-Wl,-znotext
 
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME:tl}
 SUB_FILES=	pkg-message
 
-OPTIONS_DEFINE=	CACA FFMPEG OSS JACK PULSEAUDIO ALSA SDL OPENGL OPENAL V4L FREETYPE UDEV QT X11 DOCS
-OPTIONS_DEFINE_amd64=	WAYLAND	# svgalib is x86 only
+OPTIONS_DEFINE=		ALSA CACA DOCS FFMPEG FREETYPE JACK OPENAL OPENGL OSS \
+			PULSEAUDIO QT SDL UDEV V4L X11
+OPTIONS_DEFINE_amd64=	WAYLAND # svgalib is x86 only
 OPTIONS_DEFINE_i386=	WAYLAND
-OPTIONS_DEFAULT=FFMPEG OSS SDL OPENGL OPENAL V4L FREETYPE UDEV QT X11
+OPTIONS_DEFAULT=	FFMPEG FREETYPE OPENAL OPENGL OSS QT SDL UDEV V4L X11
 OPTIONS_DEFAULT_amd64=	WAYLAND
 OPTIONS_DEFAULT_i386=	WAYLAND
+
 FFMPEG_DESC=	On-the-fly recording of gameplay with libavcodec
-WAYLAND_DESC=	Wayland display support
-UDEV_DESC=	udev device hotplug support
 QT_DESC=	Qt based desktop-style GUI
+UDEV_DESC=	udev device hotplug support
+WAYLAND_DESC=	Wayland display support
 
-CACA_LIB_DEPENDS=	libcaca.so:graphics/libcaca
-CACA_CONFIGURE_ENABLE=	caca
-FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
-FFMPEG_CONFIGURE_ENABLE=ffmpeg
-OSS_CONFIGURE_ENABLE=	oss
-JACK_LIB_DEPENDS=	libjack.so:audio/jack
-JACK_CONFIGURE_ENABLE=	jack
-PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
-PULSEAUDIO_CONFIGURE_ENABLE=	pulse
-ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
-ALSA_CONFIGURE_ENABLE=	alsa
-SDL_USES=		sdl
-SDL_USE=		SDL=sdl2 image2
-SDL_CONFIGURE_ON=	--disable-sdl --enable-sdl2
-SDL_CONFIGURE_OFF=	--disable-sdl --disable-sdl2
-OPENGL_USES=		gl
-OPENGL_USE=		GL=gl,egl,gbm
-OPENGL_CONFIGURE_ENABLE=opengl
-OPENAL_USES=		openal:soft
-OPENAL_CONFIGURE_ENABLE=al
-V4L_LIB_DEPENDS=	libv4l2.so:multimedia/libv4l
-V4L_BUILD_DEPENDS=	v4l_compat>0:multimedia/v4l_compat
-V4L_CONFIGURE_ENABLE=	v4l2
-FREETYPE_LIB_DEPENDS=	libfreetype.so:print/freetype2
+ALSA_LIB_DEPENDS=		libasound.so:audio/alsa-lib
+ALSA_CONFIGURE_ENABLE=		alsa
+CACA_LIB_DEPENDS=		libcaca.so:graphics/libcaca
+CACA_CONFIGURE_ENABLE=		caca
+FFMPEG_LIB_DEPENDS=		libavcodec.so:multimedia/ffmpeg
+FFMPEG_CONFIGURE_ENABLE=	ffmpeg
+FREETYPE_LIB_DEPENDS=		libfreetype.so:print/freetype2
 FREETYPE_CONFIGURE_ENABLE=	freetype
-WAYLAND_CATEGORIES=	wayland
-WAYLAND_BUILD_DEPENDS=	${LOCALBASE}/include/linux/input.h:devel/evdev-proto \
-			${LOCALBASE}/include/linux/kd.h:graphics/svgalib
-WAYLAND_LIB_DEPENDS=	libwayland-egl.so:graphics/wayland
+JACK_LIB_DEPENDS=		libjack.so:audio/jack
+JACK_CONFIGURE_ENABLE=		jack
+OPENAL_USES=			openal:soft
+OPENAL_CONFIGURE_ENABLE=	al
+OPENGL_USES=			gl
+OPENGL_USE=			GL=egl,gbm,gl
+OPENGL_CONFIGURE_ENABLE=	opengl
+OSS_CONFIGURE_ENABLE=		oss
+PULSEAUDIO_LIB_DEPENDS=		libpulse.so:audio/pulseaudio
+PULSEAUDIO_CONFIGURE_ENABLE=	pulse
+QT_USES=			qt:5
+QT_USE=				QT=concurrent,core,gui,network,widgets
+QT_CONFIGURE_ENABLE=		qt
+SDL_USES=			sdl
+SDL_USE=			image2 \
+				SDL=sdl2
+SDL_CONFIGURE_ON=		--disable-sdl \
+				--enable-sdl2
+SDL_CONFIGURE_OFF=		--disable-sdl \
+				--disable-sdl2
+UDEV_LIB_DEPENDS=		libepoll-shim.so:devel/libepoll-shim \
+				libudev.so:devel/libudev-devd
+UDEV_CONFIGURE_ENABLE=		udev
+UDEV_CFLAGS=			-I${LOCALBASE}/include/libepoll-shim
+UDEV_LDFLAGS=			-L${LOCALBASE}/lib -lepoll-shim
+V4L_BUILD_DEPENDS=		v4l_compat>0:multimedia/v4l_compat
+V4L_LIB_DEPENDS=		libv4l2.so:multimedia/libv4l
+V4L_CONFIGURE_ENABLE=		v4l2
+WAYLAND_CATEGORIES=		wayland
+WAYLAND_BUILD_DEPENDS=		${LOCALBASE}/include/linux/input.h:devel/evdev-proto \
+				${LOCALBASE}/include/linux/kd.h:graphics/svgalib
+WAYLAND_LIB_DEPENDS=		libwayland-egl.so:graphics/wayland
 WAYLAND_CONFIGURE_ENABLE=	wayland
-UDEV_LIB_DEPENDS=	libudev.so:devel/libudev-devd \
-			libepoll-shim.so:devel/libepoll-shim
-UDEV_CFLAGS=		-I${LOCALBASE}/include/libepoll-shim
-UDEV_LDFLAGS=		-L${LOCALBASE}/lib -lepoll-shim
-UDEV_CONFIGURE_ENABLE=	udev
-QT_USES=		qt:5
-QT_USE=			QT=core,gui,widgets,concurrent,network
-QT_CONFIGURE_ENABLE=	qt
-X11_USES=		xorg
-X11_USE=		XORG=x11,xcb,xext,xinerama,xv,xxf86vm,xrandr
-X11_CONFIGURE_ENABLE=	x11
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|' \
-		${WRKSRC}/camera/drivers/video4linux2.c \
-		${WRKSRC}/libretro-common/libco/armeabi.c \
-		${WRKSRC}/memory/wii/mem2_manager.c
-	@${REINPLACE_CMD} -e 's|<asm/types.h>|<sys/types.h>|' \
-		${WRKSRC}/camera/drivers/video4linux2.c
+X11_USES=			xorg
+X11_USE=			XORG=x11,xcb,xext,xinerama,xrandr,xv,xxf86vm
+X11_CONFIGURE_ENABLE=		x11
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/retroarch
diff --git a/games/retroarch/distinfo b/games/retroarch/distinfo
index 2a4443645f8f..6d74103147a7 100644
--- a/games/retroarch/distinfo
+++ b/games/retroarch/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1697986894
-SHA256 (libretro-RetroArch-v1.16.0.3_GH0.tar.gz) = 556aaec4afebd901d9f252181256bb1a2a91606c5eabb432927320f5e67a2c61
-SIZE (libretro-RetroArch-v1.16.0.3_GH0.tar.gz) = 49084629
+TIMESTAMP = 1707558003
+SHA256 (libretro-RetroArch-v1.17.0_GH0.tar.gz) = f4182c5118629d96d502df9e8dc781847ba73c6787cbebf0745f22e8a6637437
+SIZE (libretro-RetroArch-v1.17.0_GH0.tar.gz) = 52321130
diff --git a/games/retroarch/files/patch-gfx_common_wayland__common.c b/games/retroarch/files/patch-gfx_common_wayland__common.c
index c964aead462b..3aae61f3e6d3 100644
--- a/games/retroarch/files/patch-gfx_common_wayland__common.c
+++ b/games/retroarch/files/patch-gfx_common_wayland__common.c
@@ -1,6 +1,6 @@
---- gfx/common/wayland_common.c.orig	2023-11-06 19:16:56 UTC
+--- gfx/common/wayland_common.c.orig	2024-02-03 00:11:03 UTC
 +++ gfx/common/wayland_common.c
-@@ -419,7 +419,7 @@ bool gfx_ctx_wl_get_metrics_common(void *data,
+@@ -440,7 +440,7 @@ static int create_shm_file(off_t size)
  static int create_shm_file(off_t size)
  {
     int fd, ret;
diff --git a/games/retroarch/files/patch-libretro-common_features_features__cpu.c b/games/retroarch/files/patch-libretro-common_features_features__cpu.c
index c724722c8534..183304f479bc 100644
--- a/games/retroarch/files/patch-libretro-common_features_features__cpu.c
+++ b/games/retroarch/files/patch-libretro-common_features_features__cpu.c
@@ -1,5 +1,5 @@
---- libretro-common/features/features_cpu.c.orig	2023-12-12 02:50:19.541552000 +0000
-+++ libretro-common/features/features_cpu.c	2023-12-12 02:52:13.056521000 +0000
+--- libretro-common/features/features_cpu.c.orig	2024-02-03 00:11:03 UTC
++++ libretro-common/features/features_cpu.c
 @@ -45,7 +45,7 @@
  
  #if defined(_XBOX360)
@@ -9,7 +9,7 @@
  #ifndef _PPU_INTRINSICS_H
  #include <ppu_intrinsics.h>
  #endif
-@@ -181,7 +181,7 @@
+@@ -181,7 +181,7 @@ retro_perf_tick_t cpu_features_get_perf_counter(void)
     time_ticks = (1000000 * tv_sec + tv_usec);
  #elif defined(GEKKO)
     time_ticks = gettime();