summaryrefslogtreecommitdiff
path: root/devel/SDL
diff options
context:
space:
mode:
authortron <tron>2007-12-17 20:40:00 +0000
committertron <tron>2007-12-17 20:40:00 +0000
commit90ba5afaabd65ff76b1b62487311d04e9c2ba01b (patch)
treea2ff400dd0f672aa0f419617693b4b8629be3fa3 /devel/SDL
parent985e54ccc3b9571de89124f06798dbd300e66f25 (diff)
downloadpkgsrc-90ba5afaabd65ff76b1b62487311d04e9c2ba01b.tar.gz
Fix build under Mac OS X Leopard.
Diffstat (limited to 'devel/SDL')
-rw-r--r--devel/SDL/Makefile9
-rw-r--r--devel/SDL/distinfo4
-rw-r--r--devel/SDL/patches/patch-ab12
-rw-r--r--devel/SDL/patches/patch-ac12
4 files changed, 35 insertions, 2 deletions
diff --git a/devel/SDL/Makefile b/devel/SDL/Makefile
index 76331bdd9c2..f6d63466a20 100644
--- a/devel/SDL/Makefile
+++ b/devel/SDL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.79 2007/08/14 14:08:13 tron Exp $
+# $NetBSD: Makefile,v 1.80 2007/12/17 20:40:00 tron Exp $
DISTNAME= SDL-1.2.12
CATEGORIES= devel games
@@ -49,8 +49,15 @@ COCOA_DIRS+= /System /Library /Developer
BUILDLINK_PASSTHRU_DIRS+= ${dir}
. endif
. endfor
+
+# See <http://developer.apple.com/qa/qa2007/qa1567.html>.
+. if !empty(OS_VERSION:M9.*)
+LDFLAGS+= -Wl,-dylib_file -Wl,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
+. endif
+
.endif
+
.include "../../mk/oss.buildlink3.mk"
AM_CFLAGS= -D_PATH_DEV_DSP="\"${DEVOSSAUDIO}\""
diff --git a/devel/SDL/distinfo b/devel/SDL/distinfo
index 9170923a96f..a98559daf8a 100644
--- a/devel/SDL/distinfo
+++ b/devel/SDL/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.48 2007/07/25 23:31:08 wiz Exp $
+$NetBSD: distinfo,v 1.49 2007/12/17 20:40:00 tron Exp $
SHA1 (SDL-1.2.12.tar.gz) = 2c37ff1683368369c0f555d4a742f0544153610d
RMD160 (SDL-1.2.12.tar.gz) = 3871023c63ea056eba43ce4f55ee8d3a73ff3022
Size (SDL-1.2.12.tar.gz) = 2829456 bytes
SHA1 (patch-aa) = 5a3b922c1ad64837d2bc1461723e4f34622b481f
+SHA1 (patch-ab) = f18edd064b28528dec186d26967fdd9455fb9cff
+SHA1 (patch-ac) = 0b14c735e5467e176549576aed5f8e1e2378037a
diff --git a/devel/SDL/patches/patch-ab b/devel/SDL/patches/patch-ab
new file mode 100644
index 00000000000..3b14297c638
--- /dev/null
+++ b/devel/SDL/patches/patch-ab
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.6 2007/12/17 20:40:01 tron Exp $
+
+--- src/audio/macosx/SDL_coreaudio.c.orig 2007-07-20 06:52:10.000000000 +0100
++++ src/audio/macosx/SDL_coreaudio.c 2007-12-17 20:08:14.000000000 +0000
+@@ -22,6 +22,7 @@
+ #include "SDL_config.h"
+
+ #include <AudioUnit/AudioUnit.h>
++#include <AudioUnit/AUNTComponent.h>
+
+ #include "SDL_audio.h"
+ #include "../SDL_audio_c.h"
diff --git a/devel/SDL/patches/patch-ac b/devel/SDL/patches/patch-ac
new file mode 100644
index 00000000000..cce1a964c3a
--- /dev/null
+++ b/devel/SDL/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.14 2007/12/17 20:40:02 tron Exp $
+
+--- src/cdrom/macosx/AudioFilePlayer.h.orig 2007-07-20 06:52:11.000000000 +0100
++++ src/cdrom/macosx/AudioFilePlayer.h 2007-12-17 20:15:35.000000000 +0000
+@@ -33,6 +33,7 @@
+ #include <CoreServices/CoreServices.h>
+
+ #include <AudioUnit/AudioUnit.h>
++#include <AudioUnit/AUNTComponent.h>
+
+ #include "SDL_error.h"
+