Revision: 93905 https://trac.macports.org/changeset/93905 Author: rmstonecipher@macports.org Date: 2012-06-03 19:04:13 -0700 (Sun, 03 Jun 2012) Log Message: ----------- multimedia/libvpx upgraded version from 1.0.0 to 1.1.0, edited and removed patchfiles due to upstream fixes Modified Paths: -------------- trunk/dports/multimedia/libvpx/Portfile trunk/dports/multimedia/libvpx/files/patch-build-make-configure.sh.diff Removed Paths: ------------- trunk/dports/multimedia/libvpx/files/patch-configure.diff Modified: trunk/dports/multimedia/libvpx/Portfile =================================================================== --- trunk/dports/multimedia/libvpx/Portfile 2012-06-03 22:46:22 UTC (rev 93904) +++ trunk/dports/multimedia/libvpx/Portfile 2012-06-04 02:04:13 UTC (rev 93905) @@ -5,7 +5,7 @@ PortGroup muniversal 1.0 name libvpx -version 1.0.0 +version 1.1.0 categories multimedia maintainers nomaintainer platforms darwin @@ -20,14 +20,13 @@ use_bzip2 yes distname ${name}-v${version} -checksums rmd160 2ee5a2e7f4cb2f126c6d0d9a36e8636455f42915 \ - sha256 07cedb0a19a44e6d81d75f52eea864f59ef10c6c725cb860431bec6641eafe21 +checksums rmd160 6f462c1421a51af77d3401ea4c1eaf0dbeaf4791 \ + sha256 9ce074cf4b3bcd9a49ff93e05485b71c273bfc3685a305e55a0e7fa51beb72c5 depends_build port:yasm # patches for: 10.6; correct "universal" arch default selection; 'sed' scripts. -patchfiles patch-build-make-configure.sh.diff \ - patch-configure.diff +patchfiles patch-build-make-configure.sh.diff post-patch { if {[vercmp $xcodeversion 4.3] < 0} { Modified: trunk/dports/multimedia/libvpx/files/patch-build-make-configure.sh.diff =================================================================== --- trunk/dports/multimedia/libvpx/files/patch-build-make-configure.sh.diff 2012-06-03 22:46:22 UTC (rev 93904) +++ trunk/dports/multimedia/libvpx/files/patch-build-make-configure.sh.diff 2012-06-04 02:04:13 UTC (rev 93905) @@ -13,29 +13,3 @@ EOF fi -@@ -616,17 +616,17 @@ process_common_toolchain() { - - # Handle darwin variants. Newer SDKs allow targeting older - # platforms, so find the newest SDK available. -- if [ -d "/Developer/SDKs/MacOSX10.4u.sdk" ]; then -- osx_sdk_dir="/Developer/SDKs/MacOSX10.4u.sdk" -+ if [ -d "@SDK_DIR@/MacOSX10.4u.sdk" ]; then -+ osx_sdk_dir="@SDK_DIR@/MacOSX10.4u.sdk" - fi -- if [ -d "/Developer/SDKs/MacOSX10.5.sdk" ]; then -- osx_sdk_dir="/Developer/SDKs/MacOSX10.5.sdk" -+ if [ -d "@SDK_DIR@/MacOSX10.5.sdk" ]; then -+ osx_sdk_dir="@SDK_DIR@/MacOSX10.5.sdk" - fi -- if [ -d "/Developer/SDKs/MacOSX10.6.sdk" ]; then -- osx_sdk_dir="/Developer/SDKs/MacOSX10.6.sdk" -+ if [ -d "@SDK_DIR@/MacOSX10.6.sdk" ]; then -+ osx_sdk_dir="@SDK_DIR@/MacOSX10.6.sdk" - fi -- if [ -d "/Developer/SDKs/MacOSX10.7.sdk" ]; then -- osx_sdk_dir="/Developer/SDKs/MacOSX10.7.sdk" -+ if [ -d "@SDK_DIR@/MacOSX10.7.sdk" ]; then -+ osx_sdk_dir="@SDK_DIR@/MacOSX10.7.sdk" - fi - - case ${toolchain} in Deleted: trunk/dports/multimedia/libvpx/files/patch-configure.diff =================================================================== --- trunk/dports/multimedia/libvpx/files/patch-configure.diff 2012-06-03 22:46:22 UTC (rev 93904) +++ trunk/dports/multimedia/libvpx/files/patch-configure.diff 2012-06-04 02:04:13 UTC (rev 93905) @@ -1,56 +0,0 @@ ---- configure.orig 2012-02-17 09:50:13.000000000 -0800 -+++ configure 2012-02-17 09:52:07.000000000 -0800 -@@ -107,6 +107,8 @@ all_platforms="${all_platforms} x86-darw - all_platforms="${all_platforms} x86-darwin9-gcc" - all_platforms="${all_platforms} x86-darwin9-icc" - all_platforms="${all_platforms} x86-darwin10-gcc" -+all_platforms="${all_platforms} x86-darwin11-gcc" -+all_platforms="${all_platforms} x86-darwin12-gcc" - all_platforms="${all_platforms} x86-linux-gcc" - all_platforms="${all_platforms} x86-linux-icc" - all_platforms="${all_platforms} x86-solaris-gcc" -@@ -117,6 +119,7 @@ all_platforms="${all_platforms} x86-win3 - all_platforms="${all_platforms} x86_64-darwin9-gcc" - all_platforms="${all_platforms} x86_64-darwin10-gcc" - all_platforms="${all_platforms} x86_64-darwin11-gcc" -+all_platforms="${all_platforms} x86_64-darwin12-gcc" - all_platforms="${all_platforms} x86_64-linux-gcc" - all_platforms="${all_platforms} x86_64-linux-icc" - all_platforms="${all_platforms} x86_64-solaris-gcc" -@@ -125,6 +128,9 @@ all_platforms="${all_platforms} x86_64-w - all_platforms="${all_platforms} x86_64-win64-vs9" - all_platforms="${all_platforms} universal-darwin8-gcc" - all_platforms="${all_platforms} universal-darwin9-gcc" -+all_platforms="${all_platforms} universal-darwin10-gcc" -+all_platforms="${all_platforms} universal-darwin11-gcc" -+all_platforms="${all_platforms} universal-darwin12-gcc" - all_platforms="${all_platforms} generic-gnu" - - # all_targets is a list of all targets that can be configured -@@ -483,12 +489,20 @@ process_toolchain() { - case $toolchain in - universal-darwin*) - local darwin_ver=${tgt_os##darwin} -- fat_bin_archs="$fat_bin_archs ppc32-${tgt_os}-gcc" -- -- # Intel -- fat_bin_archs="$fat_bin_archs x86-${tgt_os}-${tgt_cc}" -- if [ $darwin_ver -gt 8 ]; then -- fat_bin_archs="$fat_bin_archs x86_64-${tgt_os}-${tgt_cc}" -+ if [ $darwin_ver -eq 8 ]; then -+ # ppc32 and x86 are defaults for universal on 10.4 -+ fat_bin_archs="$fat_bin_archs ppc32-${tgt_os}-${tgt_cc}" -+ fat_bin_archs="$fat_bin_archs x86-${tgt_os}-${tgt_cc}" -+ fi -+ if [ $darwin_ver -eq 9 ]; then -+ # ppc32 and x86 are defaults for universal on 10.5 -+ fat_bin_archs="$fat_bin_archs ppc32-${tgt_os}-${tgt_cc}" -+ fat_bin_archs="$fat_bin_archs x86-${tgt_os}-${tgt_cc}" -+ fi -+ if [ $darwin_ver -ge 10 ]; then -+ # x86 and x86_64 are defaults for universal on 10.6 and 10.7 -+ fat_bin_archs="$fat_bin_archs x86-${tgt_os}-${tgt_cc}" -+ fat_bin_archs="$fat_bin_archs x86_64-${tgt_os}-${tgt_cc}" - fi - ;; - esac