diff options
author | joerg <joerg@pkgsrc.org> | 2006-05-10 23:05:00 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2006-05-10 23:05:00 +0000 |
commit | fe459ff81d59b7ca8644f93d12a36fa2bf5544e5 (patch) | |
tree | 9cc2f30ed555565f056643222b12b3c976beadaa /multimedia/kdemultimedia3/patches | |
parent | 094798f0e457ff51dae884ffec37568e179e90b7 (diff) | |
download | pkgsrc-fe459ff81d59b7ca8644f93d12a36fa2bf5544e5.tar.gz |
Fix OSS audio mixer on DragonFly. Kill a malloc.h include.
Based on patch from wa1ter@myrealbox.com on DragonFly's user list.
Bump revision.
Diffstat (limited to 'multimedia/kdemultimedia3/patches')
-rw-r--r-- | multimedia/kdemultimedia3/patches/patch-al | 13 | ||||
-rw-r--r-- | multimedia/kdemultimedia3/patches/patch-am | 13 | ||||
-rw-r--r-- | multimedia/kdemultimedia3/patches/patch-an | 16 |
3 files changed, 42 insertions, 0 deletions
diff --git a/multimedia/kdemultimedia3/patches/patch-al b/multimedia/kdemultimedia3/patches/patch-al new file mode 100644 index 00000000000..e00aef59d92 --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-al @@ -0,0 +1,13 @@ +$NetBSD: patch-al,v 1.1 2006/05/10 23:05:00 joerg Exp $ + +--- kmix/kmix-platforms.cpp.orig 2006-05-10 20:05:22.000000000 +0000 ++++ kmix/kmix-platforms.cpp +@@ -46,7 +46,7 @@ + #define OSS_MIXER + #endif + +-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(_UNIXWARE) ++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(_UNIXWARE) || defined(__DragonFly__) + #define OSS_MIXER + #endif + diff --git a/multimedia/kdemultimedia3/patches/patch-am b/multimedia/kdemultimedia3/patches/patch-am new file mode 100644 index 00000000000..75698f7491f --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-am @@ -0,0 +1,13 @@ +$NetBSD: patch-am,v 1.3 2006/05/10 23:05:00 joerg Exp $ + +--- kmix/mixer_oss.cpp.orig 2006-05-10 20:07:25.000000000 +0000 ++++ kmix/mixer_oss.cpp +@@ -150,7 +150,7 @@ int Mixer_OSS::open() + writeVolumeToHW( idx, md->getVolume() ); + } + +-#if !defined(__FreeBSD__) ++#if defined(SOUND_MIXER_INFO) + struct mixer_info l_mix_info; + if (ioctl(m_fd, SOUND_MIXER_INFO, &l_mix_info) != -1) + { diff --git a/multimedia/kdemultimedia3/patches/patch-an b/multimedia/kdemultimedia3/patches/patch-an new file mode 100644 index 00000000000..9cd718b6ef4 --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-an @@ -0,0 +1,16 @@ +$NetBSD: patch-an,v 1.1 2006/05/10 23:05:00 joerg Exp $ + +--- kscd/kscdmagic/xlib.c.orig 2006-05-10 20:09:55.000000000 +0000 ++++ kscd/kscdmagic/xlib.c +@@ -33,11 +33,7 @@ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> +-#ifndef __FreeBSD__ +-#include <malloc.h> +-#else + #include <stdlib.h> +-#endif + #include "xlib.h" + #ifdef AMIGA + #define XFlush(x) while(0) |