Date: Fri, 6 Jan 2017 10:09:28 +0000 (UTC) From: Thomas Zander <riggs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r430697 - in branches/2017Q1/multimedia: mencoder mplayer Message-ID: <201701061009.v06A9Stq016663@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: riggs Date: Fri Jan 6 10:09:28 2017 New Revision: 430697 URL: https://svnweb.freebsd.org/changeset/ports/430697 Log: MFH: r430413 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 Approved by: ports-secteam (junovitch) Modified: branches/2017Q1/multimedia/mencoder/Makefile branches/2017Q1/multimedia/mplayer/Makefile branches/2017Q1/multimedia/mplayer/Makefile.common branches/2017Q1/multimedia/mplayer/Makefile.optvars Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/multimedia/mencoder/Makefile ============================================================================== --- branches/2017Q1/multimedia/mencoder/Makefile Fri Jan 6 10:07:59 2017 (r430696) +++ branches/2017Q1/multimedia/mencoder/Makefile Fri Jan 6 10:09:28 2017 (r430697) @@ -10,13 +10,13 @@ COMMENT= Convenient video file and movie .include "${.CURDIR}/../mplayer/Makefile.common" -OPTIONS_DEFINE= AMR_NB AMR_WB BLURAY CDIO DEBUG DV DVDNAV FAAC FONTCONFIG \ +OPTIONS_DEFINE= AMR_NB AMR_WB ASS BLURAY CDIO DEBUG DV DVDNAV FAAC FONTCONFIG \ FRIBIDI GIF GNUTLS GSM IPV6 JACK LADSPA LIBMNG LZO \ MAD NAS OPENAL OPENJPEG OPUS PULSEAUDIO \ RTMP SCHROEDINGER SMB SPEEX THEORA TWOLAME V4L VPX \ X264 XVID -OPTIONS_DEFAULT=DVDNAV FONTCONFIG GIF GNUTLS X264 XVID +OPTIONS_DEFAULT=ASS DVDNAV FONTCONFIG GIF GNUTLS X264 XVID OPTIONS_DEFINE_i386= RTCPU OPTIONS_DEFINE_amd64= RTCPU @@ -26,6 +26,7 @@ OPTIONS_DEFAULT_i386= RTCPU OPTIONS_DEFAULT_amd64= RTCPU OPTIONS_DEFAULT_powerpc=RTCPU +ASS_DESC?= Subtitles rendering via libass BLURAY_DESC?= BluRay support DVDNAV_DESC?= DVD navigation features support LZO_DESC?= Enable external liblzo library Modified: branches/2017Q1/multimedia/mplayer/Makefile ============================================================================== --- branches/2017Q1/multimedia/mplayer/Makefile Fri Jan 6 10:07:59 2017 (r430696) +++ branches/2017Q1/multimedia/mplayer/Makefile Fri Jan 6 10:09:28 2017 (r430697) @@ -10,14 +10,14 @@ COMMENT= High performance media player s .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 Modified: branches/2017Q1/multimedia/mplayer/Makefile.common ============================================================================== --- branches/2017Q1/multimedia/mplayer/Makefile.common Fri Jan 6 10:07:59 2017 (r430696) +++ branches/2017Q1/multimedia/mplayer/Makefile.common Fri Jan 6 10:09:28 2017 (r430697) @@ -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 Modified: branches/2017Q1/multimedia/mplayer/Makefile.optvars ============================================================================== --- branches/2017Q1/multimedia/mplayer/Makefile.optvars Fri Jan 6 10:07:59 2017 (r430696) +++ branches/2017Q1/multimedia/mplayer/Makefile.optvars Fri Jan 6 10:09:28 2017 (r430697) @@ -13,6 +13,9 @@ AMR_NB_CONFIGURE_OFF= --disable-libopenc 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701061009.v06A9Stq016663>