libvpx: update to version 1.6.0

No longer supports ppc build targets.  Remove outdated Id tag line.

multimedia/libvpx/Portfile

@@ -1,5 +1,4 @@
 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
-# $Id$
 
 PortSystem          1.0
 PortGroup           compiler_blacklist_versions 1.0
@@ -8,7 +7,7 @@ PortGroup           muniversal 1.0
 # Since libvpx installs a static library only, increase the revision of
 # dependents when updating libvpx to a new version so they'll be rebuilt.
 name                libvpx
-version             1.4.0
+version             1.6.0
 categories          multimedia
 maintainers         devans openmaintainer
 platforms           darwin
@@ -28,8 +27,8 @@ homepage            http://webmproject.org
 master_sites        http://storage.googleapis.com/downloads.webmproject.org/releases/webm/
 use_bzip2           yes
 
-checksums           rmd160  272b1a9f1687a80337d79ccbada2a344c96d1bf1 \
-                    sha256  f582d9b2d60a592a4a3d8c32965ca2d2167e9ade38c6c30bac8801ff66a118e4
+checksums           rmd160  84bcd655859fddbe170e9ffb08c3a37dd2dad62c \
+                    sha256  d0afbb5eb1ecae68f8d578abace160a97e2e8a230e3028cf4db115d59a695aad
 
 if {[string match "*86*" [get_canonical_archs]]} {
     depends_build-append port:yasm
@@ -92,14 +91,14 @@ if {[string match "macports-clang-3.\[5-9\]" ${configure.compiler}] ||
 
 configure.universal_args-delete --disable-dependency-tracking
 
-set my_targets(ppc)     ppc32
-set my_targets(ppc64)   ppc64
+# As of 1.5.0 ppc build targets are no longer supported
+
 set my_targets(i386)    x86
 set my_targets(x86_64)  x86_64
 
 # We must specify the target, otherwise the configure script will guess,
 # and that may not match what the user requested in macports.conf.
-foreach my_arch {ppc ppc64 i386 x86_64} {
+foreach my_arch {i386 x86_64} {
     set merger_host(${my_arch}) ""
     if {[info exists my_targets(${my_arch})]} {
         set merger_configure_args(${my_arch}) --target=$my_targets(${my_arch})-${os.platform}-gcc

multimedia/libvpx/files/patch-Makefile.diff

@@ -1,11 +1,11 @@
---- build/make/Makefile.orig	2014-12-05 11:21:21.000000000 -0800
-+++ build/make/Makefile	2014-12-05 11:25:52.000000000 -0800
-@@ -158,7 +158,7 @@ $(BUILD_PFX)%.s.o: %.s
+--- build/make/Makefile.orig	2016-07-20 18:15:41.000000000 -0700
++++ build/make/Makefile	2016-11-28 09:23:37.000000000 -0800
+@@ -192,7 +192,7 @@
  	$(qexec)$(AS) $(ASFLAGS) -o $@ $<
 
  .PRECIOUS: %.c.S
 -%.c.S: CFLAGS += -DINLINE_ASM
 +%.c.S: CFLAGS += -DINLINE_ASM $(CFLAGS_S)
  $(BUILD_PFX)%.c.S: %.c
  	$(if $(quiet),@echo "    [GEN] $@")
- 	$(qexec)$(CC) -S $(CFLAGS) -o $@ $<
+ 	$(qexec)$(if $(CONFIG_DEPENDENCY_TRACKING),,mkdir -p $(dir $@))

multimedia/libvpx/files/patch-build-make-configure.sh.diff

@@ -1,21 +1,12 @@
---- build/make/configure.sh.orig	2015-04-03 13:49:19.000000000 -0500
-+++ build/make/configure.sh	2015-06-02 13:22:43.000000000 -0500
-@@ -653,33 +653,13 @@
+--- build/make/configure.sh.orig	2016-07-20 18:15:41.000000000 -0700
++++ build/make/configure.sh	2016-11-28 08:49:54.000000000 -0800
+@@ -704,29 +704,9 @@
 
      # detect tgt_os
      case "$gcctarget" in
--      *darwin8*)
-+      *darwin[89]*)
-         tgt_isa=universal
--        tgt_os=darwin8
-+        tgt_os=darwin
-         ;;
--      *darwin9*)
--        tgt_isa=universal
--        tgt_os=darwin9
--        ;;
 -      *darwin10*)
--        tgt_isa=x86_64
++      *darwin*)
+         tgt_isa=x86_64
 -        tgt_os=darwin10
 -        ;;
 -      *darwin11*)
@@ -31,21 +22,32 @@
 -        tgt_os=darwin13
 -        ;;
 -      *darwin14*)
