pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel/SDL Fix build under Mac OS X Leopard.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/73072befa8f4
branches:  trunk
changeset: 536592:73072befa8f4
user:      tron <tron%pkgsrc.org@localhost>
date:      Mon Dec 17 20:40:00 2007 +0000

description:
Fix build under Mac OS X Leopard.

diffstat:

 devel/SDL/Makefile         |   9 ++++++++-
 devel/SDL/distinfo         |   4 +++-
 devel/SDL/patches/patch-ab |  12 ++++++++++++
 devel/SDL/patches/patch-ac |  12 ++++++++++++
 4 files changed, 35 insertions(+), 2 deletions(-)

diffs (70 lines):

diff -r 3af47a05bda1 -r 73072befa8f4 devel/SDL/Makefile
--- a/devel/SDL/Makefile        Mon Dec 17 20:24:13 2007 +0000
+++ b/devel/SDL/Makefile        Mon Dec 17 20:40:00 2007 +0000
@@ -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 @@
 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 -r 3af47a05bda1 -r 73072befa8f4 devel/SDL/distinfo
--- a/devel/SDL/distinfo        Mon Dec 17 20:24:13 2007 +0000
+++ b/devel/SDL/distinfo        Mon Dec 17 20:40:00 2007 +0000
@@ -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 -r 3af47a05bda1 -r 73072befa8f4 devel/SDL/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/SDL/patches/patch-ab        Mon Dec 17 20:40:00 2007 +0000
@@ -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 -r 3af47a05bda1 -r 73072befa8f4 devel/SDL/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/SDL/patches/patch-ac        Mon Dec 17 20:40:00 2007 +0000
@@ -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"
+ 



Home | Main Index | Thread Index | Old Index