[pkgsrc/trunk]: pkgsrc/multimedia/libaom libaom: ensure "generic" CPU type is...

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6423e2b33267
branches:  trunk
changeset: 454528:6423e2b33267
user:      nia <nia%pkgsrc.org@localhost>
date:      Sun Jun 13 06:22:12 2021 +0000

description:
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.

diffstat:

 multimedia/libaom/Makefile |  24 +++++++++++++++++++++---
 1 files changed, 21 insertions(+), 3 deletions(-)

diffs (46 lines):

diff -r c1204914c644 -r 6423e2b33267 multimedia/libaom/Makefile
--- a/multimedia/libaom/Makefile        Sun Jun 13 06:04:17 2021 +0000
+++ b/multimedia/libaom/Makefile        Sun Jun 13 06:22:12 2021 +0000
@@ -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_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+=   -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"