svn commit: r445839 - in head/multimedia: libx264 x264

[Jan Beich]

Author: jbeich
Date: Fri Jul 14 23:42:13 2017
New Revision: 445839
URL: https://svnweb.freebsd.org/changeset/ports/445839

Log:
  multimedia/x264: enable FFMS, LAVF, SWSCALE by default
  
  Without FFmpeg-based demuxers x264 CLI can only read raw formats as
  source. So, enable more options to allow the binary package not only
  write but also read mp4/mkv.
  
  PR:		220694
  Approved by:	koobs (maintainer)
  MFH:		2017Q3 (usability improvement)
  Differential Revision:	https://reviews.freebsd.org/D11566

Modified:
  head/multimedia/libx264/Makefile   (contents, props changed)
  head/multimedia/x264/Makefile   (contents, props changed)

Modified: head/multimedia/libx264/Makefile
==============================================================================
--- head/multimedia/libx264/Makefile	Fri Jul 14 23:42:03 2017	(r445838)
+++ head/multimedia/libx264/Makefile	Fri Jul 14 23:42:13 2017	(r445839)
@@ -3,6 +3,7 @@
 #
 # Updating notes: see multimedia/x264/Makefile.
 
+PORTREVISION=	0
 PKGNAMEPREFIX=	lib
 COMMENT=	H.264/MPEG-4 AVC Video Encoding (Library)
 MASTERDIR=	${.CURDIR}/../x264

Modified: head/multimedia/x264/Makefile
==============================================================================
--- head/multimedia/x264/Makefile	Fri Jul 14 23:42:03 2017	(r445838)
+++ head/multimedia/x264/Makefile	Fri Jul 14 23:42:13 2017	(r445839)
@@ -19,7 +19,7 @@
 
 PORTNAME=	x264
 PORTVERSION=	0.${X264_BUILD}.${X264_REV}
-PORTREVISION?=	0
+PORTREVISION?=	1 # 0 in libx264
 CATEGORIES=	multimedia
 MASTER_SITES=	ftp://ftp.videolan.org/pub/videolan/x264/snapshots/ \
 		http://samples.mplayerhq.hu/yuv4mpeg2/:pgo
@@ -53,7 +53,7 @@ PLIST_FILES?=	bin/x264
 OPTIONS_DEFINE+=	DEBUG FFMS GCC LAVF PGO SWSCALE
 OPTIONS_RADIO+=		MP4
 OPTIONS_RADIO_MP4+=	GPAC LSMASH
-OPTIONS_DEFAULT+=	LSMASH
+OPTIONS_DEFAULT+=	FFMS LAVF LSMASH SWSCALE
 
 FFMS_DESC=		FFmpeg Source input support
 GPAC_DESC=		GPAC library support