The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=d78291b0e9736f39f22c55c163978c1b92e601e4
commit d78291b0e9736f39f22c55c163978c1b92e601e4 Author: Brooks Davis <[email protected]> AuthorDate: 2026-01-16 09:34:18 +0000 Commit: Brooks Davis <[email protected]> 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 <bsd.lib.mk> 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 <bsd.lib.mk> 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 <bsd.lib.mk>
