From owner-svn-ports-all@FreeBSD.ORG  Fri Aug  9 20:12:10 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id B14EA633;
 Fri,  9 Aug 2013 20:12:10 +0000 (UTC) (envelope-from flo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9D5A42F76;
 Fri,  9 Aug 2013 20:12:10 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r79KCAAc005500;
 Fri, 9 Aug 2013 20:12:10 GMT (envelope-from flo@svn.freebsd.org)
Received: (from flo@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r79KCA4R005499;
 Fri, 9 Aug 2013 20:12:10 GMT (envelope-from flo@svn.freebsd.org)
Message-Id: <201308092012.r79KCA4R005499@svn.freebsd.org>
From: Florian Smeets <flo@FreeBSD.org>
Date: Fri, 9 Aug 2013 20:12:10 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r324461 - head/www/firefox/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Aug 2013 20:12:10 -0000

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;
+