From nobody Wed Feb 21 14:28:02 2024 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 4TfzC64ChDz59Xvj; Wed, 21 Feb 2024 14:28: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 4TfzC63WMtz4mHH; Wed, 21 Feb 2024 14:28:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708525682; 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=vPucdXxHl8Cv9fRyzV92Zt54cyqT05DeYj0q5g8W9XY=; b=mFrRo516cRndydsb0XjlubXAvP86UYxLvY4jb7gexdW+b7sWrLmfLia/9DnEsZgGm3Mok4 IGcoJZCP4m9JeA6CNxn+LzpRnw7vV5/0rReRDkVtkagBrYPCQbY3SH85emx3cdYu8o0kcn yI/yC2wIGwUoIlHmJAD9/9YZvTlTZcE9YpDLcbAGFYosLp4VpXs9OwK4Jjm3kJHOzNs+vm rnZZg76qh1U3LKD3xPsV3iQ+RiG81ztAco1tjl0NbvRi/eulx2WRyvqPy84iz2TxHj0/1e OY8oPIu51Pb7ludfrdf7xPzRZEZip/mPniIe9fVtwNimKzt3prukljPKdgpksQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708525682; 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=vPucdXxHl8Cv9fRyzV92Zt54cyqT05DeYj0q5g8W9XY=; b=cK9yxfSUaJ0TX1sfBi7zhiJ77jHP6xZuYpJRI+yEgATizB/6dBEhD0j2zi1grsbXCQpLR9 Ite/dcu3ilq/FpvqNn4692aLZyQJeUF/MrQdANtCylY/oLZM2gfItC3aHngGhqwT40Zpw5 wJlqlN+mOvenyIrE3nCrs4VlhDXpOGOPrXaO91WyIWYzxvsDrrG5qNExHCaFTElXSdi4dY 9NaVpD4o+Wt1gauHgHAYVGKrinmiaS/u5kHgDQfZZUofNpXFApUUdhXEIXBczR6Gy69cEG LKGJJGL3kSkH5S0afmmbvLz7aQ6zJGaVX/L4cu5Fx2Arhkl1cfRbVTM5+Gqusg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708525682; a=rsa-sha256; cv=none; b=ETc82OGDOuZM7S4Btbs/jjbVL2lHjGLS7QkNdJ91+09oG2eQikCzRlwZz5lk8lZp7bakek HLSXge8SSk1HDqzDUeRhmdw5iFFZR8LRC/C1bkzEukt65y5kiaInU6hSDHmEdpmS1UUkF/ s2s4ylsL5oh5ys47lJcKj5rOxIG8A9rdpPkO5CeudYy5GIyiGMkJSnUfoJ5MzXqIN7qqdi he16oV2QVp/4jK1nTVcSfBCc5AUAcdz5wqwYRJmuv6A3A6TxNwPbAFDsdVEqpU/CWQRb8W 6n6lVqXO/wwmjERXNtFHe6L9Zq/o51hjbhiUkY89/9lsL5/RYjZPszfQKsuHkg== 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 4TfzC62Z2bz15sf; Wed, 21 Feb 2024 14:28: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 41LES2TA017657; Wed, 21 Feb 2024 14:28:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41LES2rW017654; Wed, 21 Feb 2024 14:28:02 GMT (envelope-from git) Date: Wed, 21 Feb 2024 14:28:02 GMT Message-Id: <202402211428.41LES2rW017654@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: 7dd904d9178a - main - audio/alsa-plugins: temporarily drop subpackages 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: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7dd904d9178aef2ac7369c77551e6c7774997564 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=7dd904d9178aef2ac7369c77551e6c7774997564 commit 7dd904d9178aef2ac7369c77551e6c7774997564 Author: Jan Beich AuthorDate: 2024-02-20 20:21:14 +0000 Commit: Jan Beich CommitDate: 2024-02-21 14:27:19 +0000 audio/alsa-plugins: temporarily drop subpackages https://github.com/freebsd/poudriere/issues/1113 https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=276845 Requested by: makc (kde), bdrewery (pkgmgr) Suggested by: pizzamig (portmgr) This reverts commit 06dbf1df62a4f54da4cadecbbc0be5f33902eb1c. --- audio/alsa-plugins/Makefile | 19 +++----- audio/alsa-plugins/pkg-descr.ffmpeg | 3 -- audio/alsa-plugins/pkg-descr.jack | 3 -- audio/alsa-plugins/pkg-descr.pulseaudio | 3 -- audio/alsa-plugins/pkg-descr.samplerate | 3 -- audio/alsa-plugins/pkg-descr.speex | 3 -- audio/alsa-plugins/pkg-message | 13 ----- audio/alsa-plugins/pkg-plist | 84 ++++++++++++++++----------------- 8 files changed, 49 insertions(+), 82 deletions(-) diff --git a/audio/alsa-plugins/Makefile b/audio/alsa-plugins/Makefile index 80cd0031b0cf..127343819c20 100644 --- a/audio/alsa-plugins/Makefile +++ b/audio/alsa-plugins/Makefile @@ -1,6 +1,6 @@ PORTNAME= alsa-plugins PORTVERSION= 1.2.7.1 -PORTREVISION= 3 +PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= https://www.alsa-project.org/files/pub/plugins/ @@ -20,27 +20,22 @@ INSTALL_TARGET= install-strip CPPFLAGS+= -I${.CURDIR}/../alsa-lib/files OPTIONS_DEFINE= FFMPEG JACK PULSEAUDIO SAMPLERATE SPEEX -OPTIONS_DEFAULT= FFMPEG JACK PULSEAUDIO SAMPLERATE SPEEX +OPTIONS_DEFAULT= PULSEAUDIO OPTIONS_SUB= yes -FFMPEG_SUBPACKAGES= ffmpeg -LIB_DEPENDS.ffmpeg= ${LIB_DEPENDS} libavcodec.so:multimedia/ffmpeg +FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg FFMPEG_CONFIGURE_ENABLE= libav -JACK_SUBPACKAGES= jack -LIB_DEPENDS.jack= ${LIB_DEPENDS} libjack.so:audio/jack +JACK_LIB_DEPENDS= libjack.so:audio/jack JACK_CONFIGURE_ENABLE= jack -PULSEAUDIO_SUBPACKAGES= pulseaudio -LIB_DEPENDS.pulseaudio= ${LIB_DEPENDS} libpulse.so:audio/pulseaudio +PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_CONFIGURE_ENABLE= pulseaudio -SAMPLERATE_SUBPACKAGES= samplerate -LIB_DEPENDS.samplerate= ${LIB_DEPENDS} libsamplerate.so:audio/libsamplerate +SAMPLERATE_LIB_DEPENDS= libsamplerate.so:audio/libsamplerate SAMPLERATE_CONFIGURE_ENABLE= samplerate -SPEEX_SUBPACKAGES= speex -LIB_DEPENDS.speex= ${LIB_DEPENDS} libspeexdsp.so:audio/speexdsp +SPEEX_LIB_DEPENDS= libspeexdsp.so:audio/speexdsp SPEEX_CONFIGURE_ON= --with-speex=lib SPEEX_CONFIGURE_OFF= --without-speex diff --git a/audio/alsa-plugins/pkg-descr.ffmpeg b/audio/alsa-plugins/pkg-descr.ffmpeg deleted file mode 100644 index 0e7a7c1ebabe..000000000000 --- a/audio/alsa-plugins/pkg-descr.ffmpeg +++ /dev/null @@ -1,3 +0,0 @@ -The Advanced Linux Sound Architecture (ALSA) plugins - -This package provides FFmpeg-based plugins. diff --git a/audio/alsa-plugins/pkg-descr.jack b/audio/alsa-plugins/pkg-descr.jack deleted file mode 100644 index 945af4fa9321..000000000000 --- a/audio/alsa-plugins/pkg-descr.jack +++ /dev/null @@ -1,3 +0,0 @@ -The Advanced Linux Sound Architecture (ALSA) plugins - -This package provides jack plugin. diff --git a/audio/alsa-plugins/pkg-descr.pulseaudio b/audio/alsa-plugins/pkg-descr.pulseaudio deleted file mode 100644 index e26d8290a7ee..000000000000 --- a/audio/alsa-plugins/pkg-descr.pulseaudio +++ /dev/null @@ -1,3 +0,0 @@ -The Advanced Linux Sound Architecture (ALSA) plugins - -This package provides pulseaudio plugin. diff --git a/audio/alsa-plugins/pkg-descr.samplerate b/audio/alsa-plugins/pkg-descr.samplerate deleted file mode 100644 index 673f7550eab1..000000000000 --- a/audio/alsa-plugins/pkg-descr.samplerate +++ /dev/null @@ -1,3 +0,0 @@ -The Advanced Linux Sound Architecture (ALSA) plugins - -This package provides samplerate plugin. diff --git a/audio/alsa-plugins/pkg-descr.speex b/audio/alsa-plugins/pkg-descr.speex deleted file mode 100644 index 9bc2f7628467..000000000000 --- a/audio/alsa-plugins/pkg-descr.speex +++ /dev/null @@ -1,3 +0,0 @@ -The Advanced Linux Sound Architecture (ALSA) plugins - -This package provides speex plugin. diff --git a/audio/alsa-plugins/pkg-message b/audio/alsa-plugins/pkg-message deleted file mode 100644 index 343f2a5c551b..000000000000 --- a/audio/alsa-plugins/pkg-message +++ /dev/null @@ -1,13 +0,0 @@ -[ -{ type: upgrade - maximum_version: "1.2.7.1_2" - message: <