From nobody Fri Jul 07 21:34:01 2023 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 4QyRVK2D2Tz4m5RV; Fri, 7 Jul 2023 21:34:01 +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 4QyRVK1phXz4L8j; Fri, 7 Jul 2023 21:34:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688765641; 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=pTtTxuUW2LIfeee/H9fU6EGX/cyqoCGFazds797y4GE=; b=uiuHStBkjzg+gFqmnJ7SF++OUIUAyZG5BN/0ulDPW0c/1nqV8CG2fb8IZTyChMCqemSQ6d cApJDFFx33vhOGGHZ7vn53cn3C0sObPgMWb+97qGTw2TGbK/L8zIBYHs0PN0gt0GpKnZlb W7QwHR3hgqVa5uCMfIyZgWqu83tXYBjo2M61BwIwXB90Kf9kHofDMqRjWaEzgz9FVOk37u /gYUCl0gikBEG84MtCNouYSeDRojnRpjl3fQJjpHV33zElMqkg67q58Wtqi/DWuk0gwT7p ToAjCdIYADkEQEdMqqA40NcAEZQcwyunu8EKWJfN60R1Aia1HzkpJiMwGyRGBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688765641; 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=pTtTxuUW2LIfeee/H9fU6EGX/cyqoCGFazds797y4GE=; b=rmeiIW3oY5kiKrm1xPdrMZly04voS0AKWOl8NrEwn9yGjVe+UR/2GaItQDy5V3TYlaqazh 04j82N4v845KYlUEb0FgrHsMCSHrTpaBqnF9ku7OXvmJkq+ty8qKEHGJ/6Pjsf6C/dvWGm c92Q8BwbiJfhewIAjL0AsJFBhSW/SYXPYnXFxDl77kNa4W4w+zdS4lMho9KgNw794FosWs MUM8UNodE06J2nKbJkshHAaoo0PWcMR9pJLNkZxxZhgoOStdBblfkzxkz06QFAW9k/UWJW NaV/98yEseJcb3c+dHMnb/xmTET4EhG1ACJNuEyOOaw/Zzn/e8owLv7vHx+u5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688765641; a=rsa-sha256; cv=none; b=tgNnrMO/UN8IE4yOe2K8Pg6VNtFAKL5vzVuMCMBiOm799z2Fpqdi6edN9EdzZzRoPoLXJS uotHMwMo7faYV87SYZp7rEv1LJManh2ZUCCBhOXZVA0VDFDMDHEwhefmfo/KVWxjxVWvz5 bfNhborMIJbgNFC7UeQTpjyldP+MBIfooKL4jKd90XiPaCklrwbQpLB7jndXQoQ0TxV18t d/Mn3yT31VOB7UmDNbqGpa+bZZ/twJLvcYlLHl9gcZVXptE35VLT+iU/OIo7qzPKeNHjCi alF52DR8fELzQlYNsNHT+42S+LBHhgjCcyKJ8xSI44dEWFXzRzoP+2sk4b/VAw== 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 4QyRVK0rhPzv40; Fri, 7 Jul 2023 21:34:01 +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 367LY1Sr077830; Fri, 7 Jul 2023 21:34:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 367LY1G9077829; Fri, 7 Jul 2023 21:34:01 GMT (envelope-from git) Date: Fri, 7 Jul 2023 21:34:01 GMT Message-Id: <202307072134.367LY1G9077829@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: b2bad281f662 - 2023Q3 - audio/alsa-plugins: revert ffmpeg workaround 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: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q3 X-Git-Reftype: branch X-Git-Commit: b2bad281f662159af0709d978dd5dcb5c375d863 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q3 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=b2bad281f662159af0709d978dd5dcb5c375d863 commit b2bad281f662159af0709d978dd5dcb5c375d863 Author: Jan Beich AuthorDate: 2023-07-07 21:02:50 +0000 Commit: Jan Beich CommitDate: 2023-07-07 21:33:57 +0000 audio/alsa-plugins: revert ffmpeg workaround Not a leaf consumer. Depending on ffmpeg4 can cause bustage or crashes in ffmpeg consumers. PR: 271641 272337 This reverts commit ca82785515c8ecfa4bab73b7539a688c343f327e. (cherry picked from commit 38462c18edacfc7e912783cb164065eab8d38be2) --- audio/alsa-plugins/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/audio/alsa-plugins/Makefile b/audio/alsa-plugins/Makefile index 92788a29cc1b..80531dcf2cae 100644 --- a/audio/alsa-plugins/Makefile +++ b/audio/alsa-plugins/Makefile @@ -39,10 +39,9 @@ BLKCNT_P2_CFLAGS= -DFREEBSD_OSS_BLKCNT_P2 BUFSZ_P2_CFLAGS= -DFREEBSD_OSS_BUFSZ_P2 VERBOSE_CFLAGS= -DALSA_OSS_DEBUG_VERBOSE -FFMPEG_LIB_DEPENDS= libavcodec.so.58:multimedia/ffmpeg4 +FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg FFMPEG_CONFIGURE_ENABLE= libav -FFMPEG_CONFIGURE_ENV+= PKG_CONFIG_PATH="${LOCALBASE}/ffmpeg4/libdata/pkgconfig" -FFMPEG_MAKE_ENV+= PKG_CONFIG_PATH="${LOCALBASE}/ffmpeg4/libdata/pkgconfig" +FFMPEG_BROKEN= fails to build with ffmpeg >= 5 JACK_LIB_DEPENDS= libjack.so:audio/jack JACK_CONFIGURE_ENABLE= jack