Update to 1.2.0

* Buildlink to devel/googletest to test-libvpx (not installed and not tested).

Changelog:
2012-12-21 v1.2.0
  This release acts as a checkpoint for a large amount of internal refactoring
  and testing. It also contains a number of small bugfixes, so all users are
  encouraged to upgrade.

  - 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:
      VP8 optimizations for MIPS dspr2
      vpxenc: add -quiet option

  - Speed:
      Encoder and decoder speed is consistent with the Eider release.

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

      Minor tweaks to ARNR filtering
      Minor improvements to real time encoding with multiple temporal layers

  - Bug Fixes:
      Fixes multithreaded encoder race condition in loopfilter
      Fixes multi-resolution threaded encoding
      Fix potential encoder dead-lock after picture resize

5 files changed, 61 insertions, 77 deletions

diff --git a/multimedia/libvpx/Makefile b/multimedia/libvpx/Makefile
index 3fec1be2556..a9fee0c26c1 100644
--- a/multimedia/libvpx/Makefile
+++ b/multimedia/libvpx/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2013/05/31 12:41:31 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2013/09/11 15:50:32 ryoon Exp $
 
-DISTNAME=	libvpx-v1.1.0
+DISTNAME=	libvpx-v1.2.0
 PKGNAME=	${DISTNAME:S/-v/-/}
-PKGREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	http://webm.googlecode.com/files/
 EXTRACT_SUFX=	.tar.bz2
@@ -74,5 +73,6 @@ BUILD_TARGET=	# none
 post-extract:
 	${CP} ${FILESDIR}/strip_fPIC.sh ${WRKSRC}
 
+.include "../../devel/googletest/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/libvpx/distinfo b/multimedia/libvpx/distinfo
index 88cd55f488c..dd860e92f91 100644
--- a/multimedia/libvpx/distinfo
+++ b/multimedia/libvpx/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.17 2013/09/09 20:42:00 wiz Exp $
+$NetBSD: distinfo,v 1.18 2013/09/11 15:50:32 ryoon Exp $
 
-SHA1 (libvpx-v1.1.0.tar.bz2) = 356af5f770c50cd021c60863203d8f30164f6021
-RMD160 (libvpx-v1.1.0.tar.bz2) = 6f462c1421a51af77d3401ea4c1eaf0dbeaf4791
-Size (libvpx-v1.1.0.tar.bz2) = 1653485 bytes
-SHA1 (patch-aa) = 088d405d598800d4587eb20647347db1490a29f2
+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) = 5b18ef2471039e2b3f9ba7818ed9372d03662cdd
 SHA1 (patch-ab) = 468131a66c39d9b42080e62f6afa7cfd3657609b
 SHA1 (patch-ac) = e177ad5416b50b75fe026377d8033032e0ca63c3
-SHA1 (patch-ad) = b8f64861bd03599bcc1db52ea970d8eb20331a33
+SHA1 (patch-ad) = 274dc555219811c72b1f4a3298a0e9b1b300d169
 SHA1 (patch-af) = 3eb0c222433a62d044e712f572000d97b1d635a3
-SHA1 (patch-build_make_gen_asm_deps.sh) = 907d0a95ae4c5a8804354a85820eadf0858b62b7
+SHA1 (patch-build_make_gen_asm_deps.sh) = db7f9abcf1bdd1ccb8e48c695de3f2276bb5f891
 SHA1 (patch-configure) = 72587d9f326040dd50b55e8ea086a05713533cbe
diff --git a/multimedia/libvpx/patches/patch-aa b/multimedia/libvpx/patches/patch-aa
index fa7f370661f..707c7a6e841 100644
--- a/multimedia/libvpx/patches/patch-aa
+++ b/multimedia/libvpx/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2012/02/02 12:32:43 ryoon Exp $
+$NetBSD: patch-aa,v 1.6 2013/09/11 15:50:32 ryoon Exp $
 
---- build/make/Makefile.orig	2012-01-27 18:36:39.000000000 +0000
+--- build/make/Makefile.orig	2013-09-04 18:49:22.000000000 +0000
 +++ build/make/Makefile
-@@ -106,16 +106,16 @@ $(BUILD_PFX)%.c.d: %.c
+@@ -110,7 +110,7 @@ $(BUILD_PFX)%.c.d: %.c
  
  $(BUILD_PFX)%.c.o: %.c
  	$(if $(quiet),@echo "    [CC] $@")
@@ -11,46 +11,44 @@ $NetBSD: patch-aa,v 1.5 2012/02/02 12:32:43 ryoon Exp $
  
  $(BUILD_PFX)%.cc.d: %.cc
  	$(if $(quiet),@echo "    [DEP] $@")
