diff options
author | Thomas Zander <riggs@FreeBSD.org> | 2017-01-02 21:15:34 +0000 |
---|---|---|
committer | Thomas Zander <riggs@FreeBSD.org> | 2017-01-02 21:15:34 +0000 |
commit | e3c8a23fb6380bb689b822363681ee7f2bb8d75e (patch) | |
tree | c54d4a857b2158ba7f13e3891e7144e483186fcf /multimedia/mplayer | |
parent | 793d63aee035c9c548a709579ab61d776aac6826 (diff) | |
download | ports-e3c8a23fb6380bb689b822363681ee7f2bb8d75e.tar.gz ports-e3c8a23fb6380bb689b822363681ee7f2bb8d75e.zip |
Unbundle libass from mplayer / mencoder
Log:
- Use libass from ports instead of bundled version (this likely
addresses some vulnerabilities since bundled libass is from 2013)
- New default OPTION ASS
- Bump portrevision
Reported by: jbeich
MFH: 2017Q1
Notes
Notes:
svn path=/head/; revision=430413
Diffstat (limited to 'multimedia/mplayer')
-rw-r--r-- | multimedia/mplayer/Makefile | 7 | ||||
-rw-r--r-- | multimedia/mplayer/Makefile.common | 4 | ||||
-rw-r--r-- | multimedia/mplayer/Makefile.optvars | 3 |
3 files changed, 9 insertions, 5 deletions
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile index 287a51582f01..fddbd9a8523c 100644 --- a/multimedia/mplayer/Makefile +++ b/multimedia/mplayer/Makefile @@ -10,14 +10,14 @@ COMMENT= High performance media player supporting many formats .include "${.CURDIR}/../../multimedia/mplayer/Makefile.common" -OPTIONS_DEFINE= AALIB AMR_NB AMR_WB BLURAY CACA CDIO DEBUG DV DVDNAV \ +OPTIONS_DEFINE= AALIB AMR_NB AMR_WB ASS BLURAY CACA CDIO DEBUG DV DVDNAV \ ENCA FONTCONFIG FRIBIDI GIF GNUTLS GSM GUI IPV6 JACK \ LADSPA LIBMNG LIRC LZO NAS OPENAL OPENGL \ OPENJPEG OPUS PULSEAUDIO RTC RTMP \ SCHROEDINGER SDL SKINS SNDIO SMB SPEEX SVGALIB V4L VDPAU VPX \ X11 X11DGA X11VM XINERAMA XVIDEO XVMC -OPTIONS_DEFAULT=DVDNAV FONTCONFIG FRIBIDI GNUTLS OPENGL \ +OPTIONS_DEFAULT=ASS DVDNAV FONTCONFIG FRIBIDI GNUTLS OPENGL \ SKINS X11 X11DGA X11VM XINERAMA XVIDEO OPTIONS_DEFINE_i386= RTCPU @@ -28,8 +28,9 @@ OPTIONS_DEFAULT_i386= RTCPU VDPAU OPTIONS_DEFAULT_amd64= RTCPU VDPAU OPTIONS_DEFAULT_powerpc=RTCPU -DVDNAV_DESC?= DVD navigation features support +ASS_DESC?= Subtitles rendering via libass BLURAY_DESC?= BluRay support +DVDNAV_DESC?= DVD navigation features support ENCA_DESC?= Charset conversion via enca LZO_DESC?= External liblzo support RTC_DESC?= Add support for kernel real time clock diff --git a/multimedia/mplayer/Makefile.common b/multimedia/mplayer/Makefile.common index 7e577a8a3708..e45182b92a9d 100644 --- a/multimedia/mplayer/Makefile.common +++ b/multimedia/mplayer/Makefile.common @@ -6,7 +6,7 @@ MPLAYER_PORT_VERSION= 1.3.0 MPLAYER_SNAPSHOT_DATE= 2016-12-28 -PORTREVISION?= 1 +PORTREVISION?= 2 MASTER_SITES= LOCAL/riggs/mplayer DISTNAME= mplayer-${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g} WRKSRC= ${WRKDIR}/mplayer-export-${MPLAYER_SNAPSHOT_DATE} @@ -29,6 +29,7 @@ CONFIGURE_ARGS= --cc="${CC}" \ --extra-cflags="-I${PREFIX}/include -I${LOCALBASE}/include" \ --extra-libs="-L${PREFIX}/lib" \ --disable-alsa \ + --disable-ass-internal \ --disable-bitmap-font \ --disable-crystalhd \ --disable-esd \ @@ -48,7 +49,6 @@ CONFIGURE_ARGS= --cc="${CC}" \ --disable-libmpeg2 \ --disable-nemesi \ --disable-real \ - --enable-ass-internal \ --yasm='' WANT_GNOME= yes diff --git a/multimedia/mplayer/Makefile.optvars b/multimedia/mplayer/Makefile.optvars index 887126a36159..14ab14ec1869 100644 --- a/multimedia/mplayer/Makefile.optvars +++ b/multimedia/mplayer/Makefile.optvars @@ -13,6 +13,9 @@ AMR_NB_CONFIGURE_OFF= --disable-libopencore_amrnb AMR_WB_LIB_DEPENDS= libopencore-amrwb.so:audio/opencore-amr AMR_WB_CONFIGURE_OFF= --disable-libopencore_amrwb +ASS_LIB_DEPENDS= libass.so:multimedia/libass +ASS_CONFIGURE_OFF= --disable-ass + BLURAY_LIB_DEPENDS= libbluray.so:multimedia/libbluray BLURAY_CONFIGURE_OFF= --disable-bluray |