Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 6 Mar 2022 16:31:19 GMT
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: d754f15cf977 - main - audio/openal-soft: allow to build the port without the utilities
Message-ID:  <202203061631.226GVJmG076598@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by danfe:

URL: https://cgit.FreeBSD.org/ports/commit/?id=d754f15cf9775d4dc879bd9ccbf9e1173ee8aa6c

commit d754f15cf9775d4dc879bd9ccbf9e1173ee8aa6c
Author:     Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2022-03-06 16:30:22 +0000
Commit:     Alexey Dokuchaev <danfe@FreeBSD.org>
CommitDate: 2022-03-06 16:30:22 +0000

    audio/openal-soft: allow to build the port without the utilities
    
    This helps to avoid dependency on `audio/libmysofa' and thus not
    to download its quite heavy ~190 MB distfile.
---
 audio/openal-soft/Makefile  | 13 ++++++++-----
 audio/openal-soft/pkg-plist |  4 ++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/audio/openal-soft/Makefile b/audio/openal-soft/Makefile
index f780656de5ef..6674bc2840da 100644
--- a/audio/openal-soft/Makefile
+++ b/audio/openal-soft/Makefile
@@ -10,15 +10,13 @@ COMMENT=	Software implementation of the OpenAL specification
 LICENSE=	LGPL20+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libmysofa.so:audio/libmysofa
-
 USES=		cmake compiler:c++14-lang tar:bzip2
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS=	-DCMAKE_INSTALL_DATADIR:STRING="${PREFIX}/etc"
 CMAKE_OFF=	ALSOFT_BACKEND_ALSA ALSOFT_DLOPEN ALSOFT_EXAMPLES \
 		ALSOFT_REQUIRE_QSA ALSOFT_REQUIRE_SOLARIS
-CMAKE_ON=	ALSOFT_BACKEND_WAVE ALSOFT_UTILS
+CMAKE_ON=	ALSOFT_BACKEND_WAVE
 
 # do not link with librt and libdl.
 LDFLAGS+=	-Wl,--as-needed
@@ -26,11 +24,13 @@ LDFLAGS_i386=	-Wl,-z,notext
 
 PLIST_SUB=	SOVERSION=${PORTVERSION}
 
-OPTIONS_DEFINE=		CONFIG EXAMPLES JACK OSS PORTAUDIO PULSEAUDIO SDL SNDIO
-OPTIONS_DEFAULT=	OSS
+OPTIONS_DEFINE=		CONFIG EXAMPLES JACK OSS PORTAUDIO PULSEAUDIO \
+			SDL SNDIO UTILS
+OPTIONS_DEFAULT=	OSS UTILS
 OPTIONS_SUB=		yes
 
 CONFIG_DESC=	Install configuration utility (needs Qt 5)
+UTILS_DESC=	Build and install utility programs
 
 CONFIG_USES=		qt:5
 CONFIG_USE=		QT=core,gui,widgets,buildtools_build,qmake_build
@@ -55,6 +55,9 @@ SDL_CMAKE_BOOL=	ALSOFT_BACKEND_SDL2 ALSOFT_REQUIRE_SDL2
 SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio
 SNDIO_CMAKE_BOOL=	ALSOFT_BACKEND_SNDIO ALSOFT_REQUIRE_SNDIO
 
+UTILS_LIB_DEPENDS=	libmysofa.so:audio/libmysofa
+UTILS_CMAKE_BOOL=	ALSOFT_UTILS
+
 post-patch:
 	@${REINPLACE_CMD} 's|/etc/openal|${ETCDIR}|' \
 		${WRKSRC}/alc/alconfig.cpp
diff --git a/audio/openal-soft/pkg-plist b/audio/openal-soft/pkg-plist
index 08321dfbc00a..ac89f5532261 100644
--- a/audio/openal-soft/pkg-plist
+++ b/audio/openal-soft/pkg-plist
@@ -1,6 +1,6 @@
 %%CONFIG%%bin/alsoft-config
-bin/makemhr
-bin/openal-info
+%%UTILS%%bin/makemhr
+%%UTILS%%bin/openal-info
 %%ETCDIR%%/alsoftrc.sample
 %%ETCDIR%%/hrtf/Default HRTF.mhr
 %%ETCDIR%%/presets/3D7.1.ambdec



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