diff --git a/audio/faudio/Makefile b/audio/faudio/Makefile index 50f2119791a2..55b18f962837 100644 --- a/audio/faudio/Makefile +++ b/audio/faudio/Makefile @@ -1,36 +1,28 @@ PORTNAME= FAudio -DISTVERSION= 21.01 +DISTVERSION= 24.08 CATEGORIES= audio MAINTAINER= multimedia@FreeBSD.org COMMENT= Accuracy-focused XAudio reimplementation WWW= https://fna-xna.github.io/ LICENSE= ZLIB LICENSE_FILE= ${WRKSRC}/LICENSE USES= cmake compiler:c11 sdl +USE_SDL= sdl2 +USE_LDCONFIG= yes + USE_GITHUB= yes GH_ACCOUNT= FNA-XNA -USE_LDCONFIG= yes -USE_SDL= sdl2 PLIST_SUB= SOVERSION=${DISTVERSION:S,., ,g:[1..2]:ts.} -OPTIONS_DEFINE= GSTREAMER -OPTIONS_DEFAULT= GSTREAMER - -GSTREAMER_DESC= WMA/XMA support via GStreamer - -GSTREAMER_USES= gettext-runtime gnome gstreamer pkgconfig -GSTREAMER_USE= GNOME=glib20 -GSTREAMER_CMAKE_BOOL= GSTREAMER - do-test: @cd ${BUILD_WRKSRC} && \ - ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} \ + ${SETENVI} ${WRK_ENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} \ -DBUILD_TESTS=ON -DBUILD_UTILS=ON ${CMAKE_SOURCE_PATH} && \ ${DO_MAKE_BUILD} ${ALL_TARGET} - @${SETENV} SDL_AUDIODRIVER=dummy ${BUILD_WRKSRC}/faudio_tests + @${SETENVI} SDL_AUDIODRIVER=dummy ${BUILD_WRKSRC}/faudio_tests .include diff --git a/audio/faudio/distinfo b/audio/faudio/distinfo index 753d0fcdcae9..66ef6c84cb19 100644 --- a/audio/faudio/distinfo +++ b/audio/faudio/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1609598982 -SHA256 (FNA-XNA-FAudio-21.01_GH0.tar.gz) = bebe6aa66a64c7d936b44120d59b2bd4aaf6d7999777aa3c6cdb6ccde51ce59d -SIZE (FNA-XNA-FAudio-21.01_GH0.tar.gz) = 1134752 +TIMESTAMP = 1725172429 +SHA256 (FNA-XNA-FAudio-24.08_GH0.tar.gz) = 7c116d79d24abbca192e63de2d7ee42a679e1994f0a2e79200731b9878fdacca +SIZE (FNA-XNA-FAudio-24.08_GH0.tar.gz) = 1125131 diff --git a/audio/faudio/files/patch-CMakeLists.txt b/audio/faudio/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..74faee79f859 --- /dev/null +++ b/audio/faudio/files/patch-CMakeLists.txt @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2024-09-01 06:45:46 UTC ++++ CMakeLists.txt +@@ -353,7 +353,7 @@ install( + ) + install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/generated/${PROJECT_NAME}.pc +- DESTINATION ${FAudio_INSTALL_LIBDIR}/pkgconfig ++ DESTINATION ${FAudio_INSTALL_LIBDIR}data/pkgconfig + ) + + # Generate cmake-config file, install CMake files diff --git a/audio/faudio/files/patch-src_FAudio__platform__sdl2.c b/audio/faudio/files/patch-src_FAudio__platform__sdl2.c deleted file mode 100644 index 1e4828e99646..000000000000 --- a/audio/faudio/files/patch-src_FAudio__platform__sdl2.c +++ /dev/null @@ -1,23 +0,0 @@ -https://github.com/FNA-XNA/FAudio/issues/183 - ---- src/FAudio_platform_sdl2.c.orig 2020-04-01 14:55:30 UTC -+++ src/FAudio_platform_sdl2.c -@@ -100,6 +100,18 @@ void FAudio_PlatformInit( - want.samples = want.freq / 100; - } - -+ /* SDL audio with arts/dsp backends expect ^2, so round up. -+ * For 48KHz this should be 512. -+ * https://graphics.stanford.edu/~seander/bithacks.html#RoundUpPowerOf2 -+ */ -+ want.samples--; -+ want.samples |= want.samples >> 1; -+ want.samples |= want.samples >> 2; -+ want.samples |= want.samples >> 4; -+ want.samples |= want.samples >> 8; -+ want.samples |= want.samples >> 16; -+ want.samples++; -+ - /* Open the device (or at least try to) */ - iosretry: - device = SDL_OpenAudioDevice( diff --git a/audio/faudio/pkg-plist b/audio/faudio/pkg-plist index 2080a5ffd1e8..95c7b49227b3 100644 --- a/audio/faudio/pkg-plist +++ b/audio/faudio/pkg-plist @@ -1,15 +1,15 @@ include/F3DAudio.h include/FACT.h include/FACT3D.h include/FAPO.h include/FAPOBase.h include/FAPOFX.h include/FAudio.h include/FAudioFX.h -lib/cmake/FAudio/FAudio-config.cmake lib/cmake/FAudio/FAudio-targets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/FAudio/FAudio-targets.cmake +lib/cmake/FAudio/FAudioConfig.cmake lib/libFAudio.so lib/libFAudio.so.0 lib/libFAudio.so.0.%%SOVERSION%% libdata/pkgconfig/FAudio.pc