Update to 1.4.0

Changelog:
2015-04-03 v1.4.0 "Indian Runner Duck"
  This release includes significant improvements to the VP9 codec.

  - Upgrading:
    This release is ABI incompatible with 1.3.0. It drops the compatibility
    layer, requiring VPX_IMG_FMT_* instead of IMG_FMT_*, and adds several codec
    controls for VP9.

  - Enhancements:
    Faster VP9 encoding and decoding
    Multithreaded VP9 decoding (tile and frame-based)
    Multithreaded VP9 encoding - on by default
    YUV 4:2:2 and 4:4:4 support in VP9
    10 and 12bit support in VP9
    64bit ARM support by replacing ARM assembly with intrinsics

  - Bug Fixes:
    Fixes a VP9 bitstream issue in Profile 1. This only affected non-YUV 4:2:0
    files.

  - Known Issues:
    Frame Parallel decoding fails for segmented and non-420 files.

12 files changed, 195 insertions, 190 deletions

diff --git a/multimedia/libvpx/Makefile b/multimedia/libvpx/Makefile
index 50282e88ad4..5e35127e675 100644
--- a/multimedia/libvpx/Makefile
+++ b/multimedia/libvpx/Makefile
@@ -1,19 +1,16 @@
-# $NetBSD: Makefile,v 1.55 2015/06/12 10:50:38 wiz Exp $
+# $NetBSD: Makefile,v 1.56 2015/06/30 09:53:17 ryoon Exp $
 
