Update to 1.5.0

* Fix HOMEPAGE

Changelog:
2015-11-09 v1.5.0 "Javan Whistling Duck"
  This release improves upon the VP9 encoder and speeds up the encoding and
  decoding processes.

  - Upgrading:
    This release is ABI incompatible with 1.4.0. It drops deprecated VP8
    controls and adds a variety of VP9 controls for testing.

    The vpxenc utility now prefers VP9 by default.

  - Enhancements:
    Faster VP9 encoding and decoding
    Smaller library size by combining functions used by VP8 and VP9

  - Bug Fixes:
    A variety of fuzzing issues

10 files changed, 126 insertions, 101 deletions

diff --git a/multimedia/libvpx/Makefile b/multimedia/libvpx/Makefile
index 7d8529358b4..d23200de970 100644
--- a/multimedia/libvpx/Makefile
+++ b/multimedia/libvpx/Makefile
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.60 2015/11/08 15:08:00 sevan Exp $
+# $NetBSD: Makefile,v 1.61 2015/11/18 14:09:25 ryoon Exp $
 
-DISTNAME=	libvpx-1.4.0
+DISTNAME=	libvpx-1.5.0
 CATEGORIES=	multimedia
-PKGREVISION=	1
 MASTER_SITES=	${MASTER_SITE_GITHUB:=webmproject/}
 GITHUB_PROJECT=	libvpx
 GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	ryoon@NetBSD.org
-HOMEPAGE=	http://code.google.com/p/webm/
+HOMEPAGE=	https://chromium.googlesource.com/webm/libvpx
 COMMENT=	On2 VP8 library from Google
 LICENSE=	modified-bsd
 
diff --git a/multimedia/libvpx/buildlink3.mk b/multimedia/libvpx/buildlink3.mk
index 3110c378c3b..7555e30f7e6 100644
--- a/multimedia/libvpx/buildlink3.mk
+++ b/multimedia/libvpx/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.3 2015/06/30 09:53:17 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2015/11/18 14:09:25 ryoon Exp $
 
 BUILDLINK_TREE+=	libvpx
 
 .if !defined(LIBVPX_BUILDLINK3_MK)
 LIBVPX_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libvpx+=	libvpx>=1.4.0
-BUILDLINK_ABI_DEPENDS.libvpx+=	libvpx>=1.4.0
+BUILDLINK_API_DEPENDS.libvpx+=	libvpx>=1.5.0
+BUILDLINK_ABI_DEPENDS.libvpx+=	libvpx>=1.5.0
 BUILDLINK_PKGSRCDIR.libvpx?=	../../multimedia/libvpx
 
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/multimedia/libvpx/distinfo b/multimedia/libvpx/distinfo
index 70c51b3a5af..6aececca08a 100644
--- a/multimedia/libvpx/distinfo
+++ b/multimedia/libvpx/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.30 2015/11/03 23:54:29 agc Exp $
+$NetBSD: distinfo,v 1.31 2015/11/18 14:09:25 ryoon Exp $
 
-SHA1 (libvpx-1.4.0.tar.gz) = 01dac42fffd20b59ebaec5ec1d2f10b991d5ce63
-RMD160 (libvpx-1.4.0.tar.gz) = 42e5e29b1ac70730856b1a07c95c6f5302d2290c
-SHA512 (libvpx-1.4.0.tar.gz) = a3ce308cf193b80c25a96da467e771a1ab9615f4c12d6c00f14c895b9d455d0c3bf556e3f187bc0e58df1905f1ca59a2ac6fa82bc079311ad22cfd6c422a40a6
-Size (libvpx-1.4.0.tar.gz) = 2300044 bytes
-SHA1 (patch-aa) = 698114b0d5210a5905bd10b9273c2037b455fe9e
-SHA1 (patch-ab) = dfd61002748f01a5651dc58ce6f67a9906f9a456
-SHA1 (patch-ac) = 2086b1896c6c6a23ba7da75824375fae0bdb97d1
-SHA1 (patch-ad) = b2e204f131d908dd6592aa8e40ebfbf095282be2
-SHA1 (patch-build_make_gen_asm_deps.sh) = db7f9abcf1bdd1ccb8e48c695de3f2276bb5f891
-SHA1 (patch-configure) = de25f725eb4fb693b663022fdc977ed87c1863cd
-SHA1 (patch-test_sad__test.cc) = dc5c55bb7f7be062fc8195fd16bcccff46edec28
+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 (patch-aa) = 297ef73d6491a70888c9e887424c009627d55400
+SHA1 (patch-ab) = 45983c6d5324486a554b55cdac635a96465cfa41
+SHA1 (patch-ac) = 17410f43ff9952d616be3211ca697f37c107610a
+SHA1 (patch-ad) = 0923ba943c77486f750b1ade43a9c20fedc08da1
+SHA1 (patch-build_make_gen_asm_deps.sh) = 1895c974c2c0c3e28a689ad449e13b92ce5f01e8
+SHA1 (patch-configure) = 2fb02f1ffe196e508f5738a6b0170f8d4f06f070
+SHA1 (patch-test_sad__test.cc) = 139852577c9331860094d1822c8597e524bec842
 SHA1 (patch-test_sixtap__predict__test.cc) = 12e195c60a25a98e85f215d3726b571da2d67940
