Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 23 Sep 2016 13:14:54 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r422674 - in head/multimedia: libx264 x264
Message-ID:  <201609231314.u8NDEs5H064922@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Fri Sep 23 13:14:54 2016
New Revision: 422674
URL: https://svnweb.freebsd.org/changeset/ports/422674

Log:
  multimedia/x264: switch to _ENABLE option helper
  
  Many opposite switches are not available, so with default options
  selected this change incurs the following warnings.
  
    multimedia/libx264:
      Unknown option --enable-asm, ignored
      Unknown option --disable-debug, ignored
      Unknown option --enable-opencl, ignored
  
    multimedia/x264:
      Unknown option --enable-asm, ignored
      Unknown option --disable-debug, ignored
      Unknown option --enable-lsmash, ignored
  
  Differential Revision:	https://reviews.freebsd.org/D7958
  Requested by:	koobs (maintainer)

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 Sep 23 13:14:43 2016	(r422673)
+++ head/multimedia/libx264/Makefile	Fri Sep 23 13:14:54 2016	(r422674)
@@ -20,7 +20,7 @@ HI10P_DESC=		Enable High 10 Profile 10-b
 HI10P_CONFIGURE_ON=	--bit-depth=10
 
 OPENCL_BUILD_DEPENDS=	${LOCALBASE}/include/CL/opencl.h:devel/opencl
-OPENCL_CONFIGURE_OFF=	--disable-opencl
+OPENCL_CONFIGURE_ENABLE=opencl
 
 CONFIGURE_ARGS=		\
 			--enable-static \

Modified: head/multimedia/x264/Makefile
==============================================================================
--- head/multimedia/x264/Makefile	Fri Sep 23 13:14:43 2016	(r422673)
+++ head/multimedia/x264/Makefile	Fri Sep 23 13:14:54 2016	(r422674)
@@ -63,28 +63,28 @@ LSMASH_DESC=		L-SMASH library support
 MP4_DESC=		MPEG-4 output
 SWSCALE_DESC=		Resize video filter
 
-ASM_CONFIGURE_OFF=	--disable-asm
+ASM_CONFIGURE_ENABLE=	asm
 
-DEBUG_CONFIGURE_ON=	--enable-debug
+DEBUG_CONFIGURE_ENABLE=	debug
 DEBUG_CONFIGURE_OFF=	--enable-strip
 
 FFMS_LIB_DEPENDS=	libffms2.so:multimedia/ffms2
-FFMS_CONFIGURE_OFF=	--disable-ffms
+FFMS_CONFIGURE_ENABLE=	ffms
 FFMS_IMPLIES=		SWSCALE
 
 GCC_VARS=		USE_GCC=yes
 
-GPAC_CONFIGURE_OFF=	--disable-gpac
 GPAC_LIB_DEPENDS=	libgpac.so:multimedia/gpac-libgpac
+GPAC_CONFIGURE_ENABLE=	gpac
 
-LAVF_CONFIGURE_OFF=	--disable-lavf
 LAVF_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
 			libavformat.so:multimedia/ffmpeg \
 			libavutil.so:multimedia/ffmpeg
+LAVF_CONFIGURE_ENABLE=	lavf
 LAVF_IMPLIES=		SWSCALE
 
 LSMASH_LIB_DEPENDS=	liblsmash.so:multimedia/l-smash
-LSMASH_CONFIGURE_OFF=	--disable-lsmash
+LSMASH_CONFIGURE_ENABLE=lsmash
 
 PGO_DISTFILES=		${Y4M_VIDEO_DISTFILE}:pgo
 PGO_MAKE_ENV=		VIDS="${WRKDIR}/${Y4M_VIDEO}"
@@ -96,9 +96,9 @@ PGO_VARS=		USE_GCC=any \
 			RESTRICTED="${Y4M_VIDEO_DISTFILE} file may not be mirrored" \
 			RESTRICTED_FILES="${Y4M_VIDEO_DISTFILE}"
 
-SWSCALE_CONFIGURE_OFF=	--disable-swscale
 SWSCALE_LIB_DEPENDS=	libavutil.so:multimedia/ffmpeg \
 			libswscale.so:multimedia/ffmpeg
+SWSCALE_CONFIGURE_ENABLE=	swscale
 
 CONFIGURE_ARGS?=	--system-libx264
 CONFIGURE_ARGS+=	--prefix="${PREFIX}" \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609231314.u8NDEs5H064922>