-+      *darwin*)
-         tgt_isa=x86_64
+-        tgt_isa=x86_64
 -        tgt_os=darwin14
+-        ;;
+-      *darwin15*)
+-        tgt_isa=x86_64
+-        tgt_os=darwin15
 +        tgt_os=darwin
          ;;
        x86_64*mingw32*)
          tgt_os=win64
-@@ -739,58 +719,6 @@
-   # Minimum iOS version for all target platforms (darwin and iphonesimulator).
-   IOS_VERSION_MIN="6.0"
+@@ -793,70 +773,6 @@
+     IOS_VERSION_MIN="6.0"
+   fi
 
 -  # Handle darwin variants. Newer SDKs allow targeting older
 -  # platforms, so use the newest one available.
 -  case ${toolchain} in
--    *-darwin*)
+-    arm*-darwin*)
+-      add_cflags "-miphoneos-version-min=${IOS_VERSION_MIN}"
+-      iphoneos_sdk_dir="$(show_darwin_sdk_path iphoneos)"
+-      if [ -d "${iphoneos_sdk_dir}" ]; then
+-        add_cflags  "-isysroot ${iphoneos_sdk_dir}"
+-        add_ldflags "-isysroot ${iphoneos_sdk_dir}"
+-      fi
+-      ;;
+-    x86*-darwin*)
 -      osx_sdk_dir="$(show_darwin_sdk_path macosx)"
 -      if [ -d "${osx_sdk_dir}" ]; then
 -        add_cflags  "-isysroot ${osx_sdk_dir}"
@@ -83,6 +85,10 @@
 -      add_cflags  "-mmacosx-version-min=10.10"
 -      add_ldflags "-mmacosx-version-min=10.10"
 -      ;;
+-    *-darwin15-*)
+-      add_cflags  "-mmacosx-version-min=10.11"
+-      add_ldflags "-mmacosx-version-min=10.11"
+-      ;;
 -    *-iphonesimulator-*)
 -      add_cflags  "-miphoneos-version-min=${IOS_VERSION_MIN}"
 -      add_ldflags "-miphoneos-version-min=${IOS_VERSION_MIN}"

multimedia/libvpx/files/patch-configure.diff

@@ -1,36 +1,18 @@
---- configure.orig	2015-04-03 13:49:19.000000000 -0500
-+++ configure	2015-06-02 13:24:29.000000000 -0500
-@@ -112,14 +112,17 @@
- all_platforms="${all_platforms} armv7s-darwin-gcc"
- all_platforms="${all_platforms} mips32-linux-gcc"
+--- configure.orig	2016-07-20 18:15:41.000000000 -0700
++++ configure	2016-11-28 09:21:36.000000000 -0800
+@@ -116,6 +116,7 @@
  all_platforms="${all_platforms} mips64-linux-gcc"
-+all_platforms="${all_platforms} ppc32-darwin-gcc"
- all_platforms="${all_platforms} ppc32-darwin8-gcc"
- all_platforms="${all_platforms} ppc32-darwin9-gcc"
- all_platforms="${all_platforms} ppc32-linux-gcc"
-+all_platforms="${all_platforms} ppc64-darwin-gcc"
- 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-solaris-gcc"
  all_platforms="${all_platforms} x86-android-gcc"
 +all_platforms="${all_platforms} x86-darwin-gcc"
  all_platforms="${all_platforms} x86-darwin8-gcc"
  all_platforms="${all_platforms} x86-darwin8-icc"
  all_platforms="${all_platforms} x86-darwin9-gcc"
-@@ -141,6 +144,7 @@
- all_platforms="${all_platforms} x86-win32-vs10"
- all_platforms="${all_platforms} x86-win32-vs11"
+@@ -140,6 +141,7 @@
  all_platforms="${all_platforms} x86-win32-vs12"
+ all_platforms="${all_platforms} x86-win32-vs14"
+ all_platforms="${all_platforms} x86_64-android-gcc"
 +all_platforms="${all_platforms} x86_64-darwin-gcc"
  all_platforms="${all_platforms} x86_64-darwin9-gcc"
  all_platforms="${all_platforms} x86_64-darwin10-gcc"
  all_platforms="${all_platforms} x86_64-darwin11-gcc"
-@@ -157,6 +161,7 @@
- all_platforms="${all_platforms} x86_64-win64-vs10"
- all_platforms="${all_platforms} x86_64-win64-vs11"
- all_platforms="${all_platforms} x86_64-win64-vs12"
-+all_platforms="${all_platforms} universal-darwin-gcc"
- all_platforms="${all_platforms} universal-darwin8-gcc"
- all_platforms="${all_platforms} universal-darwin9-gcc"
- all_platforms="${all_platforms} universal-darwin10-gcc"