Update to 1.3.0

* tarball is not distributed by Google, use Debian's one

Changelog:
2013-11-15 v1.3.0 "Forest"
  This release introduces the VP9 codec in a backward-compatible way.
  All existing users of VP8 can continue to use the library without
  modification. However, some VP8 options do not map to VP9 in the same manner.

  The VP9 encoder in this release is not feature complete. Users interested in
  the encoder are advised to use the git master branch and discuss issues on
  libvpx mailing lists.

  - Upgrading:
    This release is ABI and API compatible with Duclair (v1.0.0). Users
    of older releases should refer to the Upgrading notes in this document
    for that release.

  - Enhancements:
      Get rid of bashisms in the main build scripts
      Added usage info on command line options
      Add lossless compression mode
      Dll build of libvpx
      Add additional Mac OS X targets: 10.7, 10.8 and 10.9 (darwin11-13)
      Add option to disable documentation
      configure: add --enable-external-build support
      make: support V=1 as short form of verbose=yes
      configure: support mingw-w64
      configure: support hardfloat armv7 CHOSTS
      configure: add support for android x86
      Add estimated completion time to vpxenc
      Don't exit on decode errors in vpxenc
      vpxenc: support scaling prior to encoding
      vpxdec: support scaling output
      vpxenc: improve progress indicators with --skip
      msvs: Don't link to winmm.lib
      Add a new script for producing vcxproj files
      Produce Visual Studio 10 and 11 project files
      Produce Windows Phone project files
      msvs-build: use msbuild for vs >= 2005
      configure: default configure log to config.log
      Add encoding option --static-thresh

  - Speed:
      Miscellaneous speed optimizations for VP8 and VP9.

  - Quality:
      In general, quality is consistent with the Eider release.

  - Bug Fixes:
      This release represents approximately a year of engineering effort,
      and contains multiple bug fixes. Please refer to git history for details.

9 files changed, 64 insertions, 60 deletions

diff --git a/multimedia/libvpx/Makefile b/multimedia/libvpx/Makefile
index 782a03b3ccb..7301ecd22b5 100644
--- a/multimedia/libvpx/Makefile
+++ b/multimedia/libvpx/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.32 2013/12/01 23:26:25 bsiegert Exp $
+# $NetBSD: Makefile,v 1.33 2014/01/02 15:18:01 ryoon Exp $
 
