diff options
| author | jmmv <jmmv@pkgsrc.org> | 2006-07-01 19:08:36 +0000 |
|---|---|---|
| committer | jmmv <jmmv@pkgsrc.org> | 2006-07-01 19:08:36 +0000 |
| commit | 7b0118cb1f25ad6bbfcc26a96490c8636a4232da (patch) | |
| tree | b315545eb2bd7482b33271ae25635f43556a2f37 /devel/SDL | |
| parent | 4c5b9e1dea3b526400a62ce26930d1386adc1754 (diff) | |
| download | pkgsrc-7b0118cb1f25ad6bbfcc26a96490c8636a4232da.tar.gz | |
Revert previous because it changed the libraries libSDL was linked to.
Instead, try to dlopen the libraries straight from the directories they
are in.
Bump PKGREVISION to 2.
Requested and reviewed by wiz@.
Diffstat (limited to 'devel/SDL')
| -rw-r--r-- | devel/SDL/Makefile | 7 | ||||
| -rw-r--r-- | devel/SDL/distinfo | 3 | ||||
| -rw-r--r-- | devel/SDL/patches/patch-aa | 37 |
3 files changed, 43 insertions, 4 deletions
diff --git a/devel/SDL/Makefile b/devel/SDL/Makefile index 6adbfee3c19..1591b9508c4 100644 --- a/devel/SDL/Makefile +++ b/devel/SDL/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.66 2006/07/01 18:18:17 jmmv Exp $ +# $NetBSD: Makefile,v 1.67 2006/07/01 19:08:36 jmmv Exp $ DISTNAME= SDL-1.2.10 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= devel games MASTER_SITES= http://www.libsdl.org/release/ @@ -16,7 +16,8 @@ GNU_CONFIGURE= yes PTHREAD_OPTS+= require PKG_INSTALLATION_TYPES= overwrite pkgviews -CONFIGURE_ARGS+= --disable-sdl-dlopen +CPPFLAGS+= -DPREFIX="\"${PREFIX}\"" +CPPFLAGS+= -DX11BASE="\"${X11BASE}\"" .include "options.mk" diff --git a/devel/SDL/distinfo b/devel/SDL/distinfo index cb5830988ce..337cfb6117c 100644 --- a/devel/SDL/distinfo +++ b/devel/SDL/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.43 2006/06/12 16:20:44 wiz Exp $ +$NetBSD: distinfo,v 1.44 2006/07/01 19:08:36 jmmv Exp $ SHA1 (SDL-1.2.10.tar.gz) = ad64b3b58b3cf83a28a1c21bedf270da43118f67 RMD160 (SDL-1.2.10.tar.gz) = e2e73a580638ab29d4b000152ed80999545e9fb5 Size (SDL-1.2.10.tar.gz) = 2792344 bytes +SHA1 (patch-aa) = 04894f421f6e56ca7967c70afba5e361dcd72b14 SHA1 (patch-aj) = 21b77004d782b5da7973e8ccb8bdd686efca1684 SHA1 (patch-am) = 0a99757ca6dbed3f46c6ed2a04a3e65d81f92b3b diff --git a/devel/SDL/patches/patch-aa b/devel/SDL/patches/patch-aa new file mode 100644 index 00000000000..36dec355f2e --- /dev/null +++ b/devel/SDL/patches/patch-aa @@ -0,0 +1,37 @@ +$NetBSD: patch-aa,v 1.13 2006/07/01 19:08:36 jmmv Exp $ + +--- src/loadso/dlopen/SDL_sysloadso.c.orig 2006-05-01 10:02:37.000000000 +0200 ++++ src/loadso/dlopen/SDL_sysloadso.c +@@ -31,9 +31,31 @@ + + #include "SDL_loadso.h" + ++const char *libdirs[] = { ++ PREFIX "/lib/", ++ X11BASE "/lib/", ++ NULL ++}; ++ + void *SDL_LoadObject(const char *sofile) + { +- void *handle = dlopen(sofile, RTLD_NOW); ++ int i; ++ void *handle; ++ ++ i = 0; ++ handle = NULL; ++ while (libdirs[i] != NULL && handle == NULL) { ++ char buf[1024]; ++ ++ strncpy(buf, libdirs[i], sizeof(buf) - 1); ++ buf[sizeof(buf) - 1] = '\0'; ++ strncat(buf, sofile, sizeof(buf) - 1); ++ buf[sizeof(buf) - 1] = '\0'; ++ ++ handle = dlopen(buf, RTLD_NOW); ++ ++ i++; ++ } + const char *loaderror = (char *)dlerror(); + if ( handle == NULL ) { + SDL_SetError("Failed loading %s: %s", sofile, loaderror); |