From owner-svn-ports-head@freebsd.org Sat Oct 3 19:23:23 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9D9904364A5; Sat, 3 Oct 2020 19:23:23 +0000 (UTC) (envelope-from hselasky@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4C3cGM3ccsz3V4K; Sat, 3 Oct 2020 19:23:23 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5F5C5181B2; Sat, 3 Oct 2020 19:23:23 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 093JNNkm057767; Sat, 3 Oct 2020 19:23:23 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 093JNNES057765; Sat, 3 Oct 2020 19:23:23 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <202010031923.093JNNES057765@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Sat, 3 Oct 2020 19:23:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r551339 - in head/audio/virtual_oss: . files X-SVN-Group: ports-head X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: in head/audio/virtual_oss: . files X-SVN-Commit-Revision: 551339 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Oct 2020 19:23:23 -0000 Author: hselasky Date: Sat Oct 3 19:23:22 2020 New Revision: 551339 URL: https://svnweb.freebsd.org/changeset/ports/551339 Log: Add missing LD_PRELOAD= environment variable to the virtual_oss rc.d . PR: 250046 Approved by: pi (implicit) Modified: head/audio/virtual_oss/Makefile head/audio/virtual_oss/files/virtual_oss.in Modified: head/audio/virtual_oss/Makefile ============================================================================== --- head/audio/virtual_oss/Makefile Sat Oct 3 18:57:23 2020 (r551338) +++ head/audio/virtual_oss/Makefile Sat Oct 3 19:23:22 2020 (r551339) @@ -3,7 +3,7 @@ PORTNAME= virtual_oss PORTVERSION= 1.2.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= http://www.selasky.org/hans_petter/distfiles/ \ http://home.selasky.org/distfiles/ @@ -18,6 +18,8 @@ LIB_DEPENDS= libsamplerate.so:audio/libsamplerate USES= tar:bzip2 uidfix USE_RC_SUBR= virtual_oss +SUB_LIST+= LIBSAMPLERATE="${LOCALBASE}/lib/libsamplerate.so:" + OPTIONS_DEFINE= BLUETOOTH BT_SPEAKER DEBUG EQUALIZER HTTPD OPTIONS_DEFAULT=BLUETOOTH EQUALIZER @@ -38,6 +40,8 @@ EQUALIZER_MAKE_ARGS= HAVE_EQUALIZER="YES" EQUALIZER_LIB_DEPENDS= libfftw3.so:math/fftw3 EQUALIZER_PLIST_FILES= sbin/virtual_equalizer \ man/man8/virtual_equalizer.8.gz +EQUALIZER_SUB_LIST= LIBFFTW3="${LOCALBASE}/lib/libfftw3.so:" +EQUALIZER_SUB_LIST_OFF= LIBFFTW3="" HTTPD_DESC= Build with HTTP server support HTTPD_MAKE_ARGS= HAVE_HTTPD="YES" Modified: head/audio/virtual_oss/files/virtual_oss.in ============================================================================== --- head/audio/virtual_oss/files/virtual_oss.in Sat Oct 3 18:57:23 2020 (r551338) +++ head/audio/virtual_oss/files/virtual_oss.in Sat Oct 3 19:23:22 2020 (r551339) @@ -56,10 +56,16 @@ load_rc_config $name : ${virtual_oss_dsp:="$virtual_oss_default_args"} : ${virtual_oss_delay:=1} -command="%%PREFIX%%/sbin/${name}" +command=virtual_oss command_args="-B" pidpath="/var/run/${name}" + +virtual_oss() +{ + # When running early we need to pre-load some libraries + env LD_PRELOAD=%%LIBFFTW3%%%%LIBSAMPLERATE%% %%PREFIX%%/sbin/virtual_oss $* +} virtual_oss_precmd() {