-DISTNAME=	libvpx_1.3.0.orig
-PKGNAME=	${DISTNAME:S/_/-/:S/.orig//}
-PKGREVISION=	4
+DISTNAME=	libvpx-1.4.0
 CATEGORIES=	multimedia
-MASTER_SITES=	${MASTER_SITE_DEBIAN:=pool/main/libv/libvpx/}
-EXTRACT_SUFX=	.tar.bz2
+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/
 COMMENT=	On2 VP8 library from Google
 LICENSE=	modified-bsd
 
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
-
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake bash:build perl:build
diff --git a/multimedia/libvpx/PLIST b/multimedia/libvpx/PLIST
index 59302587858..885ab7ad049 100644
--- a/multimedia/libvpx/PLIST
+++ b/multimedia/libvpx/PLIST
@@ -1,15 +1,13 @@
-@comment $NetBSD: PLIST,v 1.5 2014/01/02 15:18:01 ryoon Exp $
-bin/vp8_scalable_patterns
-bin/vp9_spatial_scalable_encoder
+@comment $NetBSD: PLIST,v 1.6 2015/06/30 09:53:17 ryoon Exp $
 bin/vpxdec
 bin/vpxenc
-include/vpx/svc_context.h
 include/vpx/vp8.h
 include/vpx/vp8cx.h
 include/vpx/vp8dx.h
 include/vpx/vpx_codec.h
 include/vpx/vpx_decoder.h
 include/vpx/vpx_encoder.h
+include/vpx/vpx_frame_buffer.h
 include/vpx/vpx_image.h
 include/vpx/vpx_integer.h
 lib/libvpx.la
diff --git a/multimedia/libvpx/buildlink3.mk b/multimedia/libvpx/buildlink3.mk
index c29168391d0..3110c378c3b 100644
--- a/multimedia/libvpx/buildlink3.mk
+++ b/multimedia/libvpx/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.2 2012/01/31 11:53:51 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2015/06/30 09:53:17 ryoon Exp $
 
 BUILDLINK_TREE+=	libvpx
 
 .if !defined(LIBVPX_BUILDLINK3_MK)
 LIBVPX_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libvpx+=	libvpx>=0.9.2
-BUILDLINK_ABI_DEPENDS.libvpx+=	libvpx>=1.0.0
+BUILDLINK_API_DEPENDS.libvpx+=	libvpx>=1.4.0
+BUILDLINK_ABI_DEPENDS.libvpx+=	libvpx>=1.4.0
 BUILDLINK_PKGSRCDIR.libvpx?=	../../multimedia/libvpx
 
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/multimedia/libvpx/distinfo b/multimedia/libvpx/distinfo
index cb8d67cf6ef..5eb879f3338 100644
--- a/multimedia/libvpx/distinfo
+++ b/multimedia/libvpx/distinfo
@@ -1,17 +1,13 @@
-$NetBSD: distinfo,v 1.27 2015/06/29 21:09:11 markd Exp $
+$NetBSD: distinfo,v 1.28 2015/06/30 09:53:17 ryoon Exp $
 
-SHA1 (libvpx_1.3.0.orig.tar.bz2) = fd90afbdba7905b9b3ab6c707c41369627d208e9
-RMD160 (libvpx_1.3.0.orig.tar.bz2) = f90e26d7657b26d8a3bdba82c55db5ecafc23835
-Size (libvpx_1.3.0.orig.tar.bz2) = 2077846 bytes
-SHA1 (patch-aa) = a34e812f51c9fbd6ae99d48d1e23bcf922cf0ac0
+SHA1 (libvpx-1.4.0.tar.gz) = 01dac42fffd20b59ebaec5ec1d2f10b991d5ce63
+RMD160 (libvpx-1.4.0.tar.gz) = 42e5e29b1ac70730856b1a07c95c6f5302d2290c
+Size (libvpx-1.4.0.tar.gz) = 2300044 bytes
+SHA1 (patch-aa) = 698114b0d5210a5905bd10b9273c2037b455fe9e
 SHA1 (patch-ab) = dfd61002748f01a5651dc58ce6f67a9906f9a456
 SHA1 (patch-ac) = 2086b1896c6c6a23ba7da75824375fae0bdb97d1
-SHA1 (patch-ad) = e63453d0d13ddbcbf243ece9818bbc9e1bd174b5
-SHA1 (patch-af) = 3eb0c222433a62d044e712f572000d97b1d635a3
+SHA1 (patch-ad) = 43594eb43650b31c59d9e620233ed8a613e3490f
 SHA1 (patch-build_make_gen_asm_deps.sh) = db7f9abcf1bdd1ccb8e48c695de3f2276bb5f891
 SHA1 (patch-configure) = de25f725eb4fb693b663022fdc977ed87c1863cd
-SHA1 (patch-nestegg_halloc_src_align.h) = 8ad126c493be4c075c7c1a2d93f2a11f3ce4fd53
-SHA1 (patch-nestegg_halloc_src_halloc.c) = 0d2f7438d718b6ceb83fe11c05c86103e507128c
-SHA1 (patch-test_i420__video__source.h) = e67478f08339c4b7f4cccf96e4798d1972941a7c
-SHA1 (patch-test_sad__test.cc) = fb39c0ca4ce5f424d878779a2d58ebe77c41e8b3
-SHA1 (patch-test_sixtap__predict__test.cc) = d803819f3e5d282c3159e4410e7fbbd68cd403be
+SHA1 (patch-test_sad__test.cc) = dc5c55bb7f7be062fc8195fd16bcccff46edec28
+SHA1 (patch-test_sixtap__predict__test.cc) = 12e195c60a25a98e85f215d3726b571da2d67940
diff --git a/multimedia/libvpx/patches/patch-aa b/multimedia/libvpx/patches/patch-aa
index f0c091f5404..81d58e8bac6 100644
--- a/multimedia/libvpx/patches/patch-aa
+++ b/multimedia/libvpx/patches/patch-aa
@@ -1,51 +1,60 @@
-$NetBSD: patch-aa,v 1.8 2014/01/02 15:18:01 ryoon Exp $
+$NetBSD: patch-aa,v 1.9 2015/06/30 09:53:17 ryoon Exp $
 
---- build/make/Makefile.orig	2013-11-18 22:18:52.000000000 +0000
+--- build/make/Makefile.orig	2015-04-03 18:49:19.000000000 +0000
 +++ build/make/Makefile
-@@ -126,7 +126,7 @@ $(BUILD_PFX)%.c.d: %.c
- 
+@@ -147,7 +147,7 @@ $(BUILD_PFX)%.c.d: %.c
  $(BUILD_PFX)%.c.o: %.c
  	$(if $(quiet),@echo "    [CC] $@")
+ 	$(qexec)$(if $(CONFIG_DEPENDENCY_TRACKING),,mkdir -p $(dir $@))
 -	$(qexec)$(CC) $(INTERNAL_CFLAGS) $(CFLAGS) -c -o $@ $<
 +	$(qexec)${LIBTOOL} --mode=compile $(CC) $(INTERNAL_CFLAGS) $(CFLAGS) -c -o $@ $<
  
  $(BUILD_PFX)%.cc.d: %.cc
  	$(if $(quiet),@echo "    [DEP] $@")
-@@ -135,7 +135,7 @@ $(BUILD_PFX)%.cc.d: %.cc
- 
+@@ -157,7 +157,7 @@ $(BUILD_PFX)%.cc.d: %.cc
  $(BUILD_PFX)%.cc.o: %.cc
  	$(if $(quiet),@echo "    [CXX] $@")
+ 	$(qexec)$(if $(CONFIG_DEPENDENCY_TRACKING),,mkdir -p $(dir $@))
 -	$(qexec)$(CXX) $(INTERNAL_CFLAGS) $(CXXFLAGS) -c -o $@ $<
 +	$(qexec)${LIBTOOL} --mode=compile $(CXX) $(INTERNAL_CFLAGS) $(CXXFLAGS) -c -o $@ $<
  
- $(BUILD_PFX)%.asm.d: %.asm
+ $(BUILD_PFX)%.cpp.d: %.cpp
  	$(if $(quiet),@echo "    [DEP] $@")
-@@ -145,7 +145,8 @@ $(BUILD_PFX)%.asm.d: %.asm
+@@ -167,7 +167,7 @@ $(BUILD_PFX)%.cpp.d: %.cpp
+ $(BUILD_PFX)%.cpp.o: %.cpp
+ 	$(if $(quiet),@echo "    [CXX] $@")
+ 	$(qexec)$(if $(CONFIG_DEPENDENCY_TRACKING),,mkdir -p $(dir $@))
+-	$(qexec)$(CXX) $(INTERNAL_CFLAGS) $(CXXFLAGS) -c -o $@ $<
++	$(qexec)${LIBTOOL} --mode=compile $(CXX) $(INTERNAL_CFLAGS) $(CXXFLAGS) -c -o $@ $<
  
+ $(BUILD_PFX)%.asm.d: %.asm
+ 	$(if $(quiet),@echo "    [DEP] $@")
+@@ -178,7 +178,8 @@ $(BUILD_PFX)%.asm.d: %.asm
  $(BUILD_PFX)%.asm.o: %.asm
  	$(if $(quiet),@echo "    [AS] $@")
+ 	$(qexec)$(if $(CONFIG_DEPENDENCY_TRACKING),,mkdir -p $(dir $@))
 -	$(qexec)$(AS) $(ASFLAGS) -o $@ $<
 +	$(qexec)${LIBTOOL} --mode=compile --tag=CC sh strip_fPIC.sh \
 +		$(AS) $(ASFLAGS) -o $@ $<
  
  $(BUILD_PFX)%.s.d: %.s
  	$(if $(quiet),@echo "    [DEP] $@")
-@@ -155,7 +156,8 @@ $(BUILD_PFX)%.s.d: %.s
- 
+@@ -189,7 +190,8 @@ $(BUILD_PFX)%.s.d: %.s
  $(BUILD_PFX)%.s.o: %.s
  	$(if $(quiet),@echo "    [AS] $@")
+ 	$(qexec)$(if $(CONFIG_DEPENDENCY_TRACKING),,mkdir -p $(dir $@))
 -	$(qexec)$(AS) $(ASFLAGS) -o $@ $<
 +	$(qexec)${LIBTOOL} --mode=compile --tag=CC sh strip_fPIC.sh \
 +		$(AS) $(ASFLAGS) -o $@ $<
  
  .PRECIOUS: %.c.S
  %.c.S: CFLAGS += -DINLINE_ASM
-@@ -227,13 +229,15 @@ define linker_template
+@@ -254,13 +256,15 @@ define linker_template
  $(1): $(filter-out -%,$(2))
  $(1):
  	$(if $(quiet),@echo    "    [LD] $$@")
 -	$(qexec)$$(LD) $$(strip $$(INTERNAL_LDFLAGS) $$(LDFLAGS) -o $$@ $(2) $(3) $$(extralibs))
-+	$(qexec)${LIBTOOL} --mode=link $(CC) $(LDFLAGS) -o $$@ \
++	$(qexec)${LIBTOOL} --mode=link $(CXX) $(LDFLAGS) -o $$@ \
 +		$$(filter-out -lvpx,$(2)) libvpx.la $$(extralibs)
  endef
  define linkerxx_template
@@ -58,7 +67,7 @@ $NetBSD: patch-aa,v 1.8 2014/01/02 15:18:01 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
-@@ -246,8 +250,12 @@ endef
+@@ -273,8 +277,12 @@ endef
  define install_map_template
  $(DIST_DIR)/$(1): $(2)
  	$(if $(quiet),@echo "    [INSTALL] $$@")
@@ -73,7 +82,7 @@ $NetBSD: patch-aa,v 1.8 2014/01/02 15:18:01 ryoon Exp $
  endef
  
  define archive_template
-@@ -256,7 +264,9 @@ define archive_template
+@@ -283,7 +291,9 @@ define archive_template
  # for creating them.
  $(1):
  	$(if $(quiet),@echo "    [AR] $$@")
@@ -84,7 +93,7 @@ $NetBSD: patch-aa,v 1.8 2014/01/02 15:18:01 ryoon Exp $
  endef
  
  define so_template
-@@ -348,9 +358,9 @@ clean::
+@@ -380,9 +390,9 @@ clean::
  	rm -f .bins .install-bins $(BINS)
  
  LIBS=$(call enabled,LIBS)
@@ -93,10 +102,10 @@ $NetBSD: patch-aa,v 1.8 2014/01/02 15:18:01 ryoon Exp $
  	@touch $@
 -$(foreach lib,$(filter %_g.a,$(LIBS)),$(eval $(call archive_template,$(lib))))
 +$(foreach lib,$(filter %.a,$(LIBS)),$(eval $(call archive_template,$(lib))))
- $(foreach lib,$(filter %so.$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH),$(LIBS)),$(eval $(call so_template,$(lib))))
- $(foreach lib,$(filter %$(VERSION_MAJOR).dylib,$(LIBS)),$(eval $(call dl_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))))
  
