From nobody Sun Sep 08 17:32:57 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X1xrB2gNHz5VWvy; Sun, 08 Sep 2024 17:32:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X1xrB0Nkdz4fFb; Sun, 8 Sep 2024 17:32:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725816778; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rShqSBa/mpS6OJ0U2Y/Y1RAFKnBxL4EIcX4iy9xyHwQ=; b=ZNkb9fvCkiG4niTEpRdTb7iU4eIlC3/XXZlnVxky+E98+VRU/7jJ2DbIigVWy0vpHhuQbv E1lKpYkkWOdglTtvvZaCARQQCglTwpGPtpvc/5qLE+4zcl7uCPZYSTLismHaXYKYo32RPd fpwwwLdrk18hPGczYFYS1DKnn2NOJcWgj5j/O2fBcHNNzhy5XKbSjtFPA4rZMDCHFw4JXn TN8qhAWfVXLosWrHAa92vcNPZvdoj4Fr/XypzLXjzYa4Qr4gTLt70aSxEuVfLyTobb7+OQ H8wxVf6lWfccypQl+GJ4tf5ouSF9sDI7KyJECQZapKyERBoR+K6wQEXxNTvshw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725816778; a=rsa-sha256; cv=none; b=V0EdQQ1+f0Fna9dXN5YNFsI+xoani2zxaoOHR4o19UvhnYk4+2uY6DQ95TXloutfY7nqbj V+CWkPgeyh1yuU1yE197T9g52NX1xjVBMtaSIhmPRuxdVaJbpIPh4IMOt2bfOerMHACJAs 9MGZJXfetRAa4wDScFCtfjlzK68NIHcKPuIECOZKigD7U7EDte5i8A1hUTJPl2Z8Hn8+hL m8pRH6NhkpuycDs7urMfPh9cstXjCvhga4Ah1YWM7/vfO7Wx9dYMVbU4NeMCtk3/CS8w7k 5XrZHGEVJD6ZIH3dVcTkmoXpvwz7qbQzqZKMDCnzH2xSLGZ0cUX8muemMtvyaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725816778; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rShqSBa/mpS6OJ0U2Y/Y1RAFKnBxL4EIcX4iy9xyHwQ=; b=EuJ4MXy4ty5HxKrbNQjqwew384UT5V3lW1/hlZcEf9jkGpXMn7AhSIn6XMsdGEwd3/xNgp 1YjJyPPuLRehph5VavYj2+qHgLVD00z/D08KKoyodQUI073UR6+jUkZwyMZSCa0KDI5Uyb 80U045asDI7O5TyYdprWdUugCnahA/OYzlhukbq8xx8436YV4OIszZMKrjtH4CACwbfzfl 8T2zXg6qYadKzMUg9LfaQJMswjm5kh8HXU1uTHupk3MA9TL8eB/vprAvePy9OunUSYJhXl iRtNNxsGOhV8UL/SZODR1vSJOZCl6ymEt+vBLFumB6UEy61YlTFwipU5hOHqDA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4X1xr971DfzSYP; Sun, 8 Sep 2024 17:32:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 488HWvAD008183; Sun, 8 Sep 2024 17:32:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 488HWvZI008180; Sun, 8 Sep 2024 17:32:57 GMT (envelope-from git) Date: Sun, 8 Sep 2024 17:32:57 GMT Message-Id: <202409081732.488HWvZI008180@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: eee68f8b2592 - main - audio/faudio: Update to 24.08 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eee68f8b25927bab6b3801bca9e55a8448390ece Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=eee68f8b25927bab6b3801bca9e55a8448390ece commit eee68f8b25927bab6b3801bca9e55a8448390ece Author: Daniel Engberg AuthorDate: 2024-09-08 07:02:11 +0000 Commit: Daniel Engberg CommitDate: 2024-09-08 17:31:48 +0000 audio/faudio: Update to 24.08 Changelog: https://github.com/FNA-XNA/FAudio/releases/tag/24.08 PR: 281181 Tested by: jbeich --- audio/faudio/Makefile | 20 ++++++------------- audio/faudio/distinfo | 6 +++--- audio/faudio/files/patch-CMakeLists.txt | 11 +++++++++++ .../files/patch-src_FAudio__platform__sdl2.c | 23 ---------------------- audio/faudio/pkg-plist | 2 +- 5 files changed, 21 insertions(+), 41 deletions(-) diff --git a/audio/faudio/Makefile b/audio/faudio/Makefile index 50f2119791a2..55b18f962837 100644 --- a/audio/faudio/Makefile +++ b/audio/faudio/Makefile @@ -1,5 +1,5 @@ PORTNAME= FAudio -DISTVERSION= 21.01 +DISTVERSION= 24.08 CATEGORIES= audio MAINTAINER= multimedia@FreeBSD.org @@ -10,27 +10,19 @@ 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 @@ -6,9 +6,9 @@ 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%%