Update to 1.6.0

Changelog:
2016-07-20 v1.6.0 "Khaki Campbell Duck"
  This release improves upon the VP9 encoder and speeds up the encoding and
  decoding processes.

  - Upgrading:
    This release is ABI incompatible with 1.5.0 due to a new 'color_range' enum
    in vpx_image and some minor changes to the VP8_COMP structure.

    The default key frame interval for VP9 has changed from 128 to 9999.

  - Enhancement:
    A core focus has been performance for low end Intel processors. SSSE3
    instructions such as 'pshufb' have been avoided and instructions have been
    reordered to better accommodate the more constrained pipelines.

    As a result, devices based on Celeron processors have seen substantial
    decoding improvements. From Indian Runner Duck to Javan Whistling Duck,
    decoding speed improved between 10 and 30%. Between Javan Whistling Duck
    and Khaki Campbell Duck, it improved another 10 to 15%.

    While Celeron benefited most, Core-i5 also improved 5% and 10% between the
    respective releases.

    Realtime performance for WebRTC for both speed and quality has received a
    lot of attention.

  - Bug Fixes:
    A number of fuzzing issues, found variously by Mozilla, Chromium and others,
    have been fixed and we strongly recommend updating.

8 files changed, 44 insertions, 60 deletions

diff --git a/multimedia/libvpx/Makefile b/multimedia/libvpx/Makefile
index c0cf0d3cbd3..4671e4bf85b 100644
--- a/multimedia/libvpx/Makefile
+++ b/multimedia/libvpx/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.65 2016/07/09 06:38:39 wiz Exp $
+# $NetBSD: Makefile,v 1.66 2016/08/16 23:53:25 ryoon Exp $
 
-DISTNAME=	libvpx-1.5.0
-PKGREVISION=	2
+DISTNAME=	libvpx-1.6.0
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_GITHUB:=webmproject/}
 GITHUB_PROJECT=	libvpx
diff --git a/multimedia/libvpx/buildlink3.mk b/multimedia/libvpx/buildlink3.mk
index 7555e30f7e6..7f2eaba7ec1 100644
--- a/multimedia/libvpx/buildlink3.mk
+++ b/multimedia/libvpx/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.4 2015/11/18 14:09:25 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2016/08/16 23:53:25 ryoon Exp $
 
 BUILDLINK_TREE+=	libvpx
 
 .if !defined(LIBVPX_BUILDLINK3_MK)
 LIBVPX_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libvpx+=	libvpx>=1.5.0
-BUILDLINK_ABI_DEPENDS.libvpx+=	libvpx>=1.5.0
+BUILDLINK_API_DEPENDS.libvpx+=	libvpx>=1.6.0
+BUILDLINK_ABI_DEPENDS.libvpx+=	libvpx>=1.6.0
 BUILDLINK_PKGSRCDIR.libvpx?=	../../multimedia/libvpx
 
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/multimedia/libvpx/distinfo b/multimedia/libvpx/distinfo
index 6aececca08a..f47dfec5e93 100644
--- a/multimedia/libvpx/distinfo
+++ b/multimedia/libvpx/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.31 2015/11/18 14:09:25 ryoon Exp $
+$NetBSD: distinfo,v 1.32 2016/08/16 23:53:25 ryoon Exp $
 
-SHA1 (libvpx-1.5.0.tar.gz) = 82426a59ad34d72c762f9e4079e8e5197afc842d
-RMD160 (libvpx-1.5.0.tar.gz) = e0b4307088b66e24d1eb771a6c70e3d029103b5c
-SHA512 (libvpx-1.5.0.tar.gz) = d593c727ed7b977dbd9d571898d1d8b268e534ba913440316cb9c3b15ede81bd427f22a0f45d2d4c2704b5b9a28a167745a8484fd68d917d3630075d5fa80e40
-Size (libvpx-1.5.0.tar.gz) = 2430835 bytes
+SHA1 (libvpx-1.6.0.tar.gz) = 959e4e8f28819e38fb1593cf3d294ef89f083b87
+RMD160 (libvpx-1.6.0.tar.gz) = 89f243ce65bb067c7103e4e1f9e49a8b2a084a41
+SHA512 (libvpx-1.6.0.tar.gz) = 1cbd8872517c79eb2815409fa080096e7dcbb3f018574d978871a58b96ca29e38d3a36efe9427913feda0fbf4ebce2669eb09c280e2cd9d55d4ed2dad8a7dbb1
+Size (libvpx-1.6.0.tar.gz) = 2476097 bytes
 SHA1 (patch-aa) = 297ef73d6491a70888c9e887424c009627d55400