-@@ -358,11 +368,11 @@ INSTALL-LIBS=$(call cond_enabled,CONFIG_
+@@ -390,11 +400,11 @@ INSTALL-LIBS=$(call cond_enabled,CONFIG_
  ifeq ($(MAKECMDGOALS),dist)
  INSTALL-LIBS+=$(call cond_enabled,CONFIG_INSTALL_LIBS,DIST-LIBS)
  endif
@@ -110,7 +119,7 @@ $NetBSD: patch-aa,v 1.8 2014/01/02 15:18:01 ryoon Exp $
  
  ifeq ($(CONFIG_EXTERNAL_BUILD),yes)
  PROJECTS=$(call enabled,PROJECTS)
-@@ -416,7 +426,7 @@ ifeq ($(CONFIG_EXTERNAL_BUILD),yes)
+@@ -445,7 +455,7 @@ ifeq ($(CONFIG_EXTERNAL_BUILD),yes)
      BUILD_TARGETS += .projects
      INSTALL_TARGETS += .install-projects
  endif
diff --git a/multimedia/libvpx/patches/patch-ad b/multimedia/libvpx/patches/patch-ad
index b0361a123c5..3a3cd0af732 100644
--- a/multimedia/libvpx/patches/patch-ad
+++ b/multimedia/libvpx/patches/patch-ad
@@ -1,96 +1,99 @@
-$NetBSD: patch-ad,v 1.16 2014/11/14 11:51:01 jmcneill Exp $
+$NetBSD: patch-ad,v 1.17 2015/06/30 09:53:17 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	2013-12-17 17:05:18.000000000 +0000
+--- build/make/configure.sh.orig	2015-04-03 18:49:19.000000000 +0000
 +++ build/make/configure.sh
-@@ -604,7 +604,7 @@ process_common_toolchain() {
-             armv6*)
-                 tgt_isa=armv6
-                 ;;
--            armv7*-hardfloat*)
-+            armv7*-hardfloat*|armv7*-netbsd*-*hf)
-                 tgt_isa=armv7
-                 float_abi=hard
-                 ;;
-@@ -665,7 +665,7 @@ process_common_toolchain() {
-                 [ -z "$tgt_isa" ] && tgt_isa=x86
-                 tgt_os=win32
-                 ;;
--            *linux*|*bsd*)
-+            *linux*|*bsd*|*qnx6*)
-                 tgt_os=linux
-                 ;;
-             *solaris2.10)
-@@ -704,6 +704,7 @@ process_common_toolchain() {
-     case ${tgt_isa} in
-         arm*) enable_feature arm;;
-         mips*) enable_feature mips;;
-+	sparc) disable_feature fast_unaligned;;
-     esac
+@@ -626,7 +626,7 @@ process_common_toolchain() {
+       armv6*)
+         tgt_isa=armv6
+         ;;
+-      armv7*-hardfloat*)
++      armv7*-hardfloat*|armv7*-netbsd*-*hf)
+         tgt_isa=armv7
+         float_abi=hard
+         ;;
+@@ -688,7 +688,7 @@ process_common_toolchain() {
+         [ -z "$tgt_isa" ] && tgt_isa=x86
+         tgt_os=win32
+         ;;
+-      *linux*|*bsd*)
++      *linux*|*bsd*|*qnx6*)
+         tgt_os=linux
+         ;;
+       *solaris2.10)
+@@ -731,6 +731,9 @@ process_common_toolchain() {
+     mips*)
+       enable_feature mips
+       ;;
++    sparc*)
++      enable_feature fast_unaligned
++      ;;
+   esac
  