-DISTNAME=	libvpx-v1.2.0
-PKGNAME=	${DISTNAME:S/-v/-/}
+DISTNAME=	libvpx_1.3.0.orig
+PKGNAME=	${DISTNAME:S/_/-/:S/.orig//}
 CATEGORIES=	multimedia
-MASTER_SITES=	http://webm.googlecode.com/files/
+MASTER_SITES=	${MASTER_SITE_DEBIAN:=pool/main/libv/libvpx/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	ryoon@NetBSD.org
@@ -11,6 +11,8 @@ 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 83b477f0eb2..59302587858 100644
--- a/multimedia/libvpx/PLIST
+++ b/multimedia/libvpx/PLIST
@@ -1,13 +1,13 @@
-@comment $NetBSD: PLIST,v 1.4 2012/05/22 20:42:57 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.5 2014/01/02 15:18:01 ryoon Exp $
 bin/vp8_scalable_patterns
+bin/vp9_spatial_scalable_encoder
 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_codec_impl_bottom.h
-include/vpx/vpx_codec_impl_top.h
 include/vpx/vpx_decoder.h
 include/vpx/vpx_encoder.h
 include/vpx/vpx_image.h
diff --git a/multimedia/libvpx/distinfo b/multimedia/libvpx/distinfo
index ed9a082b665..f8497915166 100644
--- a/multimedia/libvpx/distinfo
+++ b/multimedia/libvpx/distinfo
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.21 2013/11/29 18:33:54 bsiegert Exp $
+$NetBSD: distinfo,v 1.22 2014/01/02 15:18:01 ryoon Exp $
 
-SHA1 (libvpx-v1.2.0.tar.bz2) = 33fb2df4ee5b06637dc492dafe49425ead117a24
-RMD160 (libvpx-v1.2.0.tar.bz2) = ed43d99dd4a0166baf9caca7a50841ced695eb08
-Size (libvpx-v1.2.0.tar.bz2) = 1715462 bytes
-SHA1 (patch-aa) = efd541c9323b8d36272b57bffb1f95251a0a89f5
-SHA1 (patch-ab) = 468131a66c39d9b42080e62f6afa7cfd3657609b
-SHA1 (patch-ac) = e177ad5416b50b75fe026377d8033032e0ca63c3
-SHA1 (patch-ad) = b312843ea925746ed9676ae404e700af88da29d5
+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 (patch-ab) = dfd61002748f01a5651dc58ce6f67a9906f9a456
+SHA1 (patch-ac) = 2086b1896c6c6a23ba7da75824375fae0bdb97d1
+SHA1 (patch-ad) = bc151caa1aecc6278feccccbbd2223771db5c995
 SHA1 (patch-af) = 3eb0c222433a62d044e712f572000d97b1d635a3
 SHA1 (patch-build_make_gen_asm_deps.sh) = db7f9abcf1bdd1ccb8e48c695de3f2276bb5f891
-SHA1 (patch-configure) = 72587d9f326040dd50b55e8ea086a05713533cbe
+SHA1 (patch-configure) = de25f725eb4fb693b663022fdc977ed87c1863cd
 SHA1 (patch-test_i420__video__source.h) = e67478f08339c4b7f4cccf96e4798d1972941a7c
-SHA1 (patch-test_sad__test.cc) = 0b3037ceec806e2b4b42c6be1c6db19a8f2f34a4
+SHA1 (patch-test_sad__test.cc) = fb39c0ca4ce5f424d878779a2d58ebe77c41e8b3
 SHA1 (patch-test_sixtap__predict__test.cc) = d803819f3e5d282c3159e4410e7fbbd68cd403be
diff --git a/multimedia/libvpx/patches/patch-aa b/multimedia/libvpx/patches/patch-aa
index f5f35d88b84..f0c091f5404 100644
--- a/multimedia/libvpx/patches/patch-aa
+++ b/multimedia/libvpx/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.7 2013/11/09 05:28:35 ryoon Exp $
+$NetBSD: patch-aa,v 1.8 2014/01/02 15:18:01 ryoon Exp $
 
---- build/make/Makefile.orig	2013-09-04 18:49:22.000000000 +0000
+--- build/make/Makefile.orig	2013-11-18 22:18:52.000000000 +0000
 +++ build/make/Makefile
-@@ -110,7 +110,7 @@ $(BUILD_PFX)%.c.d: %.c
+@@ -126,7 +126,7 @@ $(BUILD_PFX)%.c.d: %.c
  
  $(BUILD_PFX)%.c.o: %.c
  	$(if $(quiet),@echo "    [CC] $@")
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.7 2013/11/09 05:28:35 ryoon Exp $
  
  $(BUILD_PFX)%.cc.d: %.cc
  	$(if $(quiet),@echo "    [DEP] $@")
-@@ -119,7 +119,7 @@ $(BUILD_PFX)%.cc.d: %.cc
+@@ -135,7 +135,7 @@ $(BUILD_PFX)%.cc.d: %.cc
  
  $(BUILD_PFX)%.cc.o: %.cc
  	$(if $(quiet),@echo "    [CXX] $@")
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.7 2013/11/09 05:28:35 ryoon Exp $
  
  $(BUILD_PFX)%.asm.d: %.asm
  	$(if $(quiet),@echo "    [DEP] $@")
-@@ -129,7 +129,8 @@ $(BUILD_PFX)%.asm.d: %.asm
+@@ -145,7 +145,8 @@ $(BUILD_PFX)%.asm.d: %.asm
  
  $(BUILD_PFX)%.asm.o: %.asm
  	$(if $(quiet),@echo "    [AS] $@")
@@ -30,7 +30,7 @@ $NetBSD: patch-aa,v 1.7 2013/11/09 05:28:35 ryoon Exp $
  
  $(BUILD_PFX)%.s.d: %.s
  	$(if $(quiet),@echo "    [DEP] $@")
-@@ -139,7 +140,8 @@ $(BUILD_PFX)%.s.d: %.s
+@@ -155,7 +156,8 @@ $(BUILD_PFX)%.s.d: %.s
  
  $(BUILD_PFX)%.s.o: %.s
  	$(if $(quiet),@echo "    [AS] $@")
@@ -40,7 +40,7 @@ $NetBSD: patch-aa,v 1.7 2013/11/09 05:28:35 ryoon Exp $
  
  .PRECIOUS: %.c.S
  %.c.S: CFLAGS += -DINLINE_ASM
-@@ -211,13 +213,15 @@ define linker_template
+@@ -227,13 +229,15 @@ define linker_template
  $(1): $(filter-out -%,$(2))
  $(1):
  	$(if $(quiet),@echo    "    [LD] $$@")
@@ -58,7 +58,7 @@ $NetBSD: patch-aa,v 1.7 2013/11/09 05:28:35 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
-@@ -230,8 +234,12 @@ endef
+@@ -246,8 +250,12 @@ endef
  define install_map_template
  $(DIST_DIR)/$(1): $(2)
  	$(if $(quiet),@echo "    [INSTALL] $$@")
@@ -73,7 +73,7 @@ $NetBSD: patch-aa,v 1.7 2013/11/09 05:28:35 ryoon Exp $
  endef
  
  define archive_template
-@@ -240,7 +248,9 @@ define archive_template
+@@ -256,7 +264,9 @@ define archive_template
  # for creating them.
  $(1):
  	$(if $(quiet),@echo "    [AR] $$@")
@@ -84,7 +84,7 @@ $NetBSD: patch-aa,v 1.7 2013/11/09 05:28:35 ryoon Exp $
  endef
  
  define so_template
-@@ -317,20 +327,20 @@ clean::
+@@ -348,9 +358,9 @@ clean::
  	rm -f .bins .install-bins $(BINS)
  
  LIBS=$(call enabled,LIBS)
@@ -94,8 +94,9 @@ $NetBSD: patch-aa,v 1.7 2013/11/09 05:28:35 ryoon Exp $
 -$(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))))
  
