svn commit: r415615 - in head: graphics/sekrit-twc-zimg multimedia/vapoursynth

[Jan Beich]

Author: jbeich
Date: Sun May 22 01:10:34 2016
New Revision: 415615
URL: https://svnweb.freebsd.org/changeset/ports/415615

Log:
  Partially back out r414539, it only made sense for devel/fb-adb

Modified:
  head/graphics/sekrit-twc-zimg/Makefile   (contents, props changed)
  head/multimedia/vapoursynth/Makefile   (contents, props changed)

Modified: head/graphics/sekrit-twc-zimg/Makefile
==============================================================================
--- head/graphics/sekrit-twc-zimg/Makefile	Sat May 21 23:47:51 2016	(r415614)
+++ head/graphics/sekrit-twc-zimg/Makefile	Sun May 22 01:10:34 2016	(r415615)
@@ -29,9 +29,12 @@ CPPFLAGS+=	-D_GLIBCXX_USE_C99 -D_GLIBCXX
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
-OPTIONS_DEFINE=	SIMD TEST
-OPTIONS_DEFAULT=SIMD
-OPTIONS_EXCLUDE=${ARCH:Namd64:Ni386:C/.+/SIMD/}
+OPTIONS_DEFINE=	TEST
+
+OPTIONS_DEFINE_amd64=	SIMD
+OPTIONS_DEFINE_i386=	SIMD
+OPTIONS_DEFAULT_amd64=	SIMD
+OPTIONS_DEFAULT_i386=	SIMD # runtime detection
 
 SIMD_CONFIGURE_ENABLE=	x86simd
 

Modified: head/multimedia/vapoursynth/Makefile
==============================================================================
--- head/multimedia/vapoursynth/Makefile	Sat May 21 23:47:51 2016	(r415614)
+++ head/multimedia/vapoursynth/Makefile	Sun May 22 01:10:34 2016	(r415615)
@@ -20,12 +20,14 @@ INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 DATADIR=	${PREFIX}/lib/vapoursynth
 
-OPTIONS_DEFINE=	DEBUG DOCS FRAME_GUARD SIMD
+OPTIONS_DEFINE=	DEBUG DOCS FRAME_GUARD
 OPTIONS_DEFAULT=${OPTIONS_GROUP_COMPS} ${OPTIONS_GROUP_PLUGINS}
-OPTIONS_DEFAULT_amd64=	SIMD
-OPTIONS_EXCLUDE=${ARCH:Namd64:Ni386:C/.+/SIMD/}
 OPTIONS_SUB=	yes
 
+OPTIONS_DEFINE_amd64=	SIMD
+OPTIONS_DEFINE_i386=	SIMD
+OPTIONS_DEFAULT_amd64=	SIMD
+
 OPTIONS_GROUP=		COMPS PLUGINS
 COMPS_DESC=		Components
 OPTIONS_GROUP_COMPS=	CORE PYTHON VSPIPE VSSCRIPT