From owner-svn-ports-head@FreeBSD.ORG Fri Aug 9 22:47:49 2013 Return-Path: Delivered-To: svn-ports-head@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 BA8ACF32; Fri, 9 Aug 2013 22:47:49 +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 8DC07274A; Fri, 9 Aug 2013 22:47:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r79MlnVj063474; Fri, 9 Aug 2013 22:47:49 GMT (envelope-from flo@svn.freebsd.org) Received: (from flo@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r79MlnSj063472; Fri, 9 Aug 2013 22:47:49 GMT (envelope-from flo@svn.freebsd.org) Message-Id: <201308092247.r79MlnSj063472@svn.freebsd.org> From: Florian Smeets Date: Fri, 9 Aug 2013 22:47:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r324463 - in head/www/seamonkey: . 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-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Aug 2013 22:47:49 -0000 Author: flo Date: Fri Aug 9 22:47:48 2013 New Revision: 324463 URL: http://svnweb.freebsd.org/changeset/ports/324463 Log: Fix build with pulseaudio. Fix build without MAILNEWS Added: head/www/seamonkey/files/patch-bug897300 (contents, props changed) Deleted: head/www/seamonkey/files/extra-mailnews-patch-bridge-bridge.mk head/www/seamonkey/files/extra-patch-configure.in Modified: head/www/seamonkey/Makefile Modified: head/www/seamonkey/Makefile ============================================================================== --- head/www/seamonkey/Makefile Fri Aug 9 20:52:29 2013 (r324462) +++ head/www/seamonkey/Makefile Fri Aug 9 22:47:48 2013 (r324463) @@ -77,8 +77,6 @@ MOZSRC:= ${WRKSRC}/mozilla XPI_LIBDIR= ${PREFIX}/lib/xpi .if ! ${PORT_OPTIONS:MMAILNEWS} -EXTRA_PATCHES+= ${FILESDIR}/extra-mailnews-patch-bridge-bridge.mk \ - ${FILESDIR}/extra-patch-configure.in MOZ_OPTIONS+= --disable-ldap --disable-mailnews .else # mail and news desired, but not LDAP Added: head/www/seamonkey/files/patch-bug897300 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/seamonkey/files/patch-bug897300 Fri Aug 9 22:47:48 2013 (r324463) @@ -0,0 +1,30 @@ +# HG changeset patch +# User Randell Jesup +# 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 +--- mozilla/media/webrtc/trunk/webrtc/modules/audio_device/linux/audio_device_pulse_linux.h ++++ mozilla/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; +