svn commit: r401794 - branches/2015Q4/multimedia/libvpx

[Jan Beich]

Author: jbeich
Date: Tue Nov 17 00:36:12 2015
New Revision: 401794
URL: https://svnweb.freebsd.org/changeset/ports/401794

Log:
  MFH: r401217
  
  multimedia/libvpx: bring more Chromium defaults
  
  - Add SIZE_LIMIT to work around CVE-2015-4506
  - Add MULTIRES and extend POSTPROC
  - Sort options
  
  PR:		203410
  Approved by:	maintainer timeout (6 weeks)
  Approved by:	ports-secteam (feld)
  Security:	6ca7eddd-d436-486a-b169-b948436bcf14

Modified:
  branches/2015Q4/multimedia/libvpx/Makefile
Directory Properties:
  branches/2015Q4/   (props changed)

Modified: branches/2015Q4/multimedia/libvpx/Makefile
==============================================================================
--- branches/2015Q4/multimedia/libvpx/Makefile	Mon Nov 16 23:50:26 2015	(r401793)
+++ branches/2015Q4/multimedia/libvpx/Makefile	Tue Nov 17 00:36:12 2015	(r401794)
@@ -5,6 +5,7 @@ PORTNAME=	libvpx
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.4.0-488 # tracking www/firefox
 DISTVERSIONSUFFIX=	-ge67d45d
+PORTREVISION=	1
 CATEGORIES=	multimedia
 
 MAINTAINER=	ashish at FreeBSD.org
@@ -24,12 +25,14 @@ HAS_CONFIGURE=	yes
 USE_PERL5=	build
 USE_LDCONFIG=	yes
 
-OPTIONS_DEFINE=	DEBUG POSTPROC RUNTIME THREADS SHARED
-OPTIONS_DEFAULT=	POSTPROC RUNTIME THREADS SHARED
+OPTIONS_DEFINE=	DEBUG MULTIRES POSTPROC RUNTIME SHARED SIZE_LIMIT THREADS
+OPTIONS_DEFAULT=MULTIRES POSTPROC RUNTIME SHARED SIZE_LIMIT THREADS
 OPTIONS_EXCLUDE_armv6=	RUNTIME
+MULTIRES_DESC=	Enable multi-resolution encoding
 POSTPROC_DESC=	Enable postprocessing
 RUNTIME_DESC=	Enable runtime CPU detection
 SHARED_DESC=	Enable shared-library support
+SIZE_LIMIT_DESC=Maximum size allowed by decoder: ${SIZE_LIMIT}
 
 ALL_TARGET=
 CONFIGURE_ARGS+=--prefix=${PREFIX} \
@@ -44,10 +47,14 @@ MAKE_ENV=	LC_ALL=C
 OPTIONS_SUB=		SHARED
 
 DEBUG_CONFIGURE_ON=	--enable-debug
-POSTPROC_CONFIGURE_ON=	--enable-postproc
+MULTIRES_CONFIGURE_ON=	--enable-multi-res-encoding
+POSTPROC_CONFIGURE_ON=	--enable-postproc --enable-vp9-postproc	\
+			--enable-vp9-temporal-denoising
 RUNTIME_CONFIGURE_ON=	--enable-runtime-cpu-detect
-THREADS_CONFIGURE_OFF=	--disable-multithread
 SHARED_CONFIGURE_ON=	--enable-shared
+SIZE_LIMIT_CONFIGURE_ON=--size-limit=${SIZE_LIMIT}
+SIZE_LIMIT?=		16384x16384 # Chromium; Firefox has 4000x3000
+THREADS_CONFIGURE_OFF=	--disable-multithread
 
 SHEBANG_FILES=	build/make/ads2gas.pl