diff --git a/audio/faudio/Makefile b/audio/faudio/Makefile index f7ad2f150fbe..6db6f2a1ffeb 100644 --- a/audio/faudio/Makefile +++ b/audio/faudio/Makefile @@ -1,39 +1,30 @@ PORTNAME= FAudio -DISTVERSION= 25.03 +DISTVERSION= 26.09 CATEGORIES= audio MAINTAINER= multimedia@FreeBSD.org COMMENT= Accuracy-focused XAudio reimplementation WWW= https://fna-xna.github.io/ LICENSE= ZLIB LICENSE_FILE= ${WRKSRC}/LICENSE -FLAVORS= sdl3 sdl2 -FLAVOR?= ${FLAVORS:[1]} -sdl2_CONFLICTS_INSTALL= ${PORTNAME}-sdl3 -sdl3_PKGNAMESUFFIX= -sdl3 -sdl3_CONFLICTS_INSTALL= ${PORTNAME} - USES= cmake:testing compiler:c11 sdl USE_LDCONFIG= yes -USE_SDL= ${FLAVOR} +USE_SDL= sdl3 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. +CMAKE_TESTING_TARGET= TEST_ENV= SDL_AUDIODRIVER=dummy PLIST_SUB= SOVERSION=${DISTVERSION:S,., ,g:[1..2]:ts.} post-test: @${SETENVI} ${WRK_ENV} ${TEST_ENV} ${BUILD_WRKSRC}/faudio_tests .include diff --git a/audio/faudio/distinfo b/audio/faudio/distinfo index 0c35a5804cdd..e5707ae6b129 100644 --- a/audio/faudio/distinfo +++ b/audio/faudio/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1742524268 -SHA256 (FNA-XNA-FAudio-25.03_GH0.tar.gz) = 1eeb1d2d6ed038a68e6b0a02614d4c7f859aa0a22c4a64e0bd49c26573823ae8 -SIZE (FNA-XNA-FAudio-25.03_GH0.tar.gz) = 1126597 +TIMESTAMP = 1788364775 +SHA256 (FNA-XNA-FAudio-26.09_GH0.tar.gz) = b393b2f90b21e9160fedfd3d0da88c6c449df38c17699790b1df1abbf5751792 +SIZE (FNA-XNA-FAudio-26.09_GH0.tar.gz) = 1137246 diff --git a/audio/faudio/files/patch-CMakeLists.txt b/audio/faudio/files/patch-CMakeLists.txt index fb0682f53ed9..29fa9a3cca3a 100644 --- a/audio/faudio/files/patch-CMakeLists.txt +++ b/audio/faudio/files/patch-CMakeLists.txt @@ -1,11 +1,11 @@ ---- CMakeLists.txt.orig 2025-02-01 15:45:39 UTC +--- CMakeLists.txt.orig 2026-09-01 12:47:09 UTC +++ CMakeLists.txt -@@ -365,7 +365,7 @@ install( - ) - install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/generated/${PROJECT_NAME}.pc -- DESTINATION ${FAudio_INSTALL_LIBDIR}/pkgconfig -+ DESTINATION ${FAudio_INSTALL_LIBDIR}/../libdata/pkgconfig - ) +@@ -387,7 +387,7 @@ if(FAUDIO_INSTALL) + ) + install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/generated/${PROJECT_NAME}.pc +- DESTINATION ${FAudio_INSTALL_LIBDIR}/pkgconfig ++ DESTINATION ${FAudio_INSTALL_LIBDIR}/../libdata/pkgconfig + ) - # Generate cmake-config file, install CMake files + # Generate cmake-config file, install CMake files diff --git a/audio/faudio/files/patch-cmake_config.cmake.in b/audio/faudio/files/patch-cmake_config.cmake.in deleted file mode 100644 index f837ce600d45..000000000000 --- a/audio/faudio/files/patch-cmake_config.cmake.in +++ /dev/null @@ -1,14 +0,0 @@ ---- cmake/config.cmake.in.orig 2025-02-01 15:45:39 UTC -+++ cmake/config.cmake.in -@@ -2,7 +2,11 @@ if(NOT "@PLATFORM_WIN32@") - - if(NOT "@PLATFORM_WIN32@") - include(CMakeFindDependencyMacro) -+ if ("@BUILD_SDL3@") -+ find_dependency(SDL3 CONFIG) -+ else() - find_dependency(SDL2 CONFIG) -+ endif() - endif() - - if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@-targets-shared.cmake")