-     # PIC is probably what we want when building shared libs
-@@ -799,7 +800,7 @@ process_common_toolchain() {
+   # PIC is probably what we want when building shared libs
+@@ -831,7 +834,7 @@ process_common_toolchain() {
  
-         case ${tgt_cc} in
+       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}
-@@ -988,8 +989,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
-     ;;
+-          CROSS=${CROSS:-arm-none-linux-gnueabi-}
++#          CROSS=${CROSS:-arm-none-linux-gnueabi-}
+           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*)
-@@ -1219,7 +1218,7 @@ EOF
-     check_cc <<EOF
-     unsigned int e = 'O'<<24 | '2'<<16 | 'B'<<8 | 'E';
+@@ -1280,7 +1281,7 @@ EOF
+   check_cc <<EOF
+ unsigned int e = 'O'<<24 | '2'<<16 | 'B'<<8 | 'E';
  EOF
 -    [ -f "${TMP_O}" ] && od -A n -t x1 "${TMP_O}" | tr -d '\n' |
-+    [ -f "${TMP_O}" ] && od -t x1 "${TMP_O}" | cut -c 8- | tr -d '\n' |
++    [ -f "${TMP_O}" ] && od -t x1 "${TMP_O}" | tr -d '\n' |
          grep '4f *32 *42 *45' >/dev/null 2>&1 && enable_feature big_endian
  
      # Try to find which inline keywords are supported