- INSTALL-LIBS=$(call cond_enabled,CONFIG_INSTALL_LIBS,INSTALL-LIBS)
+@@ -358,11 +368,11 @@ INSTALL-LIBS=$(call cond_enabled,CONFIG_
  ifeq ($(MAKECMDGOALS),dist)
  INSTALL-LIBS+=$(call cond_enabled,CONFIG_INSTALL_LIBS,DIST-LIBS)
  endif
@@ -109,7 +110,7 @@ $NetBSD: patch-aa,v 1.7 2013/11/09 05:28:35 ryoon Exp $
  
  ifeq ($(CONFIG_EXTERNAL_BUILD),yes)
  PROJECTS=$(call enabled,PROJECTS)
-@@ -380,7 +390,7 @@ ifeq ($(CONFIG_EXTERNAL_BUILD),yes)
+@@ -416,7 +426,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 db86312d3ff..273e10c5cab 100644
--- a/multimedia/libvpx/patches/patch-ab
+++ b/multimedia/libvpx/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.4 2012/01/31 11:53:52 ryoon Exp $
+$NetBSD: patch-ab,v 1.5 2014/01/02 15:18:01 ryoon Exp $
 
---- libs.mk.orig	2012-01-27 18:36:39.000000000 +0000
+--- libs.mk.orig	2013-12-17 17:05:28.000000000 +0000
 +++ libs.mk
-@@ -188,8 +188,8 @@ endif
+@@ -259,8 +259,8 @@ endif
  else
  LIBVPX_OBJS=$(call objs,$(CODEC_SRCS))
  OBJS-$(BUILD_LIBVPX) += $(LIBVPX_OBJS)
@@ -11,5 +11,5 @@ $NetBSD: patch-ab,v 1.4 2012/01/31 11:53:52 ryoon Exp $
 +LIBS-$(if $(BUILD_LIBVPX),$(CONFIG_STATIC)) += $(BUILD_PFX)libvpx.a
 +$(BUILD_PFX)libvpx.a: $(LIBVPX_OBJS)
  
+ 
  BUILD_LIBVPX_SO         := $(if $(BUILD_LIBVPX),$(CONFIG_SHARED))
- LIBVPX_SO               := libvpx.so.$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH)
diff --git a/multimedia/libvpx/patches/patch-ac b/multimedia/libvpx/patches/patch-ac
index eda40503bd7..7b311056d39 100644
--- a/multimedia/libvpx/patches/patch-ac
+++ b/multimedia/libvpx/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.3 2012/01/31 11:53:52 ryoon Exp $
+$NetBSD: patch-ac,v 1.4 2014/01/02 15:18:01 ryoon Exp $
 