diff --git a/multimedia/libvpx/patches/patch-aa b/multimedia/libvpx/patches/patch-aa
index 81d58e8bac6..3eb63642e02 100644
--- a/multimedia/libvpx/patches/patch-aa
+++ b/multimedia/libvpx/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.9 2015/06/30 09:53:17 ryoon Exp $
+$NetBSD: patch-aa,v 1.10 2015/11/18 14:09:25 ryoon Exp $
 
---- build/make/Makefile.orig	2015-04-03 18:49:19.000000000 +0000
+--- build/make/Makefile.orig	2015-11-09 22:12:38.000000000 +0000
 +++ build/make/Makefile
-@@ -147,7 +147,7 @@ $(BUILD_PFX)%.c.d: %.c
+@@ -151,7 +151,7 @@ $(BUILD_PFX)%.c.d: %.c
  $(BUILD_PFX)%.c.o: %.c
  	$(if $(quiet),@echo "    [CC] $@")
  	$(qexec)$(if $(CONFIG_DEPENDENCY_TRACKING),,mkdir -p $(dir $@))
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.9 2015/06/30 09:53:17 ryoon Exp $
  
  $(BUILD_PFX)%.cc.d: %.cc
  	$(if $(quiet),@echo "    [DEP] $@")
-@@ -157,7 +157,7 @@ $(BUILD_PFX)%.cc.d: %.cc
+@@ -161,7 +161,7 @@ $(BUILD_PFX)%.cc.d: %.cc
  $(BUILD_PFX)%.cc.o: %.cc
  	$(if $(quiet),@echo "    [CXX] $@")
  	$(qexec)$(if $(CONFIG_DEPENDENCY_TRACKING),,mkdir -p $(dir $@))
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.9 2015/06/30 09:53:17 ryoon Exp $
  
  $(BUILD_PFX)%.cpp.d: %.cpp
  	$(if $(quiet),@echo "    [DEP] $@")
-@@ -167,7 +167,7 @@ $(BUILD_PFX)%.cpp.d: %.cpp
+@@ -171,7 +171,7 @@ $(BUILD_PFX)%.cpp.d: %.cpp
  $(BUILD_PFX)%.cpp.o: %.cpp
  	$(if $(quiet),@echo "    [CXX] $@")
  	$(qexec)$(if $(CONFIG_DEPENDENCY_TRACKING),,mkdir -p $(dir $@))
@@ -29,7 +29,7 @@ $NetBSD: patch-aa,v 1.9 2015/06/30 09:53:17 ryoon Exp $
  
  $(BUILD_PFX)%.asm.d: %.asm
  	$(if $(quiet),@echo "    [DEP] $@")
-@@ -178,7 +178,8 @@ $(BUILD_PFX)%.asm.d: %.asm
+@@ -182,7 +182,8 @@ $(BUILD_PFX)%.asm.d: %.asm
  $(BUILD_PFX)%.asm.o: %.asm
  	$(if $(quiet),@echo "    [AS] $@")
  	$(qexec)$(if $(CONFIG_DEPENDENCY_TRACKING),,mkdir -p $(dir $@))
@@ -39,7 +39,7 @@ $NetBSD: patch-aa,v 1.9 2015/06/30 09:53:17 ryoon Exp $
  
  $(BUILD_PFX)%.s.d: %.s
  	$(if $(quiet),@echo "    [DEP] $@")
-@@ -189,7 +190,8 @@ $(BUILD_PFX)%.s.d: %.s
+@@ -193,7 +194,8 @@ $(BUILD_PFX)%.s.d: %.s
  $(BUILD_PFX)%.s.o: %.s
  	$(if $(quiet),@echo "    [AS] $@")
  	$(qexec)$(if $(CONFIG_DEPENDENCY_TRACKING),,mkdir -p $(dir $@))
