Date: Wed, 26 Aug 2015 06:22:27 +0000 (UTC) From: Thomas Zander <riggs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r395348 - head/multimedia/libass Message-ID: <201508260622.t7Q6MRLs090973@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: riggs Date: Wed Aug 26 06:22:26 2015 New Revision: 395348 URL: https://svnweb.freebsd.org/changeset/ports/395348 Log: Convert ASM to option helpers, make ASM arch-dependent - Provide ASM option only on supported archs (i386, amd64) - i386: ASM is no longer default OPTION (fixes bug 252587) - Bump PORTREVISION PR: 202599 Submitted by: jbeich Reviewed by: riggs Modified: head/multimedia/libass/Makefile Modified: head/multimedia/libass/Makefile ============================================================================== --- head/multimedia/libass/Makefile Wed Aug 26 05:07:20 2015 (r395347) +++ head/multimedia/libass/Makefile Wed Aug 26 06:22:26 2015 (r395348) @@ -2,6 +2,7 @@ PORTNAME= libass PORTVERSION= 0.12.1 +PORTREVISION= 1 CATEGORIES= multimedia devel MAINTAINER= multimedia@FreeBSD.org @@ -21,9 +22,14 @@ USE_LDCONFIG= yes PATHFIX_MAKEFILEIN=Makefile.am INSTALL_TARGET= install-strip -OPTIONS_DEFINE= ASM ENCA FONTCONFIG HARFBUZZ -OPTIONS_DEFAULT=ASM ENCA FONTCONFIG HARFBUZZ +OPTIONS_DEFINE= ENCA FONTCONFIG HARFBUZZ +OPTIONS_DEFAULT=ENCA FONTCONFIG HARFBUZZ +OPTIONS_DEFINE_amd64= ASM +OPTIONS_DEFINE_i386= ASM +OPTIONS_DEFAULT_amd64= ASM +ASM_BUILD_DEPENDS=${LOCALBASE}/bin/yasm:${PORTSDIR}/devel/yasm +ASM_CONFIGURE_ENABLE=asm ASM_DESC?= Use optimized ASM routines on x86/amd64 ENCA_LIB_DEPENDS=libenca.so:${PORTSDIR}/converters/enca @@ -37,15 +43,4 @@ HARFBUZZ_LIB_DEPENDS=libharfbuzz.so:${PO HARFBUZZ_CONFIGURE_ENABLE=harfbuzz HARFBUZZ_DESC?= Font shaping via HarfBuzz -.include <bsd.port.pre.mk> - -.if ${ARCH} == "amd64" || ${ARCH} == "i386" -.if ${PORT_OPTIONS:MASM} -CONFIGURE_ARGS+= --enable-asm -BUILD_DEPENDS+= ${LOCALBASE}/bin/yasm:${PORTSDIR}/devel/yasm -.else -CONFIGURE_ARGS+= --disable-asm -.endif -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508260622.t7Q6MRLs090973>