On Sat, Mar 03, 2012 at 08:25:17PM +1100, Jonathan Gray wrote:
> The configure script for sdl selects the wrong libraries to dlopen,
> ie it picked libX11.so.10.0 on a system with libX11.so.9 -> 15
>
> With the following diff sdl programs no longer segfault here.
here is the diff I meant to send that doesn't have the typo
spotted by brad
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/sdl/Makefile,v
retrieving revision 1.82
diff -u -p -r1.82 Makefile
--- Makefile 2 Mar 2012 09:10:38 -0000 1.82
+++ Makefile 3 Mar 2012 10:31:24 -0000
@@ -3,6 +3,7 @@
COMMENT= cross-platform multimedia library
VERSION= 1.2.15
+REVISION= 0
DISTNAME= SDL-${VERSION}
PKGNAME= ${DISTNAME:L}
CATEGORIES= devel
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/devel/sdl/patches/patch-configure,v
retrieving revision 1.22
diff -u -p -r1.22 patch-configure
--- patches/patch-configure 2 Mar 2012 09:10:38 -0000 1.22
+++ patches/patch-configure 3 Mar 2012 10:31:24 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-configure,v 1.22 2012/03/02 09:10:38 dcoppa Exp $
---- configure.orig Thu Jan 19 01:30:12 2012
-+++ configure Wed Feb 22 13:39:54 2012
+--- configure.orig Thu Jan 19 17:30:12 2012
++++ configure Sat Mar 3 21:27:39 2012
@@ -21000,6 +21000,20 @@ _ACEOF
fi
}
@@ -22,7 +22,20 @@ $OpenBSD: patch-configure,v 1.22 2012/03
CheckPulseAudio()
{
# Check whether --enable-pulseaudio was given.
-@@ -29551,6 +29565,7 @@ _ACEOF
+@@ -24073,6 +24087,12 @@ fi
+ x11_lib='libX11.so'
+ x11ext_lib='libXext.so'
+ ;;
++ *-*-openbsd*)
++ x11_lib='libX11.so'
++ x11ext_lib='libXext.so'
++ xrender_lib='libXrender.so'
++ xrander_lib='libXrandr.so'
++ ;;
+ *)
+ x11_lib=`find_lib "libX11.so.*" "$X_LIBS
-L/usr/X11/$base_libdir -L/usr/X11R6/$base_libdir" | sed 's/.*\/\(.*\)/\1/; q'`
+ x11ext_lib=`find_lib "libXext.so.*" "$X_LIBS
-L/usr/X11/$base_libdir -L/usr/X11R6/$base_libdir" | sed 's/.*\/\(.*\)/\1/; q'`
+@@ -29551,6 +29571,7 @@ _ACEOF
CheckALSA
CheckARTSC
CheckESD
@@ -30,7 +43,7 @@ $OpenBSD: patch-configure,v 1.22 2012/03
CheckPulseAudio
CheckNAS
CheckX11
-@@ -29586,7 +29601,7 @@ _ACEOF
+@@ -29586,7 +29607,7 @@ _ACEOF
SOURCES="$SOURCES $srcdir/src/audio/sun/*.c"
have_audio=yes
;;