-@@ -1235,10 +1234,32 @@ EOF
-         case ${toolchain} in
-             *-win*-vs*);;
-             *-android-gcc);;
--            *) check_header pthread.h && add_extralibs -lpthread
-+            *) check_header pthread.h && add_extralibs ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
-         esac
-     fi
+@@ -1296,11 +1297,33 @@ EOF
+       *-android-gcc)
+         ;;
+       *)
+-        check_header pthread.h && add_extralibs -lpthread
++        check_header pthread.h && add_extralibs ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
+         ;;
+     esac
+   fi
  
-+    case ${tgt_os} in
-+    darwin*)
-+       add_extralibs -lm
-+       ;;
-+    solaris*)
-+       add_extralibs -lm -lrt
-+       ;;
-+    linux*)
-+       case ${gcctarget} in
-+       *qnx6*)
-+           add_extralibs -lm
-+           ;;
-+       *openbsd*)
-+           add_extralibs -lm
-+           ;;
-+       *)
-+           add_extralibs -lm -lrt
-+           ;;
-+       esac
-+       ;;
-+    esac
++  case ${tgt_os} in
++  darwin*)
++     add_extralibs -lm
++     ;;
++  solaris*)
++     add_extralibs -lm -lrt
++     ;;
++  linux*)
++     case ${gcctarget} in
++     *qnx6*)
++         add_extralibs -lm
++         ;;
++     *openbsd*)
++         add_extralibs -lm
++         ;;
++     *)
++         add_extralibs -lm -lrt
++         ;;
++     esac
++     ;;
++  esac
 +
