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

[Jan Beich]

Author: jbeich
Date: Fri Jul 14 23:58:25 2017
New Revision: 445840
URL: https://svnweb.freebsd.org/changeset/ports/445840

Log:
  multimedia/x264: r445837 forgot to move option helpers
  
  PR:		220694
  Approved by:	portmgr blanket
  MFH:		2017Q3
  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:13 2017	(r445839)
+++ head/multimedia/libx264/Makefile	Fri Jul 14 23:58:25 2017	(r445840)
@@ -21,6 +21,7 @@ OPTIONS_EXCLUDE=	FFMS GPAC LAVF LSMASH SWSCALE
 ASM_BUILD_DEPENDS=	${ASM_BUILD_DEPENDS_${ARCH}}
 ASM_BUILD_DEPENDS_amd64=${ASM_BUILD_DEPENDS_i386}
 ASM_BUILD_DEPENDS_i386=	yasm>=1.2.0:devel/yasm
+ASM_CONFIGURE_ENABLE=	asm
 
 HI10P_DESC=		Enable High 10 Profile 10-bit encoding
 HI10P_CONFIGURE_ON=	--bit-depth=10

Modified: head/multimedia/x264/Makefile
==============================================================================
--- head/multimedia/x264/Makefile	Fri Jul 14 23:42:13 2017	(r445839)
+++ head/multimedia/x264/Makefile	Fri Jul 14 23:58:25 2017	(r445840)
@@ -62,8 +62,6 @@ LSMASH_DESC=		L-SMASH library support
 MP4_DESC=		MPEG-4 output
 SWSCALE_DESC=		Resize video filter
 
-ASM_CONFIGURE_ENABLE=	asm
-
 DEBUG_CONFIGURE_ENABLE=	debug
 DEBUG_CONFIGURE_OFF=	--enable-strip