From nobody Fri Apr 5 16:28:06 2024 X-Original-To: dev-commits-ports-all@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 4VB3nM0c1qz5Glrt; Fri, 5 Apr 2024 16:28:07 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VB3nM057Fz4WYC; Fri, 5 Apr 2024 16:28:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712334487; 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=32rpXkwcCruCqYqJ8gY5KXnkczhPRsHCX8jMlY5DGmA=; b=u7+hIc3T/ihM1ZSoqPWh7epVdKyzCU4mDqs1RLKg6Js5zIwpSa1O2D3LciOfD1cV5RHK0S M/kW+XPvNqacIR3Eq8pcD6LlcEYLDvWRc7wkOc0jZyq/9xW7+P3QP43vbN0LhWg9iEDnBx pWNi7grLJ/DGqBhU8efvu4KGBgZ4yOvpzMA7CxGaQL62SZ3lO4Kmvd9GS/DahA9lY12HcR of+9VrfETPnHusN+4ZdV3e9LwCKSmGQOfZxm+MYtnHUQ8HPqbcr/H57cZ5M4jmjQHlAkmb dn8U8JWfuwQTRLl/0e/DwX6PGauJ8IF8EmPhzX4BmfbaFfxPRd8YezNVyJp/AQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712334487; a=rsa-sha256; cv=none; b=ZK1lRyQOy7KOGqLOGhA9M64RLehdFPRr95WNzq4xZscL/j/c1VT3pKfXZl62SQj4fBDoJI OYb+d0OfhssIa8hhKTvPR40U81FWTqK99oOburx1ES548XxBOM4Aoq5DEuFGg/IyuN3ts7 d0AMmziTieI1+Yg943UXbwJIcJwZYhHOJhb0k9e5xOPbffJmRnf0U+4EmCH8CqNZMFuUSD XfV3AeXhs+WpbVmxiKZwXzgDrF1OThLC0tHM2OXMp5GryX+SA8Cg9QbikIRgMyx7c80oy3 ToUsQtC21CmzE8gaFksqIRwjNp8TewXjcWYf/Cs0XJDRBS5Lz1j9GEE2LFS5BQ== 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=1712334487; 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=32rpXkwcCruCqYqJ8gY5KXnkczhPRsHCX8jMlY5DGmA=; b=jhZDsmyvfv7YFUvLVZFYqGu2j7KrfHEmFtKOSyv4A74K/EzR+kWNnW5S7GuDdZcfFfQOKk qoclDJdD7gpyP1BKikSaHJ67U0fNZSo/D6C6cPqtJhFbJQBrOYBGn+Cz6+a7mxyjMlsLOH JjMasxey//60BtdzwtagdRJ0xHNMk/aH/Rdb4c+GhaJkAE+Ux46GsAptYuvm0fKJBBLv4a y+hupYG9QPrXmdxZJTSFu9KSGK1f1QOmEuhdhwu1d6U6EvN67jW6yzPR5Q1J55wO/eIKXe 53oGc3PcQ8tYDt0pjyge6cGmCBCm2MvaJAKQrTwR2bPYb6ML8Y4tVwOfRMcKsA== 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 4VB3nL6nggz16Yw; Fri, 5 Apr 2024 16:28:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 435GS6rP097700; Fri, 5 Apr 2024 16:28:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 435GS6qT097697; Fri, 5 Apr 2024 16:28:06 GMT (envelope-from git) Date: Fri, 5 Apr 2024 16:28:06 GMT Message-Id: <202404051628.435GS6qT097697@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: f2a60bd4e051 - main - audio/mumble{,-server}: fix build on i386 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f2a60bd4e0516763e390a2ab619db7503a9e3b20 Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=f2a60bd4e0516763e390a2ab619db7503a9e3b20 commit f2a60bd4e0516763e390a2ab619db7503a9e3b20 Author: Vladimir Druzenko AuthorDate: 2024-04-05 16:24:31 +0000 Commit: Vladimir Druzenko CommitDate: 2024-04-05 16:27:58 +0000 audio/mumble{,-server}: fix build on i386 Upstream issue: https://github.com/mumble-voip/mumble/issues/6377 Reported by: pkg-fallout Approved by: arrowd (mentor, implicit) --- audio/mumble-server/Makefile | 2 ++ audio/mumble/files/patch-src_MumbleProtocol.cpp | 11 +++++++++++ audio/mumble/files/patch-src_mumble_Audio.cpp | 11 +++++++++++ audio/mumble/files/patch-src_mumble_AudioOutput.cpp | 16 ++++++++++++++++ 4 files changed, 40 insertions(+) diff --git a/audio/mumble-server/Makefile b/audio/mumble-server/Makefile index cf83a829fe77..1902068cdddb 100644 --- a/audio/mumble-server/Makefile +++ b/audio/mumble-server/Makefile @@ -28,6 +28,8 @@ CXXFLAGS+= -Wno-deprecated-declarations USE_RC_SUBR= mumble_server SUB_LIST+= USERS="${USERS}" GROUPS="${GROUPS}" +EXTRA_PATCHES+= ${.CURDIR}/../mumble/files/patch-src_MumbleProtocol.cpp + OPTIONS_DEFINE= AVAHI DOCS ICE LTO OPTIONS_DEFAULT= AVAHI LTO MYSQL SQLITE OPTIONS_MULTI= SQL diff --git a/audio/mumble/files/patch-src_MumbleProtocol.cpp b/audio/mumble/files/patch-src_MumbleProtocol.cpp new file mode 100644 index 000000000000..2f05950b011a --- /dev/null +++ b/audio/mumble/files/patch-src_MumbleProtocol.cpp @@ -0,0 +1,11 @@ +--- src/MumbleProtocol.cpp.orig 2024-03-03 17:26:27 UTC ++++ src/MumbleProtocol.cpp +@@ -781,7 +781,7 @@ namespace Protocol { + } + + +- m_audioData.payload = gsl::span< byte >(payloadBegin, payloadSize); ++ m_audioData.payload = gsl::span< byte >(payloadBegin, static_cast< size_t >(payloadSize)); + + if (stream.left() == 3 * sizeof(float)) { + // If there are further bytes after the audio payload, this means that there is positional data attached to diff --git a/audio/mumble/files/patch-src_mumble_Audio.cpp b/audio/mumble/files/patch-src_mumble_Audio.cpp new file mode 100644 index 000000000000..5d7719c14c7c --- /dev/null +++ b/audio/mumble/files/patch-src_mumble_Audio.cpp @@ -0,0 +1,11 @@ +--- src/mumble/Audio.cpp.orig 2024-03-03 17:26:27 UTC ++++ src/mumble/Audio.cpp +@@ -43,7 +43,7 @@ void LoopUser::addFrame(const Mumble::Protocol::AudioD + QMutexLocker l(&qmLock); + bool restart = (qetLastFetch.elapsed() > 100); + +- long time = qetTicker.elapsed(); ++ long long time = qetTicker.elapsed(); + + float r; + if (restart) diff --git a/audio/mumble/files/patch-src_mumble_AudioOutput.cpp b/audio/mumble/files/patch-src_mumble_AudioOutput.cpp new file mode 100644 index 000000000000..04aaaa44bbb3 --- /dev/null +++ b/audio/mumble/files/patch-src_mumble_AudioOutput.cpp @@ -0,0 +1,16 @@ +--- src/mumble/AudioOutput.cpp.orig 2024-03-03 17:26:27 UTC ++++ src/mumble/AudioOutput.cpp +@@ -617,11 +617,11 @@ bool AudioOutput::mix(void *outbuff, unsigned int fram + // Mix down stereo to mono. TODO: stereo record support + // frame: for a stereo stream, the [LR] pair inside ...[LR]LRLRLR.... is a frame + for (unsigned int i = 0; i < frameCount; ++i) { +- recbuff[i] += (pfBuffer[2 * i] / 2.0f + pfBuffer[2 * i + 1] / 2.0f) * volumeAdjustment; ++ recbuff[static_cast< int >(i)] += (pfBuffer[2 * i] / 2.0f + pfBuffer[2 * i + 1] / 2.0f) * volumeAdjustment; + } + } else { + for (unsigned int i = 0; i < frameCount; ++i) { +- recbuff[i] += pfBuffer[i] * volumeAdjustment; ++ recbuff[static_cast< int >(i)] += pfBuffer[i] * volumeAdjustment; + } + } +