- 	$(qexec)mkdir -p $(dir $@)
--	$(qexec)g++ $(INTERNAL_CFLAGS) $(CFLAGS) -M $< | $(fmt_deps) > $@
-+	$(qexec)${CXX} $(INTERNAL_CFLAGS) $(CFLAGS) -M $< | $(fmt_deps) > $@
+@@ -119,7 +119,7 @@ $(BUILD_PFX)%.cc.d: %.cc
  
  $(BUILD_PFX)%.cc.o: %.cc
  	$(if $(quiet),@echo "    [CXX] $@")
--	$(qexec)g++ $(INTERNAL_CFLAGS) $(CFLAGS) -c -o $@ $<
-+	$(qexec)${LIBTOOL} --mode=compile ${CXX} $(INTERNAL_CFLAGS) $(CFLAGS) -c -o $@ $<
+-	$(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] $@")
-@@ -125,7 +125,8 @@ $(BUILD_PFX)%.asm.d: %.asm
+@@ -129,7 +129,8 @@ $(BUILD_PFX)%.asm.d: %.asm
  
  $(BUILD_PFX)%.asm.o: %.asm
  	$(if $(quiet),@echo "    [AS] $@")
 -	$(qexec)$(AS) $(ASFLAGS) -o $@ $<
 +	$(qexec)${LIBTOOL} --mode=compile --tag=CC sh strip_fPIC.sh \
-+	    $(AS) $(ASFLAGS) -o $@ $<
++		$(AS) $(ASFLAGS) -o $@ $<
  
  $(BUILD_PFX)%.s.d: %.s
  	$(if $(quiet),@echo "    [DEP] $@")
-@@ -207,13 +208,15 @@ define linker_template
+@@ -211,13 +212,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 $$@ \
-+	    $$(filter-out -lvpx,$(2)) libvpx.la $$(extralibs)
++		$$(filter-out -lvpx,$(2)) libvpx.la $$(extralibs)
  endef
  define linkerxx_template
  $(1): $(filter-out -%,$(2))
  $(1):
  	$(if $(quiet),@echo    "    [LD] $$@")
--	$(qexec)g++ $$(strip $$(INTERNAL_LDFLAGS) $$(LDFLAGS) -o $$@ $(2) $(3) $$(extralibs))
+-	$(qexec)$$(CXX) $$(strip $$(INTERNAL_LDFLAGS) $$(LDFLAGS) -o $$@ $(2) $(3) $$(extralibs))
 +	$(qexec)${LIBTOOL} --mode=link ${CXX} $(LDFLAGS) -o $$@ \
-+	    $$(filter-out -lvpx,$(2)) libvpx.la $$(extralibs)
++		$$(filter-out -lvpx,$(2)) libvpx.la $$(extralibs)
  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
-@@ -226,8 +229,12 @@ endef
+@@ -230,8 +233,12 @@ endef
  define install_map_template
  $(DIST_DIR)/$(1): $(2)
  	$(if $(quiet),@echo "    [INSTALL] $$@")
@@ -65,18 +63,18 @@ $NetBSD: patch-aa,v 1.5 2012/02/02 12:32:43 ryoon Exp $
  endef
  
  define archive_template
-@@ -236,7 +243,9 @@ define archive_template
+@@ -240,7 +247,9 @@ define archive_template
  # for creating them.
  $(1):
  	$(if $(quiet),@echo "    [AR] $$@")
 -	$(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)
++		$$(patsubst %.o,%.lo,$$?) -rpath $(PREFIX)/lib $$(extralibs) \
++		-version-info $(VERSION_MAJOR):$(VERSION_MINOR):$(VERSION_PATCH)
  endef
  
  define so_template
-@@ -313,20 +322,20 @@ clean::
+@@ -317,20 +326,20 @@ clean::
  	rm -f .bins .install-bins $(BINS)
  
  LIBS=$(call enabled,LIBS)
@@ -101,7 +99,7 @@ $NetBSD: patch-aa,v 1.5 2012/02/02 12:32:43 ryoon Exp $
  
  ifeq ($(CONFIG_EXTERNAL_BUILD),yes)
  PROJECTS=$(call enabled,PROJECTS)
-@@ -376,7 +385,7 @@ ifeq ($(CONFIG_EXTERNAL_BUILD),yes)
+@@ -380,7 +389,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 b77bb5cd817..c82bd8b8677 100644
--- a/multimedia/libvpx/patches/patch-ad
+++ b/multimedia/libvpx/patches/patch-ad
@@ -1,11 +1,11 @@
-$NetBSD: patch-ad,v 1.8 2012/12/23 10:33:34 ryoon Exp $
+$NetBSD: patch-ad,v 1.9 2013/09/11 15:50:32 ryoon Exp $
 
 *BSD and qnx are identified as linux.
 Add another SDK path on Mac OS X.
 