-     # only for MIPS platforms
-     case ${toolchain} in
-         mips*)
+   # only for MIPS platforms
+   case ${toolchain} in
+     mips*)
diff --git a/multimedia/libvpx/patches/patch-af b/multimedia/libvpx/patches/patch-af
deleted file mode 100644
index 21a9dd11217..00000000000
--- a/multimedia/libvpx/patches/patch-af
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-af,v 1.3 2013/09/09 20:42:00 wiz Exp $
-
---- examples/gen_example_code.sh.orig	2012-01-27 18:36:39.000000000 +0000
-+++ examples/gen_example_code.sh
-@@ -80,6 +80,6 @@ while IFS=$'\n' read -r line; do
-             || include_block < "${template%.c}.txt" \
-             #|| echo "WARNING: failed to find text for block $block_name" >&2
-             ;;
--        *)  echo "$line" ;;
-+        *)  printf "%s\n" "$line" ;;
-     esac
- done < "$template"
diff --git a/multimedia/libvpx/patches/patch-nestegg_halloc_src_align.h b/multimedia/libvpx/patches/patch-nestegg_halloc_src_align.h
deleted file mode 100644
index e60db0ed4d0..00000000000
--- a/multimedia/libvpx/patches/patch-nestegg_halloc_src_align.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-nestegg_halloc_src_align.h,v 1.1 2015/06/29 21:09:11 markd Exp $
-
-rename to avoid conflict with gcc5.x stddef.h
-
---- nestegg/halloc/src/align.h.orig	2013-11-18 22:18:52.000000000 +0000
-+++ nestegg/halloc/src/align.h
-@@ -30,7 +30,7 @@ union max_align
- 	void (*q)(void);
- };
- 
--typedef union max_align max_align_t;
-+typedef union max_align h_max_align_t;
- 
- #endif
- 
diff --git a/multimedia/libvpx/patches/patch-nestegg_halloc_src_halloc.c b/multimedia/libvpx/patches/patch-nestegg_halloc_src_halloc.c
deleted file mode 100644
index 4c3a0e4c352..00000000000
--- a/multimedia/libvpx/patches/patch-nestegg_halloc_src_halloc.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-nestegg_halloc_src_halloc.c,v 1.1 2015/06/29 21:09:11 markd Exp $
-
-rename to avoid conflict with gcc5.x stddef.h
-
---- nestegg/halloc/src/halloc.c.orig	2013-11-18 22:18:52.000000000 +0000
-+++ nestegg/halloc/src/halloc.c
-@@ -30,7 +30,7 @@ typedef struct hblock
- #endif
- 	hlist_item_t  siblings; /* 2 pointers */
- 	hlist_head_t  children; /* 1 pointer  */
--	max_align_t   data[1];  /* not allocated, see below */
-+	h_max_align_t   data[1];  /* not allocated, see below */
- 	
- } hblock_t;
- 
diff --git a/multimedia/libvpx/patches/patch-test_i420__video__source.h b/multimedia/libvpx/patches/patch-test_i420__video__source.h
deleted file mode 100644
index 53db1658f21..00000000000
--- a/multimedia/libvpx/patches/patch-test_i420__video__source.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-test_i420__video__source.h,v 1.1 2013/09/13 15:00:43 joerg Exp $
-
---- test/i420_video_source.h.orig	2013-09-12 10:09:36.000000000 +0000
-+++ test/i420_video_source.h
-@@ -72,7 +72,7 @@ class I420VideoSource : public VideoSour
-   virtual unsigned long duration() const { return 1; }
- 
-   virtual vpx_rational_t timebase() const {
--    const vpx_rational_t t = { framerate_denominator_, framerate_numerator_ };
-+    const vpx_rational_t t = { static_cast<int>(framerate_denominator_), static_cast<int>(framerate_numerator_) };
-     return t;
-   }
- 
diff --git a/multimedia/libvpx/patches/patch-test_sad__test.cc b/multimedia/libvpx/patches/patch-test_sad__test.cc
index c89f2d80394..f5b6149df67 100644
--- a/multimedia/libvpx/patches/patch-test_sad__test.cc
+++ b/multimedia/libvpx/patches/patch-test_sad__test.cc
@@ -1,9 +1,54 @@
-$NetBSD: patch-test_sad__test.cc,v 1.2 2014/01/02 15:18:01 ryoon Exp $
+$NetBSD: patch-test_sad__test.cc,v 1.3 2015/06/30 09:53:17 ryoon Exp $
 
---- test/sad_test.cc.orig	2013-11-18 22:18:52.000000000 +0000
+--- test/sad_test.cc.orig	2015-04-03 18:49:19.000000000 +0000
 +++ test/sad_test.cc
