Date: Fri, 9 Aug 2013 20:12:10 +0000 (UTC) From: Florian Smeets <flo@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r324461 - head/www/firefox/files Message-ID: <201308092012.r79KCA4R005499@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: flo Date: Fri Aug 9 20:12:10 2013 New Revision: 324461 URL: http://svnweb.freebsd.org/changeset/ports/324461 Log: 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] Added: head/www/firefox/files/patch-bug897300 (contents, props changed) Added: head/www/firefox/files/patch-bug897300 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/firefox/files/patch-bug897300 Fri Aug 9 20:12:10 2013 (r324461) @@ -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; +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308092012.r79KCA4R005499>