@@ -49,7 +49,7 @@ $NetBSD: patch-aa,v 1.9 2015/06/30 09:53:17 ryoon Exp $
  
  .PRECIOUS: %.c.S
  %.c.S: CFLAGS += -DINLINE_ASM
-@@ -254,13 +256,15 @@ define linker_template
+@@ -258,13 +260,15 @@ define linker_template
  $(1): $(filter-out -%,$(2))
  $(1):
  	$(if $(quiet),@echo    "    [LD] $$@")
@@ -67,7 +67,7 @@ $NetBSD: patch-aa,v 1.9 2015/06/30 09:53:17 ryoon Exp $
  endef
  # make-3.80 has a bug with expanding large input strings to the eval function,
  # which was triggered in some cases by the following component of
-@@ -273,8 +277,12 @@ endef
+@@ -277,8 +281,12 @@ endef
  define install_map_template
  $(DIST_DIR)/$(1): $(2)
  	$(if $(quiet),@echo "    [INSTALL] $$@")
@@ -82,18 +82,18 @@ $NetBSD: patch-aa,v 1.9 2015/06/30 09:53:17 ryoon Exp $
  endef
  
  define archive_template
-@@ -283,7 +291,9 @@ define archive_template
+@@ -287,7 +295,9 @@ define archive_template
  # for creating them.
  $(1):
  	$(if $(quiet),@echo "    [AR] $$@")
--	$(qexec)$$(AR) $$(ARFLAGS) $$@ $$?
+-	$(qexec)$$(AR) $$(ARFLAGS) $$@ $$^
 +	$(qexec)${LIBTOOL} --mode=link $(CC) $(LDFLAGS) -Wl,-Bsymbolic -o $$(patsubst %.a,%.la,$$@) \
 +		$$(patsubst %.o,%.lo,$$?) -rpath $(PREFIX)/lib $$(extralibs) \
 +		-version-info $(VERSION_MAJOR):$(VERSION_MINOR):$(VERSION_PATCH)
  endef
  
  define so_template
-@@ -380,9 +390,9 @@ clean::
+@@ -381,9 +391,9 @@ clean::
  	rm -f .bins .install-bins $(BINS)
  
  LIBS=$(call enabled,LIBS)
@@ -104,8 +104,8 @@ $NetBSD: patch-aa,v 1.9 2015/06/30 09:53:17 ryoon Exp $
 +$(foreach lib,$(filter %.a,$(LIBS)),$(eval $(call archive_template,$(lib))))
  $(foreach lib,$(filter %so.$(SO_VERSION_MAJOR).$(SO_VERSION_MINOR).$(SO_VERSION_PATCH),$(LIBS)),$(eval $(call so_template,$(lib))))
  $(foreach lib,$(filter %$(SO_VERSION_MAJOR).dylib,$(LIBS)),$(eval $(call dl_template,$(lib))))
