Thu Sep 2 19:20:08 2021 UTC ()
x264-devel: disable asm on darwin/aarch64


(nia)
diff -r1.78 -r1.79 pkgsrc/multimedia/x264-devel/Makefile
cvs diff -r1.78 -r1.79 pkgsrc/multimedia/x264-devel/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/x264-devel/Attic/Makefile 2021/06/13 06:31:50 1.78
+++ pkgsrc/multimedia/x264-devel/Attic/Makefile 2021/09/02 19:20:08 1.79
@@ -1,34 +1,35 @@ @@ -1,34 +1,35 @@
1# $NetBSD: Makefile,v 1.78 2021/06/13 06:31:50 nia Exp $ 1# $NetBSD: Makefile,v 1.79 2021/09/02 19:20:08 nia Exp $
2 2
3DISTNAME= x264-snapshot-20191217-2245 3DISTNAME= x264-snapshot-20191217-2245
4PKGNAME= ${DISTNAME:S/-snapshot-/-devel-/:S/-2245$//} 4PKGNAME= ${DISTNAME:S/-snapshot-/-devel-/:S/-2245$//}
5PKGREVISION= 2 5PKGREVISION= 2
6CATEGORIES= multimedia 6CATEGORIES= multimedia
7MASTER_SITES= ftp://ftp.videolan.org/pub/videolan/x264/snapshots/ 7MASTER_SITES= ftp://ftp.videolan.org/pub/videolan/x264/snapshots/
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= joerg@NetBSD.org 10MAINTAINER= joerg@NetBSD.org
11HOMEPAGE= https://www.videolan.org/developers/x264.html 11HOMEPAGE= https://www.videolan.org/developers/x264.html
12COMMENT= GPL licensed H.264 encoder 12COMMENT= GPL licensed H.264 encoder
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
15.include "../../mk/bsd.prefs.mk" 15.include "../../mk/bsd.prefs.mk"
16 16
17# Assembler code still needs to be disabled on at least SunOS. 17# Assembler code still needs to be disabled on at least SunOS.
18# NetBSD/i386 needs ASM disabled to avoid text relocations. 18# NetBSD/i386 needs ASM disabled to avoid text relocations.
19# NetBSD/mips needs ASM disabled because it uses the MSA extension 19# NetBSD/mips needs ASM disabled because it uses the MSA extension
20# (requires MIPS64 revision 2) and fails to build. 20# (requires MIPS64 revision 2) and fails to build.
21.if ${OPSYS} == "SunOS" || \ 21.if ${OPSYS} == "SunOS" || \
 22 !empty(MACHINE_PLATFORM:MDarwin-*-aarch64) || \
22 !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || \ 23 !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || \
23 !empty(MACHINE_PLATFORM:MNetBSD-*-mips*) 24 !empty(MACHINE_PLATFORM:MNetBSD-*-mips*)
24CONFIGURE_ARGS+= --disable-asm 25CONFIGURE_ARGS+= --disable-asm
25.elif ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" 26.elif ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
26TOOL_DEPENDS+= nasm>=2.13.0:../../devel/nasm 27TOOL_DEPENDS+= nasm>=2.13.0:../../devel/nasm
27.endif 28.endif
28 29
29USE_TOOLS+= bash gmake 30USE_TOOLS+= bash gmake
30USE_LIBTOOL= yes 31USE_LIBTOOL= yes
31HAS_CONFIGURE= yes 32HAS_CONFIGURE= yes
32CONFIG_SHELL= ${BASH} 33CONFIG_SHELL= ${BASH}
33CONFIGURE_ARGS+= --enable-shared 34CONFIGURE_ARGS+= --enable-shared
34CONFIGURE_ARGS+= --enable-static 35CONFIGURE_ARGS+= --enable-static