---- build/make/configure.sh.orig	2012-05-08 23:14:00.000000000 +0000
+--- build/make/configure.sh.orig	2013-09-04 18:49:22.000000000 +0000
 +++ build/make/configure.sh
-@@ -596,7 +596,7 @@ process_common_toolchain() {
+@@ -645,7 +645,7 @@ process_common_toolchain() {
                  [ -z "$tgt_isa" ] && tgt_isa=x86
                  tgt_os=win32
                  ;;
@@ -14,32 +14,18 @@ Add another SDK path on Mac OS X.
                  tgt_os=linux
                  ;;
              *solaris2.10)
-@@ -656,6 +656,9 @@ process_common_toolchain() {
-                     if [ -d "${OSX_SDK_ROOTS}/${v}" ]; then
-                         osx_sdk_dir="${OSX_SDK_ROOTS}/${v}"
-                     fi
-+		    if [ -d "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk" ]; then
-+		    osx_sdk_dir="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk"
-+		    fi
-                 done
-             fi
-             ;;
-@@ -890,12 +893,9 @@ process_common_toolchain() {
-         esac
-     ;;
-     mips*)
--        CROSS=${CROSS:-mipsel-linux-uclibc-}
-         link_with_cc=gcc
-         setup_gnu_toolchain
-         tune_cflags="-mtune="
+@@ -960,8 +960,6 @@ process_common_toolchain() {
+             check_add_cflags -mips32r2 -mdspr2
+             disable fast_unaligned
+         fi
 -        check_add_cflags -march=${tgt_isa}
--    check_add_asflags -march=${tgt_isa}
-     check_add_asflags -KPIC
+-        check_add_asflags -march=${tgt_isa}
+         check_add_asflags -KPIC
      ;;
      ppc*)
-@@ -1082,10 +1082,29 @@ EOF
+@@ -1160,10 +1158,29 @@ EOF
          case ${toolchain} in
-             *-win*);;
+             *-win*-vs*);;
              *-android-gcc);;
 -            *) check_header pthread.h && add_extralibs -lpthread
 +            *) check_header pthread.h && add_extralibs ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
@@ -48,23 +34,23 @@ Add another SDK path on Mac OS X.
  
 +    case ${tgt_os} in
 +    darwin*)
-+	add_extralibs -lm
-+	;;
++       add_extralibs -lm
++       ;;
 +    solaris*)
-+	add_extralibs -lm -lrt
-+	;;
-+	linux*)
-+	case ${gcctarget} in
-+	*qnx6*)
-+	    add_extralibs -lm
-+	    ;;
-+	*)
-+	    add_extralibs -lm -lrt
-+	    ;;
-+	esac
-+	;;
++       add_extralibs -lm -lrt
++       ;;
++       linux*)
++       case ${gcctarget} in
++       *qnx6*)
++           add_extralibs -lm
++           ;;
++       *)
++           add_extralibs -lm -lrt
++           ;;
++       esac
++       ;;
 +    esac
 +
-     # for sysconf(3) and friends.
-     check_header unistd.h
- 
+     # only for MIPS platforms
+     case ${toolchain} in
+         mips*)
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 f580e92c77d..a385e10d863 100644
--- a/multimedia/libvpx/patches/patch-build_make_gen_asm_deps.sh
+++ b/multimedia/libvpx/patches/patch-build_make_gen_asm_deps.sh
@@ -1,17 +1,17 @@
-$NetBSD: patch-build_make_gen_asm_deps.sh,v 1.1 2013/01/24 10:22:08 tron Exp $
+$NetBSD: patch-build_make_gen_asm_deps.sh,v 1.2 2013/09/11 15:50:32 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.old	2012-05-09 00:14:00.000000000 +0100
-+++ build/make/gen_asm_deps.sh	2013-01-24 10:02:54.000000000 +0000
-@@ -42,7 +42,7 @@
+--- build/make/gen_asm_deps.sh.orig	2013-09-04 18:49:22.000000000 +0000
++++ build/make/gen_asm_deps.sh
+@@ -42,7 +42,7 @@ done
  
  [ -n "$srcfile" ] || show_help
  sfx=${sfx:-asm}
--includes=$(LC_ALL=C egrep -i "include +\"?+[a-z0-9_/]+\.${sfx}" $srcfile |
+-includes=$(LC_ALL=C egrep -i "include +\"?[a-z0-9_/]+\.${sfx}" $srcfile |
 +includes=$(LC_ALL=C egrep -i "include +\"[a-z0-9_/]+\.${sfx}" $srcfile |
             perl -p -e "s;.*?([a-z0-9_/]+.${sfx}).*;\1;")
  #" restore editor state