Tue Sep 29 13:03:13 2020 UTC ()
libvpx: let it build on macOS 11.0


(adam)
diff -r1.83 -r1.84 pkgsrc/multimedia/libvpx/Makefile
cvs diff -r1.83 -r1.84 pkgsrc/multimedia/libvpx/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/libvpx/Makefile 2020/08/31 18:10:29 1.83
+++ pkgsrc/multimedia/libvpx/Makefile 2020/09/29 13:03:13 1.84
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.83 2020/08/31 18:10:29 wiz Exp $ 1# $NetBSD: Makefile,v 1.84 2020/09/29 13:03:13 adam Exp $
2 2
3DISTNAME= libvpx-1.9.0 3DISTNAME= libvpx-1.9.0
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= multimedia 5CATEGORIES= multimedia
6MASTER_SITES= ${MASTER_SITE_GITHUB:=webmproject/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=webmproject/}
7GITHUB_PROJECT= libvpx 7GITHUB_PROJECT= libvpx
8GITHUB_TAG= v${PKGVERSION_NOREV} 8GITHUB_TAG= v${PKGVERSION_NOREV}
9 9
10MAINTAINER= ryoon@NetBSD.org 10MAINTAINER= ryoon@NetBSD.org
11HOMEPAGE= https://chromium.googlesource.com/webm/libvpx 11HOMEPAGE= https://chromium.googlesource.com/webm/libvpx
12COMMENT= On2 VP8 library from Google 12COMMENT= On2 VP8 library from Google
13LICENSE= modified-bsd 13LICENSE= modified-bsd
14 14
@@ -45,27 +45,27 @@ REPLACE_PERL= build/make/ads2gas.pl @@ -45,27 +45,27 @@ REPLACE_PERL= build/make/ads2gas.pl
45.if ${OPSYS} == "Darwin" 45.if ${OPSYS} == "Darwin"
46BUILDLINK_TRANSFORM+= rm:-Wl,-Bsymbolic 46BUILDLINK_TRANSFORM+= rm:-Wl,-Bsymbolic
47. if ${MACHINE_ARCH} == "i386" 47. if ${MACHINE_ARCH} == "i386"
48. if !empty(OS_VERSION:M1[8-9].*) 48. if !empty(OS_VERSION:M1[8-9].*)
49CONFIGURE_ARGS+= --target=x86-darwin17-gcc 49CONFIGURE_ARGS+= --target=x86-darwin17-gcc
50. elif !empty(OS_VERSION:M1[0-7].*) 50. elif !empty(OS_VERSION:M1[0-7].*)
51CONFIGURE_ARGS+= --target=x86-darwin${OS_VERSION:C/\.[0-9]*//g}-gcc 51CONFIGURE_ARGS+= --target=x86-darwin${OS_VERSION:C/\.[0-9]*//g}-gcc
52. elif !empty(OS_VERSION:M9.*) 52. elif !empty(OS_VERSION:M9.*)
53CONFIGURE_ARGS+= --target=x86-darwin9-gcc 53CONFIGURE_ARGS+= --target=x86-darwin9-gcc
54. else 54. else
55CONFIGURE_ARGS+= --target=x86-darwin8-gcc 55CONFIGURE_ARGS+= --target=x86-darwin8-gcc
56. endif 56. endif
57. elif ${MACHINE_ARCH} == "x86_64" 57. elif ${MACHINE_ARCH} == "x86_64"
58. if !empty(OS_VERSION:M1[8-9].*) 58. if !empty(OS_VERSION:M1[8-9].*) || !empty(OS_VERSION:M2[0-9].*)
59CONFIGURE_ARGS+= --target=x86_64-darwin17-gcc 59CONFIGURE_ARGS+= --target=x86_64-darwin17-gcc
60. elif !empty(OS_VERSION:M1[0-7].*) 60. elif !empty(OS_VERSION:M1[0-7].*)
61CONFIGURE_ARGS+= --target=x86_64-darwin${OS_VERSION:C/\.[0-9]*//g}-gcc 61CONFIGURE_ARGS+= --target=x86_64-darwin${OS_VERSION:C/\.[0-9]*//g}-gcc
62. else 62. else
63CONFIGURE_ARGS+= --target=x86_64-darwin9-gcc 63CONFIGURE_ARGS+= --target=x86_64-darwin9-gcc
64. endif 64. endif
65. endif 65. endif
66.elif ${OPSYS} == "SunOS" && !empty(PKGSRC_COMPILER:Mgcc*) 66.elif ${OPSYS} == "SunOS" && !empty(PKGSRC_COMPILER:Mgcc*)
67. if ${MACHINE_ARCH} == "x86_64" 67. if ${MACHINE_ARCH} == "x86_64"
68CONFIGURE_ARGS+= --target=x86_64-solaris-gcc 68CONFIGURE_ARGS+= --target=x86_64-solaris-gcc
69. elif ${MACHINE_ARCH} == "i386" 69. elif ${MACHINE_ARCH} == "i386"
70CONFIGURE_ARGS+= --target=x86-solaris-gcc 70CONFIGURE_ARGS+= --target=x86-solaris-gcc
71# Disable libyuv SSE code, it doesn't compile at present. 71# Disable libyuv SSE code, it doesn't compile at present.