From nobody Thu Oct 2 01:37:57 2025 X-Original-To: dev-commits-src-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 4ccZDk2rvZz69rqd; Thu, 02 Oct 2025 01:37:58 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ccZDk0XySz3cx3; Thu, 02 Oct 2025 01:37:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759369078; 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=9vEeSTVoieyPZWHwOYRtviBaxePtAL3M38llhN7rtHk=; b=rp6unSfUBl74yOPwdijB1YHO9r2LdjUIjhmO3FWFkwYjjcnkTsP0U7wyVrzzXhWwRAFAOQ cVI6luIKUEHIAauyUuIXL7GMcSr4xocDwL3A8u0aaOuCSTDiWzl0bKjQGk1lWYffKJ/V0z wTwSO5U97a35rtHrW3ttOuyfcxaiFBUrxyRKuv3Rqb4jd0Kc3P4w7w/A6JF8GpO+UIQ3Nq AnUIcVwryNvjtqZu6pk47EZAG19hBHvdyQcjHBY9Qv5NkgN7HX4Nz6Nwzyehl/2RCxzFbS 2NfQUPEVhhXaAnO01/nuy8sBFcu3ub+0V4qV9Ujj2pJZSX3V2NCUVy5oj1VXKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759369078; 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=9vEeSTVoieyPZWHwOYRtviBaxePtAL3M38llhN7rtHk=; b=vujbOk4pMuTwsg8UCTOUulo+mcE4ZO7kwjWhDYFZ0A0Y5lTIU9v9IvPmOZySj7nW9EzAo8 xv6kjPx7Yd2lgqk/yEZaNTczP1F3mxGAKdE0zHDlD9AhC3g2arFB9NTY5BGcRoo4t2I27l u0/YkHFkL0BY4O9dhW3d1Nj+LnSITPZWN2dJxVHte49mdJ3zliQJmjo0y5BQpMlI85c7Nc A/7lT6hmTquagB9uniah1oH48qc9dIFKF7BLztp4O1z4DCaL4dfZpni2O12d9d25ftlYfs v+Z/9486jUVRlJtZ2Q9CsOSMf49uzoXeL6lP5DoKtQFnfxOowc8fD5C+UjJjHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759369078; a=rsa-sha256; cv=none; b=qe0gZgk55KVkgJRxUBeHiv14v+kr5mjI/vwR+QJheAU2x/Btff+xelgxVejrxlJeg252x3 OgPMX9t+r50K+Xz+O6lmgxS3U3khfN1V5UJD6DBTXv5DHpb/N7kLuPG9ZgdfQzrwvZmK/w dbNu0g8RIS1gq4hwGDI9/r3atRySlUMKrwp3V/UJVVcI/WVKfFKLiDBCrP2GpPnSur7RA4 nf8Z9n3IN83hcwA2UMkm4HsJreXz4R1QA5vAEhF+6LnANMaf/aF2hPwArWD/QvqP1YORji +55xvsp6k9ZkKXy/Nl2r/vRGKvbiSEhfp1b25OHc534O3tEV7GtzLwK2MOK8lg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4ccZDk01wXznTD; Thu, 02 Oct 2025 01:37:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5921bvOt035715; Thu, 2 Oct 2025 01:37:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5921bvZh035712; Thu, 2 Oct 2025 01:37:57 GMT (envelope-from git) Date: Thu, 2 Oct 2025 01:37:57 GMT Message-Id: <202510020137.5921bvZh035712@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: 1b806e607f52 - main - packages: Add a sound package List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1b806e607f52285f973fb1106491668fd28da6a4 Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=1b806e607f52285f973fb1106491668fd28da6a4 commit 1b806e607f52285f973fb1106491668fd28da6a4 Author: Lexi Winter AuthorDate: 2025-10-02 01:16:11 +0000 Commit: Lexi Winter CommitDate: 2025-10-02 01:37:35 +0000 packages: Add a sound package Put virtual_oss, /etc/devd/snd.conf and the other audio-related tools into a new "sound" package. Don't create a separate -lib package, since it's unlikely someone will want mixer(3) without mixer(8). Put the sound package in the optional set rather than minimal, since it's not actually required for audio hardware support, and many systems (including nearly all servers) won't want it installed. MFC after: 3 seconds Reviewed by: christos Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D52823 --- UPDATING | 6 ++++++ lib/libmixer/Makefile | 2 ++ lib/libsamplerate/Makefile | 2 ++ libexec/rc/rc.d/Makefile | 4 +++- release/packages/ucl/sound-all.ucl | 42 ++++++++++++++++++++++++++++++++++++++ sbin/devd/Makefile | 7 ++++++- usr.bin/beep/Makefile | 2 ++ usr.bin/mididump/Makefile | 2 ++ usr.sbin/mixer/Makefile | 2 ++ usr.sbin/sndctl/Makefile | 2 ++ usr.sbin/virtual_oss/Makefile.inc | 2 ++ 11 files changed, 71 insertions(+), 2 deletions(-) diff --git a/UPDATING b/UPDATING index cd7568885a26..4460898fca2d 100644 --- a/UPDATING +++ b/UPDATING @@ -27,6 +27,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 16.x IS SLOW: world, or to merely disable the most expensive debugging functionality at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20251002: + Audio-related utilities including mixer(8) and virtual_oss(8) have + moved to the new FreeBSD-sound package. If you have set-optional or + set-base installed this package will be installed automatically, + otherwise you should install it manually if you need these utilities. + 20250929: Both drm-kmod and nividia-drm ports had to be updated to either no longer conflict on LinuxKPI vs. native PCI changes and/or to keep diff --git a/lib/libmixer/Makefile b/lib/libmixer/Makefile index a0bb37a85fb8..49621ad1f188 100644 --- a/lib/libmixer/Makefile +++ b/lib/libmixer/Makefile @@ -1,3 +1,5 @@ +PACKAGE= sound + LIB= mixer SRCS= ${LIB}.c INCS= ${LIB}.h diff --git a/lib/libsamplerate/Makefile b/lib/libsamplerate/Makefile index 6ca87d8b20ca..4c55d5c2cb82 100644 --- a/lib/libsamplerate/Makefile +++ b/lib/libsamplerate/Makefile @@ -1,5 +1,7 @@ .PATH: ${SRCTOP}/contrib/libsamplerate +PACKAGE= sound + LIB= samplerate PRIVATELIB= diff --git a/libexec/rc/rc.d/Makefile b/libexec/rc/rc.d/Makefile index 4f2d63c06e19..03f0933533ca 100644 --- a/libexec/rc/rc.d/Makefile +++ b/libexec/rc/rc.d/Makefile @@ -216,7 +216,9 @@ CCDPACKAGE= ccdconfig .endif .if ${MK_CUSE} != "no" -CONFS+= virtual_oss +CONFGROUPS+= VOSS +VOSS= virtual_oss +VOSSPACKAGE= sound .endif .if ${MK_KERBEROS_SUPPORT} != "no" diff --git a/release/packages/ucl/sound-all.ucl b/release/packages/ucl/sound-all.ucl new file mode 100644 index 000000000000..6a8ad098c6b1 --- /dev/null +++ b/release/packages/ucl/sound-all.ucl @@ -0,0 +1,42 @@ +/* + * SPDX-License-Identifier: ISC + * + * Copyright (c) 2025 Lexi Winter + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +comment = "Audio utilities" + +desc = < +PACKAGE= sound + PROG= mididump SRCS= ${PROG}.c MAN= ${PROG}.1 diff --git a/usr.sbin/mixer/Makefile b/usr.sbin/mixer/Makefile index 9e96c2f2d2e8..6c75e65d2a9b 100644 --- a/usr.sbin/mixer/Makefile +++ b/usr.sbin/mixer/Makefile @@ -1,5 +1,7 @@ .include +PACKAGE= sound + PROG= mixer SRCS= ${PROG}.c MAN= ${PROG}.8 diff --git a/usr.sbin/sndctl/Makefile b/usr.sbin/sndctl/Makefile index c1830413f931..d6697bb88fd5 100644 --- a/usr.sbin/sndctl/Makefile +++ b/usr.sbin/sndctl/Makefile @@ -1,5 +1,7 @@ .include +PACKAGE= sound + PROG= sndctl SRCS= ${PROG}.c MAN= ${PROG}.8 diff --git a/usr.sbin/virtual_oss/Makefile.inc b/usr.sbin/virtual_oss/Makefile.inc index 01b5f23410c8..d2b0d74fa8c4 100644 --- a/usr.sbin/virtual_oss/Makefile.inc +++ b/usr.sbin/virtual_oss/Makefile.inc @@ -1 +1,3 @@ +PACKAGE?= sound + .include "../Makefile.inc"