From nobody Fri Feb 02 13:46:26 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 4TRH9v3vD0z58nPY; Fri, 2 Feb 2024 13:46:27 +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 4TRH9v0zgqz485n; Fri, 2 Feb 2024 13:46:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706881587; 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=1TlWLboxAMVA84fANDmxusOx1lC7cH3toUM/BcLPha4=; b=sHSqfW/lme34IY82nJPCNquO6laiRnTMsdEshjFNzkFhYN1xE9DuqMCR4e/DMiTPBK2acC 5VbdEKPZvPbHIA4sEECjjfffBxPr1aJypSNfDvUcrv6hywQrT8XE2Lk8pEAAndDFhcWIeT hmZoPMksTqsD+gzZltwSIC9EcTbLJBOoZgDmMZRS4osAr/4kcpKZtCvRm+jnpMAdGcF1Z3 2ffjVpmBViJNhVjllwhM0hixbbZpf17yhfTQKdlfNdPHH/8fwqV7HyCuec/RcVYifrd9Hj dyDQF+bQvRfTsyPsbYw2JHAEWOkkP2pFAJEaGlOPn+tozQ7pv+h+f25SwDqrWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706881587; 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=1TlWLboxAMVA84fANDmxusOx1lC7cH3toUM/BcLPha4=; b=msasIHTjXnG8k0rIkXEfYtIErlLjRVuqPdXiuWvrwqBUtptpP62RYxbOOCZbFRHtW/+7wg r04c0lrsPjFPIRKdRlEaT3dv9o9UypnPnXhoG6FfAoTSwq1dxpaIFHSKl6QCB3M1AD4pYe /1NqUOPN52FR0MRY1nEyDPvicXHzVsftmFg77l8HXmtWD4RiX3dKnqz9QCcmGZXF8Mi0Ff 8y/R1F9LhUOmLikK0z4Eipn4tYSFH3nA96dq/NiuXpIsUDpC8vnpvsPunA8xZ7xSjXPACc LJCCxW0nJSZYCHYMDLlsxoE45jUXBCgGp/zip5XYczvIcMZCnYe1p0FcHzrSbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706881587; a=rsa-sha256; cv=none; b=goEFJFepqVawQvboHgvp2oOccsg7ttmEd3eO+RAe93oF1noIfMp5QcYxGwmOH+DuUcwH6S IChfq7ikGmhhmrb/6tPbZ9UoWPk4G/B7DqYWdSaGL3TG1GKUgeaIeglLY9TMlXrGAckt0+ NQ3WncJmDqWYXrOoLZVXz9ipxwat6K1OWUItWseDTFD4+O0zjxbj67YsMEoBauWRgNq626 aElH1dxlytCC+suq1WTI0xCP+bqS04snE9+ZNTaKeTj/93V77EDH2CgDM2mux0KEkST8iG PIs+QoDxlcfOPdZwJDCrUXBo32Q7/+eChRNl+zilh6Zqy7hX6BdtIQucCXUWJg== 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 4TRH9v049czYby; Fri, 2 Feb 2024 13:46:27 +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 412DkQYV016435; Fri, 2 Feb 2024 13:46:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 412DkQIX016432; Fri, 2 Feb 2024 13:46:26 GMT (envelope-from git) Date: Fri, 2 Feb 2024 13:46:26 GMT Message-Id: <202402021346.412DkQIX016432@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: 077152a79ad8 - main - audio/alsa-plugins: install vendor OSS config after 44c14328c08e 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: 077152a79ad8181830e324b2ede39301a94d4093 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=077152a79ad8181830e324b2ede39301a94d4093 commit 077152a79ad8181830e324b2ede39301a94d4093 Author: Jan Beich AuthorDate: 2024-02-02 13:16:38 +0000 Commit: Jan Beich CommitDate: 2024-02-02 13:44:55 +0000 audio/alsa-plugins: install vendor OSS config after 44c14328c08e Allows overriding /dev/dsp without adjusting config e.g., $ aplay -D oss:/dev/dsp4 foo.wav PR: 245321 See also: https://github.com/alsa-project/alsa-plugins/commit/6e40eb5fd346 --- audio/alsa-lib/Makefile | 1 + audio/alsa-lib/files/asound.conf.sample | 9 --------- audio/alsa-plugins/Makefile | 2 +- audio/alsa-plugins/pkg-plist | 4 ++-- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/audio/alsa-lib/Makefile b/audio/alsa-lib/Makefile index f92cdb551931..4eb25c86dbb2 100644 --- a/audio/alsa-lib/Makefile +++ b/audio/alsa-lib/Makefile @@ -1,5 +1,6 @@ PORTNAME= alsa-lib PORTVERSION= 1.2.10 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= https://www.alsa-project.org/files/pub/lib/ diff --git a/audio/alsa-lib/files/asound.conf.sample b/audio/alsa-lib/files/asound.conf.sample index 4fef58bdb9d7..e97133e770cc 100644 --- a/audio/alsa-lib/files/asound.conf.sample +++ b/audio/alsa-lib/files/asound.conf.sample @@ -1,15 +1,6 @@ # # FreeBSD/OSS # -pcm.oss { - type oss - hint.description "Open Sound System" -} - -ctl.oss { - type oss -} - pcm.!sysdefault pcm.plug:oss ctl.!sysdefault ctl.oss pcm.!default pcm.sysdefault diff --git a/audio/alsa-plugins/Makefile b/audio/alsa-plugins/Makefile index 3c0692c7ea99..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= 1 +PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= https://www.alsa-project.org/files/pub/plugins/ diff --git a/audio/alsa-plugins/pkg-plist b/audio/alsa-plugins/pkg-plist index 8fddd4d644cd..afe367876651 100644 --- a/audio/alsa-plugins/pkg-plist +++ b/audio/alsa-plugins/pkg-plist @@ -4,7 +4,7 @@ %%JACK%%etc/alsa/conf.d/50-jack.conf %%FFMPEG%%etc/alsa/conf.d/60-a52-encoder.conf @comment etc/alsa/conf.d/50-arcam-av-ctl.conf -@comment etc/alsa/conf.d/50-oss.conf +etc/alsa/conf.d/50-oss.conf %%PULSEAUDIO%%etc/alsa/conf.d/50-pulseaudio.conf %%SPEEX%%etc/alsa/conf.d/60-speex.conf @comment etc/alsa/conf.d/60-upmix.conf @@ -56,7 +56,7 @@ lib/alsa-lib/libasound_module_pcm_vdownmix.so %%SPEEX%%share/alsa/alsa.conf.d/10-speexrate.conf @comment share/alsa/alsa.conf.d/50-arcam-av-ctl.conf %%JACK%%share/alsa/alsa.conf.d/50-jack.conf -@comment share/alsa/alsa.conf.d/50-oss.conf +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