From owner-svn-ports-head@freebsd.org Mon Jan 2 21:15:35 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D30E0C9C9DA; Mon, 2 Jan 2017 21:15:35 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 93EE517AA; Mon, 2 Jan 2017 21:15:35 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v02LFYHs002382; Mon, 2 Jan 2017 21:15:34 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v02LFYTK002377; Mon, 2 Jan 2017 21:15:34 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201701022115.v02LFYTK002377@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Mon, 2 Jan 2017 21:15:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r430413 - in head/multimedia: mencoder mplayer X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Jan 2017 21:15:35 -0000 Author: riggs Date: Mon Jan 2 21:15:34 2017 New Revision: 430413 URL: https://svnweb.freebsd.org/changeset/ports/430413 Log: 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 Modified: head/multimedia/mencoder/Makefile head/multimedia/mplayer/Makefile head/multimedia/mplayer/Makefile.common head/multimedia/mplayer/Makefile.optvars Modified: head/multimedia/mencoder/Makefile ============================================================================== --- head/multimedia/mencoder/Makefile Mon Jan 2 21:11:01 2017 (r430412) +++ head/multimedia/mencoder/Makefile Mon Jan 2 21:15:34 2017 (r430413) @@ -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: head/multimedia/mplayer/Makefile ============================================================================== --- head/multimedia/mplayer/Makefile Mon Jan 2 21:11:01 2017 (r430412) +++ head/multimedia/mplayer/Makefile Mon Jan 2 21:15:34 2017 (r430413) @@ -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: head/multimedia/mplayer/Makefile.common ============================================================================== --- head/multimedia/mplayer/Makefile.common Mon Jan 2 21:11:01 2017 (r430412) +++ head/multimedia/mplayer/Makefile.common Mon Jan 2 21:15:34 2017 (r430413) @@ -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: head/multimedia/mplayer/Makefile.optvars ============================================================================== --- head/multimedia/mplayer/Makefile.optvars Mon Jan 2 21:11:01 2017 (r430412) +++ head/multimedia/mplayer/Makefile.optvars Mon Jan 2 21:15:34 2017 (r430413) @@ -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