<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/45a6ef691ca3a0bd0c747839e00879b57d9accff">https://github.com/macports/macports-ports/commit/45a6ef691ca3a0bd0c747839e00879b57d9accff</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 45a6ef691ca3a0bd0c747839e00879b57d9accff
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Mon Nov 28 17:31:34 2016 -0800
<span style='display:block; white-space:pre;color:#404040;'> libvpx: update to version 1.6.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> No longer supports ppc build targets. Remove outdated Id tag line.
</span>---
multimedia/libvpx/Portfile | 13 +++---
multimedia/libvpx/files/patch-Makefile.diff | 8 ++--
.../files/patch-build-make-configure.sh.diff | 46 ++++++++++++----------
multimedia/libvpx/files/patch-configure.diff | 30 +++-----------
4 files changed, 42 insertions(+), 55 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/libvpx/Portfile b/multimedia/libvpx/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 76be7f0..952d3a3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/libvpx/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/libvpx/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,4 @@
</span> # -*- 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
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# $Id$
</span>
PortSystem 1.0
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +7,7 @@ PortGroup muniversal 1.0
</span> # 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
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.4.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.6.0
</span> categories multimedia
maintainers devans openmaintainer
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,8 +27,8 @@ homepage http://webmproject.org
</span> master_sites http://storage.googleapis.com/downloads.webmproject.org/releases/webm/
use_bzip2 yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 272b1a9f1687a80337d79ccbada2a344c96d1bf1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f582d9b2d60a592a4a3d8c32965ca2d2167e9ade38c6c30bac8801ff66a118e4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 84bcd655859fddbe170e9ffb08c3a37dd2dad62c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d0afbb5eb1ecae68f8d578abace160a97e2e8a230e3028cf4db115d59a695aad
</span>
if {[string match "*86*" [get_canonical_archs]]} {
depends_build-append port:yasm
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -92,14 +91,14 @@ if {[string match "macports-clang-3.\[5-9\]" ${configure.compiler}] ||
</span>
configure.universal_args-delete --disable-dependency-tracking
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set my_targets(ppc) ppc32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set my_targets(ppc64) ppc64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# As of 1.5.0 ppc build targets are no longer supported
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> 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.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-foreach my_arch {ppc ppc64 i386 x86_64} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach my_arch {i386 x86_64} {
</span> 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
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/libvpx/files/patch-Makefile.diff b/multimedia/libvpx/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 711b2cf..2f18d05 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/libvpx/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/libvpx/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- build/make/Makefile.orig 2014-12-05 11:21:21.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ build/make/Makefile 2014-12-05 11:25:52.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -158,7 +158,7 @@ $(BUILD_PFX)%.s.o: %.s
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- build/make/Makefile.orig 2016-07-20 18:15:41.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ build/make/Makefile 2016-11-28 09:23:37.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -192,7 +192,7 @@
</span> $(qexec)$(AS) $(ASFLAGS) -o $@ $<
.PRECIOUS: %.c.S
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,4 +8,4 @@
</span> +%.c.S: CFLAGS += -DINLINE_ASM $(CFLAGS_S)
$(BUILD_PFX)%.c.S: %.c
$(if $(quiet),@echo " [GEN] $@")
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $(qexec)$(CC) -S $(CFLAGS) -o $@ $<
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(qexec)$(if $(CONFIG_DEPENDENCY_TRACKING),,mkdir -p $(dir $@))
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/libvpx/files/patch-build-make-configure.sh.diff b/multimedia/libvpx/files/patch-build-make-configure.sh.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 7f38535..6733016 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/libvpx/files/patch-build-make-configure.sh.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/libvpx/files/patch-build-make-configure.sh.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,21 +1,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- build/make/configure.sh.orig 2015-04-03 13:49:19.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ build/make/configure.sh 2015-06-02 13:22:43.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -653,33 +653,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- build/make/configure.sh.orig 2016-07-20 18:15:41.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ build/make/configure.sh 2016-11-28 08:49:54.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -704,29 +704,9 @@
</span>
# detect tgt_os
case "$gcctarget" in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- *darwin8*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *darwin[89]*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tgt_isa=universal
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- tgt_os=darwin8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ tgt_os=darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- *darwin9*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- tgt_isa=universal
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- tgt_os=darwin9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ;;
</span> - *darwin10*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- tgt_isa=x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *darwin*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tgt_isa=x86_64
</span> - tgt_os=darwin10
- ;;
- *darwin11*)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,21 +22,32 @@
</span> - tgt_os=darwin13
- ;;
- *darwin14*)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *darwin*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tgt_isa=x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- tgt_isa=x86_64
</span> - tgt_os=darwin14
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- *darwin15*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- tgt_isa=x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- tgt_os=darwin15
</span> + tgt_os=darwin
;;
x86_64*mingw32*)
tgt_os=win64
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -739,58 +719,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Minimum iOS version for all target platforms (darwin and iphonesimulator).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IOS_VERSION_MIN="6.0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -793,70 +773,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IOS_VERSION_MIN="6.0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span>
- # Handle darwin variants. Newer SDKs allow targeting older
- # platforms, so use the newest one available.
- case ${toolchain} in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- *-darwin*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- arm*-darwin*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- add_cflags "-miphoneos-version-min=${IOS_VERSION_MIN}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- iphoneos_sdk_dir="$(show_darwin_sdk_path iphoneos)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if [ -d "${iphoneos_sdk_dir}" ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- add_cflags "-isysroot ${iphoneos_sdk_dir}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- add_ldflags "-isysroot ${iphoneos_sdk_dir}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- x86*-darwin*)
</span> - osx_sdk_dir="$(show_darwin_sdk_path macosx)"
- if [ -d "${osx_sdk_dir}" ]; then
- add_cflags "-isysroot ${osx_sdk_dir}"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -83,6 +85,10 @@
</span> - add_cflags "-mmacosx-version-min=10.10"
- add_ldflags "-mmacosx-version-min=10.10"
- ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- *-darwin15-*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- add_cflags "-mmacosx-version-min=10.11"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- add_ldflags "-mmacosx-version-min=10.11"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ;;
</span> - *-iphonesimulator-*)
- add_cflags "-miphoneos-version-min=${IOS_VERSION_MIN}"
- add_ldflags "-miphoneos-version-min=${IOS_VERSION_MIN}"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/libvpx/files/patch-configure.diff b/multimedia/libvpx/files/patch-configure.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index f563dcd..2d82628 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/libvpx/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/libvpx/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,36 +1,18 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2015-04-03 13:49:19.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2015-06-02 13:24:29.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -112,14 +112,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- all_platforms="${all_platforms} armv7s-darwin-gcc"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- all_platforms="${all_platforms} mips32-linux-gcc"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2016-07-20 18:15:41.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2016-11-28 09:21:36.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -116,6 +116,7 @@
</span> all_platforms="${all_platforms} mips64-linux-gcc"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+all_platforms="${all_platforms} ppc32-darwin-gcc"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- all_platforms="${all_platforms} ppc32-darwin8-gcc"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- all_platforms="${all_platforms} ppc32-darwin9-gcc"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- all_platforms="${all_platforms} ppc32-linux-gcc"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+all_platforms="${all_platforms} ppc64-darwin-gcc"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- all_platforms="${all_platforms} ppc64-darwin8-gcc"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- all_platforms="${all_platforms} ppc64-darwin9-gcc"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- all_platforms="${all_platforms} ppc64-linux-gcc"
</span> 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"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -141,6 +144,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- all_platforms="${all_platforms} x86-win32-vs10"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- all_platforms="${all_platforms} x86-win32-vs11"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -140,6 +141,7 @@
</span> all_platforms="${all_platforms} x86-win32-vs12"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ all_platforms="${all_platforms} x86-win32-vs14"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ all_platforms="${all_platforms} x86_64-android-gcc"
</span> +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"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -157,6 +161,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- all_platforms="${all_platforms} x86_64-win64-vs10"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- all_platforms="${all_platforms} x86_64-win64-vs11"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- all_platforms="${all_platforms} x86_64-win64-vs12"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+all_platforms="${all_platforms} universal-darwin-gcc"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- all_platforms="${all_platforms} universal-darwin8-gcc"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- all_platforms="${all_platforms} universal-darwin9-gcc"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- all_platforms="${all_platforms} universal-darwin10-gcc"
</span></pre><pre style='margin:0'>
</pre>