From 691a35bdfd7949f2c056ec3f165f946b57ebfea0 Mon Sep 17 00:00:00 2001 From: Tilman Keskinoz Date: Sun, 16 Jan 2011 19:13:52 +0000 Subject: [PATCH] Make compile on supported versions of FreeBSD Feature safe: yes --- audio/emu10kx/Makefile | 4 ---- audio/emu10kx/files/patch-emu10kx-pcm.c | 11 +++++++++++ audio/emu10kx/files/patch-emu10kx.c | 11 +++++++++++ 3 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 audio/emu10kx/files/patch-emu10kx-pcm.c create mode 100644 audio/emu10kx/files/patch-emu10kx.c diff --git a/audio/emu10kx/Makefile b/audio/emu10kx/Makefile index 10828d4eff12..cb603ef03285 100644 --- a/audio/emu10kx/Makefile +++ b/audio/emu10kx/Makefile @@ -24,10 +24,6 @@ WRKSRC= ${WRKDIR}/${DISTNAME} .include -.if ${OSVERSION} > 699999 -BROKEN= does not compile -.endif - do-install: @${SETENV} ${MAKE_ENV} ${MAKE} -C ${WRKSRC} -DMODULES_WITH_WORLD install diff --git a/audio/emu10kx/files/patch-emu10kx-pcm.c b/audio/emu10kx/files/patch-emu10kx-pcm.c new file mode 100644 index 000000000000..f17c84ccb872 --- /dev/null +++ b/audio/emu10kx/files/patch-emu10kx-pcm.c @@ -0,0 +1,11 @@ +--- emu10kx-pcm.c.orig 2011-01-16 20:06:25.000000000 +0100 ++++ emu10kx-pcm.c 2011-01-16 20:10:06.000000000 +0100 +@@ -977,7 +977,7 @@ + break; + } + sc->rnum++; +- if (sndbuf_alloc(ch->buffer, sc->card->parent_dmat, sc->card->bufsz) != 0) ++ if (sndbuf_alloc(ch->buffer, sc->card->parent_dmat, NULL, sc->card->bufsz) != 0) + return NULL; + else { + snd_mtxlock(sc->lock); diff --git a/audio/emu10kx/files/patch-emu10kx.c b/audio/emu10kx/files/patch-emu10kx.c new file mode 100644 index 000000000000..32b34187592b --- /dev/null +++ b/audio/emu10kx/files/patch-emu10kx.c @@ -0,0 +1,11 @@ +--- emu10kx.c.orig 2011-01-16 20:03:30.000000000 +0100 ++++ emu10kx.c 2011-01-16 20:03:54.000000000 +0100 +@@ -892,7 +892,7 @@ + #else + sc->irq = bus_alloc_resource(dev, SYS_RES_IRQ, &i, 0, ~0, 1, RF_ACTIVE | RF_SHAREABLE); + #endif +- if ((!(sc->irq)) || bus_setup_intr(dev, sc->irq, INTR_MPSAFE | INTR_TYPE_AV, emu_intr, sc, &sc->ih)) { ++ if ((!(sc->irq)) || bus_setup_intr(dev, sc->irq, INTR_MPSAFE | INTR_TYPE_AV, NULL, emu_intr, sc, &sc->ih)) { + device_printf(dev, "unable to map interrupt\n"); + goto bad; + }