Update to 0.9.7

Changelog:
* Feature enhancement and bug fix
* backward compatibility with 0.9.5 and 0.9.6

8 files changed, 61 insertions, 59 deletions

diff --git a/multimedia/libvpx/Makefile b/multimedia/libvpx/Makefile
index 869e4037b7b..4b99f2ac903 100644
--- a/multimedia/libvpx/Makefile
+++ b/multimedia/libvpx/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2011/06/21 18:14:30 tron Exp $
+# $NetBSD: Makefile,v 1.8 2011/08/07 17:20:09 ryoon Exp $
 
-DISTNAME=	libvpx-v0.9.6
+DISTNAME=	libvpx-v0.9.7
 PKGNAME=	${DISTNAME:S/-v/-/}
 CATEGORIES=	multimedia
 MASTER_SITES=	http://webm.googlecode.com/files/
diff --git a/multimedia/libvpx/PLIST b/multimedia/libvpx/PLIST
index 8fa1c297abc..430c93da756 100644
--- a/multimedia/libvpx/PLIST
+++ b/multimedia/libvpx/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2011/01/19 21:15:51 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.2 2011/08/07 17:20:09 ryoon Exp $
 bin/vpxdec
 bin/vpxenc
 include/vpx/vp8.h
@@ -14,3 +14,4 @@ include/vpx/vpx_encoder.h
 include/vpx/vpx_image.h
 include/vpx/vpx_integer.h
 lib/libvpx.la
+lib/pkgconfig/vpx.pc
diff --git a/multimedia/libvpx/distinfo b/multimedia/libvpx/distinfo
index 32baf03495a..9c4404cd024 100644
--- a/multimedia/libvpx/distinfo
+++ b/multimedia/libvpx/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.5 2011/06/21 18:14:30 tron Exp $
+$NetBSD: distinfo,v 1.6 2011/08/07 17:20:09 ryoon Exp $
 
-SHA1 (libvpx-v0.9.6.tar.bz2) = a3522bd2b73d52381ba767ded1cbf4760e9cc6f8
-RMD160 (libvpx-v0.9.6.tar.bz2) = b85038b92d911b29b3b912c3d71c60e13f89a551
-Size (libvpx-v0.9.6.tar.bz2) = 1230418 bytes
-SHA1 (patch-aa) = 7f0816d094a7855cfb059905a7a21e438eb03000
-SHA1 (patch-ab) = bd8cc8cf876eb3a8c6dbc317fb9eba3867f2cf2b
-SHA1 (patch-ac) = e41b971e300a108beb5ae717ab6a57abc25318d9
-SHA1 (patch-ad) = e535891d4819a40ce47b1cfdc6e9d5cc1fefcc97
-SHA1 (patch-ae) = e9a5895bbd34b58844bf14bd7851b116c900d1ff
+SHA1 (libvpx-v0.9.7.tar.bz2) = 639596df7182a93db83f61af8f5bb5b6a13dcf63
+RMD160 (libvpx-v0.9.7.tar.bz2) = 1e322f97de39ad0126bf847c94de06f5b34e78d4
+Size (libvpx-v0.9.7.tar.bz2) = 1244448 bytes
+SHA1 (patch-aa) = 77f98144d28166ac26f76bb349303c0766633a99
+SHA1 (patch-ab) = ee50d164938f4225dee83d5c4d65314ba331e2cf
+SHA1 (patch-ac) = 9c7ed134d8b85734dc81ed1eb2e3ada2b753c802
+SHA1 (patch-ad) = f1963d5997afb486f53bb94ab6b60c6eb3edc626
+SHA1 (patch-ae) = 15cc4d0a043bd66c48ebe43612a8619533afca04
diff --git a/multimedia/libvpx/patches/patch-aa b/multimedia/libvpx/patches/patch-aa
index 0454d69649e..f3b413393fe 100644
--- a/multimedia/libvpx/patches/patch-aa
+++ b/multimedia/libvpx/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.2 2011/04/14 07:08:00 adam Exp $
+$NetBSD: patch-aa,v 1.3 2011/08/07 17:20:09 ryoon Exp $
 
---- build/make/Makefile.orig	2010-10-28 13:14:14.000000000 +0000
+--- build/make/Makefile.orig	2011-08-04 17:30:15.000000000 +0000
 +++ build/make/Makefile
 @@ -102,7 +102,7 @@ $(BUILD_PFX)%.c.d: %.c
  
  $(BUILD_PFX)%.c.o: %.c
  	$(if $(quiet),@echo "    [CC] $@")
--	$(qexec)$(CC) $(CFLAGS) -c -o $@ $<
-+	$(qexec)${LIBTOOL} --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
+-	$(qexec)$(CC) $(INTERNAL_CFLAGS) $(CFLAGS) -c -o $@ $<
++	$(qexec)${LIBTOOL} --mode=compile $(CC) $(INTERNAL_CFLAGS) $(CFLAGS) -c -o $@ $<
  
  $(BUILD_PFX)%.asm.d: %.asm
  	$(if $(quiet),@echo "    [DEP] $@")
