build fails, error message (requires some digging): /usr/ports/www/firefox/work/mozilla-release/media/webrtc/trunk/webrtc/modules/audio_device/linux/audio_device_pulse_linux.cc:82:5: error: initializer 'sample_rate_hz_' does not name a non-static data member or base class; did you mean the member 'sampling_rate_hz'? sample_rate_hz_(0), ^~~~~~~~~~~~~~~ sampling_rate_hz /usr/ports/www/firefox/work/mozilla-release/media/webrtc/trunk/webrtc/modules/audio_device/linux/audio_device_pulse_linux.h:313:19: note: 'sampling_rate_hz' declared here WebRtc_Word32 sampling_rate_hz; ^ Fix: use the attached patch as /usr/ports/www/firefox/files/patch-media-webrtc-trunk-webrtc-modules-audio_device-linux-audio_device_pulse_linux.h . I reported this issue upstream at https://bugzilla.mozilla.org/show_bug.cgi?id=903549 Patch: Regards, Christoph--1rCa05FImXyU0S6xw5RA5kqDaqXty0nqO7OZWSjg83g0xBFO Content-Type: text/plain; name="file.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="file.diff" --- media/webrtc/trunk/webrtc/modules/audio_device/linux/audio_device_pulse_linux.h.orig 2013-08-09 20:23:23.000000000 +0200 +++ media/webrtc/trunk/webrtc/modules/audio_device/linux/audio_device_pulse_linux.h 2013-08-09 20:23:47.000000000 +0200 @@ -310,7 +310,7 @@ bool _inputDeviceIsSpecified; bool _outputDeviceIsSpecified; - WebRtc_Word32 sampling_rate_hz; + WebRtc_Word32 sample_rate_hz_; WebRtc_UWord8 _recChannels; WebRtc_UWord8 _playChannels; How-To-Repeat: use config as above (webrtc + pulseaudio) this looks like a merging error at mozilla.
Responsible Changed From-To: freebsd-ports-bugs->gecko Over to maintainer (via the GNATS Auto Assign Tool)
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; + _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Shold be fixed by r324461. Thanks for the reports!