diff options
| author | flo <flo@FreeBSD.org> | 2013-08-10 04:12:10 +0800 |
|---|---|---|
| committer | flo <flo@FreeBSD.org> | 2013-08-10 04:12:10 +0800 |
| commit | e5b87dc986cf7e3813faa63657a8fb5d9ca291c4 (patch) | |
| tree | 6e0692aebf875ad9e55408804011dfa4a90ade1f /www | |
| parent | b82f2dec1825030d0a586e2cb186e112ff0dd788 (diff) | |
| download | freebsd-ports-gnome-e5b87dc986cf7e3813faa63657a8fb5d9ca291c4.tar.gz freebsd-ports-gnome-e5b87dc986cf7e3813faa63657a8fb5d9ca291c4.tar.zst freebsd-ports-gnome-e5b87dc986cf7e3813faa63657a8fb5d9ca291c4.zip | |
Fix build with pulseaudio.
Reported by: kwm, sltdlt <sasamotikomi@gmail.com> [1],
Christoph Moench-Tegeder <cmt@burggraben.net> [2]
PR: ports/181167 [1], ports/181169 [2]
Diffstat (limited to 'www')
| -rw-r--r-- | www/firefox/files/patch-bug897300 | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/www/firefox/files/patch-bug897300 b/www/firefox/files/patch-bug897300 new file mode 100644 index 000000000000..f0b45c329872 --- /dev/null +++ b/www/firefox/files/patch-bug897300 @@ -0,0 +1,30 @@ +# HG changeset patch +# User Randell Jesup <rjesup@jesup.org> +# Date 1375222105 14400 +# Node ID 64c5cc9bad2e84a9b1d6392b095ad06a75b94a4e +# Parent 0368f4123c8aeb2209582fb8faf3bcb04acd0e13 +Bug897300: Correct mis-merge for pulse audio on Aurora from bug 886886 r=padenot a=bajaj + +diff --git a/media/webrtc/trunk/webrtc/modules/audio_device/linux/audio_device_pulse_linux.h b/media/webrtc/trunk/webrtc/modules/audio_device/linux/audio_device_pulse_linux.h +--- media/webrtc/trunk/webrtc/modules/audio_device/linux/audio_device_pulse_linux.h ++++ media/webrtc/trunk/webrtc/modules/audio_device/linux/audio_device_pulse_linux.h +@@ -305,17 +305,17 @@ private: + + AudioMixerManagerLinuxPulse _mixerManager; + + WebRtc_UWord16 _inputDeviceIndex; + WebRtc_UWord16 _outputDeviceIndex; + bool _inputDeviceIsSpecified; + bool _outputDeviceIsSpecified; + +- WebRtc_Word32 sampling_rate_hz; ++ WebRtc_Word32 sample_rate_hz_; + WebRtc_UWord8 _recChannels; + WebRtc_UWord8 _playChannels; + + AudioDeviceModule::BufferType _playBufType; + + private: + bool _initialized; + bool _recording; + |