diff options
| author | Jeremy Messenger <mezz@FreeBSD.org> | 2009-08-02 19:36:34 +0000 |
|---|---|---|
| committer | Jeremy Messenger <mezz@FreeBSD.org> | 2009-08-02 19:36:34 +0000 |
| commit | 789d75c728ef23566a07bf5b9bc2190bf34ff4f1 (patch) | |
| tree | dc7540d42fa2d5d7c1c74515e3bdbf6ab842cd17 /audio/pulseaudio/files/patch-src_modules_oss_module-oss.c | |
| parent | d1a9e827c98542eb35619dffa314cba50fb08b58 (diff) | |
-Repocopy devel/libtool15 -> libtool22 and libltdl15 -> libltdl22.
-Update libtool and libltdl to 2.2.6a.
-Remove devel/libtool15 and devel/libltdl15.
-Fix ports build with libtool22/libltdl22.
-Bump ports that depend on libltdl22 due to shared library version change.
-Explain what to do update in the UPDATING.
It has been tested with GNOME2, XFCE4, KDE3, KDE4 and other many wm/desktop
and applications in the runtime.
With help: marcus and kwm
Pointyhat-exp: a few times by pav
Tested by: pgollucci, "Romain Tartière" <romain@blogreen.org>, and
a few MarcusCom CVS users. Also, I might have missed a few.
Repocopy by: marcus
Approved by: portmgr
Diffstat (limited to 'audio/pulseaudio/files/patch-src_modules_oss_module-oss.c')
| -rw-r--r-- | audio/pulseaudio/files/patch-src_modules_oss_module-oss.c | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/audio/pulseaudio/files/patch-src_modules_oss_module-oss.c b/audio/pulseaudio/files/patch-src_modules_oss_module-oss.c new file mode 100644 index 000000000000..a723999af7fd --- /dev/null +++ b/audio/pulseaudio/files/patch-src_modules_oss_module-oss.c @@ -0,0 +1,24 @@ +--- src/modules/oss/module-oss.c.orig 2009-04-13 17:11:32.000000000 -0400 ++++ src/modules/oss/module-oss.c 2009-07-19 14:24:25.000000000 -0400 +@@ -1214,10 +1214,12 @@ int pa__init(pa_module*m) { + use_mmap = FALSE; + } + ++#ifndef __FreeBSD__ + if (use_mmap && mode == O_WRONLY) { + pa_log_info("Device opened for playback only, cannot do memory mapping, falling back to UNIX write() mode."); + use_mmap = FALSE; + } ++#endif + + if (pa_oss_get_hw_description(dev, hwdesc, sizeof(hwdesc)) >= 0) + pa_log_info("Hardware name is '%s'.", hwdesc); +@@ -1399,7 +1401,7 @@ int pa__init(pa_module*m) { + if ((u->mixer_fd = pa_oss_open_mixer_for_device(u->device_name)) >= 0) { + pa_bool_t do_close = TRUE; + +- if (ioctl(fd, SOUND_MIXER_READ_DEVMASK, &u->mixer_devmask) < 0) ++ if (ioctl(u->mixer_fd, SOUND_MIXER_READ_DEVMASK, &u->mixer_devmask) < 0) + pa_log_warn("SOUND_MIXER_READ_DEVMASK failed: %s", pa_cstrerror(errno)); + + else { |