CVS commit: pkgsrc/multimedia/libaom

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

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

Modified Files:
        pkgsrc/multimedia/libaom: Makefile

Log Message:
libaom: ensure "generic" CPU type is selected correctly

libaom will refuse to build if it can't properly detect the CPU
architecture, unless the "generic" target is explicitly selected
on the command line.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/multimedia/libaom/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/libaom/Makefile
diff -u pkgsrc/multimedia/libaom/Makefile:1.12 pkgsrc/multimedia/libaom/Makefile:1.13
--- pkgsrc/multimedia/libaom/Makefile:1.12      Mon May 24 19:53:13 2021
+++ pkgsrc/multimedia/libaom/Makefile   Sun Jun 13 06:22:12 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2021/05/24 19:53:13 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2021/06/13 06:22:12 nia Exp $
 
 PKGNAME=       libaom-1.0.0
 PKGREVISION=   4
@@ -30,7 +30,6 @@ CMAKE_ARGS+=  -DENABLE_DECODE_PERF_TESTS:
 CMAKE_ARGS+=   -DENABLE_EXAMPLES:BOOL=ON
 CMAKE_ARGS+=   -DENABLE_DOCS:BOOL=OFF
 CMAKE_ARGS+=   -DENABLE_GOMA:BOOL=OFF
-CMAKE_ARGS+=   -DENABLE_NASM:BOOL=ON
 CMAKE_ARGS+=   -DENABLE_TESTS:BOOL=OFF
 CMAKE_ARGS+=   -DENABLE_TOOLS:BOOL=OFF
 CMAKE_ARGS+=   -DENABLE_WERROR:BOOL=OFF
@@ -43,8 +42,27 @@ CMAKE_ARGS+= -DENABLE_WERROR:BOOL=OFF
 CMAKE_ARGS+=   -DCONFIG_RUNTIME_CPU_DETECT=0
 .endif
 
+.if !empty(MACHINE_ARCH:Mmips64*)
+CMAKE_ARGS+=   -DAOM_TARGET_CPU="mips64"
+.elif !empty(MACHINE_ARCH:Mmips*)
+CMAKE_ARGS+=   -DAOM_TARGET_CPU="mips"
+.elif !empty(MACHINE_ARCH:Mpowerpc*)
+CMAKE_ARGS+=   -DAOM_TARGET_CPU="ppc"
+.elif ${MACHINE_ARCH} == "earmv7hf"
+CMAKE_ARGS+=   -DAOM_TARGET_CPU="armv7"
+.elif ${MACHINE_ARCH} == "aarch64"
+CMAKE_ARGS+=   -DAOM_TARGET_CPU="arm64"
+.elif ${MACHINE_ARCH} == "x86_64"
+CMAKE_ARGS+=   -DAOM_TARGET_CPU="x86_64"
+.elif ${MACHINE_ARCH} == "i386"
+CMAKE_ARGS+=   -DAOM_TARGET_CPU="x86"
+.else
+CMAKE_ARGS+=   -DAOM_TARGET_CPU="generic"
+.endif
+
 .if ${MACHINE_ARCH} == x86_64 || ${MACHINE_ARCH} == i386
-BUILD_DEPENDS+=        nasm>=2.13:../../devel/nasm
+CMAKE_ARGS+=   -DENABLE_NASM:BOOL=ON
+TOOL_DEPENDS+= nasm>=2.13:../../devel/nasm
 .endif
 
 .include "../../mk/bsd.pkg.mk"