@@ -21,17 +21,17 @@ $NetBSD: patch-aa,v 1.2 2011/04/14 07:08:00 adam Exp $
  
  $(BUILD_PFX)%.s.d: %.s
  	$(if $(quiet),@echo "    [DEP] $@")
-@@ -188,7 +189,8 @@ define linker_template
+@@ -194,7 +195,8 @@ define linker_template
  $(1): $(filter-out -%,$(2))
  $(1):
  	$(if $(quiet),@echo    "    [LD] $$@")
--	$(qexec)$$(LD) $$(strip $$(LDFLAGS) -o $$@ $(2) $(3) $$(extralibs))
+-	$(qexec)$$(LD) $$(strip $$(INTERNAL_LDFLAGS) $$(LDFLAGS) -o $$@ $(2) $(3) $$(extralibs))
 +	$(qexec)${LIBTOOL} --mode=link $(CC) $(LDFLAGS) -o $$@ \
 +	    $$(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
-@@ -201,8 +203,12 @@ endef
+@@ -207,8 +209,12 @@ endef
  define install_map_template
  $(DIST_DIR)/$(1): $(2)
  	$(if $(quiet),@echo "    [INSTALL] $$@")
@@ -40,24 +40,24 @@ $NetBSD: patch-aa,v 1.2 2011/04/14 07:08:00 adam Exp $
 +	$(qexec)${BSD_INSTALL_DATA} -d -m 755 $$(dir $$@)
 +	$$(if $$(filter %.a,$$<), \
 +	${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} -c $$(patsubst %.a,%.la,$$<) $$(dir $$@), \
-+	$$(if $$(filter %.h,$$<), \
++	$$(if $$(filter %.h %.pc,$$<), \
 +	${BSD_INSTALL_DATA} -c -m 644 $$< $$(dir $$@), \
 +	${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} -c -s $$< $$(dir $$@)))
  endef
  
  define archive_template
-@@ -211,7 +217,9 @@ define archive_template
+@@ -217,7 +223,9 @@ define archive_template
  # for creating them.
  $(1):
  	$(if $(quiet),@echo "    [AR] $$@")
 -	$(qexec)$$(AR) $$(ARFLAGS) $$@ $$?
 +	$(qexec)${LIBTOOL} --mode=link $(CC) $(LDFLAGS) -o $$(patsubst %.a,%.la,$$@) \
-+	    $$(patsubst %.o,%.lo,$$?) -rpath $(DIST_DIR)/lib $$(extralibs) \
++	    $$(patsubst %.o,%.lo,$$?) -rpath $(PREFIX)/lib $$(extralibs) \
 +	    -version-info $(VERSION_MINOR):$(VERSION_PATCH):$(VERSION_MINOR)
  endef
  
  define so_template
-@@ -290,7 +298,7 @@ clean::
+@@ -296,7 +304,7 @@ clean::
  LIBS=$(call enabled,LIBS)
  .libs: $(LIBS)
  	@touch $@
diff --git a/multimedia/libvpx/patches/patch-ab b/multimedia/libvpx/patches/patch-ab
index 25aa8f2b8ca..51e3a851534 100644
--- a/multimedia/libvpx/patches/patch-ab
+++ b/multimedia/libvpx/patches/patch-ab
@@ -1,14 +1,14 @@
-$NetBSD: patch-ab,v 1.1.1.1 2011/01/19 21:15:51 ryoon Exp $
+$NetBSD: patch-ab,v 1.2 2011/08/07 17:20:09 ryoon Exp $
 
---- libs.mk.orig	2010-10-28 13:14:14.000000000 +0000
+--- libs.mk.orig	2011-08-04 17:30:15.000000000 +0000
 +++ libs.mk
-@@ -176,8 +176,8 @@ endif
+@@ -180,8 +180,8 @@ endif
  else
  LIBVPX_OBJS=$(call objs,$(CODEC_SRCS))
  OBJS-$(BUILD_LIBVPX) += $(LIBVPX_OBJS)
--LIBS-$(BUILD_LIBVPX) += $(BUILD_PFX)libvpx.a $(BUILD_PFX)libvpx_g.a
+-LIBS-$(if $(BUILD_LIBVPX),$(CONFIG_STATIC)) += $(BUILD_PFX)libvpx.a $(BUILD_PFX)libvpx_g.a
 -$(BUILD_PFX)libvpx_g.a: $(LIBVPX_OBJS)
-+LIBS-$(BUILD_LIBVPX) += $(BUILD_PFX)libvpx.a
++LIBS-$(if $(BUILD_LIBVPX),$(CONFIG_STATIC)) += $(BUILD_PFX)libvpx.a
 +$(BUILD_PFX)libvpx.a: $(LIBVPX_OBJS)
  
  BUILD_LIBVPX_SO         := $(if $(BUILD_LIBVPX),$(CONFIG_SHARED))
diff --git a/multimedia/libvpx/patches/patch-ac b/multimedia/libvpx/patches/patch-ac
index 7db81719e5b..2d63ea5d502 100644
--- a/multimedia/libvpx/patches/patch-ac
+++ b/multimedia/libvpx/patches/patch-ac
@@ -1,12 +1,13 @@
-$NetBSD: patch-ac,v 1.1.1.1 2011/01/19 21:15:51 ryoon Exp $
+$NetBSD: patch-ac,v 1.2 2011/08/07 17:20:09 ryoon Exp $
 
---- examples.mk.orig	2010-10-28 13:14:14.000000000 +0000
+--- examples.mk.orig	2011-08-04 17:30:15.000000000 +0000
 +++ examples.mk
-@@ -153,7 +153,6 @@ BINS-$(NOT_MSVS)           += $(addprefi
+@@ -167,7 +167,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)
  $(foreach bin,$(BINS-yes),\
--    $(if $(BUILD_OBJS),$(eval $(bin): $(LIB_PATH)/lib$(CODEC_LIB).a))\
-     $(if $(BUILD_OBJS),$(eval $(call linker_template,$(bin),\
-         $(call objs,$($(notdir $(bin)).SRCS)) \
-         -l$(CODEC_LIB) $(addprefix -l,$(CODEC_EXTRA_LIBS))\
+     $(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 2a5cf49bf9f..769d9ffdc3b 100644
--- a/multimedia/libvpx/patches/patch-ad
+++ b/multimedia/libvpx/patches/patch-ad
@@ -1,10 +1,10 @@
-$NetBSD: patch-ad,v 1.3 2011/06/16 13:22:48 seanb Exp $
+$NetBSD: patch-ad,v 1.4 2011/08/07 17:20:09 ryoon Exp $
 
 *BSD and qnx are identified as linux.
 
---- build/make/configure.sh.orig	2011-03-04 20:40:37.000000000 +0000
+--- build/make/configure.sh.orig	2011-08-04 17:30:15.000000000 +0000
 +++ build/make/configure.sh
-@@ -559,7 +559,7 @@ process_common_toolchain() {
+@@ -562,7 +562,7 @@ process_common_toolchain() {
                  [ -z "$tgt_isa" ] && tgt_isa=x86
                  tgt_os=win32
                  ;;
@@ -13,7 +13,7 @@ $NetBSD: patch-ad,v 1.3 2011/06/16 13:22:48 seanb Exp $
                  tgt_os=linux
                  ;;
              *solaris2.10)
-@@ -975,10 +975,29 @@ EOF
+@@ -970,10 +970,29 @@ EOF
      if enabled multithread; then
          case ${toolchain} in
              *-win*);;
@@ -24,23 +24,23 @@ $NetBSD: patch-ad,v 1.3 2011/06/16 13:22:48 seanb Exp $
  
 +    case ${tgt_os} in
 +    darwin*)
-+	add_extralibs -lm
-+	;;
++       add_extralibs -lm
++       ;;
 +    solaris*)
-+	add_extralibs -lm -lrt
-+	;;
++       add_extralibs -lm -lrt
++       ;;
 +    linux*)
-+	case ${gcctarget} in
-+	*qnx6*)
-+	    add_extralibs -lm
-+	    ;;
-+	*)
-+	    add_extralibs -lm -lrt
-+	    ;;
-+	esac
-+	;;
++       case ${gcctarget} in
++       *qnx6*)
++           add_extralibs -lm
++           ;;
++       *)
++           add_extralibs -lm -lrt
++           ;;
++       esac
++       ;;
 +    esac
 +