-SHA1 (patch-ab) = 45983c6d5324486a554b55cdac635a96465cfa41
+SHA1 (patch-ab) = fcf929c039acbd8b1787cd0d8ee0600df2d3751a
 SHA1 (patch-ac) = 17410f43ff9952d616be3211ca697f37c107610a
-SHA1 (patch-ad) = 0923ba943c77486f750b1ade43a9c20fedc08da1
-SHA1 (patch-build_make_gen_asm_deps.sh) = 1895c974c2c0c3e28a689ad449e13b92ce5f01e8
-SHA1 (patch-configure) = 2fb02f1ffe196e508f5738a6b0170f8d4f06f070
+SHA1 (patch-ad) = baa186625ee1cdab150827eed36402b096922e4b
+SHA1 (patch-build_make_gen_asm_deps.sh) = c55bd4d0e12176b73ba62c3c4741b58de77923e6
+SHA1 (patch-configure) = 3b3064995ca840e4d918e52e66a071ff4dfc05b2
 SHA1 (patch-test_sad__test.cc) = 139852577c9331860094d1822c8597e524bec842
-SHA1 (patch-test_sixtap__predict__test.cc) = 12e195c60a25a98e85f215d3726b571da2d67940
+SHA1 (patch-test_sixtap__predict__test.cc) = 5ca4e4072ba16f185617dceb2c09e55eb74bb100
diff --git a/multimedia/libvpx/patches/patch-ab b/multimedia/libvpx/patches/patch-ab
index e3c523fa3bf..b45b031995f 100644
--- a/multimedia/libvpx/patches/patch-ab
+++ b/multimedia/libvpx/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.6 2015/11/18 14:09:25 ryoon Exp $
+$NetBSD: patch-ab,v 1.7 2016/08/16 23:53:25 ryoon Exp $
 
---- libs.mk.orig	2015-11-09 22:12:38.000000000 +0000
+--- libs.mk.orig	2016-07-21 01:15:41.000000000 +0000
 +++ libs.mk
-@@ -200,7 +200,6 @@ INSTALL-LIBS-$(CONFIG_SHARED) += $(forea
+@@ -169,7 +169,6 @@ INSTALL-LIBS-$(CONFIG_SHARED) += $(forea
  endif
  else
  INSTALL-LIBS-$(CONFIG_STATIC) += $(LIBSUBDIR)/libvpx.a
@@ -10,7 +10,7 @@ $NetBSD: patch-ab,v 1.6 2015/11/18 14:09:25 ryoon Exp $
  endif
  
  CODEC_SRCS=$(call enabled,CODEC_SRCS)
-@@ -257,8 +256,8 @@ endif
+@@ -226,8 +225,8 @@ endif
  else
  LIBVPX_OBJS=$(call objs,$(CODEC_SRCS))
  OBJS-yes += $(LIBVPX_OBJS)
@@ -19,5 +19,5 @@ $NetBSD: patch-ab,v 1.6 2015/11/18 14:09:25 ryoon Exp $
 +LIBS-$(if yes,$(CONFIG_STATIC)) += $(BUILD_PFX)libvpx.a
 +$(BUILD_PFX)libvpx.a: $(LIBVPX_OBJS)
  
- SO_VERSION_MAJOR := 3
+ SO_VERSION_MAJOR := 4
  SO_VERSION_MINOR := 0
diff --git a/multimedia/libvpx/patches/patch-ad b/multimedia/libvpx/patches/patch-ad
index 32e9d424116..ee8e158e5b4 100644
--- a/multimedia/libvpx/patches/patch-ad
+++ b/multimedia/libvpx/patches/patch-ad
@@ -1,11 +1,11 @@
-$NetBSD: patch-ad,v 1.19 2015/11/18 14:09:25 ryoon Exp $
+$NetBSD: patch-ad,v 1.20 2016/08/16 23:53:25 ryoon Exp $
 
 *BSD and qnx are identified as linux.
 Add another SDK path on Mac OS X.
 All sparc cpus can not do unaligned access.
 Detect NetBSD ARMv7 hardfloat toolchain.
 
---- build/make/configure.sh.orig	2015-11-09 22:12:38.000000000 +0000
+--- build/make/configure.sh.orig	2016-07-21 01:15:41.000000000 +0000
 +++ build/make/configure.sh
 @@ -1,4 +1,4 @@
 -#!/bin/sh
@@ -13,16 +13,16 @@ Detect NetBSD ARMv7 hardfloat toolchain.
  ##
  ##  configure.sh
  ##
-@@ -647,7 +647,7 @@ process_common_toolchain() {
+@@ -683,7 +683,7 @@ process_common_toolchain() {
        armv6*)
          tgt_isa=armv6
          ;;
--      armv7*-hardfloat*)
-+      armv7*-hardfloat*|armv7*-netbsd*-*hf)
+-      armv7*-hardfloat* | armv7*-gnueabihf | arm-*-gnueabihf)
++      armv7*-hardfloat* | armv7*-gnueabihf | arm-*-gnueabihf | armv7*-netbsd*-*hf)
          tgt_isa=armv7
          float_abi=hard
          ;;