---- examples.mk.orig	2012-01-27 18:36:39.000000000 +0000
+--- examples.mk.orig	2013-12-17 17:05:28.000000000 +0000
 +++ examples.mk
-@@ -178,7 +178,7 @@ BINS-$(NOT_MSVS)           += $(addprefi
- 
+@@ -192,7 +192,7 @@ BINS-$(NOT_MSVS)           += $(addprefi
  # Instantiate linker template for all examples.
  CODEC_LIB=$(if $(CONFIG_DEBUG_LIBS),vpx_g,vpx)
--CODEC_LIB_SUF=$(if $(CONFIG_SHARED),.so,.a)
-+CODEC_LIB_SUF=$(if $(CONFIG_SHARED),.so,.la)
+ SHARED_LIB_SUF=$(if $(filter darwin%,$(TGT_OS)),.dylib,.so)
+-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)))\
diff --git a/multimedia/libvpx/patches/patch-ad b/multimedia/libvpx/patches/patch-ad
index ff7b8e9a3da..5ab22cf2c2c 100644
--- a/multimedia/libvpx/patches/patch-ad
+++ b/multimedia/libvpx/patches/patch-ad
@@ -1,11 +1,11 @@
-$NetBSD: patch-ad,v 1.11 2013/11/29 18:33:54 bsiegert Exp $
+$NetBSD: patch-ad,v 1.12 2014/01/02 15:18:01 ryoon Exp $
 
 *BSD and qnx are identified as linux.
 Add another SDK path on Mac OS X.
 
---- build/make/configure.sh.orig	Wed Sep  4 18:48:57 2013
+--- build/make/configure.sh.orig	2013-12-17 17:05:18.000000000 +0000
 +++ build/make/configure.sh
