From 1c742619cf3a43f236e410ad487978bc4bd8905e Mon Sep 17 00:00:00 2001
From: "Jason E. Hale" <jhale@FreeBSD.org>
Date: Fri, 21 Mar 2025 00:01:46 -0400
Subject: [PATCH] audio/faudio: Update to 25.03

Set default flavor. [1] Make default flavor sdl3 since this is now
the preferred SDL version by upstream starting with this release.

Convert tests to cmake:testing. Note: tests only build for the sdl3
flavor as upstream dropped sdl2 support in the utils required to
run the tests.

Add flavor specifier to games/vvvvvv. [1]

https://github.com/FNA-XNA/FAudio/releases/tag/25.03

Reported by:	pkg-fallout [1]
Fixes:		264d97ece00e audio/faudio: add SDL3 flavor (default since 25.03) [1]
---
 audio/faudio/Makefile | 27 ++++++++++++++++-----------
 audio/faudio/distinfo |  6 +++---
 games/vvvvvv/Makefile |  4 ++--
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/audio/faudio/Makefile b/audio/faudio/Makefile
index cc7bbd219ca0..f7ad2f150fbe 100644
--- a/audio/faudio/Makefile
+++ b/audio/faudio/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	FAudio
-DISTVERSION=	25.02
+DISTVERSION=	25.03
 CATEGORIES=	audio
 
 MAINTAINER=	multimedia@FreeBSD.org
@@ -9,26 +9,31 @@ WWW=		https://fna-xna.github.io/
 LICENSE=	ZLIB
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-FLAVORS=	sdl2 sdl3
+FLAVORS=	sdl3 sdl2
+FLAVOR?=	${FLAVORS:[1]}
 sdl2_CONFLICTS_INSTALL=	${PORTNAME}-sdl3
 sdl3_PKGNAMESUFFIX=	-sdl3
 sdl3_CONFLICTS_INSTALL=	${PORTNAME}
 
-USES=		cmake compiler:c11 sdl
-USE_SDL=	${FLAVOR}
+USES=		cmake:testing compiler:c11 sdl
 USE_LDCONFIG=	yes
-CMAKE_${"${FLAVOR:Msdl3}":?ON:OFF}=	BUILD_SDL3
+USE_SDL=	${FLAVOR}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	FNA-XNA
 
+CMAKE_${"${FLAVOR:Msdl3}":?ON:OFF}=	BUILD_SDL3
+# Tests will fail to build with the sdl2 flavor. Upstream dropped sdl2
+# support in the utils needed for the tests starting with version 25.03.
+CMAKE_TESTING_ON=	BUILD_TESTS \
+			BUILD_UTILS
+CMAKE_TESTING_TARGET=	# No internal target for running tests. Run via post-test.
+
+TEST_ENV=	SDL_AUDIODRIVER=dummy
+
 PLIST_SUB=	SOVERSION=${DISTVERSION:S,., ,g:[1..2]:ts.}
 
-do-test:
-	@cd ${BUILD_WRKSRC} && \
-		${SETENVI} ${WRK_ENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} \
-		-DBUILD_TESTS=ON -DBUILD_UTILS=ON ${CMAKE_SOURCE_PATH} && \
-		${DO_MAKE_BUILD} ${ALL_TARGET}
-	@${SETENVI} SDL_AUDIODRIVER=dummy ${BUILD_WRKSRC}/faudio_tests
+post-test:
+	@${SETENVI} ${WRK_ENV} ${TEST_ENV} ${BUILD_WRKSRC}/faudio_tests
 
 .include <bsd.port.mk>
diff --git a/audio/faudio/distinfo b/audio/faudio/distinfo
index 5dade91429c2..0c35a5804cdd 100644
--- a/audio/faudio/distinfo
+++ b/audio/faudio/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1739453142
-SHA256 (FNA-XNA-FAudio-25.02_GH0.tar.gz) = eab667d231e5036b0e5c3c6f89fb4ea792284493d46161bc056a88a6dadc2683
-SIZE (FNA-XNA-FAudio-25.02_GH0.tar.gz) = 1127116
+TIMESTAMP = 1742524268
+SHA256 (FNA-XNA-FAudio-25.03_GH0.tar.gz) = 1eeb1d2d6ed038a68e6b0a02614d4c7f859aa0a22c4a64e0bd49c26573823ae8
+SIZE (FNA-XNA-FAudio-25.03_GH0.tar.gz) = 1126597
diff --git a/games/vvvvvv/Makefile b/games/vvvvvv/Makefile
index ff64fe501c4f..5ad3dc782968 100644
--- a/games/vvvvvv/Makefile
+++ b/games/vvvvvv/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	VVVVVV
 DISTVERSION=	2.4.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 .if ${FLAVOR:U} == makeandplay
 # The data file may only be distributed if the MAKEANDPLAY define is set.
@@ -29,7 +29,7 @@ IGNORE=		license requires that the license be shipped
 .endif
 
 BUILD_DEPENDS=	${LOCALBASE}/include/stb/stb_vorbis.c:devel/stb
-LIB_DEPENDS=	libFAudio.so:audio/faudio \
+LIB_DEPENDS=	libFAudio.so:audio/faudio@sdl2 \
 		libtinyxml2.so:textproc/tinyxml2 \
 		libphysfs.so:devel/physfs