-@@ -296,7 +296,11 @@ TEST_P(SADTest, MaxSAD) {
-   CheckSad(128);
+@@ -36,28 +36,44 @@ typedef unsigned int (*SadMxNFunc)(const
+                                    const unsigned char *reference_ptr,
+                                    int reference_stride,
+                                    unsigned int max_sad);
++#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);
++#if __cplusplus >= 201103L
++typedef std::tuple<int, int, SadMxNAvgVp9Func, int> SadMxNAvgVp9Param;
++#else
+ typedef std::tr1::tuple<int, int, SadMxNAvgVp9Func, int> SadMxNAvgVp9Param;
+ #endif
++#endif
+ 
+ typedef void (*SadMxNx4Func)(const uint8_t *src_ptr,
+                              int src_stride,
+                              const uint8_t *const ref_ptr[],
+                              int ref_stride,
+                              uint32_t *sad_array);
++#if __cplusplus >= 201103L
++typedef std::tuple<int, int, SadMxNx4Func, int> SadMxNx4Param;
++#else
+ typedef std::tr1::tuple<int, int, SadMxNx4Func, int> SadMxNx4Param;
++#endif
+ 
+ using libvpx_test::ACMRandom;
+ 
+@@ -637,7 +653,11 @@ TEST_P(SADx4Test, SrcAlignedByWidth) {
+   source_data_ = tmp_source_data;
  }
  
 +#if __cplusplus >= 201103L
@@ -12,5 +57,5 @@ $NetBSD: patch-test_sad__test.cc,v 1.2 2014/01/02 15:18:01 ryoon Exp $
  using std::tr1::make_tuple;
 +#endif
  
- #if CONFIG_VP8_ENCODER
- const sad_m_by_n_fn_t sad_16x16_c = vp8_sad16x16_c;
+ //------------------------------------------------------------------------------
+ // C functions
diff --git a/multimedia/libvpx/patches/patch-test_sixtap__predict__test.cc b/multimedia/libvpx/patches/patch-test_sixtap__predict__test.cc
index 67e20342a09..5b50b83e137 100644
--- a/multimedia/libvpx/patches/patch-test_sixtap__predict__test.cc
+++ b/multimedia/libvpx/patches/patch-test_sixtap__predict__test.cc
@@ -1,8 +1,20 @@
-$NetBSD: patch-test_sixtap__predict__test.cc,v 1.1 2013/09/13 15:00:43 joerg Exp $
+$NetBSD: patch-test_sixtap__predict__test.cc,v 1.2 2015/06/30 09:53:17 ryoon Exp $
 
---- test/sixtap_predict_test.cc.orig	2013-09-12 10:12:12.000000000 +0000
+--- test/sixtap_predict_test.cc.orig	2015-04-03 18:49:19.000000000 +0000
 +++ test/sixtap_predict_test.cc
-@@ -175,7 +175,11 @@ TEST_P(SixtapPredictTest, TestWithRandom
+@@ -30,7 +30,11 @@ typedef void (*SixtapPredictFunc)(uint8_
+                                   uint8_t *dst_ptr,
+                                   int dst_pitch);
+ 
++#if __cplusplus >= 201103L
++typedef std::tuple<int, int, SixtapPredictFunc> SixtapPredictParam;
++#else
+ typedef std::tr1::tuple<int, int, SixtapPredictFunc> SixtapPredictParam;
++#endif
+ 
+ class SixtapPredictTest
+     : public ::testing::TestWithParam<SixtapPredictParam> {
+@@ -182,7 +186,11 @@ TEST_P(SixtapPredictTest, TestWithRandom
    }
  }
  
@@ -12,5 +24,5 @@ $NetBSD: patch-test_sixtap__predict__test.cc,v 1.1 2013/09/13 15:00:43 joerg Exp
  using std::tr1::make_tuple;
 +#endif
  
- const sixtap_predict_fn_t sixtap_16x16_c = vp8_sixtap_predict16x16_c;
- const sixtap_predict_fn_t sixtap_8x8_c = vp8_sixtap_predict8x8_c;
+ const SixtapPredictFunc sixtap_16x16_c = vp8_sixtap_predict16x16_c;
+ const SixtapPredictFunc sixtap_8x8_c = vp8_sixtap_predict8x8_c;