diff options
| author | Thomas Zander <riggs@FreeBSD.org> | 2015-08-26 06:22:26 +0000 |
|---|---|---|
| committer | Thomas Zander <riggs@FreeBSD.org> | 2015-08-26 06:22:26 +0000 |
| commit | e38f12c62c8796270f62a2482c9480f8bc657e2a (patch) | |
| tree | b6fd17bc0cc83f504e6013bb16f6f69a9fbc5543 /multimedia/libass | |
| parent | a27dff8bc0a7cd004294432f07fe13271a5c7961 (diff) | |
| download | ports-e38f12c62c8796270f62a2482c9480f8bc657e2a.tar.gz ports-e38f12c62c8796270f62a2482c9480f8bc657e2a.zip | |
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
Notes
Notes:
svn path=/head/; revision=395348
Diffstat (limited to 'multimedia/libass')
| -rw-r--r-- | multimedia/libass/Makefile | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/multimedia/libass/Makefile b/multimedia/libass/Makefile index 29786be8c5cf..1e19dd4d568c 100644 --- a/multimedia/libass/Makefile +++ b/multimedia/libass/Makefile @@ -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:${PORTSDIR}/print/harfbuzz 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> |