-     # glibc needs these
-     if enabled linux; then
-         add_cflags -D_LARGEFILE_SOURCE
+     # for sysconf(3) and friends.
+     check_header unistd.h
+ 
diff --git a/multimedia/libvpx/patches/patch-ae b/multimedia/libvpx/patches/patch-ae
index 449749cc359..fe287c60c71 100644
--- a/multimedia/libvpx/patches/patch-ae
+++ b/multimedia/libvpx/patches/patch-ae
@@ -1,11 +1,11 @@
-$NetBSD: patch-ae,v 1.1 2011/06/21 18:14:30 tron Exp $
+$NetBSD: patch-ae,v 1.2 2011/08/07 17:20:09 ryoon Exp $
 
 Fix build under Mac OS X Snow Leopard if the Mac OS X Leopard SDK
 is not installed.
 
---- configure.orig	2011-06-21 19:02:21.000000000 +0100
-+++ configure	2011-06-21 19:04:37.000000000 +0100
-@@ -105,6 +105,7 @@
+--- configure.orig	2011-08-04 17:30:15.000000000 +0000
++++ configure
+@@ -107,6 +107,7 @@ all_platforms="${all_platforms} x86-darw
  all_platforms="${all_platforms} x86-darwin8-icc"
  all_platforms="${all_platforms} x86-darwin9-gcc"
  all_platforms="${all_platforms} x86-darwin9-icc"