On Thu, Jan 10, 2013 at 02:00:08AM +0100, Stefan Sperling wrote:
> On Thu, Jan 10, 2013 at 12:37:54AM +0000, Stuart Henderson wrote:
> > On 2012/12/31 01:50, Stefan Sperling wrote:
> > > Perhaps mikmod should be updated but I'd rather just fix this for now.
> >
> > updated to 3.2.0 here, some of the patches were rolled in, and I've
> > added a comment in patches for the remaining ones where it's not obvious.
>
> Diff is fine with me. Unfortunately this update breaks sdl-mixer :(
You need this. The new version does segfault with mikmod, currently
debugging...
Index: files/drv_sndio.c
===================================================================
RCS file: /home/vcs/cvs/openbsd/ports/audio/libmikmod/files/drv_sndio.c,v
retrieving revision 1.1
diff -u -p -r1.1 drv_sndio.c
--- files/drv_sndio.c 11 Jan 2010 04:25:26 -0000 1.1
+++ files/drv_sndio.c 10 Jan 2013 01:46:05 -0000
@@ -65,7 +65,7 @@ static BOOL Sndio_Init(void)
return 1;
}
- if (!(audiobuffer = (SBYTE *)_mm_malloc(fragsize)))
+ if (!(audiobuffer = (SBYTE *)MikMod_malloc(fragsize)))
return 1;
sio_initpar(&par);
@@ -106,7 +106,7 @@ static BOOL Sndio_Init(void)
static void Sndio_Exit(void)
{
VC_Exit();
- _mm_free(audiobuffer);
+ MikMod_free(audiobuffer);
if (hdl) {
sio_close(hdl);
hdl = NULL;
