multimedia/{mplayer|mencoder}: Fix stage-qa warnings

Details:
- Rework dependencies to fix stage-qa warnings, at least for the default
  packages and a couple configs tested.
- Add JPEG OPTION to allow to actually disable it (as it is picked up
  automatically in most systems via build dependencies, even if the user
  does not want to include it).

PR:		256994
Reported by:	bsd@philippost.de
MFH:		2022Q3

(cherry picked from commit 381fe1e14c)
This commit is contained in:
Thomas Zander 2022-08-07 14:11:20 +02:00
parent 59a9ef205e
commit 3ecd18593d
No known key found for this signature in database
GPG Key ID: 856D8ED47C7EAFA5
3 changed files with 16 additions and 8 deletions

View File

@ -2,6 +2,7 @@
PORTNAME= mencoder
PORTVERSION= ${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g}
PORTREVISION= 1
CATEGORIES= multimedia audio
MAINTAINER= riggs@FreeBSD.org
@ -10,12 +11,12 @@ COMMENT= Convenient video file and movie encoder
.include "${.CURDIR}/../mplayer/Makefile.common"
OPTIONS_DEFINE= AMR_NB AMR_WB ASS BLURAY CDIO DEBUG DV DVDNAV FAAC FONTCONFIG \
FRIBIDI GIF GNUTLS GSM IPV6 JACK LADSPA LIBMNG LZO \
FRIBIDI GIF GNUTLS GSM IPV6 JACK JPEG LADSPA LIBMNG LZO \
MAD NAS NLS OPENAL OPENJPEG OPUS PULSEAUDIO \
RTMP SMB SPEEX THEORA TWOLAME V4L VPX \
X264 XVID
OPTIONS_DEFAULT=ASS DVDNAV FONTCONFIG GIF GNUTLS X264 XVID
OPTIONS_DEFAULT=ASS DVDNAV FONTCONFIG GIF GNUTLS JPEG X264 XVID
OPTIONS_DEFINE_i386= RTCPU
OPTIONS_DEFINE_amd64= RTCPU

View File

@ -2,6 +2,7 @@
PORTNAME= mplayer
PORTVERSION= ${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g}
PORTREVISION= 1
CATEGORIES= multimedia audio
MAINTAINER= riggs@FreeBSD.org
@ -11,7 +12,7 @@ COMMENT= High performance media player supporting many formats
OPTIONS_DEFINE= AALIB AMR_NB AMR_WB ASS BLURAY CACA CDIO DV DVDNAV \
ENCA FONTCONFIG FRIBIDI GIF GNUTLS GSM GUI IPV6 JACK \
LADSPA LIBMNG LIRC LZO NAS NLS OPENAL OPENGL \
JPEG LADSPA LIBMNG LIRC LZO NAS NLS OPENAL OPENGL \
OPENJPEG OPUS PULSEAUDIO RTMP \
SDL SKINS SNDIO SMB SPEEX SVGALIB V4L VDPAU VPX \
X11 X11DGA X11VM XINERAMA XVIDEO XVMC

View File

@ -11,7 +11,8 @@ AMR_NB_CONFIGURE_ENABLE=libopencore_amrnb
AMR_WB_LIB_DEPENDS= libopencore-amrwb.so:audio/opencore-amr
AMR_WB_CONFIGURE_ENABLE=libopencore_amrwb
ASS_LIB_DEPENDS= libass.so:multimedia/libass
ASS_LIB_DEPENDS= libass.so:multimedia/libass \
libharfbuzz.so:print/harfbuzz
ASS_CONFIGURE_OFF= --disable-ass
BLURAY_LIB_DEPENDS= libbluray.so:multimedia/libbluray
@ -26,7 +27,8 @@ CDIO_CONFIGURE_OFF= --disable-libcdio
DV_LIB_DEPENDS= libdv.so:multimedia/libdv
DV_CONFIGURE_ENABLE= libdv
DVDNAV_LIB_DEPENDS= libdvdnav.so:multimedia/libdvdnav
DVDNAV_LIB_DEPENDS= libdvdnav.so:multimedia/libdvdnav \
libdvdread.so:multimedia/libdvdread
DVDNAV_CONFIGURE_OFF= --disable-dvdnav
ENCA_LIB_DEPENDS= libenca.so:converters/enca
@ -51,16 +53,19 @@ GSM_LIB_DEPENDS= libgsm.so:audio/gsm
GSM_CONFIGURE_OFF= --disable-libgsm
GUI_CONFIGURE_ENABLE= gui
GUI_USE= GNOME=gtk20
GUI_USE= GNOME=cairo,gdkpixbuf2,gtk20
GUI_USES= gnome
GUI_DESKTOP_ENTRIES= "MPlayer" "High performance media player" "mplayer" "gmplayer" "" false
GUI_IMPLIES= ASS X11
GUI_IMPLIES= ASS JPEG X11
IPV6_CONFIGURE_OFF= --disable-inet6
JACK_LIB_DEPENDS= libjack.so:audio/jack
JACK_CONFIGURE_OFF= --disable-jack
JPEG_USES= jpeg
JPEG_CONFIGURE_OFF= --disable-jpeg
LADSPA_RUN_DEPENDS= ${LOCALBASE}/lib/ladspa/amp.so:audio/ladspa
LADSPA_CONFIGURE_OFF= --disable-ladspa
@ -122,7 +127,8 @@ SPEEX_CONFIGURE_OFF= --disable-speex
SVGALIB_LIB_DEPENDS= libvga.so:graphics/svgalib
SVGALIB_CONFIGURE_OFF= --disable-svga
THEORA_LIB_DEPENDS= libtheora.so:multimedia/libtheora
THEORA_LIB_DEPENDS= libtheora.so:multimedia/libtheora \
libogg.so:audio/libogg
THEORA_CONFIGURE_OFF= --disable-theora
TWOLAME_LIB_DEPENDS= libtwolame.so:audio/twolame