Tue Jul 13 15:35:42 2021 UTC ()
arm_cpudetect.c doesn't cover macOS. On M1 Macs, set
--disable-runtime-cpu-detect to fix build.


(schmonz)
diff -r1.87 -r1.88 pkgsrc/multimedia/libvpx/Makefile
cvs diff -r1.87 -r1.88 pkgsrc/multimedia/libvpx/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/libvpx/Makefile 2021/05/24 19:53:13 1.87
+++ pkgsrc/multimedia/libvpx/Makefile 2021/07/13 15:35:42 1.88
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.87 2021/05/24 19:53:13 wiz Exp $ 1# $NetBSD: Makefile,v 1.88 2021/07/13 15:35:42 schmonz Exp $
2 2
3DISTNAME= libvpx-1.10.0 3DISTNAME= libvpx-1.10.0
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= multimedia 5CATEGORIES= multimedia
6MASTER_SITES= ${MASTER_SITE_GITHUB:=webmproject/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=webmproject/}
7GITHUB_TAG= v${PKGVERSION_NOREV} 7GITHUB_TAG= v${PKGVERSION_NOREV}
8 8
9MAINTAINER= ryoon@NetBSD.org 9MAINTAINER= ryoon@NetBSD.org
10HOMEPAGE= https://chromium.googlesource.com/webm/libvpx 10HOMEPAGE= https://chromium.googlesource.com/webm/libvpx
11COMMENT= On2 VP8 library from Google 11COMMENT= On2 VP8 library from Google
12LICENSE= modified-bsd 12LICENSE= modified-bsd
13 13
14USE_LANGUAGES= c c++ 14USE_LANGUAGES= c c++
@@ -46,26 +46,28 @@ CONFIGURE_ARGS+= --target=x86-darwin17-g @@ -46,26 +46,28 @@ CONFIGURE_ARGS+= --target=x86-darwin17-g
46. elif !empty(OS_VERSION:M1[0-7].*) 46. elif !empty(OS_VERSION:M1[0-7].*)
47CONFIGURE_ARGS+= --target=x86-darwin${OS_VERSION:C/\.[0-9]*//g}-gcc 47CONFIGURE_ARGS+= --target=x86-darwin${OS_VERSION:C/\.[0-9]*//g}-gcc
48. elif !empty(OS_VERSION:M9.*) 48. elif !empty(OS_VERSION:M9.*)
49CONFIGURE_ARGS+= --target=x86-darwin9-gcc 49CONFIGURE_ARGS+= --target=x86-darwin9-gcc
50. else 50. else
51CONFIGURE_ARGS+= --target=x86-darwin8-gcc 51CONFIGURE_ARGS+= --target=x86-darwin8-gcc
52. endif 52. endif
53. elif ${MACHINE_ARCH} == "x86_64" 53. elif ${MACHINE_ARCH} == "x86_64"
54. if !empty(OS_VERSION:M1[0-7].*) || !empty(OS_VERSION:M2[0-9].*) 54. if !empty(OS_VERSION:M1[0-7].*) || !empty(OS_VERSION:M2[0-9].*)
55CONFIGURE_ARGS+= --target=x86_64-darwin${OS_VERSION:C/\.[0-9]*//g}-gcc 55CONFIGURE_ARGS+= --target=x86_64-darwin${OS_VERSION:C/\.[0-9]*//g}-gcc
56. else 56. else
57CONFIGURE_ARGS+= --target=x86_64-darwin9-gcc 57CONFIGURE_ARGS+= --target=x86_64-darwin9-gcc
58. endif 58. endif
 59. elif ${MACHINE_ARCH} == "aarch64"
 60CONFIGURE_ARGS+= --disable-runtime-cpu-detect
59. endif 61. endif
60.elif ${OPSYS} == "SunOS" && !empty(PKGSRC_COMPILER:Mgcc*) 62.elif ${OPSYS} == "SunOS" && !empty(PKGSRC_COMPILER:Mgcc*)
61. if ${MACHINE_ARCH} == "x86_64" 63. if ${MACHINE_ARCH} == "x86_64"
62CONFIGURE_ARGS+= --target=x86_64-solaris-gcc 64CONFIGURE_ARGS+= --target=x86_64-solaris-gcc
63. elif ${MACHINE_ARCH} == "i386" 65. elif ${MACHINE_ARCH} == "i386"
64CONFIGURE_ARGS+= --target=x86-solaris-gcc 66CONFIGURE_ARGS+= --target=x86-solaris-gcc
65# Disable libyuv SSE code, it doesn't compile at present. 67# Disable libyuv SSE code, it doesn't compile at present.
66CFLAGS+= -U__SSE2__ 68CFLAGS+= -U__SSE2__
67. endif 69. endif
68.endif 70.endif
69 71
70.if !empty(PKGSRC_COMPILER:Mclang) 72.if !empty(PKGSRC_COMPILER:Mclang)
71. if ${OPSYS} == "NetBSD" || ${OPSYS} == "Darwin" 73. if ${OPSYS} == "NetBSD" || ${OPSYS} == "Darwin"