Date: Wed, 26 Aug 2015 12:38:19 +0000 From: bugzilla-noreply@freebsd.org To: freebsd-ports-bugs@FreeBSD.org Subject: [Bug 202404] [MAINTAINER] multimedia/mplayer2: updates to Makefile Message-ID: <bug-202404-13-htjjVzIdAc@https.bugs.freebsd.org/bugzilla/> In-Reply-To: <bug-202404-13@https.bugs.freebsd.org/bugzilla/> References: <bug-202404-13@https.bugs.freebsd.org/bugzilla/>
next in thread | previous in thread | raw e-mail | index | archive | help
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D202404 --- Comment #21 from Jan Beich <jbeich@FreeBSD.org> --- Comment on attachment 160366 --> https://bugs.freebsd.org/bugzilla/attachment.cgi?id=3D160366 v6 > + --disable-radio-v4l2 \ > + --disable-radio-bsdbt848 \ > + --disable-tv \ > + --disable-tv-v4l2 \ > + --disable-tv-bsdbt848 \ > + --disable-v4l2 \ These are trivial to unbreak, see attachment 160375. And radio is disabled by default, anyway. > @@ -270,17 +206,17 @@ pre-everything:: >=20 > post-patch: > .if ${OSVERSION} >=3D 900010 This conditional is always true since 8.x is EOL since 1 August. Remove? > - @${REINPLACE_CMD} -e \ > + ${REINPLACE_CMD} -e \ > - @${REINPLACE_CMD} \ > + ${REINPLACE_CMD} \ [and others, since v4] Both variants are fine. Only INSTALL_* commands or those in *-install targets are required (by portlint) to be echoed. Actually, all examples=20 in Porter's Handbook for REINPLACE_CMD have @ prepended. Unless you feel strongly the change adds unnecessary noise for |svn blame|. > +A52_LIBS=3D -la52 > +ASS_LIBS=3D -lass > +CACA_LIBS=3D -lcaca > +ENCA_LIBS=3D -lenca > +JACK_LIBS=3D -ljack [and many more] Looking at configure it has the following pattern which consistently fails to add -lfoo in --enable-foo case. I think, _foo=3Dauto options are better left with only _CONFIGURE_OFF like before. Knowing which -lfoo to provide is an implementation detail and shouldn't be present in the port's Makefile. echocheck "FOO support" if test "$_foo" =3D auto ; then _foo=3Dno if pkg_config_add foo ; then _foo=3Dyes fi fi if test "$_foo" =3D yes; then def_foo=3D"#define CONFIG_FOO 1" else def_foo=3D"#undef CONFIG_FOO" fi echores "$_foo" mplayer's configure is no better and one such mistake slipped in the port. # multimedia/mplayer/Makefile.options .if ${PORT_OPTIONS:MRTMP} LIB_DEPENDS+=3D librtmp.so:${PORTSDIR}/multimedia/librtmp CONFIGURE_ARGS+=3D --enable-librtmp EXTRA_LIBS+=3D -lrtmp .else CONFIGURE_ARGS+=3D --disable-librtmp .endif should be .if ${PORT_OPTIONS:MRTMP} LIB_DEPENDS+=3D librtmp.so:${PORTSDIR}/multimedia/librtmp .else CONFIGURE_ARGS+=3D --disable-librtmp .endif or (via option helpers) RTMP_LIB_DEPENDS=3D librtmp.so:${PORTSDIR}/multimedia/librtmp RTMP_CONFIGURE_OFF=3D --disable-librtmp In mplayer2 example it'be reverting JACK_LIB_DEPENDS=3D libjack.so:${PORTSDIR}/audio/jack JACK_CONFIGURE_ENABLE=3D jack JACK_LIBS=3D -ljack back to .if ${PORT_OPTIONS:MJACK} LIB_DEPENDS+=3D libjack.so:${PORTSDIR}/audio/jack .else CONFIGURE_ARGS+=3D --disable-jack .endif or (via option helpers) JACK_LIB_DEPENDS=3D libjack.so:${PORTSDIR}/audio/jack JACK_CONFIGURE_OFF=3D --disable-jack > -LIBAV_LIB_DEPENDS=3D libavresample.so:${PORTSDIR}/multimedia/libav > +LIBAV_LIB_DEPENDS=3D libavresample.so:${PORTSDIR}/multimedia/ffmpeg > LIBAV_CONFIGURE_ENABLE=3D libavresample > LIBAV_LIBS=3D -lavresample ffmpeg is integral requirement like in multimedia/mpv. Just copy uppermost LIB_DEPENDS from there and drop LIBAV option. --=20 You are receiving this mail because: You are the assignee for the bug.=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?bug-202404-13-htjjVzIdAc>