Date: Thu, 10 Mar 2016 01:44:44 +0100 From: Jan Beich <jbeich@freebsd.org> To: Antoine Brodin <antoine@FreeBSD.org> Cc: "svn-ports-head\@freebsd.org" <svn-ports-head@freebsd.org>, "svn-ports-all\@freebsd.org" <svn-ports-all@freebsd.org>, "ports-committers\@freebsd.org" <ports-committers@freebsd.org> Subject: Re: svn commit: r410689 - in head/audio: sdl2_mixer sdl2_mixer/files sdl_mixer Message-ID: <y49r-rwjn-wny@vfemail.net> In-Reply-To: <CAALwa8kOpqTKSBvUxM=DYg63V4-%2BTpbEYfwXMQT4ABPAyWJJWw@mail.gmail.com> (Antoine Brodin's message of "Wed, 9 Mar 2016 23:47:02 %2B0100") References: <201603090518.u295IoEt073907@repo.freebsd.org> <CAALwa8kOpqTKSBvUxM=DYg63V4-%2BTpbEYfwXMQT4ABPAyWJJWw@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--=-=-= Content-Type: text/plain Antoine Brodin <antoine@FreeBSD.org> writes: > On Wed, Mar 9, 2016 at 6:18 AM, Jan Beich <jbeich@freebsd.org> wrote: > >> Author: jbeich >> Date: Wed Mar 9 05:18:50 2016 >> New Revision: 410689 >> URL: https://svnweb.freebsd.org/changeset/ports/410689 >> >> Log: >> audio/sdl{,2}_mixer: add TREMOR option >> >> TREMOR is enabled by default on platforms without hardware floating point. >> >> PR: 202689 >> Approved by: maintainer timeout (6 months) > ... >> @@ -46,6 +53,9 @@ SMPEG_CONFIGURE_OFF= --disable-music-mp >> VORBIS_LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis >> VORBIS_CONFIGURE_ENABLE= music-ogg >> >> +TREMOR_LIB_DEPENDS= libvorbisidec.so:${PORTSDIR}/audio/libtremor >> +TREMOR_CONFIGURE_ENABLE= music-ogg music-ogg-tremor > > This both --enable-music-ogg and --disable-music-ogg which looks wrong Thanks for noticing early. Fixed in r410736. I've decided to stick to option helpers rather than expanding into: VORBIS_CONFIGURE_ON= --enable-music-ogg TREMOR_CONFIGURE_ON= --enable-music-ogg --enable-music-ogg-tremor .include <bsd.port.options.mk> .if ! ${PORT_OPTIONS:MVORBIS} && ! ${PORT_OPTIONS:MTREMOR} CONFIGURE_ARGS+= --disable-music-ogg .endif For reference, here's what configure.in contains: AC_ARG_ENABLE([music-ogg],,[], [enable_music_ogg=yes]) AC_ARG_ENABLE(music-ogg-tremor,, [], enable_music_ogg_tremor=no) if test x$enable_music_ogg = xyes; then if test x$enable_music_ogg_tremor = xyes; then AC_CHECK_HEADER([tremor/ivorbisfile.h], [have_tremor_hdr=yes]) AC_CHECK_LIB([vorbisidec], [ov_open_callbacks], [have_tremor_lib=yes]) [...] else AC_CHECK_HEADER([vorbis/vorbisfile.h], [have_ogg_hdr=yes]) AC_CHECK_LIB([vorbisfile], [ov_open_callbacks], [have_ogg_lib=yes]) [...] compared to MOD options that don't depend on each other AC_ARG_ENABLE([music-mod],, [], [enable_music_mod=yes]) if test x$enable_music_mod = xyes; then AC_PATH_PROG(LIBMIKMOD_CONFIG, libmikmod-config, no, [$PATH]) [...] AC_ARG_ENABLE([music-mod-modplug],, [], [enable_music_mod_modplug=no]) if test x$enable_music_mod_modplug = xyes; then PKG_CHECK_MODULES([MODPLUG], [libmodplug >= 0.8.7]) [...] -- AC_ARG_ENABLE (FEATURE, HELP-STRING, [ACTION-IF-GIVEN], [ACTION-IF-NOT-GIVEN]) --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQF8BAEBCgBmBQJW4MN8XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXREQjQ0MzY3NEM3RDIzNTc4NkUxNDkyQ0VF NEM3Nzg4MzQ3OURCRERCAAoJEOTHeINHnb3bXyIIAMtJj9rYC2Lk7WinjH2wEv5s CnlDIuhHlUMvmrlldW6homUbAbgH4W/Q63Yi1CmBSWYPuPLENjWXrXTAbWJgn5ll a8SozjyXdnnZyrWJjUDJ6bKM0Spsof7u+WnIlqrcru4aSK/4wNGarEhsaT2Y6FYT 3fVrHnzKzgYn8FF2HEDi00lchDU3QR8NOmqFWFlKBwMQfMOKIGzHwDpts/JG4BlX 5sH8XIZ6JMSa0Fi6ZdMRQRhF7xUgpujxVlS4v5fjxL2aZf3JW3PIKgWzfPLonwJQ VN4WyOtHVFT4ypfIy7uQ9O72W7FxJ86ecTxCA4COemkd0Gmo/ISPAJMgvqhOUT4= =rHbN -----END PGP SIGNATURE----- --=-=-=--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?y49r-rwjn-wny>