-@@ -645,7 +645,7 @@ process_common_toolchain() {
+@@ -665,7 +665,7 @@ process_common_toolchain() {
                  [ -z "$tgt_isa" ] && tgt_isa=x86
                  tgt_os=win32
                  ;;
@@ -14,7 +14,7 @@ Add another SDK path on Mac OS X.
                  tgt_os=linux
                  ;;
              *solaris2.10)
-@@ -775,7 +775,7 @@ process_common_toolchain() {
+@@ -799,7 +799,7 @@ process_common_toolchain() {
  
          case ${tgt_cc} in
          gcc)
@@ -23,25 +23,25 @@ Add another SDK path on Mac OS X.
              link_with_cc=gcc
              setup_gnu_toolchain
              arch_int=${tgt_isa##armv}
-@@ -960,8 +960,6 @@ process_common_toolchain() {
+@@ -988,8 +988,6 @@ EOF
              check_add_cflags -mips32r2 -mdspr2
-             disable fast_unaligned
+             disable_feature fast_unaligned
          fi
 -        check_add_cflags -march=${tgt_isa}
 -        check_add_asflags -march=${tgt_isa}
          check_add_asflags -KPIC
      ;;
      ppc*)
-@@ -1152,7 +1155,7 @@ EOF
+@@ -1219,7 +1217,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' |
-         grep '4f *32 *42 *45' >/dev/null 2>&1 && enable big_endian
+         grep '4f *32 *42 *45' >/dev/null 2>&1 && enable_feature big_endian
  
-     # Almost every platform uses pthreads.
-@@ -1160,9 +1163,28 @@ EOF
+     # Try to find which inline keywords are supported
+@@ -1235,10 +1233,29 @@ EOF
          case ${toolchain} in
              *-win*-vs*);;
              *-android-gcc);;
@@ -49,7 +49,7 @@ Add another SDK path on Mac OS X.
 +            *) check_header pthread.h && add_extralibs ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
          esac
      fi
-+
+ 
 +    case ${tgt_os} in
 +    darwin*)
 +       add_extralibs -lm
@@ -68,6 +68,7 @@ Add another SDK path on Mac OS X.
 +       esac
 +       ;;
 +    esac
- 
++
      # only for MIPS platforms
      case ${toolchain} in
+         mips*)
diff --git a/multimedia/libvpx/patches/patch-configure b/multimedia/libvpx/patches/patch-configure
index 78eea4a6121..60405934889 100644
--- a/multimedia/libvpx/patches/patch-configure
+++ b/multimedia/libvpx/patches/patch-configure
@@ -1,12 +1,12 @@
-$NetBSD: patch-configure,v 1.1 2012/02/28 14:12:05 martin Exp $
+$NetBSD: patch-configure,v 1.2 2014/01/02 15:18:01 ryoon Exp $
 
---- configure.orig	2012-02-28 11:02:34.000000000 +0100
-+++ configure	2012-02-28 14:57:32.000000000 +0100
-@@ -101,6 +101,7 @@ all_platforms="${all_platforms} ppc32-li
+--- configure.orig	2013-12-17 17:05:28.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"
 +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"
- all_platforms="${all_platforms} x86-darwin8-icc"
diff --git a/multimedia/libvpx/patches/patch-test_sad__test.cc b/multimedia/libvpx/patches/patch-test_sad__test.cc
index 179e8af0914..c89f2d80394 100644
--- a/multimedia/libvpx/patches/patch-test_sad__test.cc
+++ b/multimedia/libvpx/patches/patch-test_sad__test.cc
@@ -1,8 +1,8 @@
-$NetBSD: patch-test_sad__test.cc,v 1.1 2013/09/13 15:00:43 joerg Exp $
+$NetBSD: patch-test_sad__test.cc,v 1.2 2014/01/02 15:18:01 ryoon Exp $
 
---- test/sad_test.cc.orig	2013-09-12 10:19:23.000000000 +0000
+--- test/sad_test.cc.orig	2013-11-18 22:18:52.000000000 +0000
 +++ test/sad_test.cc
-@@ -182,7 +182,11 @@ TEST_P(SADTest, MaxSAD) {
+@@ -296,7 +296,11 @@ TEST_P(SADTest, MaxSAD) {
    CheckSad(128);
  }
  
@@ -12,5 +12,5 @@ $NetBSD: patch-test_sad__test.cc,v 1.1 2013/09/13 15:00:43 joerg Exp $
  using std::tr1::make_tuple;
 +#endif
  
+ #if CONFIG_VP8_ENCODER
  const sad_m_by_n_fn_t sad_16x16_c = vp8_sad16x16_c;
- const sad_m_by_n_fn_t sad_8x16_c = vp8_sad8x16_c;