CVS commit: pkgsrc/multimedia/x264-devel

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Jun 13 06:28:17 UTC 2021

Modified Files:
        pkgsrc/multimedia/x264-devel: Makefile

Log Message:
x264-devel: disable ASM on NetBSD/mips and future proof version pattern
for NetBSD/i386.


To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 pkgsrc/multimedia/x264-devel/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/x264-devel/Makefile
diff -u pkgsrc/multimedia/x264-devel/Makefile:1.76 pkgsrc/multimedia/x264-devel/Makefile:1.77
--- pkgsrc/multimedia/x264-devel/Makefile:1.76  Mon May 24 19:53:14 2021
+++ pkgsrc/multimedia/x264-devel/Makefile       Sun Jun 13 06:28:17 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.76 2021/05/24 19:53:14 wiz Exp $
+# $NetBSD: Makefile,v 1.77 2021/06/13 06:28:17 nia Exp $
 
 DISTNAME=      x264-snapshot-20191217-2245
 PKGNAME=       ${DISTNAME:S/-snapshot-/-devel-/:S/-2245$//}
@@ -17,10 +17,15 @@ LICENSE=    gnu-gpl-v2
 # Assembler code still needs to be disabled on at least SunOS
 # Also needs to avoid text relocations caused by non-pie x86 asm on NetBSD/i386
 .if ${OPSYS} == "SunOS" || \
-    !empty(MACHINE_PLATFORM:MNetBSD-[89].*-i386)
+    !empty(MACHINE_PLATFORM:MNetBSD-*-i386)
 CONFIGURE_ARGS+=       --disable-asm
 .elif ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
-BUILD_DEPENDS+=                nasm>=2.13.0:../../devel/nasm
+TOOL_DEPENDS+=         nasm>=2.13.0:../../devel/nasm
+.endif
+
+.if !empty(MACHINE_PLATFORM:MNetBSD-*-mips*)
+# error: unknown type name 'v8i16'
+CONFIGURE_ARGS+=       --disable-asm
 .endif
 
 USE_TOOLS+=            bash gmake