-@@ -695,7 +695,7 @@ process_common_toolchain() {
+@@ -735,7 +735,7 @@ process_common_toolchain() {
          [ -z "$tgt_isa" ] && tgt_isa=x86
          tgt_os=win32
          ;;
@@ -31,7 +31,7 @@ Detect NetBSD ARMv7 hardfloat toolchain.
          tgt_os=linux
          ;;
        *solaris2.10)
-@@ -738,6 +738,9 @@ process_common_toolchain() {
+@@ -778,6 +778,9 @@ process_common_toolchain() {
      mips*)
        enable_feature mips
        ;;
@@ -41,16 +41,7 @@ Detect NetBSD ARMv7 hardfloat toolchain.
    esac
  
    # PIC is probably what we want when building shared libs
-@@ -869,7 +872,7 @@ process_common_toolchain() {
- 
-       case ${tgt_cc} in
-         gcc)
--          CROSS=${CROSS:-arm-none-linux-gnueabi-}
-+#          CROSS=${CROSS:-arm-none-linux-gnueabi-}
-           link_with_cc=gcc
-           setup_gnu_toolchain
-           arch_int=${tgt_isa##armv}
-@@ -1338,7 +1341,7 @@ EOF
+@@ -1415,7 +1418,7 @@ EOF
    check_cc <<EOF
  unsigned int e = 'O'<<24 | '2'<<16 | 'B'<<8 | 'E';
  EOF
@@ -59,7 +50,7 @@ Detect NetBSD ARMv7 hardfloat toolchain.
          grep '4f *32 *42 *45' >/dev/null 2>&1 && enable_feature big_endian
  
      # Try to find which inline keywords are supported
-@@ -1354,11 +1357,33 @@ EOF
+@@ -1431,11 +1434,33 @@ EOF
        *-android-gcc)
          ;;
        *)
diff --git a/multimedia/libvpx/patches/patch-build_make_gen_asm_deps.sh b/multimedia/libvpx/patches/patch-build_make_gen_asm_deps.sh
index 0c1b6868f4f..38fdf98bf0d 100644
--- a/multimedia/libvpx/patches/patch-build_make_gen_asm_deps.sh
+++ b/multimedia/libvpx/patches/patch-build_make_gen_asm_deps.sh
@@ -1,18 +1,12 @@
-$NetBSD: patch-build_make_gen_asm_deps.sh,v 1.3 2015/11/18 14:09:25 ryoon Exp $
+$NetBSD: patch-build_make_gen_asm_deps.sh,v 1.4 2016/08/16 23:53:25 ryoon Exp $
 
 Fix build problems under Mac OS X with Xcode 4.4 and newer. Patch
 taken from here:
 
 https://github.com/mxcl/homebrew/issues/12567#issuecomment-6434000
 
---- build/make/gen_asm_deps.sh.orig	2015-11-09 22:12:38.000000000 +0000
+--- build/make/gen_asm_deps.sh.orig	2016-07-21 01:15:41.000000000 +0000
 +++ build/make/gen_asm_deps.sh
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/usr/pkg/bin/bash
- ##
- ##  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
- ##
 @@ -42,7 +42,7 @@ done
  
  [ -n "$srcfile" ] || show_help
diff --git a/multimedia/libvpx/patches/patch-configure b/multimedia/libvpx/patches/patch-configure
index 80807f06b59..369533e02c6 100644
--- a/multimedia/libvpx/patches/patch-configure
+++ b/multimedia/libvpx/patches/patch-configure
@@ -1,6 +1,6 @@
-$NetBSD: patch-configure,v 1.3 2015/11/18 14:09:25 ryoon Exp $
+$NetBSD: patch-configure,v 1.4 2016/08/16 23:53:25 ryoon Exp $
 
---- configure.orig	2015-11-09 22:12:38.000000000 +0000
+--- configure.orig	2016-07-21 01:15:41.000000000 +0000
 +++ configure
 @@ -1,4 +1,4 @@
 -#!/bin/sh
@@ -8,15 +8,15 @@ $NetBSD: patch-configure,v 1.3 2015/11/18 14:09:25 ryoon Exp $
  ##
  ##  configure
  ##
-@@ -111,6 +111,7 @@ all_platforms="${all_platforms} armv7-wi
- all_platforms="${all_platforms} armv7s-darwin-gcc"
+@@ -114,6 +114,7 @@ all_platforms="${all_platforms} armv7s-d
+ all_platforms="${all_platforms} armv8-linux-gcc"
  all_platforms="${all_platforms} mips32-linux-gcc"
  all_platforms="${all_platforms} mips64-linux-gcc"
 +all_platforms="${all_platforms} sparc-linux-gcc"
  all_platforms="${all_platforms} sparc-solaris-gcc"
  all_platforms="${all_platforms} x86-android-gcc"
  all_platforms="${all_platforms} x86-darwin8-gcc"
-@@ -176,19 +177,6 @@ if [ "`cd \"${source_path}\" && pwd`" !=
+@@ -181,19 +182,6 @@ if [ "`cd \"${source_path}\" && pwd`" !=
    fi
  fi
  
@@ -34,5 +34,5 @@ $NetBSD: patch-configure,v 1.3 2015/11/18 14:09:25 ryoon Exp $
 -fi
 -
  # disable codecs when their source directory does not exist
- [ -d "${source_path}/vp8" ] || disable_feature vp8
- [ -d "${source_path}/vp9" ] || disable_feature vp9
+ [ -d "${source_path}/vp8" ] || disable_codec vp8
+ [ -d "${source_path}/vp9" ] || disable_codec vp9
diff --git a/multimedia/libvpx/patches/patch-test_sixtap__predict__test.cc b/multimedia/libvpx/patches/patch-test_sixtap__predict__test.cc
index 5b50b83e137..c70ca98634e 100644
--- a/multimedia/libvpx/patches/patch-test_sixtap__predict__test.cc
+++ b/multimedia/libvpx/patches/patch-test_sixtap__predict__test.cc
@@ -1,8 +1,8 @@
-$NetBSD: patch-test_sixtap__predict__test.cc,v 1.2 2015/06/30 09:53:17 ryoon Exp $
+$NetBSD: patch-test_sixtap__predict__test.cc,v 1.3 2016/08/16 23:53:25 ryoon Exp $
 
---- test/sixtap_predict_test.cc.orig	2015-04-03 18:49:19.000000000 +0000
+--- test/sixtap_predict_test.cc.orig	2016-07-21 01:15:41.000000000 +0000
 +++ test/sixtap_predict_test.cc
-@@ -30,7 +30,11 @@ typedef void (*SixtapPredictFunc)(uint8_
+@@ -32,7 +32,11 @@ typedef void (*SixtapPredictFunc)(uint8_
                                    uint8_t *dst_ptr,
                                    int dst_pitch);
  
@@ -14,7 +14,7 @@ $NetBSD: patch-test_sixtap__predict__test.cc,v 1.2 2015/06/30 09:53:17 ryoon Exp
  
  class SixtapPredictTest
      : public ::testing::TestWithParam<SixtapPredictParam> {
-@@ -182,7 +186,11 @@ TEST_P(SixtapPredictTest, TestWithRandom
+@@ -184,7 +188,11 @@ TEST_P(SixtapPredictTest, TestWithRandom
    }
  }
  
@@ -24,5 +24,5 @@ $NetBSD: patch-test_sixtap__predict__test.cc,v 1.2 2015/06/30 09:53:17 ryoon Exp
  using std::tr1::make_tuple;
 +#endif
  
- const SixtapPredictFunc sixtap_16x16_c = vp8_sixtap_predict16x16_c;
- const SixtapPredictFunc sixtap_8x8_c = vp8_sixtap_predict8x8_c;
+ INSTANTIATE_TEST_CASE_P(
+     C, SixtapPredictTest, ::testing::Values(