<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[137263] trunk/dports/multimedia/libvpx</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/137263">137263</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2015-06-07 11:53:58 -0700 (Sun, 07 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>libvpx: update to version 1.4.0, universal/ppc configuration reworked and tested by ryandesign, thanks (#47907).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmultimedialibvpxPortfile">trunk/dports/multimedia/libvpx/Portfile</a></li>
<li><a href="#trunkdportsmultimedialibvpxfilespatchbuildmakeconfigureshdiff">trunk/dports/multimedia/libvpx/files/patch-build-make-configure.sh.diff</a></li>
<li><a href="#trunkdportsmultimedialibvpxfilespatchconfigurediff">trunk/dports/multimedia/libvpx/files/patch-configure.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsmultimedialibvpxPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/libvpx/Portfile (137262 => 137263)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/libvpx/Portfile 2015-06-07 18:53:53 UTC (rev 137262)
+++ trunk/dports/multimedia/libvpx/Portfile 2015-06-07 18:53:58 UTC (rev 137263)
</span><span class="lines">@@ -5,9 +5,10 @@
</span><span class="cx"> PortGroup compiler_blacklist_versions 1.0
</span><span class="cx"> PortGroup muniversal 1.0
</span><span class="cx">
</span><ins>+# Since libvpx installs a static library only, increase the revision of
+# dependents when updating libvpx to a new version so they'll be rebuilt.
</ins><span class="cx"> name libvpx
</span><del>-version 1.3.0
-revision 1
</del><ins>+version 1.4.0
</ins><span class="cx"> categories multimedia
</span><span class="cx"> maintainers devans openmaintainer
</span><span class="cx"> platforms darwin
</span><span class="lines">@@ -24,12 +25,11 @@
</span><span class="cx"> The VP9 encoder in this release is not, as yet, feature complete.
</span><span class="cx">
</span><span class="cx"> homepage http://webmproject.org
</span><del>-master_sites googlecode:webm
</del><ins>+master_sites http://storage.googleapis.com/downloads.webmproject.org/releases/webm/
</ins><span class="cx"> use_bzip2 yes
</span><del>-distname ${name}-v${version}
</del><span class="cx">
</span><del>-checksums rmd160 bf74821ac8f20ed30f44b6e01473ee1f332f721c \
- sha256 d3dcc8d84af51c6c382b214397c62402e37a799e8ebcda6f4217aef0010451a9
</del><ins>+checksums rmd160 272b1a9f1687a80337d79ccbada2a344c96d1bf1 \
+ sha256 f582d9b2d60a592a4a3d8c32965ca2d2167e9ade38c6c30bac8801ff66a118e4
</ins><span class="cx">
</span><span class="cx"> if {[string match "*86*" [get_canonical_archs]]} {
</span><span class="cx"> depends_build-append port:yasm
</span><span class="lines">@@ -52,7 +52,8 @@
</span><span class="cx"> --enable-runtime-cpu-detect \
</span><span class="cx"> --disable-install-docs \
</span><span class="cx"> --disable-debug-libs \
</span><del>- --disable-examples
</del><ins>+ --disable-examples \
+ --disable-unit-tests
</ins><span class="cx">
</span><span class="cx"> configure.env LD="${configure.cc}"
</span><span class="cx">
</span><span class="lines">@@ -85,35 +86,24 @@
</span><span class="cx"> build.args-append CFLAGS_S=-fno-integrated-as
</span><span class="cx"> }
</span><span class="cx">
</span><del>-platform darwin {
- if {${os.major} >= 10} {
- supported_archs i386 x86_64
- }
-}
</del><ins>+configure.universal_args-delete --disable-dependency-tracking
</ins><span class="cx">
</span><del>-# set configure parameters depending on if universal or not
</del><span class="cx"> set my_targets(ppc) ppc32
</span><span class="cx"> set my_targets(ppc64) ppc64
</span><span class="cx"> set my_targets(i386) x86
</span><span class="cx"> set my_targets(x86_64) x86_64
</span><del>-if {[variant_isset universal]} {
- # clear universal flags; configure will determine them.
- configure.universal_cppflags
- configure.universal_cflags
- configure.universal_cxxflags
- configure.universal_ldflags
- configure.universal_args-delete --disable-dependency-tracking
- foreach my_arch ${configure.universal_archs} {
- 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
- }
</del><ins>+
+# 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 ${configure.universal_archs} {
+ 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
</ins><span class="cx"> }
</span><del>-} else {
- # specify only the single target, otherwise 'configure' will try
- # for a universal install.
- if {[info exists my_targets(${build_arch})]} {
- configure.args-append --target=$my_targets(${build_arch})-${os.platform}-gcc
</del><ins>+}
+if {![variant_isset universal]} {
+ if {[info exists merger_configure_args(${build_arch})]} {
+ configure.args-append $merger_configure_args(${build_arch})
</ins><span class="cx"> } else {
</span><span class="cx"> configure.args-append --target=${os.arch}-${os.platform}-gcc
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportsmultimedialibvpxfilespatchbuildmakeconfigureshdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/libvpx/files/patch-build-make-configure.sh.diff (137262 => 137263)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/libvpx/files/patch-build-make-configure.sh.diff 2015-06-07 18:53:53 UTC (rev 137262)
+++ trunk/dports/multimedia/libvpx/files/patch-build-make-configure.sh.diff 2015-06-07 18:53:58 UTC (rev 137263)
</span><span class="lines">@@ -1,121 +1,99 @@
</span><del>---- build/make/configure.sh.orig 2015-04-17 10:56:45.000000000 -0700
-+++ build/make/configure.sh 2015-04-17 10:58:27.000000000 -0700
-@@ -442,10 +442,10 @@
- EOF
</del><ins>+--- 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 @@
</ins><span class="cx">
</span><del>- if enabled rvct; then cat >> $1 << EOF
--fmt_deps = sed -e 's;^__image.axf;\${@:.d=.o} \$@;' #hide
-+fmt_deps = sed -e 's;^__image.axf;\$\${@:.d=.o} \$@;' #hide
- EOF
- else cat >> $1 << EOF
--fmt_deps = sed -e 's;^\([a-zA-Z0-9_]*\)\.o;\${@:.d=.o} \$@;'
-+fmt_deps = sed -e 's;^\([a-zA-Z0-9_]*\)\.o;\$\${@:.d=.o} \$@;'
- EOF
- fi
</del><ins>+ # 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
+- tgt_os=darwin10
+- ;;
+- *darwin11*)
+- tgt_isa=x86_64
+- tgt_os=darwin11
+- ;;
+- *darwin12*)
+- tgt_isa=x86_64
+- tgt_os=darwin12
+- ;;
+- *darwin13*)
+- tgt_isa=x86_64
+- tgt_os=darwin13
+- ;;
+- *darwin14*)
++ *darwin*)
+ tgt_isa=x86_64
+- tgt_os=darwin14
++ 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"
</ins><span class="cx">
</span><del>-@@ -634,29 +634,13 @@
-
- # 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
-- tgt_os=darwin10
-- ;;
-- *darwin11*)
-- tgt_isa=x86_64
-- tgt_os=darwin11
-- ;;
-- *darwin12*)
-+ *darwin*)
- tgt_isa=x86_64
-- tgt_os=darwin12
-- ;;
-- *darwin13*)
-- tgt_isa=x86_64
-- tgt_os=darwin13
-+ tgt_os=darwin
- ;;
- x86_64*mingw32*)
- tgt_os=win64
-@@ -709,59 +693,6 @@
- # PIC is probably what we want when building shared libs
- enabled shared && soft_enable pic
-
-- # Handle darwin variants. Newer SDKs allow targeting older
-- # platforms, so find the newest SDK available.
-- case ${toolchain} in
-- *-darwin*)
-- if [ -z "${DEVELOPER_DIR}" ]; then
-- DEVELOPER_DIR=`xcode-select -print-path 2> /dev/null`
-- [ $? -ne 0 ] && OSX_SKIP_DIR_CHECK=1
-- fi
-- if [ -z "${OSX_SKIP_DIR_CHECK}" ]; then
-- OSX_SDK_ROOTS="${DEVELOPER_DIR}/SDKs"
-- OSX_SDK_VERSIONS="MacOSX10.4u.sdk MacOSX10.5.sdk MacOSX10.6.sdk"
-- OSX_SDK_VERSIONS="${OSX_SDK_VERSIONS} MacOSX10.7.sdk"
-- for v in ${OSX_SDK_VERSIONS}; do
-- if [ -d "${OSX_SDK_ROOTS}/${v}" ]; then
-- osx_sdk_dir="${OSX_SDK_ROOTS}/${v}"
-- fi
-- done
-- fi
-- ;;
-- esac
--
-- if [ -d "${osx_sdk_dir}" ]; then
</del><ins>+- # Handle darwin variants. Newer SDKs allow targeting older
+- # platforms, so use the newest one available.
+- case ${toolchain} in
+- *-darwin*)
+- osx_sdk_dir="$(show_darwin_sdk_path macosx)"
+- if [ -d "${osx_sdk_dir}" ]; then
</ins><span class="cx"> - add_cflags "-isysroot ${osx_sdk_dir}"
</span><span class="cx"> - add_ldflags "-isysroot ${osx_sdk_dir}"
</span><del>-- fi
</del><ins>+- fi
+- ;;
+- esac
</ins><span class="cx"> -
</span><del>-- case ${toolchain} in
-- *-darwin8-*)
-- add_cflags "-mmacosx-version-min=10.4"
-- add_ldflags "-mmacosx-version-min=10.4"
-- ;;
-- *-darwin9-*)
-- add_cflags "-mmacosx-version-min=10.5"
-- add_ldflags "-mmacosx-version-min=10.5"
-- ;;
-- *-darwin10-*)
-- add_cflags "-mmacosx-version-min=10.6"
-- add_ldflags "-mmacosx-version-min=10.6"
-- ;;
-- *-darwin11-*)
-- add_cflags "-mmacosx-version-min=10.7"
-- add_ldflags "-mmacosx-version-min=10.7"
-- ;;
-- *-darwin12-*)
-- add_cflags "-mmacosx-version-min=10.8"
-- add_ldflags "-mmacosx-version-min=10.8"
-- ;;
-- *-darwin13-*)
-- add_cflags "-mmacosx-version-min=10.9"
-- add_ldflags "-mmacosx-version-min=10.9"
-- ;;
-- esac
</del><ins>+- case ${toolchain} in
+- *-darwin8-*)
+- add_cflags "-mmacosx-version-min=10.4"
+- add_ldflags "-mmacosx-version-min=10.4"
+- ;;
+- *-darwin9-*)
+- add_cflags "-mmacosx-version-min=10.5"
+- add_ldflags "-mmacosx-version-min=10.5"
+- ;;
+- *-darwin10-*)
+- add_cflags "-mmacosx-version-min=10.6"
+- add_ldflags "-mmacosx-version-min=10.6"
+- ;;
+- *-darwin11-*)
+- add_cflags "-mmacosx-version-min=10.7"
+- add_ldflags "-mmacosx-version-min=10.7"
+- ;;
+- *-darwin12-*)
+- add_cflags "-mmacosx-version-min=10.8"
+- add_ldflags "-mmacosx-version-min=10.8"
+- ;;
+- *-darwin13-*)
+- add_cflags "-mmacosx-version-min=10.9"
+- add_ldflags "-mmacosx-version-min=10.9"
+- ;;
+- *-darwin14-*)
+- add_cflags "-mmacosx-version-min=10.10"
+- add_ldflags "-mmacosx-version-min=10.10"
+- ;;
+- *-iphonesimulator-*)
+- add_cflags "-miphoneos-version-min=${IOS_VERSION_MIN}"
+- add_ldflags "-miphoneos-version-min=${IOS_VERSION_MIN}"
+- iossim_sdk_dir="$(show_darwin_sdk_path iphonesimulator)"
+- if [ -d "${iossim_sdk_dir}" ]; then
+- add_cflags "-isysroot ${iossim_sdk_dir}"
+- add_ldflags "-isysroot ${iossim_sdk_dir}"
+- fi
+- ;;
+- esac
</ins><span class="cx"> -
</span><del>- # Handle Solaris variants. Solaris 10 needs -lposix4
- case ${toolchain} in
- sparc-solaris-*)
-@@ -1018,11 +949,6 @@
- x86*)
- bits=32
- enabled x86_64 && bits=64
-- check_cpp <<EOF && bits=x32
--#ifndef __ILP32__
--#error "not x32"
--#endif
--EOF
-
- case ${tgt_os} in
- win*)
</del><ins>+ # Handle Solaris variants. Solaris 10 needs -lposix4
+ case ${toolchain} in
+ sparc-solaris-*)
</ins></span></pre></div>
<a id="trunkdportsmultimedialibvpxfilespatchconfigurediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/libvpx/files/patch-configure.diff (137262 => 137263)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/libvpx/files/patch-configure.diff 2015-06-07 18:53:53 UTC (rev 137262)
+++ trunk/dports/multimedia/libvpx/files/patch-configure.diff 2015-06-07 18:53:58 UTC (rev 137263)
</span><span class="lines">@@ -1,41 +1,36 @@
</span><del>---- configure.orig 2014-01-10 12:12:42.000000000 -0800
-+++ configure 2014-03-01 21:48:09.000000000 -0800
-@@ -104,9 +104,11 @@
</del><ins>+--- 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"
</ins><span class="cx"> all_platforms="${all_platforms} mips32-linux-gcc"
</span><ins>+ all_platforms="${all_platforms} mips64-linux-gcc"
++all_platforms="${all_platforms} ppc32-darwin-gcc"
</ins><span class="cx"> all_platforms="${all_platforms} ppc32-darwin8-gcc"
</span><span class="cx"> all_platforms="${all_platforms} ppc32-darwin9-gcc"
</span><del>-+all_platforms="${all_platforms} ppc32-darwin-gcc"
</del><span class="cx"> all_platforms="${all_platforms} ppc32-linux-gcc"
</span><ins>++all_platforms="${all_platforms} ppc64-darwin-gcc"
</ins><span class="cx"> all_platforms="${all_platforms} ppc64-darwin8-gcc"
</span><span class="cx"> all_platforms="${all_platforms} ppc64-darwin9-gcc"
</span><del>-+all_platforms="${all_platforms} ppc64-darwin-gcc"
</del><span class="cx"> all_platforms="${all_platforms} ppc64-linux-gcc"
</span><span class="cx"> all_platforms="${all_platforms} sparc-solaris-gcc"
</span><span class="cx"> all_platforms="${all_platforms} x86-android-gcc"
</span><del>-@@ -118,6 +120,8 @@
- all_platforms="${all_platforms} x86-darwin11-gcc"
- all_platforms="${all_platforms} x86-darwin12-gcc"
- all_platforms="${all_platforms} x86-darwin13-gcc"
</del><span class="cx"> +all_platforms="${all_platforms} x86-darwin-gcc"
</span><del>-+all_platforms="${all_platforms} x86-darwin-clang"
- all_platforms="${all_platforms} x86-linux-gcc"
- all_platforms="${all_platforms} x86-linux-icc"
- all_platforms="${all_platforms} x86-os2-gcc"
-@@ -134,6 +138,8 @@
- all_platforms="${all_platforms} x86_64-darwin11-gcc"
- all_platforms="${all_platforms} x86_64-darwin12-gcc"
- all_platforms="${all_platforms} x86_64-darwin13-gcc"
</del><ins>+ 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"
+ all_platforms="${all_platforms} x86-win32-vs12"
</ins><span class="cx"> +all_platforms="${all_platforms} x86_64-darwin-gcc"
</span><del>-+all_platforms="${all_platforms} x86_64-darwin-clang"
- all_platforms="${all_platforms} x86_64-linux-gcc"
- all_platforms="${all_platforms} x86_64-linux-icc"
- all_platforms="${all_platforms} x86_64-solaris-gcc"
-@@ -149,6 +155,8 @@
- all_platforms="${all_platforms} universal-darwin11-gcc"
- all_platforms="${all_platforms} universal-darwin12-gcc"
- all_platforms="${all_platforms} universal-darwin13-gcc"
</del><ins>+ 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"
</ins><span class="cx"> +all_platforms="${all_platforms} universal-darwin-gcc"
</span><del>-+all_platforms="${all_platforms} universal-darwin-clang"
- all_platforms="${all_platforms} generic-gnu"
-
- # all_targets is a list of all targets that can be configured
</del><ins>+ all_platforms="${all_platforms} universal-darwin8-gcc"
+ all_platforms="${all_platforms} universal-darwin9-gcc"
+ all_platforms="${all_platforms} universal-darwin10-gcc"
</ins></span></pre>
</div>
</div>
</body>
</html>