5 files changed, 20 insertions, 29 deletions
diff --git a/multimedia/libvpx/Makefile b/multimedia/libvpx/Makefile
index d525c0bbcc8..ed2c08deebb 100644
--- a/multimedia/libvpx/Makefile
+++ b/multimedia/libvpx/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.85 2020/10/25 12:43:45 nia Exp $
+# $NetBSD: Makefile,v 1.86 2021/04/14 07:02:49 adam Exp $
 
-DISTNAME=	libvpx-1.9.0
-PKGREVISION=	1
+DISTNAME=	libvpx-1.10.0
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_GITHUB:=webmproject/}
-GITHUB_PROJECT=	libvpx
 GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	ryoon@NetBSD.org
@@ -52,9 +50,7 @@ CONFIGURE_ARGS+=	--target=x86-darwin9-gcc
 CONFIGURE_ARGS+=	--target=x86-darwin8-gcc
 .    endif
 .  elif ${MACHINE_ARCH} == "x86_64"
-.    if !empty(OS_VERSION:M1[8-9].*) || !empty(OS_VERSION:M2[0-9].*)
-CONFIGURE_ARGS+=	--target=x86_64-darwin17-gcc
-.    elif !empty(OS_VERSION:M1[0-7].*)
+.    if !empty(OS_VERSION:M1[0-7].*) || !empty(OS_VERSION:M2[0-9].*)
 CONFIGURE_ARGS+=	--target=x86_64-darwin${OS_VERSION:C/\.[0-9]*//g}-gcc
 .    else
 CONFIGURE_ARGS+=	--target=x86_64-darwin9-gcc
diff --git a/multimedia/libvpx/PLIST b/multimedia/libvpx/PLIST
index 885ab7ad049..64951ab59b2 100644
--- a/multimedia/libvpx/PLIST
+++ b/multimedia/libvpx/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2015/06/30 09:53:17 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.7 2021/04/14 07:02:49 adam Exp $
 bin/vpxdec
 bin/vpxenc
 include/vpx/vp8.h
@@ -7,6 +7,7 @@ include/vpx/vp8dx.h
 include/vpx/vpx_codec.h
 include/vpx/vpx_decoder.h
 include/vpx/vpx_encoder.h
+include/vpx/vpx_ext_ratectrl.h
 include/vpx/vpx_frame_buffer.h
 include/vpx/vpx_image.h
 include/vpx/vpx_integer.h
diff --git a/multimedia/libvpx/distinfo b/multimedia/libvpx/distinfo
index 3cd4590317e..5613b8cbab0 100644
--- a/multimedia/libvpx/distinfo
+++ b/multimedia/libvpx/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.41 2020/08/30 12:33:29 js Exp $
+$NetBSD: distinfo,v 1.42 2021/04/14 07:02:49 adam Exp $
 
-SHA1 (libvpx-1.9.0.tar.gz) = 2ab8203ad8922bdf3256e4a197d1348fa8db9a62
-RMD160 (libvpx-1.9.0.tar.gz) = 6189b855a38cd5f2e34a5120d5a48cc945b623b1
-SHA512 (libvpx-1.9.0.tar.gz) = 8d544552b35000ea5712aec220b78bb5f7dc210704b2f609365214cb95a4f5a0e343b362723d829cb4a9ac203b10d5443700ba84b28fd6b2fefbabb40663e298
-Size (libvpx-1.9.0.tar.gz) = 5326239 bytes
+SHA1 (libvpx-1.10.0.tar.gz) = 72ba77ee50c379c54417ac924cca29336e37b953
+RMD160 (libvpx-1.10.0.tar.gz) = 9bd56c2bd1397cbc78d8f681503e0ffb857324d8
+SHA512 (libvpx-1.10.0.tar.gz) = f88c588145b5164e98531b75215e119056cd806a9dbe6599bb9dab35c0af0ecd4b3daabee7d795e412a58aeb543d5c7dc0107457c4bd8f4d434e966e8e22a32d
+Size (libvpx-1.10.0.tar.gz) = 5340421 bytes
 SHA1 (patch-build_make_Makefile) = 908b1abc8c5eed56e920f442f8f1f80c49838a6f
-SHA1 (patch-build_make_configure.sh) = 6ef2a73aceeec910d1edce592f944cb46016010e
+SHA1 (patch-build_make_configure.sh) = ec0235cc29830b7e2619885dda2abdadbe5f2417
 SHA1 (patch-build_make_gen_asm_deps.sh) = c55bd4d0e12176b73ba62c3c4741b58de77923e6
 SHA1 (patch-configure) = 738871dc9ffa44a809e594849915a875a97ac40b
 SHA1 (patch-examples.mk) = 17410f43ff9952d616be3211ca697f37c107610a
-SHA1 (patch-libs.mk) = cdbd8b590746f3b366f25ba9b2a8636ff790d930
+SHA1 (patch-libs.mk) = 2eff62fd8080eeb9315793cc0dc93cbb485cc33d
diff --git a/multimedia/libvpx/patches/patch-build_make_configure.sh b/multimedia/libvpx/patches/patch-build_make_configure.sh
index b18310062a8..acf833876e4 100644
--- a/multimedia/libvpx/patches/patch-build_make_configure.sh
+++ b/multimedia/libvpx/patches/patch-build_make_configure.sh
@@ -1,4 +1,4 @@
-$NetBSD: patch-build_make_configure.sh,v 1.1 2019/02/12 20:47:14 adam Exp $
+$NetBSD: patch-build_make_configure.sh,v 1.2 2021/04/14 07:02:49 adam Exp $
 
 *BSD and qnx are identified as linux.
 Add another SDK path on Mac OS X.
@@ -8,12 +8,6 @@ Recognize powerpc as a target ISA, so we don't end up with generic-gnu
 
 --- build/make/configure.sh.orig	2019-02-04 17:02:33.000000000 +0000
 +++ build/make/configure.sh
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/usr/pkg/bin/bash
- ##
- ##  configure.sh
- ##
 @@ -740,7 +740,7 @@ process_common_toolchain() {
        aarch64*)
          tgt_isa=arm64
diff --git a/multimedia/libvpx/patches/patch-libs.mk b/multimedia/libvpx/patches/patch-libs.mk
index 00a4bb28ed6..134094bcdad 100644
--- a/multimedia/libvpx/patches/patch-libs.mk
+++ b/multimedia/libvpx/patches/patch-libs.mk
@@ -1,10 +1,10 @@
-$NetBSD: patch-libs.mk,v 1.5 2020/08/30 12:33:29 js Exp $
+$NetBSD: patch-libs.mk,v 1.6 2021/04/14 07:02:49 adam Exp $
 
 Do not install debug library.
 
---- libs.mk.orig	2020-07-30 19:59:15.000000000 +0000
+--- libs.mk.orig	2021-03-18 19:59:46.000000000 +0000
 +++ libs.mk
-@@ -170,7 +170,6 @@ INSTALL-LIBS-$(CONFIG_SHARED) += $(forea
+@@ -174,7 +174,6 @@ INSTALL-LIBS-$(CONFIG_SHARED) += $(forea
  endif
  else
  INSTALL-LIBS-$(CONFIG_STATIC) += $(LIBSUBDIR)/libvpx.a
@@ -12,7 +12,7 @@ Do not install debug library.
  endif
  
  ifeq ($(CONFIG_VP9_ENCODER)$(CONFIG_RATE_CTRL),yesyes)
-@@ -278,8 +277,8 @@ endif # ifeq ($(CONFIG_MSVS),yes)
+@@ -284,8 +283,8 @@ endif # ifeq ($(CONFIG_MSVS),yes)
  else # ifeq ($(CONFIG_EXTERNAL_BUILD),yes)
  LIBVPX_OBJS=$(call objs, $(filter-out $(ASM_INCLUDES), $(CODEC_SRCS)))
  OBJS-yes += $(LIBVPX_OBJS)
@@ -21,9 +21,9 @@ Do not install debug library.
 +LIBS-$(if yes,$(CONFIG_STATIC)) += $(BUILD_PFX)libvpx.a
 +$(BUILD_PFX)libvpx.a: $(LIBVPX_OBJS)
  
- SO_VERSION_MAJOR := 6
- SO_VERSION_MINOR := 3
-@@ -384,15 +383,15 @@ ifeq ($(CONFIG_VP9_ENCODER),yes)
+ # Updating version info.
+ # https://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info
+@@ -402,15 +401,15 @@ ifeq ($(CONFIG_VP9_ENCODER),yes)
    RC_RTC_OBJS=$(call objs,$(RC_RTC_SRCS))
    RC_RTC_OBJS=$(call objs,$(RC_RTC_SRCS))
    OBJS-yes += $(RC_RTC_OBJS)