From nobody Wed Feb 16 21:03:02 2022 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 8D3B319C2EF8; Wed, 16 Feb 2022 21:03: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 4JzVm63bBwz3Pc8; Wed, 16 Feb 2022 21:03:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645045382; 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=A1bxAbDklafy0C7K77VUGxkKLzqQh4XDZJ5kWK28dBE=; b=Vi+pn/dUo/P/D5Czqv6ixxud3lBLeXO+HIIsyGmAQR6uruksLD5ii9ncbaOVYxqnDe/pp7 CI4amQYtY1ym0neDs0JNUBOFGzrlycJYPRysv3+zpsyT8rD69LB8htp6kLoK5UqC9RmBJe ThoCYiFjJi7yih3kj7p9SSw6yiiTLzCRjFHpGW9uvazO1AhtaupCFr0UmqEwCI9nvoyLq/ EXVZX/G1vLoTfBAmGk6lay9J+YeyQRAytE0jfOsqv7A3farDrgrfHv9/97i/SsUNX4WwLD ulViPbpp2YPgUiCHrz53Lg/3ay/oyJc0jK8Aredom7nYV76HGoAAKK3qSoSnxA== 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 5BD611D36A; Wed, 16 Feb 2022 21:03:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21GL32RU005697; Wed, 16 Feb 2022 21:03:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21GL322h005696; Wed, 16 Feb 2022 21:03:02 GMT (envelope-from git) Date: Wed, 16 Feb 2022 21:03:02 GMT Message-Id: <202202162103.21GL322h005696@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Andree Subject: git: 037eee264831 - main - audio/alsa-plugins: Fix SPEEX option, and symlinks. 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 037eee264831689f93e16d51875bbebd30ed50dd Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645045382; 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=A1bxAbDklafy0C7K77VUGxkKLzqQh4XDZJ5kWK28dBE=; b=eE3LZHcKrtsRv13q10+2ZS3mpsWByMR0NdHSqlpjZu98Wm3zvES5qt2nTUrE1WCsvlDq3h apjbIJ8zMK8OrwMEc5Q6KuhQy1GLNyzUiOt+mA591JUES74yGNLph4l9v5/7JD++he2PLQ 4Wzc3LhpRAH+4sfM4t/ThQtszz6yScL3TKBvntgiQ15DbdJE0PvGf7XILpWuUz65DTY2GA M3X59+89CLJHwpbLVaw1jaDv+7o4wMo9Fp3SfDEmJ6ZH7bQi3fXzPx6e83AkFk3tLsjAkL cw1Y13DLuHDrmjfUfebYN3HaoNA1TyaOz9Kjppqljp1ZBwW2EWJc6hPBeDULOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645045382; a=rsa-sha256; cv=none; b=HAow/VMFIHoJxWYUwUUftZN924m23dyQLUAIQB7Npns+OqPOlce/XoquyykZz1wYhm7BRM 138JLOndz/GHp4hu1vU5iA8A6GBtfu3hyvZk4Ur0gZq66+C6hGGUgPueZeyqJPiH9Q4vp2 RIqt05qZgVLIRJnw790OhrXxDG33JcH+Z5S/WbLpu9Vi2B6HsY6Cl3eBBd64rAi5k7zEv5 hjYlpj2oWfXqdEnicpyxSqT3FVp6Z2fRGuaUamLW4TpnMXRVMRzofi37dU5lyoygZc5H0P r6wiX39I2OR6ZrX9x2Sr5IoqD2cMqLjFAHeOieUhYDJ78Z/Y2r0sZHn0GPMa7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=037eee264831689f93e16d51875bbebd30ed50dd commit 037eee264831689f93e16d51875bbebd30ed50dd Author: Matthias Andree AuthorDate: 2022-02-16 20:22:32 +0000 Commit: Matthias Andree CommitDate: 2022-02-16 21:02:16 +0000 audio/alsa-plugins: Fix SPEEX option, and symlinks. Fixes these errors: Error: /usr/local/lib/alsa-lib/libasound_module_pcm_speex.so is linked to /usr/local/lib/libspeexdsp.so.1 from audio/speexdsp but it is not declared as a dependency Error: Orphaned: etc/alsa/conf.d/60-speex.conf Error: Orphaned: share/alsa/alsa.conf.d/60-speex.conf Also makes symlinks from etc/alsa/conf.d to share/alsa/alsa.conf.d/ relative to fix stage-qa warnings. --- audio/alsa-plugins/Makefile | 9 +++++++-- audio/alsa-plugins/pkg-plist | 2 ++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/audio/alsa-plugins/Makefile b/audio/alsa-plugins/Makefile index cb092103d9ca..e2f3c17781dc 100644 --- a/audio/alsa-plugins/Makefile +++ b/audio/alsa-plugins/Makefile @@ -2,7 +2,7 @@ PORTNAME= alsa-plugins PORTVERSION= 1.2.2 -PORTREVISION= 7 +PORTREVISION= 8 DISTVERSIONPREFIX= v CATEGORIES= audio MASTER_SITES= GH @@ -53,8 +53,13 @@ PULSEAUDIO_CONFIGURE_ENABLE= pulseaudio SAMPLERATE_LIB_DEPENDS= libsamplerate.so:audio/libsamplerate SAMPLERATE_CONFIGURE_ENABLE= samplerate -SPEEX_LIB_DEPENDS= libspeex.so:audio/speex +SPEEX_LIB_DEPENDS= libspeex.so:audio/speex libspeexdsp.so:audio/speexdsp SPEEX_CONFIGURE_ON= --with-speex=lib SPEEX_CONFIGURE_OFF= --without-speex +post-install: + # sanitize links + cd ${STAGEDIR}${PREFIX}/etc/alsa/conf.d && for i in [0-9][0-9]-*.conf ; do \ + ${LN} -sf ../../../share/alsa/alsa.conf.d/$$i . ; done + .include diff --git a/audio/alsa-plugins/pkg-plist b/audio/alsa-plugins/pkg-plist index 176a27a18e85..d93a5bad2821 100644 --- a/audio/alsa-plugins/pkg-plist +++ b/audio/alsa-plugins/pkg-plist @@ -4,6 +4,7 @@ @comment etc/alsa/conf.d/50-arcam-av-ctl.conf @comment etc/alsa/conf.d/50-oss.conf @comment etc/alsa/conf.d/50-pulseaudio.conf +%%SPEEX%%etc/alsa/conf.d/60-speex.conf @comment etc/alsa/conf.d/60-upmix.conf @comment etc/alsa/conf.d/60-vdownmix.conf @comment etc/alsa/conf.d/98-usb-stream.conf @@ -54,6 +55,7 @@ lib/alsa-lib/libasound_module_pcm_vdownmix.so @comment share/alsa/alsa.conf.d/50-oss.conf %%PULSEAUDIO%%share/alsa/alsa.conf.d/50-pulseaudio.conf %%FFMPEG%%share/alsa/alsa.conf.d/60-a52-encoder.conf +%%SPEEX%%share/alsa/alsa.conf.d/60-speex.conf @comment share/alsa/alsa.conf.d/60-upmix.conf @comment share/alsa/alsa.conf.d/60-vdownmix.conf @comment share/alsa/alsa.conf.d/98-usb-stream.conf