- 
-@@ -390,11 +400,11 @@ INSTALL-LIBS=$(call cond_enabled,CONFIG_
+ $(foreach lib,$(filter %$(SO_VERSION_MAJOR).dll,$(LIBS)),$(eval $(call dll_template,$(lib))))
+@@ -392,11 +402,11 @@ INSTALL-LIBS=$(call cond_enabled,CONFIG_
  ifeq ($(MAKECMDGOALS),dist)
  INSTALL-LIBS+=$(call cond_enabled,CONFIG_INSTALL_LIBS,DIST-LIBS)
  endif
@@ -119,7 +119,7 @@ $NetBSD: patch-aa,v 1.9 2015/06/30 09:53:17 ryoon Exp $
  
  ifeq ($(CONFIG_EXTERNAL_BUILD),yes)
  PROJECTS=$(call enabled,PROJECTS)
-@@ -445,7 +455,7 @@ ifeq ($(CONFIG_EXTERNAL_BUILD),yes)
+@@ -447,7 +457,7 @@ ifeq ($(CONFIG_EXTERNAL_BUILD),yes)
      BUILD_TARGETS += .projects
      INSTALL_TARGETS += .install-projects
  endif
diff --git a/multimedia/libvpx/patches/patch-ab b/multimedia/libvpx/patches/patch-ab
index 273e10c5cab..e3c523fa3bf 100644
--- a/multimedia/libvpx/patches/patch-ab
+++ b/multimedia/libvpx/patches/patch-ab
@@ -1,15 +1,23 @@
-$NetBSD: patch-ab,v 1.5 2014/01/02 15:18:01 ryoon Exp $
+$NetBSD: patch-ab,v 1.6 2015/11/18 14:09:25 ryoon Exp $
 
---- libs.mk.orig	2013-12-17 17:05:28.000000000 +0000
+--- libs.mk.orig	2015-11-09 22:12:38.000000000 +0000
 +++ libs.mk
-@@ -259,8 +259,8 @@ endif
+@@ -200,7 +200,6 @@ INSTALL-LIBS-$(CONFIG_SHARED) += $(forea
+ endif
+ else
+ INSTALL-LIBS-$(CONFIG_STATIC) += $(LIBSUBDIR)/libvpx.a
+-INSTALL-LIBS-$(CONFIG_DEBUG_LIBS) += $(LIBSUBDIR)/libvpx_g.a
+ endif
+ 
+ CODEC_SRCS=$(call enabled,CODEC_SRCS)
+@@ -257,8 +256,8 @@ endif
  else
  LIBVPX_OBJS=$(call objs,$(CODEC_SRCS))
- OBJS-$(BUILD_LIBVPX) += $(LIBVPX_OBJS)
--LIBS-$(if $(BUILD_LIBVPX),$(CONFIG_STATIC)) += $(BUILD_PFX)libvpx.a $(BUILD_PFX)libvpx_g.a
+ OBJS-yes += $(LIBVPX_OBJS)
+-LIBS-$(if yes,$(CONFIG_STATIC)) += $(BUILD_PFX)libvpx.a $(BUILD_PFX)libvpx_g.a
 -$(BUILD_PFX)libvpx_g.a: $(LIBVPX_OBJS)
-+LIBS-$(if $(BUILD_LIBVPX),$(CONFIG_STATIC)) += $(BUILD_PFX)libvpx.a
++LIBS-$(if yes,$(CONFIG_STATIC)) += $(BUILD_PFX)libvpx.a
 +$(BUILD_PFX)libvpx.a: $(LIBVPX_OBJS)
  
- 
- BUILD_LIBVPX_SO         := $(if $(BUILD_LIBVPX),$(CONFIG_SHARED))
+ SO_VERSION_MAJOR := 3
+ SO_VERSION_MINOR := 0
diff --git a/multimedia/libvpx/patches/patch-ac b/multimedia/libvpx/patches/patch-ac
index 7b311056d39..2d3c7f97c62 100644
--- a/multimedia/libvpx/patches/patch-ac
+++ b/multimedia/libvpx/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.4 2014/01/02 15:18:01 ryoon Exp $
+$NetBSD: patch-ac,v 1.5 2015/11/18 14:09:25 ryoon Exp $
 
---- examples.mk.orig	2013-12-17 17:05:28.000000000 +0000
+--- examples.mk.orig	2015-11-09 22:12:38.000000000 +0000
 +++ examples.mk
-@@ -192,7 +192,7 @@ BINS-$(NOT_MSVS)           += $(addprefi
- # Instantiate linker template for all examples.
- CODEC_LIB=$(if $(CONFIG_DEBUG_LIBS),vpx_g,vpx)
- SHARED_LIB_SUF=$(if $(filter darwin%,$(TGT_OS)),.dylib,.so)
+@@ -294,7 +294,7 @@ else
+ SHARED_LIB_SUF=.so
+ endif
+ endif
 -CODEC_LIB_SUF=$(if $(CONFIG_SHARED),$(SHARED_LIB_SUF),.a)
 +CODEC_LIB_SUF=$(if $(CONFIG_SHARED),$(SHARED_LIB_SUF),.la)
  $(foreach bin,$(BINS-yes),\
-     $(if $(BUILD_OBJS),$(eval $(bin):\
-         $(LIB_PATH)/lib$(CODEC_LIB)$(CODEC_LIB_SUF)))\
+     $(eval $(bin):$(LIB_PATH)/lib$(CODEC_LIB)$(CODEC_LIB_SUF))\
+     $(eval $(call linker_template,$(bin),\
diff --git a/multimedia/libvpx/patches/patch-ad b/multimedia/libvpx/patches/patch-ad
index 89d7cdac34c..32e9d424116 100644
--- a/multimedia/libvpx/patches/patch-ad
+++ b/multimedia/libvpx/patches/patch-ad
@@ -1,13 +1,19 @@
-$NetBSD: patch-ad,v 1.18 2015/07/06 09:46:36 martin Exp $
+$NetBSD: patch-ad,v 1.19 2015/11/18 14:09: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-04-03 18:49:19.000000000 +0000
+--- build/make/configure.sh.orig	2015-11-09 22:12:38.000000000 +0000
 +++ build/make/configure.sh
-@@ -626,7 +626,7 @@ process_common_toolchain() {
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/usr/pkg/bin/bash
+ ##
+ ##  configure.sh
+ ##
+@@ -647,7 +647,7 @@ process_common_toolchain() {
        armv6*)
          tgt_isa=armv6
          ;;
@@ -16,7 +22,7 @@ Detect NetBSD ARMv7 hardfloat toolchain.
          tgt_isa=armv7
          float_abi=hard
          ;;
-@@ -688,7 +688,7 @@ process_common_toolchain() {
+@@ -695,7 +695,7 @@ process_common_toolchain() {
          [ -z "$tgt_isa" ] && tgt_isa=x86
          tgt_os=win32
          ;;
@@ -25,7 +31,7 @@ Detect NetBSD ARMv7 hardfloat toolchain.
          tgt_os=linux
          ;;
        *solaris2.10)
-@@ -731,6 +731,9 @@ process_common_toolchain() {
+@@ -738,6 +738,9 @@ process_common_toolchain() {
      mips*)
        enable_feature mips
        ;;
@@ -35,7 +41,7 @@ Detect NetBSD ARMv7 hardfloat toolchain.
    esac
  
    # PIC is probably what we want when building shared libs
-@@ -831,7 +834,7 @@ process_common_toolchain() {
+@@ -869,7 +872,7 @@ process_common_toolchain() {
  
        case ${tgt_cc} in
          gcc)
@@ -44,16 +50,7 @@ Detect NetBSD ARMv7 hardfloat toolchain.
            link_with_cc=gcc
            setup_gnu_toolchain
            arch_int=${tgt_isa##armv}
-@@ -1041,8 +1044,6 @@ EOF
-         check_add_cflags -mips32r2 -mdspr2
-         disable_feature fast_unaligned
-       fi
--      check_add_cflags -march=${tgt_isa}
--      check_add_asflags -march=${tgt_isa}
-       check_add_asflags -KPIC
-       ;;
-     ppc*)
-@@ -1280,7 +1281,7 @@ EOF
+@@ -1338,7 +1341,7 @@ EOF
    check_cc <<EOF
  unsigned int e = 'O'<<24 | '2'<<16 | 'B'<<8 | 'E';
  EOF
@@ -62,7 +59,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
-@@ -1296,11 +1297,33 @@ EOF
+@@ -1354,11 +1357,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 a385e10d863..0c1b6868f4f 100644
--- a/multimedia/libvpx/patches/patch-build_make_gen_asm_deps.sh
+++ b/multimedia/libvpx/patches/patch-build_make_gen_asm_deps.sh
@@ -1,12 +1,18 @@
-$NetBSD: patch-build_make_gen_asm_deps.sh,v 1.2 2013/09/11 15:50:32 ryoon Exp $
+$NetBSD: patch-build_make_gen_asm_deps.sh,v 1.3 2015/11/18 14:09: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	2013-09-04 18:49:22.000000000 +0000
+--- build/make/gen_asm_deps.sh.orig	2015-11-09 22:12:38.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 60405934889..80807f06b59 100644
--- a/multimedia/libvpx/patches/patch-configure
+++ b/multimedia/libvpx/patches/patch-configure
@@ -1,12 +1,38 @@
-$NetBSD: patch-configure,v 1.2 2014/01/02 15:18:01 ryoon Exp $
+$NetBSD: patch-configure,v 1.3 2015/11/18 14:09:25 ryoon Exp $
 
---- configure.orig	2013-12-17 17:05:28.000000000 +0000
+--- configure.orig	2015-11-09 22:12:38.000000000 +0000
 +++ configure
-@@ -108,6 +108,7 @@ all_platforms="${all_platforms} ppc32-li
- all_platforms="${all_platforms} ppc64-darwin8-gcc"
- all_platforms="${all_platforms} ppc64-darwin9-gcc"
- all_platforms="${all_platforms} ppc64-linux-gcc"
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/usr/pkg/bin/bash
+ ##
+ ##  configure
+ ##
+@@ -111,6 +111,7 @@ all_platforms="${all_platforms} armv7-wi
+ all_platforms="${all_platforms} armv7s-darwin-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`" !=
+   fi
+ fi
+ 
+-# check installed doxygen version
+-doxy_version=$(doxygen --version 2>/dev/null)
+-doxy_major=${doxy_version%%.*}
+-if [ ${doxy_major:-0} -ge 1 ]; then
+-    doxy_version=${doxy_version#*.}
+-    doxy_minor=${doxy_version%%.*}
+-    doxy_patch=${doxy_version##*.}
+-
+-    [ $doxy_major -gt 1 ] && enable_feature doxygen
+-    [ $doxy_minor -gt 5 ] && enable_feature doxygen
+-    [ $doxy_minor -eq 5 ] && [ $doxy_patch -ge 3 ] && enable_feature doxygen
+-fi
+-
+ # disable codecs when their source directory does not exist
+ [ -d "${source_path}/vp8" ] || disable_feature vp8
+ [ -d "${source_path}/vp9" ] || disable_feature vp9
diff --git a/multimedia/libvpx/patches/patch-test_sad__test.cc b/multimedia/libvpx/patches/patch-test_sad__test.cc
index f5b6149df67..129e7c258ec 100644
--- a/multimedia/libvpx/patches/patch-test_sad__test.cc
+++ b/multimedia/libvpx/patches/patch-test_sad__test.cc
@@ -1,37 +1,26 @@
-$NetBSD: patch-test_sad__test.cc,v 1.3 2015/06/30 09:53:17 ryoon Exp $
+$NetBSD: patch-test_sad__test.cc,v 1.4 2015/11/18 14:09:25 ryoon Exp $
 
---- test/sad_test.cc.orig	2015-04-03 18:49:19.000000000 +0000
+--- test/sad_test.cc.orig	2015-11-09 22:12:38.000000000 +0000
 +++ test/sad_test.cc
-@@ -36,28 +36,44 @@ typedef unsigned int (*SadMxNFunc)(const
-                                    const unsigned char *reference_ptr,
-                                    int reference_stride,
-                                    unsigned int max_sad);
+@@ -29,21 +29,33 @@ typedef unsigned int (*SadMxNFunc)(const
+                                    int src_stride,
+                                    const uint8_t *ref_ptr,
+                                    int ref_stride);
 +#if __cplusplus >= 201103L
 +typedef std::tuple<int, int, SadMxNFunc, int> SadMxNParam;
 +#else
  typedef std::tr1::tuple<int, int, SadMxNFunc, int> SadMxNParam;
- #endif
 +#endif
- #if CONFIG_VP9_ENCODER
- typedef unsigned int (*SadMxNVp9Func)(const unsigned char *source_ptr,
-                                       int source_stride,
-                                       const unsigned char *reference_ptr,
-                                       int reference_stride);
-+#if __cplusplus >= 201103L
-+typedef std::tuple<int, int, SadMxNVp9Func, int> SadMxNVp9Param;
-+#else
- typedef std::tr1::tuple<int, int, SadMxNVp9Func, int> SadMxNVp9Param;
-+#endif
- typedef uint32_t (*SadMxNAvgVp9Func)(const uint8_t *source_ptr,
-                                      int source_stride,
-                                      const uint8_t *reference_ptr,
-                                      int reference_stride,
-                                      const uint8_t *second_pred);
+ 
+ typedef uint32_t (*SadMxNAvgFunc)(const uint8_t *src_ptr,
+                                   int src_stride,
+                                   const uint8_t *ref_ptr,
+                                   int ref_stride,
+                                   const uint8_t *second_pred);
 +#if __cplusplus >= 201103L
-+typedef std::tuple<int, int, SadMxNAvgVp9Func, int> SadMxNAvgVp9Param;
++typedef std::tuple<int, int, SadMxNAvgFunc, int> SadMxNAvgParam;
 +#else
- typedef std::tr1::tuple<int, int, SadMxNAvgVp9Func, int> SadMxNAvgVp9Param;
- #endif
+ typedef std::tr1::tuple<int, int, SadMxNAvgFunc, int> SadMxNAvgParam;
 +#endif
  
  typedef void (*SadMxNx4Func)(const uint8_t *src_ptr,
@@ -47,7 +36,7 @@ $NetBSD: patch-test_sad__test.cc,v 1.3 2015/06/30 09:53:17 ryoon Exp $
  
  using libvpx_test::ACMRandom;
  
-@@ -637,7 +653,11 @@ TEST_P(SADx4Test, SrcAlignedByWidth) {
+@@ -480,7 +492,11 @@ TEST_P(SADx4Test, SrcAlignedByWidth) {
    source_data_ = tmp_source_data;
  }