From nobody Fri Oct 3 16:53:43 2025 X-Original-To: dev-commits-src-all@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 4cdZVw1bP6z6BBmM; Fri, 03 Oct 2025 16:53:44 +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 4cdZVv6w9Fz3HJS; Fri, 03 Oct 2025 16:53:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759510424; 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=eflY8lZICV7/Z/4H39oO3dT+V8IrnaWgne4pRh+1yzk=; b=HlCvyIf8bBw1zVhkPfLyBeiaIeuJeYLiOeO5dgSloRTIlsWMi5RoQ5gTLO3CCVnQyZpAm1 iZa7u6r9Nmi4RYmQLCIv5acgHqQUerjzeY2MhBlXjo1BGNvCoiVlnulJQ+l9/lzCT0n04Q ENzEMVaU4ZMvvItUiP7bDV6WwDH4rTz4gTyX4BKViy7nk13Tt2iULeJQ34RbQpH+BIo3Hb QxAm/iTQlCa+WFPnBmVNMCuhdXCisPBykAjHik8syMz5R9qSVsWma7sbmSJYSL7emvRRI1 2a+O4qDjDiBFePWOtTdSTazEGaQvf69W5GqxHVzjarG33S1tOm7qrQBMvYcP8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759510424; 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=eflY8lZICV7/Z/4H39oO3dT+V8IrnaWgne4pRh+1yzk=; b=WGOGjVQTbcmsMx1EKpSvdoMxq6xZ2xdFDrKAdZ2838DvBXIuvZMNngYMlu+U2M3p3Dx14z RPEa9NmQh7DxhohYMvB6HH5TXMqtuvIcXKfIkm0hu/I54B+PEHDzGJdLCVr9/3hQzvbIO5 jHC7a1rEcjBPNje8mLtRcqApKDt5ZLMTywrKUZRBGQk/LYrFOhww+z88sBYruyZeU6BUGQ tZJpeOExYY3nY6t5x2DLsJCF6vuWRCQwdNlh7c2kncsTOL7dAOMkDQX85P+1YCzgicKeU5 tZD/mPa5MWrbjY6wjCZbCP0SXco9tz+9VYdEpE73GkAx/bcsikkoo4pevHWlqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759510424; a=rsa-sha256; cv=none; b=PGoR3B05dAe6+74DYFlUjAokvCatSJeYJspdQoJ0Bdccce/b5zehfKBo8LmXEFNwLrF7W2 hJZckH1HWnHjnDNfF7reeOJc77pOWR1WaH4vbKTZrHbS/z+EPPG/uwgicsID27ZPB7ERw9 JMIISg18c0ju6SBItdbqdeBbgln6anziYD8QexXfzsw63um0icXVa8hq7ACcJ19o/afo25 nSVgay1tF1UJrWzeBEN0Y6SGLpZcrpAfvpvwo0SEMPFpXHexmI7Nx83nzR6+izYaek9Gob vGga4RWTege9Df4vqH4JlEUp2yGPVptHvKa3/0DfYmKILd/qn0T+PmEbOj/dpQ== 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 4cdZVv6WyVz135N; Fri, 03 Oct 2025 16:53:43 +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 593GrhkN064233; Fri, 3 Oct 2025 16:53:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 593GrhNa064230; Fri, 3 Oct 2025 16:53:43 GMT (envelope-from git) Date: Fri, 3 Oct 2025 16:53:43 GMT Message-Id: <202510031653.593GrhNa064230@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 085b0eb3ebf1 - stable/15 - packages: Add a sound package List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 085b0eb3ebf13e65facbf77fd3b1f90f19a570b9 Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=085b0eb3ebf13e65facbf77fd3b1f90f19a570b9 commit 085b0eb3ebf13e65facbf77fd3b1f90f19a570b9 Author: Lexi Winter AuthorDate: 2025-10-02 01:16:11 +0000 Commit: Colin Percival CommitDate: 2025-10-03 16:50:05 +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 (cherry picked from commit 1b806e607f52285f973fb1106491668fd28da6a4) --- 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 6ee866092f47..6e893f07df61 100644 --- a/UPDATING +++ b/UPDATING @@ -17,6 +17,12 @@ and/or ports. can install the ftp/freebsd-ftpd port. pkgbase users should remove the orphaned FreeBSD-ftpd package. +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 256f2087284f..c094cbb791d2 100644 --- a/lib/libsamplerate/Makefile +++ b/lib/libsamplerate/Makefile @@ -1,5 +1,7 @@ .PATH: ${SRCTOP}/contrib/libsamplerate +PACKAGE= sound + LIB= samplerate INTERNALLIB= diff --git a/libexec/rc/rc.d/Makefile b/libexec/rc/rc.d/Makefile index a116ba751fde..7ac2f382b989 100644 --- a/libexec/rc/rc.d/Makefile +++ b/libexec/rc/rc.d/Makefile @@ -213,7 +213,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"