diff options
| author | leot <leot@pkgsrc.org> | 2018-10-23 12:39:35 +0000 |
|---|---|---|
| committer | leot <leot@pkgsrc.org> | 2018-10-23 12:39:35 +0000 |
| commit | cd4fee94605001ece2b46acf30714b24103e5f37 (patch) | |
| tree | 0cc3f9c9f3241cd3b1580bd2f99466774c298ee0 /multimedia/mpv | |
| parent | 5dc2bb163bbcfc53eb9634f259981cc1f3487bb9 (diff) | |
| download | pkgsrc-cd4fee94605001ece2b46acf30714b24103e5f37.tar.gz | |
mpv: Fix patch-audio_out_ao_oss.c `reqchannels > 2' case
(The previous version actually introduced a regression in `reqchannels
> 2' code path, sorry!)
Diffstat (limited to 'multimedia/mpv')
| -rw-r--r-- | multimedia/mpv/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/mpv/patches/patch-audio_out_ao__oss.c | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/multimedia/mpv/distinfo b/multimedia/mpv/distinfo index 1a9ec6cc912..d2ab9461367 100644 --- a/multimedia/mpv/distinfo +++ b/multimedia/mpv/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.44 2018/10/23 12:14:54 leot Exp $ +$NetBSD: distinfo,v 1.45 2018/10/23 12:39:35 leot Exp $ SHA1 (mpv-0.29.1.tar.gz) = 83f2bc0eb5a8bec9a9d5efc7de0e19a442238ac5 RMD160 (mpv-0.29.1.tar.gz) = 72a4fda3a72ac4fd37ed04435833fa2cf378a012 SHA512 (mpv-0.29.1.tar.gz) = ec57c9ceaaf2915ee237dd5a1c5ea5d22725d8611e28a9b998e5bb0d8ab5bdf3631d0267fc7b54da31cb1eaa145ef35841e68846bd41c3b9e1024902e92fd086 Size (mpv-0.29.1.tar.gz) = 3059503 bytes -SHA1 (patch-audio_out_ao__oss.c) = b957a3a2cdb58d2c083c7098571485eea3c8f46d +SHA1 (patch-audio_out_ao__oss.c) = b07972345960e4024ad7f48b166b4ebd81cb0758 SHA1 (patch-player_main.c) = e794199990059cc95050032194bca70557c381d7 diff --git a/multimedia/mpv/patches/patch-audio_out_ao__oss.c b/multimedia/mpv/patches/patch-audio_out_ao__oss.c index e77d3746a68..f1d07825299 100644 --- a/multimedia/mpv/patches/patch-audio_out_ao__oss.c +++ b/multimedia/mpv/patches/patch-audio_out_ao__oss.c @@ -1,4 +1,4 @@ -$NetBSD: patch-audio_out_ao__oss.c,v 1.7 2018/10/23 12:14:54 leot Exp $ +$NetBSD: patch-audio_out_ao__oss.c,v 1.8 2018/10/23 12:39:35 leot Exp $ - ioctl(..., SNDCTL_DSP_CHANNELS, &nchannels) for not supported nchannels does not return an error and instead set nchannels to the default value. Instead of @@ -6,12 +6,12 @@ $NetBSD: patch-audio_out_ao__oss.c,v 1.7 2018/10/23 12:14:54 leot Exp $ --- audio/out/ao_oss.c.orig 2018-10-02 19:03:41.000000000 +0000 +++ audio/out/ao_oss.c -@@ -336,19 +336,23 @@ static int reopen_device(struct ao *ao, +@@ -336,19 +336,24 @@ static int reopen_device(struct ao *ao, mp_chmap_sel_add_map(&sel, &oss_layouts[n]); if (!ao_chmap_sel_adjust(ao, &sel, &channels)) goto fail; - int reqchannels = channels.num; -+ int nchannels, reqchannels; ++ int c, nchannels, reqchannels; + nchannels = reqchannels = channels.num; // We only use SNDCTL_DSP_CHANNELS for >2 channels, in case some drivers don't have it if (reqchannels > 2) { @@ -24,9 +24,10 @@ $NetBSD: patch-audio_out_ao__oss.c,v 1.7 2018/10/23 12:14:54 leot Exp $ reqchannels); goto fail; } ++ goto stereo; } else { - int c = reqchannels - 1; -+ int c; ++stereo: + if (nchannels != reqchannels) { + // Fallback to stereo + c = 1; |