From nobody Fri Jul 07 21:33:44 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 4QyRV11bpkz4m5fk; Fri, 7 Jul 2023 21:33:45 +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 4QyRV119jTz4KyV; Fri, 7 Jul 2023 21:33:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688765625; 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=pYTXS+nwhlracrnCHdFtWGQe4T8AY2VkkOz9ZTZAack=; b=doOKtRsZiahb2L5YpfyDvvzGwPT/KM4mlKuG2mWglt43N1oTkKbj2yU1sCqT5R+5XKfeyQ k0xdgWVk/EpUCqLliWcMnfwUyFphocKA5e67LHvJ4rkiUzwlVHHguSIwbK65d5nd7iwOw+ FwijoLqBOanD6Ip7mPPjvit2WY6Vi87AYFHVdR2v/eFmn/Nk2v6Hgnitiioqwl+n4VhlpJ eI5lQqajkdvFgT6k4GMKMhXRGJsrSOGJDtoGHx23/TzEx7QrAbmBPH4gSHhDGYib5jSFOn ZHVPSqDpRB9Uh3CgsqpnjB4nGWdj6BcHYV2/9/EJKbUFFqpW1s8kWwHhqQhHvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688765625; 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=pYTXS+nwhlracrnCHdFtWGQe4T8AY2VkkOz9ZTZAack=; b=QgsC2XvDPH0JvCMiYa3618XEu4MapPkRHe9GsXirWt0qc5+YCrmqI9SYWEXMd9tRqwUFUM I7YRwW5USxpUeECf30aNgT81ICoCDdULSfCQems5Rc14O/8cnRshUDKbiFS5nomTZ+8bIn kzsooU3ZeahGKp2xC3VFxWZQjYYiV9eJoo0rgOZWiP1+dvM6icls4AuM8y9sgRXzcpb/YN Cq1WLWlxqI/TjWXg/yVo/cAmrWn0iHrZr/Z2kQa1OGsxqw7CTFKjeQ/Yl9Azk9H9kGsFTe E00Hwkts7q1hVWLgxzmCs/tjJw6NolkGgK445QxHyXv2SR9zirVxkZ272qTe9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688765625; a=rsa-sha256; cv=none; b=OQLoieUoSVW6b4ntwzXLNrruMeShb6xmZM4Obz7CxCHyy6/VwqTcjaM17p7DC/cMmC5AoQ LiBGPSrUN6zMMufBxlXm40jgsfxUeW/4wqNbQtrMussPs4/EVPnJTT++ag9/6lDeDsRoE4 w9RfgjSXjKUnQPEpznY8ng6SKSvUKAFAdZL8h0h7H4gv9ihpOrDo9kU4gWbPfZCL5+flnD D/FwAllZc34jusi3eip0ovWm2WheBVlBicEHo8Oyc8kBOi17Sm3Vsq18/GnPh7+mUlQzKY lPPU7NSSfpt/iCaKm5ZZhyPv/xDbq5aNrpeu3pPgeRfXyQp329yxA6v4yoHyPw== 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 4QyRV10FGgzvJ3; Fri, 7 Jul 2023 21:33:45 +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 367LXiUQ077625; Fri, 7 Jul 2023 21:33:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 367LXiYF077624; Fri, 7 Jul 2023 21:33:44 GMT (envelope-from git) Date: Fri, 7 Jul 2023 21:33:44 GMT Message-Id: <202307072133.367LXiYF077624@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 38462c18edac - main - 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/main X-Git-Reftype: branch X-Git-Commit: 38462c18edacfc7e912783cb164065eab8d38be2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=38462c18edacfc7e912783cb164065eab8d38be2 commit 38462c18edacfc7e912783cb164065eab8d38be2 Author: Jan Beich AuthorDate: 2023-07-07 21:02:50 +0000 Commit: Jan Beich CommitDate: 2023-07-07 21:32:45 +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. --- 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