Re: PATCH: devel/sdl
On 1/25/08, Antoine Jacoutot [EMAIL PROTECTED] wrote: On Fri, 25 Jan 2008, Antti Harri wrote: If you don't specify a major.minor in the name passed dlopen() it will select the one with the highest major then highest minor after that. Anyone wanting to commit this has my OK; it really fixes things... Yep, sorry - I somehow missed this thread. It's in now.
Re: PATCH: devel/sdl
On 25 Jan 2008 at 0:27, Brad wrote: On Friday 25 January 2008 00:21:38 Antti Harri wrote: Anyone? ok brad@ Though something really needs to be done about fixing this properly. IMO this is ridiculous to have a hardcoded shared library name in the resulting binary. Eh, why not just use libGL.so so it will find any available version? Like we do in firefox: patch-gfx_src_psshared_nsCUPSShim_cpp:-mCupsLib = PR_LoadLibrary(libcups.so.2); patch-gfx_src_psshared_nsCUPSShim_cpp:+mCupsLib = PR_LoadLibrary(libcups.so); patch-modules_libpref_src_init_all_js:-pref(font.freetype2.shared-library, libfreetype.so.6); patch-modules_libpref_src_init_all_js:+pref(font.freetype2.shared-library, libfreetype.so); patch-widget_src_gtk2_nsSound_cpp:-elib = PR_LoadLibrary(libesd.so.0); patch-widget_src_gtk2_nsSound_cpp:+elib = PR_LoadLibrary(libesd.so); On Fri, 18 Jan 2008, Antti Harri wrote: +++ patches/patch-src_video_x11_SDL_x11gl_c 18 Jan 2008 19:02:23 - @@ -6,7 +6,7 @@ #define DEFAULT_OPENGL libGL.so.3 #elif defined(__OpenBSD__) -#define DEFAULT_OPENGL libGL.so.4.0 -+#define DEFAULT_OPENGL libGL.so.5.1 ++#define DEFAULT_OPENGL libGL.so.6.0
Re: PATCH: devel/sdl
On Fri, 25 Jan 2008, Peter Strömberg wrote: Eh, why not just use libGL.so so it will find any available version? I thought about this too. But what version will it use when there are multiple version installed? For example libGL.so.5.1 and libGL.so.6.0. Like we do in firefox: patch-gfx_src_psshared_nsCUPSShim_cpp:-mCupsLib = PR_LoadLibrary(libcups.so.2); patch-gfx_src_psshared_nsCUPSShim_cpp:+mCupsLib = PR_LoadLibrary(libcups.so); patch-modules_libpref_src_init_all_js:-pref(font.freetype2.shared-library, libfreetype.so.6); patch-modules_libpref_src_init_all_js:+pref(font.freetype2.shared-library, libfreetype.so); patch-widget_src_gtk2_nsSound_cpp:-elib = PR_LoadLibrary(libesd.so.0); patch-widget_src_gtk2_nsSound_cpp:+elib = PR_LoadLibrary(libesd.so); With sdl it is loaded on runtime, it can also be overridden using and environment variable. Does that matter? -- Antti Harri
Re: PATCH: devel/sdl
On Fri, 25 Jan 2008, Kurt Miller wrote:
I thought about this too. But what version will it use
when there are multiple version installed? For example libGL.so.5.1 and
libGL.so.6.0.
If you don't specify a major.minor in the name passed dlopen() it will select
the one with the highest major then highest minor after that.
I tried Bzflag and Neverball and both worked okay with libGL.so.
With sdl it is loaded on runtime, it can also be overridden
using and environment variable. Does that matter?
Less knobs == better.
Of course.
? w-sdl-1.2.13p0
Index: Makefile
===
RCS file: /cvs/ports/devel/sdl/Makefile,v
retrieving revision 1.60
diff -u -r1.60 Makefile
--- Makefile3 Jan 2008 17:39:40 - 1.60
+++ Makefile25 Jan 2008 17:13:22 -
@@ -4,7 +4,7 @@
VERSION= 1.2.13
DISTNAME= SDL-${VERSION}
-PKGNAME= ${DISTNAME:L}
+PKGNAME= ${DISTNAME:L}p0
CATEGORIES=devel
HOMEPAGE= http://www.libsdl.org/
Index: patches/patch-src_video_x11_SDL_x11gl_c
===
RCS file: /cvs/ports/devel/sdl/patches/patch-src_video_x11_SDL_x11gl_c,v
retrieving revision 1.12
diff -u -r1.12 patch-src_video_x11_SDL_x11gl_c
--- patches/patch-src_video_x11_SDL_x11gl_c 22 Sep 2007 01:12:38 -
1.12
+++ patches/patch-src_video_x11_SDL_x11gl_c 25 Jan 2008 17:13:22 -
@@ -6,7 +6,7 @@
#define DEFAULT_OPENGLlibGL.so.3
#elif defined(__OpenBSD__)
-#define DEFAULT_OPENGLlibGL.so.4.0
-+#define DEFAULT_OPENGLlibGL.so.5.1
++#define DEFAULT_OPENGLlibGL.so
#else
#define DEFAULT_OPENGLlibGL.so.1
#endif
Re: PATCH: devel/sdl
On Fri, 25 Jan 2008, Antti Harri wrote:
If you don't specify a major.minor in the name passed dlopen() it will
select
the one with the highest major then highest minor after that.
Anyone wanting to commit this has my OK; it really fixes things...
Index: Makefile
===
RCS file: /cvs/ports/devel/sdl/Makefile,v
retrieving revision 1.60
diff -u -r1.60 Makefile
--- Makefile3 Jan 2008 17:39:40 - 1.60
+++ Makefile25 Jan 2008 17:13:22 -
@@ -4,7 +4,7 @@
VERSION=1.2.13
DISTNAME= SDL-${VERSION}
-PKGNAME= ${DISTNAME:L}
+PKGNAME= ${DISTNAME:L}p0
CATEGORIES= devel
HOMEPAGE= http://www.libsdl.org/
Index: patches/patch-src_video_x11_SDL_x11gl_c
===
RCS file: /cvs/ports/devel/sdl/patches/patch-src_video_x11_SDL_x11gl_c,v
retrieving revision 1.12
diff -u -r1.12 patch-src_video_x11_SDL_x11gl_c
--- patches/patch-src_video_x11_SDL_x11gl_c 22 Sep 2007 01:12:38 -
1.12
+++ patches/patch-src_video_x11_SDL_x11gl_c 25 Jan 2008 17:13:22 -
@@ -6,7 +6,7 @@
#define DEFAULT_OPENGL libGL.so.3
#elif defined(__OpenBSD__)
-#define DEFAULT_OPENGL libGL.so.4.0
-+#define DEFAULT_OPENGLlibGL.so.5.1
++#define DEFAULT_OPENGLlibGL.so
#else
#define DEFAULT_OPENGL libGL.so.1
#endif
--
Antoine
Re: PATCH: devel/sdl
On Friday 25 January 2008 5:17:28 am Antti Harri wrote: On Fri, 25 Jan 2008, Peter Strömberg wrote: Eh, why not just use libGL.so so it will find any available version? I thought about this too. But what version will it use when there are multiple version installed? For example libGL.so.5.1 and libGL.so.6.0. If you don't specify a major.minor in the name passed dlopen() it will select the one with the highest major then highest minor after that. Like we do in firefox: patch-gfx_src_psshared_nsCUPSShim_cpp:-mCupsLib = PR_LoadLibrary(libcups.so.2); patch-gfx_src_psshared_nsCUPSShim_cpp:+ mCupsLib = PR_LoadLibrary(libcups.so); patch-modules_libpref_src_init_all_js:-pref(font.freetype2.shared-librar y, libfreetype.so.6); patch-modules_libpref_src_init_all_js:+pref(font.freetype2.shared-librar y, libfreetype.so); patch-widget_src_gtk2_nsSound_cpp:-elib = PR_LoadLibrary(libesd.so.0); patch-widget_src_gtk2_nsSound_cpp:+ elib = PR_LoadLibrary(libesd.so); With sdl it is loaded on runtime, it can also be overridden using and environment variable. Does that matter? Less knobs == better.
Re: PATCH: devel/sdl
Anyone?
On Fri, 18 Jan 2008, Antti Harri wrote:
Hi,
I found out the reason why some SDL apps were segfaulting.
http://users.openbsd.fi/iku/files/sdl.diff
? w-sdl-1.2.13
Index: Makefile
===
RCS file: /cvs/ports/devel/sdl/Makefile,v
retrieving revision 1.60
diff -u -r1.60 Makefile
--- Makefile3 Jan 2008 17:39:40 - 1.60
+++ Makefile18 Jan 2008 19:02:23 -
@@ -4,7 +4,7 @@
VERSION=1.2.13
DISTNAME= SDL-${VERSION}
-PKGNAME= ${DISTNAME:L}
+PKGNAME= ${DISTNAME:L}p0
CATEGORIES= devel
HOMEPAGE= http://www.libsdl.org/
Index: patches/patch-src_video_x11_SDL_x11gl_c
===
RCS file: /cvs/ports/devel/sdl/patches/patch-src_video_x11_SDL_x11gl_c,v
retrieving revision 1.12
diff -u -r1.12 patch-src_video_x11_SDL_x11gl_c
--- patches/patch-src_video_x11_SDL_x11gl_c 22 Sep 2007 01:12:38 -
1.12
+++ patches/patch-src_video_x11_SDL_x11gl_c 18 Jan 2008 19:02:23 -
@@ -6,7 +6,7 @@
#define DEFAULT_OPENGL libGL.so.3
#elif defined(__OpenBSD__)
-#define DEFAULT_OPENGL libGL.so.4.0
-+#define DEFAULT_OPENGLlibGL.so.5.1
++#define DEFAULT_OPENGLlibGL.so.6.0
#else
#define DEFAULT_OPENGL libGL.so.1
#endif
Re: PATCH: devel/sdl
On Friday 25 January 2008 00:21:38 Antti Harri wrote:
Anyone?
ok brad@
Though something really needs to be done about fixing this properly.
IMO this is ridiculous to have a hardcoded shared library name in the
resulting binary.
On Fri, 18 Jan 2008, Antti Harri wrote:
Hi,
I found out the reason why some SDL apps were segfaulting.
http://users.openbsd.fi/iku/files/sdl.diff
? w-sdl-1.2.13
Index: Makefile
===
RCS file: /cvs/ports/devel/sdl/Makefile,v
retrieving revision 1.60
diff -u -r1.60 Makefile
--- Makefile3 Jan 2008 17:39:40 - 1.60
+++ Makefile18 Jan 2008 19:02:23 -
@@ -4,7 +4,7 @@
VERSION=1.2.13
DISTNAME= SDL-${VERSION}
-PKGNAME= ${DISTNAME:L}
+PKGNAME= ${DISTNAME:L}p0
CATEGORIES= devel
HOMEPAGE= http://www.libsdl.org/
Index: patches/patch-src_video_x11_SDL_x11gl_c
===
RCS file: /cvs/ports/devel/sdl/patches/patch-src_video_x11_SDL_x11gl_c,v
retrieving revision 1.12
diff -u -r1.12 patch-src_video_x11_SDL_x11gl_c
--- patches/patch-src_video_x11_SDL_x11gl_c 22 Sep 2007 01:12:38 -
1.12
+++ patches/patch-src_video_x11_SDL_x11gl_c 18 Jan 2008 19:02:23 -
@@ -6,7 +6,7 @@
#define DEFAULT_OPENGL libGL.so.3
#elif defined(__OpenBSD__)
-#define DEFAULT_OPENGL libGL.so.4.0
-+#define DEFAULT_OPENGLlibGL.so.5.1
++#define DEFAULT_OPENGLlibGL.so.6.0
#else
#define DEFAULT_OPENGL libGL.so.1
#endif
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
