From nobody Fri Jul 07 21:34:02 2023 X-Original-To: dev-commits-ports-branches@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 4QyRVL39QNz4m5P6; Fri, 7 Jul 2023 21:34:02 +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 4QyRVL2h0Mz4LTF; Fri, 7 Jul 2023 21:34:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688765642; 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=8sIuTsgK9zctJsu46p4feQsVoWQyVPI7bWGXJdtwCkI=; b=M9MJpKWxU2hChdQwOPTalgWMEpB9pE4OC0JvkGCKxz+OlOlmwwUwKFRcOKHA16oGlR5Ili ZLD4qagZoFK3mjvz7aWBbysSG6CEwj1xRzZufKZXxPCkGKck9fH3nX1QSBf1bUAnO7OHOZ USvtciJBebhq3F7Z3WvHSA5UJKLOduC40Z0edonCZRz1ZVqWSVQEQcA5ixSX1BakLY2E4Z hxrB/5tohGrVrp2CRHJM/xvPkcDlKEESrjJmBBpnibyZdEcd2CnWDhkSdirngBQhXaVt3q bNo6p4qpfiIIlQoOJVeBJglEKvSNV5aCgeP5G55uWKNb2bLpohmZsOmf+ama5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688765642; 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=8sIuTsgK9zctJsu46p4feQsVoWQyVPI7bWGXJdtwCkI=; b=tlMsuC6G9RrGmz2Gj2SKAC8npYZFtYgA6jRvv2fFUBVCfE3zldkXTnYyApkzsnAFilKQyH 8qG4EffxexYz7cB/ibZT3LpMFt7F2fo7ZouTqNuIT/V8wgkBvoPWeDlGxxtd3UMc1PtdVu 2tAabLpN/6WQqfhwApVBzpkrxayQGQIDn8oNKngaKZGDdfFCNQVfW08ZYzzS3j2MqBG+5a nIzYL8iorskh+Gq+n4n6Z8+ddS318AmuaaInqSDCCJXkkjyufMqXusUjx6tJorwvL8KqKu yqfd3IXcVOOwqiUBjqGq5LppxlUUGPcGte731yGpM4NBhHKk5zK9YG2ag+B2Rw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688765642; a=rsa-sha256; cv=none; b=kRJCpV9TACJGzd9fUnNZu+V3hkVOU1yfE5ExVXRre3SiXrXpn3JeClKrcv5AoIl8nKCYC8 fwmMtv6ju0tTEXjmqZJFC7kqQCqlA97nxbDvyf1Al59sqX5P39jCElK0TEWDfG41MXY3B4 GqEULRI16z0HySmYL8AqCPZwDyebSpo9feLmrG+bPOyxHS71/l3pAbRaS/dOR/iAXB6uYJ +F3lGn3CYJqGPkUGSeniOHd9KyrujbEClhxuRukDhfEdnCkQwMDJ06hZtFqSuyx3q9OsGd 5Wx/D3VAzJtT+qmkO/XZnZ63Ab8In5HM79kwZI/g4bZYCrKKpWu+diY9+SeWVA== 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 4QyRVL1nLQzvJ5; Fri, 7 Jul 2023 21:34:02 +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 367LY2hs077849; Fri, 7 Jul 2023 21:34:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 367LY2rW077848; Fri, 7 Jul 2023 21:34:02 GMT (envelope-from git) Date: Fri, 7 Jul 2023 21:34:02 GMT Message-Id: <202307072134.367LY2rW077848@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: 210327adb060 - 2023Q3 - audio/alsa-plugins: unbreak FFMPEG=on after 685e477b807c List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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: 210327adb060c183ed7e05d6acf029b93f3bdd8b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q3 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=210327adb060c183ed7e05d6acf029b93f3bdd8b commit 210327adb060c183ed7e05d6acf029b93f3bdd8b Author: Jan Beich AuthorDate: 2023-07-07 21:22:40 +0000 Commit: Jan Beich CommitDate: 2023-07-07 21:33:57 +0000 audio/alsa-plugins: unbreak FFMPEG=on after 685e477b807c checking for LIBAV... no checking for avcodec_open in -lavcodec... no [...] configure:13617: checking for LIBAV configure:13624: $PKG_CONFIG --exists --print-errors "libavcodec libavutil libavresample" Package libavresample was not found in the pkg-config search path. Perhaps you should add the directory containing `libavresample.pc' to the PKG_CONFIG_PATH environment variable Package 'libavresample', required by 'virtual:world', not found configure:13627: $? = 1 [...] ====> Checking for pkg-plist issues (check-plist) ===> Parsing plist ===> Checking for items in STAGEDIR missing from pkg-plist ===> Checking for items in pkg-plist which are not in STAGEDIR Error: Missing: etc/alsa/conf.d/10-rate-lav.conf Error: Missing: etc/alsa/conf.d/60-a52-encoder.conf Error: Missing: lib/alsa-lib/libasound_module_pcm_a52.la Error: Missing: lib/alsa-lib/libasound_module_pcm_a52.so Error: Missing: lib/alsa-lib/libasound_module_rate_lavrate.la Error: Missing: lib/alsa-lib/libasound_module_rate_lavrate.so Error: Missing: lib/alsa-lib/libasound_module_rate_lavrate_fast.so Error: Missing: lib/alsa-lib/libasound_module_rate_lavrate_faster.so Error: Missing: lib/alsa-lib/libasound_module_rate_lavrate_high.so Error: Missing: lib/alsa-lib/libasound_module_rate_lavrate_higher.so Error: Missing: share/alsa/alsa.conf.d/10-rate-lav.conf Error: Missing: share/alsa/alsa.conf.d/60-a52-encoder.conf ===> Error: Plist issues found. *** Error code 1 PR: 271641 272337 (cherry picked from commit df94027c843002a2abe044fa124eb5956a385932) --- audio/alsa-plugins/Makefile | 6 ++++-- audio/alsa-plugins/distinfo | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/audio/alsa-plugins/Makefile b/audio/alsa-plugins/Makefile index 80531dcf2cae..c9e1e85c3080 100644 --- a/audio/alsa-plugins/Makefile +++ b/audio/alsa-plugins/Makefile @@ -1,10 +1,13 @@ PORTNAME= alsa-plugins PORTVERSION= 1.2.2 -PORTREVISION= 10 +PORTREVISION= 11 DISTVERSIONPREFIX= v CATEGORIES= audio MASTER_SITES= GH +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= 8a3c0d795fbe.patch:-p1 # rate-lav: Convert to libswresample + USE_GITHUB= yes GH_ACCOUNT= alsa-project GH_PROJECT= ${PORTNAME} @@ -41,7 +44,6 @@ VERBOSE_CFLAGS= -DALSA_OSS_DEBUG_VERBOSE FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg FFMPEG_CONFIGURE_ENABLE= libav -FFMPEG_BROKEN= fails to build with ffmpeg >= 5 JACK_LIB_DEPENDS= libjack.so:audio/jack JACK_CONFIGURE_ENABLE= jack diff --git a/audio/alsa-plugins/distinfo b/audio/alsa-plugins/distinfo index 09cefefdb80f..8efb3f320225 100644 --- a/audio/alsa-plugins/distinfo +++ b/audio/alsa-plugins/distinfo @@ -1,3 +1,5 @@ TIMESTAMP = 1634083456 SHA256 (alsa-project-alsa-plugins-v1.2.2_GH0.tar.gz) = 1872622227c474db9db57bf5b6ec91bbef391f9750e9d64d00d05af29f579e1a SIZE (alsa-project-alsa-plugins-v1.2.2_GH0.tar.gz) = 121998 +SHA256 (8a3c0d795fbe.patch) = 5772b954c166cf3c148872a405b21476039193b06fb2e834c4cc5a855325d8bf +SIZE (8a3c0d795fbe.patch) = 6946