From nobody Fri Jan 16 09:44:46 2026 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 4dsw1W1kffz6P2ZQ for ; Fri, 16 Jan 2026 09:44:47 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dsw1V6ww1z3fgT for ; Fri, 16 Jan 2026 09:44:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768556687; 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=8afLfMA6oy7EMPq4oMA8+ex+wvD3obrmPSPRzgezAiw=; b=i7wytCNIXYmMsPnADlcPLl+nZ7BeP4V29H4VPSHTSjg7d/Z+HToB1FNN7TqTndmShJ1uAJ qVjaZuURLgVJi/pPDTrRlN1IUUizMzsJAoZMdDYlunCbxxHC08ePjK4wkN9dVOO8dFJW8x IgUmN7CF3gcyb72Xr1JmAEHWO22UFzwrWV2O1Ewn/yienZxONG9wZHCFatvUjzTrt4hBnY otQ4P6Tizxhc/l4mC7Qrq0h2qJ4lZ7WJ8rsuui18nAQR8HgdynDPaarvu5u+ArvLq6zeK8 dmvPNIHsYm4hZ9UgpqsDGMuvPsvplty3hKd5pwm5DT7AZT2X9hize2qwffk/ZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768556687; 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=8afLfMA6oy7EMPq4oMA8+ex+wvD3obrmPSPRzgezAiw=; b=fj3avwav74weS//0v6X8Ky1svuNcdwoCvToaDOXgCOtJSz/xQ2ZJ5Kn6qQE8kcuQk7Uzo2 hmWm5GobwVXudOCkrjmGSAumkN8Q0E93ohQPpMYwPSji/vM0ieillwEzl9ksvcX5A5iZs/ mOqgO10yn/yCdjGdR2jH0cLqKOQtxUZqmjjND/hNTrhKpvo0CwJiE8o2LUIknH2j1IFNtR yrHh3+UMXEKheDwX6K3EK5vbh3toVVZQVx3lQhmC1KYaym2ZjZ7KKIvPJtPMwFv9barMpf QQgQRbTDJ1H/evUmSbyjT4DBMh5a6VW+kUkd1bzn54tezFJSQe4/K+Ky+hfR0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768556687; a=rsa-sha256; cv=none; b=hTptHJA3V3Ilt+mY9FHyPDfh//GoR2Vc3S9AUv01k0IqcJTMRx14uXjU1NiVDwuZxmlo+C qHubIs090nBpcA4YjhqcEy6NwlI24Fm3E6h+oF1lX/+rLKOnckvZLIlfQNfAqMqdZ5AFBA 6zgiO+3L1b/RzPWWtmHER4AsKpvwK+wpA1NJ9mUZSVn/6AO549gRvybzcdRjKDLxPJ3RlR /aBslvENdvvLK01ayK1cel2+6yfurVJHdm5MmqUqVR46/BQJkSSjWspZRGBmQTIcantN3N oOmYypdSbLkn+mP2Q+P8qrlOK5mk+/XBSvkltKAZ/SiJiHh/ESH44yKjywrkgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dsw1V69PNz17Mq for ; Fri, 16 Jan 2026 09:44:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2290c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 16 Jan 2026 09:44:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: d78291b0e973 - main - lib/virtual_oss: don't (over)link to libsamplerate 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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d78291b0e9736f39f22c55c163978c1b92e601e4 Auto-Submitted: auto-generated Date: Fri, 16 Jan 2026 09:44:46 +0000 Message-Id: <696a088e.2290c.48e5a893@gitrepo.freebsd.org> The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=d78291b0e9736f39f22c55c163978c1b92e601e4 commit d78291b0e9736f39f22c55c163978c1b92e601e4 Author: Brooks Davis AuthorDate: 2026-01-16 09:34:18 +0000 Commit: Brooks Davis CommitDate: 2026-01-16 09:34:18 +0000 lib/virtual_oss: don't (over)link to libsamplerate These plugins require samplerate.h due to virtual_oss's int.h including it, but don't use any symbols directly so don't link to the library. Centralize adding the include path. Reviewed by: christos Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D54705 --- lib/virtual_oss/Makefile.inc | 2 ++ lib/virtual_oss/bt/Makefile | 3 +-- lib/virtual_oss/null/Makefile | 3 --- lib/virtual_oss/oss/Makefile | 3 --- lib/virtual_oss/sndio/Makefile | 4 +--- 5 files changed, 4 insertions(+), 11 deletions(-) diff --git a/lib/virtual_oss/Makefile.inc b/lib/virtual_oss/Makefile.inc index 2a0c75218f49..b3f00b075640 100644 --- a/lib/virtual_oss/Makefile.inc +++ b/lib/virtual_oss/Makefile.inc @@ -3,5 +3,7 @@ PACKAGE= sound SHLIBDIR= ${LIBDIR}/virtual_oss CFLAGS+= -I${SRCTOP}/usr.sbin/virtual_oss/virtual_oss +# XXX virtual_oss/int.h includes samplerate.h, but the library isn't used +CFLAGS+= -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/private/samplerate .include "../Makefile.inc" diff --git a/lib/virtual_oss/bt/Makefile b/lib/virtual_oss/bt/Makefile index 9a4ce586ef95..f7c4077eb8f4 100644 --- a/lib/virtual_oss/bt/Makefile +++ b/lib/virtual_oss/bt/Makefile @@ -4,8 +4,7 @@ SRCS= bt.c \ avdtp.c \ sbc_encode.c -CFLAGS+= -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/private/samplerate -LIBADD= bluetooth samplerate sdp +LIBADD= bluetooth sdp .if defined(HAVE_LIBAV) CFLAGS+= -I${LOCALBASE:U/usr/local}/include -DHAVE_LIBAV diff --git a/lib/virtual_oss/null/Makefile b/lib/virtual_oss/null/Makefile index 5c265d1be055..a5a8d4ec6a24 100644 --- a/lib/virtual_oss/null/Makefile +++ b/lib/virtual_oss/null/Makefile @@ -2,7 +2,4 @@ SHLIB_NAME= voss_null.so SRCS= null.c -CFLAGS+= -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/private/samplerate -LIBADD= samplerate - .include diff --git a/lib/virtual_oss/oss/Makefile b/lib/virtual_oss/oss/Makefile index 773b3518602e..795d9c45469d 100644 --- a/lib/virtual_oss/oss/Makefile +++ b/lib/virtual_oss/oss/Makefile @@ -2,7 +2,4 @@ SHLIB_NAME= voss_oss.so SRCS= oss.c -CFLAGS+= -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/private/samplerate -LIBADD= samplerate - .include diff --git a/lib/virtual_oss/sndio/Makefile b/lib/virtual_oss/sndio/Makefile index 238507be1e4b..d27ff7ced579 100644 --- a/lib/virtual_oss/sndio/Makefile +++ b/lib/virtual_oss/sndio/Makefile @@ -2,9 +2,7 @@ SHLIB_NAME= voss_sndio.so SRCS= sndio.c -CFLAGS+= -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/private/samplerate \ - -I${LOCALBASE:U/usr/local}/include +CFLAGS+= -I${LOCALBASE:U/usr/local}/include \ LDFLAGS+= -L${LOCALBASE:U/usr/local}/lib -lsndio -LIBADD= samplerate .include