Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 29 Nov 2019 21:56:03 +0000 (UTC)
From:      Tobias Kortkamp <tobik@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r518674 - head/audio/openal-soft
Message-ID:  <201911292156.xATLu350065484@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tobik
Date: Fri Nov 29 21:56:02 2019
New Revision: 518674
URL: https://svnweb.freebsd.org/changeset/ports/518674

Log:
  audio/openal-soft: Pet portclippy
  
  While here drop CONFLICTS; audio/openal is gone.

Modified:
  head/audio/openal-soft/Makefile

Modified: head/audio/openal-soft/Makefile
==============================================================================
--- head/audio/openal-soft/Makefile	Fri Nov 29 21:37:03 2019	(r518673)
+++ head/audio/openal-soft/Makefile	Fri Nov 29 21:56:02 2019	(r518674)
@@ -12,52 +12,46 @@ COMMENT=	Software implementation of the OpenAL specifi
 LICENSE=	LGPL20+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-CONFLICTS=	openal-200[0-9]*
-
 USES=		cmake compiler:c11 tar:bzip2
-LLD_UNSAFE=	yes
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS=	-DCMAKE_INSTALL_DATADIR:STRING="${PREFIX}/etc"
-CMAKE_OFF=	ALSOFT_BACKEND_ALSA \
-		ALSOFT_DLOPEN \
-		ALSOFT_EXAMPLES \
-		ALSOFT_REQUIRE_SOLARIS \
-		ALSOFT_REQUIRE_QSA
-CMAKE_ON=	ALSOFT_BACKEND_WAVE \
-		ALSOFT_UTILS
+CMAKE_OFF=	ALSOFT_BACKEND_ALSA ALSOFT_DLOPEN ALSOFT_EXAMPLES \
+		ALSOFT_REQUIRE_QSA ALSOFT_REQUIRE_SOLARIS
+CMAKE_ON=	ALSOFT_BACKEND_WAVE ALSOFT_UTILS
 
 # do not link with librt and libdl.
 LDFLAGS+=	-Wl,--as-needed
+LLD_UNSAFE=	yes
 
-OPTIONS_DEFINE=		EXAMPLES CONFIG JACK OSS PORTAUDIO PULSEAUDIO SDL SNDIO
+OPTIONS_DEFINE=		CONFIG EXAMPLES JACK OSS PORTAUDIO PULSEAUDIO SDL SNDIO
 OPTIONS_DEFAULT=	OSS
 OPTIONS_SUB=		yes
 
-CONFIG_DESC=		Install configuration utility (needs Qt 5)
+CONFIG_DESC=	Install configuration utility (needs Qt 5)
 
-CONFIG_CMAKE_BOOL_OFF=	ALSOFT_NO_CONFIG_UTIL
-CONFIG_CMAKE_ON=	-DALSOFT_NO_QT5:BOOL=OFF
 CONFIG_USES=		qt:5
 CONFIG_USE=		QT=core,gui,widgets,buildtools_build,qmake_build
+CONFIG_CMAKE_BOOL_OFF=	ALSOFT_NO_CONFIG_UTIL
+CONFIG_CMAKE_ON=	-DALSOFT_NO_QT5:BOOL=OFF
 
-JACK_CMAKE_BOOL=	ALSOFT_REQUIRE_JACK ALSOFT_BACKEND_JACK
 JACK_LIB_DEPENDS=	libjack.so:audio/jack
+JACK_CMAKE_BOOL=	ALSOFT_BACKEND_JACK ALSOFT_REQUIRE_JACK
 
-OSS_CMAKE_BOOL=		ALSOFT_REQUIRE_OSS ALSOFT_BACKEND_OSS
+OSS_CMAKE_BOOL=	ALSOFT_BACKEND_OSS ALSOFT_REQUIRE_OSS
 
-PORTAUDIO_CMAKE_BOOL=	ALSOFT_REQUIRE_PORTAUDIO ALSOFT_BACKEND_PORTAUDIO
 PORTAUDIO_LIB_DEPENDS=	libportaudio.so:audio/portaudio
+PORTAUDIO_CMAKE_BOOL=	ALSOFT_BACKEND_PORTAUDIO ALSOFT_REQUIRE_PORTAUDIO
 
-PULSEAUDIO_CMAKE_BOOL=	ALSOFT_REQUIRE_PULSEAUDIO ALSOFT_BACKEND_PULSEAUDIO
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
+PULSEAUDIO_CMAKE_BOOL=	ALSOFT_BACKEND_PULSEAUDIO ALSOFT_REQUIRE_PULSEAUDIO
 
-SDL_CMAKE_BOOL=		ALSOFT_REQUIRE_SDL2 ALSOFT_BACKEND_SDL2
-SDL_USES=		localbase sdl
-SDL_USE=		SDL=sdl2
+SDL_USES=	localbase sdl
+SDL_USE=	SDL=sdl2
+SDL_CMAKE_BOOL=	ALSOFT_BACKEND_SDL2 ALSOFT_REQUIRE_SDL2
 
-SNDIO_CMAKE_BOOL=	ALSOFT_REQUIRE_SNDIO ALSOFT_BACKEND_SNDIO
 SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio
+SNDIO_CMAKE_BOOL=	ALSOFT_BACKEND_SNDIO ALSOFT_REQUIRE_SNDIO
 
 post-patch:
 	@${REINPLACE_CMD} 's|/etc/openal|${ETCDIR}|' \



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