From nobody Fri Jan 30 16:33:17 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 4f2hQQ3NyBz6Q4fg for ; Fri, 30 Jan 2026 16:33:18 +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 4f2hQP4zptz411d for ; Fri, 30 Jan 2026 16:33:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769790797; 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=Y+u3Pn0DYrvac8fYeGkuWZA/S5WA47ng3nRaRMl+rHw=; b=FQiv5oGduS9/JecwJRr5Q+jJ75XrLeIlN9/pT7bJztVntlC0ej+5tD3eU+yPQ6293A9uXT v1uptkY8MRgCpgOAMHtAderredLMRQ1V2+tOlV606twLj/z5JSc4U7qQII1ol7I0UZ1lA0 jwJ0v9BuTZepN7BSkn4rozWlGvNkBQIRMg6VXd97eBAo/1rFSYeVslaJ5E6s2Yy5lA0Sit ZCH42MyptqgmGRSojRR6RGoeC0FALBxoGGl38Y98B30oqpsGhlZ4UtnT4WO59hY7v8u5/K BaVXZSjD8L9OQkvjOtWjOhIkRlkmPGrmcn09uC/SZe9Nb1w7gdfoOUJ6ZPUPJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769790797; a=rsa-sha256; cv=none; b=rrUgUDaciFTOBKwOJfFS7BpHIF9gYAEtzGY8zqwRLSqMs9mcj3okc0UVXZF4c+16pWZmtZ l2MxbhtVL8KUQMldQ197zUCJrnFHd3PYsiVEgi9fuQlZAvxvflIVjxJMaCOzA/JGYaI3f5 GKbW7d/H636QtQGD5b1GuVQ9HxZVKOOl6dvQzEX7Zid1SfEwsFPDTz6FAG+ALWPpTMF1io nD9mW8CAfYBSQdA2UCoAhU3m7a874HZqN8N3iMtzIVSWx67huZ9p5BdZ88TjT9KcCTfqnH PVmVgM7Wb/r+hArlayRTqEvlHxh1NNZbc47CFAnYYGgaVGRPOCIqNhpwW8m2GQ== 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=1769790797; 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=Y+u3Pn0DYrvac8fYeGkuWZA/S5WA47ng3nRaRMl+rHw=; b=en+YYp9K+hZ1VA4quvMhiniyzdFgH7cADWe6dAo8hIoHaE7PyOWb4zeMdjO6SEM2u7Cj6J TlxZRnPcJ3lwPRmnOWrJYz3sO1nq0n2JEsKKB5X9aIZnUd+WB5hBIZxWGwokargJxanpxM 1pufSy90pXx5fVuG32zF7kK6PIDzMIdRn4nEMVKogV1sm1BXvnOiCzOTE127Tj2n9AIHXM 6REZFxERxY+zZvbOai1A0eYEcD/BH3GBLa66/AietFTbAC+fxaQgmFahS0jqLV7TS5ef7o k1zQOpNLdetYMzvTjCBFWWHOdsNLiDVYJJ5FNHOrDELzlzbyjzgdEz8qYGVWHg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f2hQP0LTPz1Jl for ; Fri, 30 Jan 2026 16:33:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d81b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 30 Jan 2026 16:33:17 +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: f3888268299d - stable/15 - lib/virtual_oss: don't (over)link to libsamplerate 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: f3888268299db8d9623c46ccd1f456a4f6e49eea Auto-Submitted: auto-generated Date: Fri, 30 Jan 2026 16:33:17 +0000 Message-Id: <697cdd4d.3d81b.479a291@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=f3888268299db8d9623c46ccd1f456a4f6e49eea commit f3888268299db8d9623c46ccd1f456a4f6e49eea Author: Brooks Davis AuthorDate: 2026-01-16 09:34:18 +0000 Commit: Christos Margiolis CommitDate: 2026-01-30 16:30:06 +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 (cherry picked from commit d78291b0e9736f39f22c55c163978c1b92e601e4) (cherry picked from commit c88f012faa13c39f13efdcef88d3141253a300ab) --- 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..59a19aeb2ba5 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