Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 1 Nov 2019 00:28:26 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r516205 - head/audio/sdl_sound
Message-ID:  <201911010028.xA10SQjX066994@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Fri Nov  1 00:28:25 2019
New Revision: 516205
URL: https://svnweb.freebsd.org/changeset/ports/516205

Log:
  - Produce meaningful error when timidity is built without required option
  - Add USES=sdl
  
  PR:		238080
  Reported by:	list1@gjunka.com
  MFH:		2019Q4 (with hat)

Modified:
  head/audio/sdl_sound/Makefile

Modified: head/audio/sdl_sound/Makefile
==============================================================================
--- head/audio/sdl_sound/Makefile	Thu Oct 31 23:43:55 2019	(r516204)
+++ head/audio/sdl_sound/Makefile	Fri Nov  1 00:28:25 2019	(r516205)
@@ -14,7 +14,7 @@ COMMENT=	SDL audio library and player for some popular
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		libtool localbase
+USES=		libtool localbase sdl
 GNU_CONFIGURE=	yes
 USE_SDL=	sdl
 INSTALL_TARGET=	install-strip
@@ -49,13 +49,20 @@ SPEEX_LIB_DEPENDS=	libspeex.so:audio/speex \
 SPEEX_CONFIGURE_ENABLE=	speex
 
 MIDI_DESC=		Software MIDI music
-MIDI_RUN_DEPENDS=	${LOCALBASE}/lib/timidity/goemon.cfg:audio/timidity
-MIDI_BUILD_DEPENDS=	${LOCALBASE}/lib/timidity/goemon.cfg:audio/timidity
+MIDI_RUN_DEPENDS=	timidity>=0:audio/timidity
+MIDI_BUILD_DEPENDS=	timidity>=0:audio/timidity
 MIDI_CONFIGURE_ENABLE=	midi
 
 VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis \
 			libogg.so:audio/libogg
 VORBIS_CONFIGURE_ENABLE=ogg
+
+pre-configure-MIDI-on:
+	@if ! [ -e "${LOCALBASE}/lib/timidity/goemon.cfg" ]; then \
+		${ECHO_CMD} 'MIDI support requires audio/timidity port to be built with GOEMON option enabled, which is not the case'; \
+		${ECHO_CMD} 'Please, run `make -C ${PORTSDIR}/audio/timidity config` and enable GOEMON option to continue'; \
+		${FALSE}; \
+	fi
 
 post-patch:
 	@${REINPLACE_CMD} 's|timidity.cfg|${PREFIX}/share/timidity/&|' \



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