From owner-svn-ports-all@freebsd.org Sun May 1 05:29:10 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D1A25B24C2C; Sun, 1 May 2016 05:29:10 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 94F7E108F; Sun, 1 May 2016 05:29:10 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u415T962018881; Sun, 1 May 2016 05:29:09 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u415T8qE018868; Sun, 1 May 2016 05:29:08 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201605010529.u415T8qE018868@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sun, 1 May 2016 05:29:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r414386 - in head: Mk mail/thunderbird mail/thunderbird/files www/firefox www/firefox-esr www/firefox-esr/files www/firefox/files www/libxul www/libxul/files www/seamonkey www/seamonkey... 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.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 May 2016 05:29:10 -0000 Author: jbeich Date: Sun May 1 05:29:08 2016 New Revision: 414386 URL: https://svnweb.freebsd.org/changeset/ports/414386 Log: gecko: unbreak WebRTC microphone selection popup with ALSA=on On FreeBSD sound(4) is enabled by default while alsa-plugins-oss assumes a soundcard is always available. https://bugzilla.mozilla.org/show_bug.cgi?id=1269165 MFH: 2016Q2 Added: head/mail/thunderbird/files/patch-bug1269165 (contents, props changed) head/www/firefox-esr/files/patch-bug1269165 (contents, props changed) head/www/firefox/files/patch-bug1269165 (contents, props changed) head/www/libxul/files/patch-bug1269165 (contents, props changed) head/www/seamonkey/files/patch-bug1269165 (contents, props changed) Modified: head/Mk/bsd.gecko.mk (contents, props changed) head/mail/thunderbird/Makefile (contents, props changed) head/www/firefox-esr/Makefile (contents, props changed) head/www/firefox/Makefile (contents, props changed) head/www/libxul/Makefile (contents, props changed) head/www/seamonkey/Makefile (contents, props changed) Modified: head/Mk/bsd.gecko.mk ============================================================================== --- head/Mk/bsd.gecko.mk Sun May 1 05:26:21 2016 (r414385) +++ head/Mk/bsd.gecko.mk Sun May 1 05:29:08 2016 (r414386) @@ -379,7 +379,7 @@ MOZ_EXPORT+=MOZ_OPTIMIZE_FLAGS="-Os" MOZ .if ${PORT_OPTIONS:MALSA} LIB_DEPENDS+= libasound.so:audio/alsa-lib RUN_DEPENDS+= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins -RUN_DEPENDS+= alsa-lib>=1.0.27.2_1:audio/alsa-lib +RUN_DEPENDS+= alsa-lib>=1.1.1_1:audio/alsa-lib MOZ_OPTIONS+= --enable-alsa .endif Modified: head/mail/thunderbird/Makefile ============================================================================== --- head/mail/thunderbird/Makefile Sun May 1 05:26:21 2016 (r414385) +++ head/mail/thunderbird/Makefile Sun May 1 05:29:08 2016 (r414386) @@ -3,6 +3,7 @@ PORTNAME= thunderbird DISTVERSION= 45.0 +PORTREVISION= 1 CATEGORIES= mail news net-im ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source Added: head/mail/thunderbird/files/patch-bug1269165 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/thunderbird/files/patch-bug1269165 Sun May 1 05:29:08 2016 (r414386) @@ -0,0 +1,24 @@ +# getUserMedia fails to enumerate ALSA plugins + +--- mozilla/media/webrtc/trunk/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc.orig 2016-04-22 00:37:17 UTC ++++ mozilla/media/webrtc/trunk/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc +@@ -1752,7 +1752,9 @@ int32_t AudioDeviceLinuxALSA::GetDevices + // Don't use snd_device_name_hint(-1,..) since there is a access violation + // inside this ALSA API with libasound.so.2.0.0. + int card = -1; ++#ifdef WEBRTC_LINUX + while (!(LATE(snd_card_next)(&card)) && (card >= 0) && keepSearching) { ++#endif + void **hints; + err = LATE(snd_device_name_hint)(card, "pcm", &hints); + if (err != 0) +@@ -1878,7 +1880,9 @@ int32_t AudioDeviceLinuxALSA::GetDevices + LATE(snd_strerror)(err)); + // Continue and return true anyway, since we did get the whole list. + } ++#ifdef WEBRTC_LINUX + } ++#endif + + if (FUNC_GET_NUM_OF_DEVICE == function) + { Modified: head/www/firefox-esr/Makefile ============================================================================== --- head/www/firefox-esr/Makefile Sun May 1 05:26:21 2016 (r414385) +++ head/www/firefox-esr/Makefile Sun May 1 05:29:08 2016 (r414386) @@ -4,6 +4,7 @@ PORTNAME= firefox DISTVERSION= 45.1.0 DISTVERSIONSUFFIX=esr.source +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \ Added: head/www/firefox-esr/files/patch-bug1269165 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/firefox-esr/files/patch-bug1269165 Sun May 1 05:29:08 2016 (r414386) @@ -0,0 +1,24 @@ +# getUserMedia fails to enumerate ALSA plugins + +--- media/webrtc/trunk/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc.orig 2016-04-22 00:37:17 UTC ++++ media/webrtc/trunk/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc +@@ -1752,7 +1752,9 @@ int32_t AudioDeviceLinuxALSA::GetDevices + // Don't use snd_device_name_hint(-1,..) since there is a access violation + // inside this ALSA API with libasound.so.2.0.0. + int card = -1; ++#ifdef WEBRTC_LINUX + while (!(LATE(snd_card_next)(&card)) && (card >= 0) && keepSearching) { ++#endif + void **hints; + err = LATE(snd_device_name_hint)(card, "pcm", &hints); + if (err != 0) +@@ -1878,7 +1880,9 @@ int32_t AudioDeviceLinuxALSA::GetDevices + LATE(snd_strerror)(err)); + // Continue and return true anyway, since we did get the whole list. + } ++#ifdef WEBRTC_LINUX + } ++#endif + + if (FUNC_GET_NUM_OF_DEVICE == function) + { Modified: head/www/firefox/Makefile ============================================================================== --- head/www/firefox/Makefile Sun May 1 05:26:21 2016 (r414385) +++ head/www/firefox/Makefile Sun May 1 05:29:08 2016 (r414386) @@ -4,7 +4,7 @@ PORTNAME= firefox DISTVERSION= 46.0 DISTVERSIONSUFFIX=.source -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ Added: head/www/firefox/files/patch-bug1269165 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/firefox/files/patch-bug1269165 Sun May 1 05:29:08 2016 (r414386) @@ -0,0 +1,24 @@ +# getUserMedia fails to enumerate ALSA plugins + +--- media/webrtc/trunk/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc.orig 2016-04-22 00:37:17 UTC ++++ media/webrtc/trunk/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc +@@ -1752,7 +1752,9 @@ int32_t AudioDeviceLinuxALSA::GetDevices + // Don't use snd_device_name_hint(-1,..) since there is a access violation + // inside this ALSA API with libasound.so.2.0.0. + int card = -1; ++#ifdef WEBRTC_LINUX + while (!(LATE(snd_card_next)(&card)) && (card >= 0) && keepSearching) { ++#endif + void **hints; + err = LATE(snd_device_name_hint)(card, "pcm", &hints); + if (err != 0) +@@ -1878,7 +1880,9 @@ int32_t AudioDeviceLinuxALSA::GetDevices + LATE(snd_strerror)(err)); + // Continue and return true anyway, since we did get the whole list. + } ++#ifdef WEBRTC_LINUX + } ++#endif + + if (FUNC_GET_NUM_OF_DEVICE == function) + { Modified: head/www/libxul/Makefile ============================================================================== --- head/www/libxul/Makefile Sun May 1 05:26:21 2016 (r414385) +++ head/www/libxul/Makefile Sun May 1 05:29:08 2016 (r414386) @@ -3,6 +3,7 @@ PORTNAME= libxul DISTVERSION= 45.1.0 +PORTREVISION= 1 CATEGORIES?= www devel MASTER_SITES= MOZILLA/firefox/releases/${DISTVERSION}esr/source \ MOZILLA/firefox/candidates/${DISTVERSION}esr-candidates/build1/source Added: head/www/libxul/files/patch-bug1269165 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/libxul/files/patch-bug1269165 Sun May 1 05:29:08 2016 (r414386) @@ -0,0 +1,24 @@ +# getUserMedia fails to enumerate ALSA plugins + +--- media/webrtc/trunk/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc.orig 2016-04-22 00:37:17 UTC ++++ media/webrtc/trunk/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc +@@ -1752,7 +1752,9 @@ int32_t AudioDeviceLinuxALSA::GetDevices + // Don't use snd_device_name_hint(-1,..) since there is a access violation + // inside this ALSA API with libasound.so.2.0.0. + int card = -1; ++#ifdef WEBRTC_LINUX + while (!(LATE(snd_card_next)(&card)) && (card >= 0) && keepSearching) { ++#endif + void **hints; + err = LATE(snd_device_name_hint)(card, "pcm", &hints); + if (err != 0) +@@ -1878,7 +1880,9 @@ int32_t AudioDeviceLinuxALSA::GetDevices + LATE(snd_strerror)(err)); + // Continue and return true anyway, since we did get the whole list. + } ++#ifdef WEBRTC_LINUX + } ++#endif + + if (FUNC_GET_NUM_OF_DEVICE == function) + { Modified: head/www/seamonkey/Makefile ============================================================================== --- head/www/seamonkey/Makefile Sun May 1 05:26:21 2016 (r414385) +++ head/www/seamonkey/Makefile Sun May 1 05:29:08 2016 (r414386) @@ -4,7 +4,7 @@ PORTNAME= seamonkey DISTVERSION= 2.39 MOZILLA_VER= 42 # above + 3 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES?= www mail news editors irc ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source Added: head/www/seamonkey/files/patch-bug1269165 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/seamonkey/files/patch-bug1269165 Sun May 1 05:29:08 2016 (r414386) @@ -0,0 +1,24 @@ +# getUserMedia fails to enumerate ALSA plugins + +--- mozilla/media/webrtc/trunk/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc.orig 2016-04-22 00:37:17 UTC ++++ mozilla/media/webrtc/trunk/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc +@@ -1752,7 +1752,9 @@ int32_t AudioDeviceLinuxALSA::GetDevices + // Don't use snd_device_name_hint(-1,..) since there is a access violation + // inside this ALSA API with libasound.so.2.0.0. + int card = -1; ++#ifdef WEBRTC_LINUX + while (!(LATE(snd_card_next)(&card)) && (card >= 0) && keepSearching) { ++#endif + void **hints; + err = LATE(snd_device_name_hint)(card, "pcm", &hints); + if (err != 0) +@@ -1878,7 +1880,9 @@ int32_t AudioDeviceLinuxALSA::GetDevices + LATE(snd_strerror)(err)); + // Continue and return true anyway, since we did get the whole list. + } ++#ifdef WEBRTC_LINUX + } ++#endif + + if (FUNC_GET_NUM_OF_DEVICE == function) + {