From owner-svn-ports-all@freebsd.org Fri Nov 1 00:28:26 2019 Return-Path: Delivered-To: svn-ports-all@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 960C817B487; Fri, 1 Nov 2019 00:28:26 +0000 (UTC) (envelope-from amdmi3@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) server-signature RSA-PSS (4096 bits) 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 47432L3Mktz41tB; Fri, 1 Nov 2019 00:28:26 +0000 (UTC) (envelope-from amdmi3@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 52CEA2BE5; Fri, 1 Nov 2019 00:28:26 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xA10SQY0066995; Fri, 1 Nov 2019 00:28:26 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xA10SQjX066994; Fri, 1 Nov 2019 00:28:26 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201911010028.xA10SQjX066994@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Fri, 1 Nov 2019 00:28:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r516205 - head/audio/sdl_sound X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: head/audio/sdl_sound X-SVN-Commit-Revision: 516205 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Nov 2019 00:28:26 -0000 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/&|' \