summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authoradam <adam>2012-03-05 21:16:09 +0000
committeradam <adam>2012-03-05 21:16:09 +0000
commitb46032426ac209fc48aa8948a0008f0d21a2a8c4 (patch)
tree5056e6bb7557ca6fc512765642049499aa89599e /multimedia
parent07a8085387f2586d32accb7e8b5bb63eb68014a2 (diff)
downloadpkgsrc-b46032426ac209fc48aa8948a0008f0d21a2a8c4.tar.gz
Fix building with Xcode installed in /Applications (as is the current version on Lion).
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/libvpx/distinfo4
-rw-r--r--multimedia/libvpx/patches/patch-ad13
2 files changed, 14 insertions, 3 deletions
diff --git a/multimedia/libvpx/distinfo b/multimedia/libvpx/distinfo
index a5218ecb11e..158380f9994 100644
--- a/multimedia/libvpx/distinfo
+++ b/multimedia/libvpx/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2012/02/28 14:12:05 martin Exp $
+$NetBSD: distinfo,v 1.13 2012/03/05 21:16:09 adam Exp $
SHA1 (libvpx-v1.0.0.tar.bz2) = 2919e11074fef72fc61ef1a75160050ffaad6074
RMD160 (libvpx-v1.0.0.tar.bz2) = 2ee5a2e7f4cb2f126c6d0d9a36e8636455f42915
@@ -6,6 +6,6 @@ Size (libvpx-v1.0.0.tar.bz2) = 1641411 bytes
SHA1 (patch-aa) = 088d405d598800d4587eb20647347db1490a29f2
SHA1 (patch-ab) = 468131a66c39d9b42080e62f6afa7cfd3657609b
SHA1 (patch-ac) = e177ad5416b50b75fe026377d8033032e0ca63c3
-SHA1 (patch-ad) = 9263176218e1a6dd70b55101cd047a34746109a9
+SHA1 (patch-ad) = 169e259b73e13175298aba9cd07084e5479e1e99
SHA1 (patch-af) = 01ad55ae9a30c079267b7a7af6b644d56a3e57e3
SHA1 (patch-configure) = 72587d9f326040dd50b55e8ea086a05713533cbe
diff --git a/multimedia/libvpx/patches/patch-ad b/multimedia/libvpx/patches/patch-ad
index e1754f8e0a5..f8cf90fcbeb 100644
--- a/multimedia/libvpx/patches/patch-ad
+++ b/multimedia/libvpx/patches/patch-ad
@@ -1,6 +1,7 @@
-$NetBSD: patch-ad,v 1.5 2012/01/31 11:53:52 ryoon Exp $
+$NetBSD: patch-ad,v 1.6 2012/03/05 21:16:09 adam Exp $
*BSD and qnx are identified as linux.
+Add another SDK path on Mac OS X.
--- build/make/configure.sh.orig 2012-01-27 18:36:39.000000000 +0000
+++ build/make/configure.sh
@@ -13,6 +14,16 @@ $NetBSD: patch-ad,v 1.5 2012/01/31 11:53:52 ryoon Exp $
tgt_os=linux
;;
*solaris2.10)
+@@ -628,6 +628,9 @@ process_common_toolchain() {
+ if [ -d "/Developer/SDKs/MacOSX10.7.sdk" ]; then
+ osx_sdk_dir="/Developer/SDKs/MacOSX10.7.sdk"
+ fi
++ if [ -d "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk" ]; then
++ osx_sdk_dir="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk"
++ fi
+
+ case ${toolchain} in
+ *-darwin8-*)
@@ -1019,10 +1019,29 @@ EOF
case ${toolchain} in
*-win*);;