Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 3 Oct 2020 19:23:23 +0000 (UTC)
From:      Hans Petter Selasky <hselasky@FreeBSD.org>
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
Message-ID:  <202010031923.093JNNES057765@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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()
 {



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202010031923.093JNNES057765>