From nobody Fri Jan 30 16:33:15 2026 X-Original-To: dev-commits-src-branches@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 4f2hQN2lyGz6Q4fQ for ; Fri, 30 Jan 2026 16:33:16 +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 4f2hQN02Bnz40yB for ; Fri, 30 Jan 2026 16:33:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769790796; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lDGc8fMIIAjyYNGWGw9jO1hPzd/TuygwZwUnVh+txtE=; b=K/CV6h/0U0t1Q7ggUeXhG4iFcVi69/dQyatPqEsX+3qlF1C9tf7f9KkqM+BJOYMtSUlWku g2X+IYR8TYbozxfj5Ua0SBdo+tMrVjqgKCA9iYVHr3EjqSAxkCdQ6OI/UHtate6yjQfOot vujp8kaJ0D5XIesbel6vscRG/uVOSfeOTEA1Xy8uAhGOfCd6CXUn9BdxSIJ3ojze2UooOL sy7LtF60FA66neO9xDDhhDCh9qpRUXSlp8goPlzBcpL9LJaPuXzBodu5XfpQSv1GPAMymk 0j4t/nmrrNEFcM7BvOObTIoBqPHe2ngXpWN8tEUtlR2e65d6rUWmEivo7uu8pA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769790796; a=rsa-sha256; cv=none; b=gUsUq9S8a1BE5nE8/yfehI0yprjlgCgjgZm4NHB9j1ISzu0llD0Ki57YLcw3/6bfCZL7Zc 4n2pJeoh8j+2gfO5DadqG0zpvcBoukPQkFwSPeuQLVoGaVOF2XmnLVn6DMtxO80ZNlovX5 cmYa8njn/BZY7uzvaI2oli4hxJu7YZeON4mFczB3vL08Dq+SP5gdLjd3h6caQm54KbNCnm 4bbp+1orDNrw3RFUEi3syIN03wSOQwBxEHv2whG3JeajnvfzhpDl61L6Al5oMwablu9QqB 5M9FAWCtPEHCKAD768uxSAk+Rt6YVUqNpygR2KVRtzX5NFaaUW/ib29ZzqasYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769790796; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lDGc8fMIIAjyYNGWGw9jO1hPzd/TuygwZwUnVh+txtE=; b=rPMrcp/dtYYVWRXw8nTLxvAUYSB/h16HxLO9/TKPLvURyWbasNOy89luVSo9LAdMKaZitQ dx9hBEzdSZZZf2tFEPPGn7bCy3tnF5SkyZ7bZC17uJaEe6ToqbbOn6iQFu7znHmQ4drIro E2qS5wcPeGgkL5pSsVRUPxjqEj6WBVT1A8Cy3pv+hfA4slp80uEu/IPGDYSu5sqJD+Qwmm qgPnRN6ZmT3dItunFSqOzY76H0odNpQTYZ+XM3//sJe/4KL1WhzZxceyKBluccFLVbHxan YhfbliaVQufLwWmtoT7NGznXOnYv4X3f/r8qOodqI++dgkFGPQRLBd73zo8w7w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f2hQM6gsNz16Z for ; Fri, 30 Jan 2026 16:33:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d7ba by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 30 Jan 2026 16:33:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Brooks Davis From: Christos Margiolis Subject: git: 9be3ccda4c90 - stable/15 - virtual_oss: build system tidying List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 9be3ccda4c90725c81ab3b3482505d2cb7a86630 Auto-Submitted: auto-generated Date: Fri, 30 Jan 2026 16:33:15 +0000 Message-Id: <697cdd4b.3d7ba.7b250a7f@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=9be3ccda4c90725c81ab3b3482505d2cb7a86630 commit 9be3ccda4c90725c81ab3b3482505d2cb7a86630 Author: Brooks Davis AuthorDate: 2026-01-16 09:33:56 +0000 Commit: Christos Margiolis CommitDate: 2026-01-30 16:29:56 +0000 virtual_oss: build system tidying general: - find libsamplerate's headers in the temporary sysroot instead of digging in the source tree. - use LIBADD where possible lib/virtual_oss: - centralize SHLIBDIR define - centralize include path for internal headers - don't try to find libsamplerate directly in .OBJDIR No functional changes. Reviewed by: christos Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D54704 (cherry picked from commit 373c72ad5044d5f84b7f3fa169d37e7214729f74) --- lib/virtual_oss/Makefile | 2 -- lib/virtual_oss/Makefile.inc | 6 ++++-- lib/virtual_oss/bt/Makefile | 7 ++----- lib/virtual_oss/null/Makefile | 4 +--- lib/virtual_oss/oss/Makefile | 4 +--- lib/virtual_oss/sndio/Makefile | 4 +--- usr.sbin/virtual_oss/virtual_bt_speaker/Makefile | 2 +- usr.sbin/virtual_oss/virtual_oss/Makefile | 9 ++++----- 8 files changed, 14 insertions(+), 24 deletions(-) diff --git a/lib/virtual_oss/Makefile b/lib/virtual_oss/Makefile index 11715bbcbf0b..e6cb5fbe5985 100644 --- a/lib/virtual_oss/Makefile +++ b/lib/virtual_oss/Makefile @@ -1,7 +1,5 @@ .include -SHLIBDIR?= ${LIBDIR}/virtual_oss - SUBDIR+= null \ oss diff --git a/lib/virtual_oss/Makefile.inc b/lib/virtual_oss/Makefile.inc index 877465a5c548..2a0c75218f49 100644 --- a/lib/virtual_oss/Makefile.inc +++ b/lib/virtual_oss/Makefile.inc @@ -1,5 +1,7 @@ PACKAGE= sound -.include "../Makefile.inc" +SHLIBDIR= ${LIBDIR}/virtual_oss + +CFLAGS+= -I${SRCTOP}/usr.sbin/virtual_oss/virtual_oss -LDFLAGS+= -L${.OBJDIR:H:H}/libsamplerate +.include "../Makefile.inc" diff --git a/lib/virtual_oss/bt/Makefile b/lib/virtual_oss/bt/Makefile index 15413b7a1f1e..9a4ce586ef95 100644 --- a/lib/virtual_oss/bt/Makefile +++ b/lib/virtual_oss/bt/Makefile @@ -1,14 +1,11 @@ SHLIB_NAME= voss_bt.so -SHLIBDIR= ${LIBDIR}/virtual_oss SRCS= bt.c \ avdtp.c \ sbc_encode.c -CFLAGS+= -I${SRCTOP}/usr.sbin/virtual_oss/virtual_oss \ - -I${SRCTOP}/contrib/libsamplerate -LDFLAGS+= -lbluetooth -lsdp -LIBADD= samplerate +CFLAGS+= -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/private/samplerate +LIBADD= bluetooth samplerate 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 ec5c2d40f665..5c265d1be055 100644 --- a/lib/virtual_oss/null/Makefile +++ b/lib/virtual_oss/null/Makefile @@ -1,10 +1,8 @@ SHLIB_NAME= voss_null.so -SHLIBDIR= ${LIBDIR}/virtual_oss SRCS= null.c -CFLAGS+= -I${SRCTOP}/usr.sbin/virtual_oss/virtual_oss \ - -I${SRCTOP}/contrib/libsamplerate +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 257d7f0c0bae..773b3518602e 100644 --- a/lib/virtual_oss/oss/Makefile +++ b/lib/virtual_oss/oss/Makefile @@ -1,10 +1,8 @@ SHLIB_NAME= voss_oss.so -SHLIBDIR= ${LIBDIR}/virtual_oss SRCS= oss.c -CFLAGS+= -I${SRCTOP}/usr.sbin/virtual_oss/virtual_oss \ - -I${SRCTOP}/contrib/libsamplerate +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 9b5af63a3246..238507be1e4b 100644 --- a/lib/virtual_oss/sndio/Makefile +++ b/lib/virtual_oss/sndio/Makefile @@ -1,10 +1,8 @@ SHLIB_NAME= voss_sndio.so -SHLIBDIR= ${LIBDIR}/virtual_oss SRCS= sndio.c -CFLAGS+= -I${SRCTOP}/usr.sbin/virtual_oss/virtual_oss \ - -I${SRCTOP}/contrib/libsamplerate \ +CFLAGS+= -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/private/samplerate \ -I${LOCALBASE:U/usr/local}/include LDFLAGS+= -L${LOCALBASE:U/usr/local}/lib -lsndio LIBADD= samplerate diff --git a/usr.sbin/virtual_oss/virtual_bt_speaker/Makefile b/usr.sbin/virtual_oss/virtual_bt_speaker/Makefile index 0f5fb2b4eb99..d3bb0e4cdb44 100644 --- a/usr.sbin/virtual_oss/virtual_bt_speaker/Makefile +++ b/usr.sbin/virtual_oss/virtual_bt_speaker/Makefile @@ -6,6 +6,6 @@ SRCS= bt_speaker.c CFLAGS+= -I${SRCTOP}/usr.sbin/virtual_oss/virtual_oss \ -I${SRCTOP}/lib/virtual_oss/bt -LDFLAGS+= -lm -lbluetooth -lsdp +LIBADD= bluetooth m sdp .include diff --git a/usr.sbin/virtual_oss/virtual_oss/Makefile b/usr.sbin/virtual_oss/virtual_oss/Makefile index cdb6bcac3fad..78532356f097 100644 --- a/usr.sbin/virtual_oss/virtual_oss/Makefile +++ b/usr.sbin/virtual_oss/virtual_oss/Makefile @@ -12,13 +12,12 @@ SRCS= audio_delay.c \ ring.c \ virtual_oss.c -CFLAGS+= -I${SRCTOP}/contrib/libsamplerate +CFLAGS+= -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/private/samplerate + +LIBADD= cuse m nv pthread samplerate # The --export-dynamic-symbol flags below are needed because some backends make # use of those symbols. -LDFLAGS+= -lpthread -lcuse -lnv -lm \ - -Wl,--export-dynamic-symbol=virtual_oss_wait \ +LDFLAGS+= -Wl,--export-dynamic-symbol=virtual_oss_wait \ -Wl,--export-dynamic-symbol=voss_has_synchronization -LIBADD= samplerate -LDFLAGS+= -L${.OBJDIR:H:H}/libsamplerate .include