diff options
| author | wiz <wiz@pkgsrc.org> | 2014-08-17 09:24:47 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2014-08-17 09:24:47 +0000 |
| commit | 2476108b881dc015bab8e5b57c039fe25ca7474d (patch) | |
| tree | 970f5e081cc8d74a02d42c044a0e8a37d23d1d7e | |
| parent | ba6e8147c5386d1055bea33f6fc1ed2bb6efbd3d (diff) | |
| download | pkgsrc-2476108b881dc015bab8e5b57c039fe25ca7474d.tar.gz | |
Fix SDL_LoadObject to try the soname itself first, without any prefixes,
and only fallback to other places when that fails.
Bump PKGREVISION.
| -rw-r--r-- | devel/SDL/Makefile | 4 | ||||
| -rw-r--r-- | devel/SDL/distinfo | 4 | ||||
| -rw-r--r-- | devel/SDL/patches/patch-aa | 12 |
3 files changed, 13 insertions, 7 deletions
diff --git a/devel/SDL/Makefile b/devel/SDL/Makefile index 8c8e1b77d6d..f2d3289ad60 100644 --- a/devel/SDL/Makefile +++ b/devel/SDL/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.115 2014/06/09 14:18:06 ryoon Exp $ +# $NetBSD: Makefile,v 1.116 2014/08/17 09:24:47 wiz Exp $ DISTNAME= SDL-1.2.15 -PKGREVISION= 11 +PKGREVISION= 12 CATEGORIES= devel games MASTER_SITES= http://www.libsdl.org/release/ diff --git a/devel/SDL/distinfo b/devel/SDL/distinfo index c759d4767fc..33cbf17366e 100644 --- a/devel/SDL/distinfo +++ b/devel/SDL/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.65 2014/04/14 19:27:46 adam Exp $ +$NetBSD: distinfo,v 1.66 2014/08/17 09:24:47 wiz Exp $ SHA1 (SDL-1.2.15.tar.gz) = 0c5f193ced810b0d7ce3ab06d808cbb5eef03a2c RMD160 (SDL-1.2.15.tar.gz) = d4802a090cb4a24eeb0c8ce5690802f596d394c3 Size (SDL-1.2.15.tar.gz) = 3920622 bytes -SHA1 (patch-aa) = 759e3e439671a0edda5d5bbd5e9fc0d0a8e15a19 +SHA1 (patch-aa) = 00fb7a85caf8fc9f08298d0a07a4587757fdffb0 SHA1 (patch-ac) = 8b2dddff9ad449b19b35ef364e2d960e46284563 SHA1 (patch-src_audio_sun_SDL__sunaudio.c) = 4b492b40d39e6444037dfda55766e4a149cc6c30 SHA1 (patch-src_joystick_bsd_SDL__sysjoystick.c) = 4ea0136f231729129b82e5f7ee4b9eaf68a13876 diff --git a/devel/SDL/patches/patch-aa b/devel/SDL/patches/patch-aa index 76d61e93d4b..fbf9eca2c6b 100644 --- a/devel/SDL/patches/patch-aa +++ b/devel/SDL/patches/patch-aa @@ -1,10 +1,10 @@ -$NetBSD: patch-aa,v 1.15 2012/09/14 13:20:20 wiz Exp $ +$NetBSD: patch-aa,v 1.16 2014/08/17 09:24:47 wiz Exp $ Try to dlopen the libraries straight from the directories they are in. ---- src/loadso/dlopen/SDL_sysloadso.c.orig 2006-05-01 01:02:37.000000000 -0700 +--- src/loadso/dlopen/SDL_sysloadso.c.orig 2012-01-19 06:30:06.000000000 +0000 +++ src/loadso/dlopen/SDL_sysloadso.c -@@ -31,9 +31,32 @@ +@@ -31,9 +31,38 @@ #include "SDL_loadso.h" @@ -17,6 +17,12 @@ Try to dlopen the libraries straight from the directories they are in. + unsigned i; + void *handle; + ++ /* first, try file name directly */ ++ handle = dlopen(sofile, RTLD_NOW); ++ if (handle) ++ return handle; ++ ++ /* if that didn't work, prefix known locations and try again */ + for (i = 0; i < sizeof libdirs / sizeof libdirs[0]; i++) { + char buf[1024]; + |