Date: Mon, 2 May 2016 05:37:30 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r414435 - in branches/2016Q2: 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 ww... Message-ID: <201605020537.u425bUJ4058067@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Mon May 2 05:37:29 2016 New Revision: 414435 URL: https://svnweb.freebsd.org/changeset/ports/414435 Log: MFH: r414386 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 Approved by: ports-secteam (junovitch) Added: branches/2016Q2/mail/thunderbird/files/patch-bug1269165 - copied unchanged from r414386, head/mail/thunderbird/files/patch-bug1269165 branches/2016Q2/www/firefox-esr/files/patch-bug1269165 - copied unchanged from r414386, head/www/firefox-esr/files/patch-bug1269165 branches/2016Q2/www/firefox/files/patch-bug1269165 - copied unchanged from r414386, head/www/firefox/files/patch-bug1269165 branches/2016Q2/www/libxul/files/patch-bug1269165 - copied unchanged from r414386, head/www/libxul/files/patch-bug1269165 branches/2016Q2/www/seamonkey/files/patch-bug1269165 - copied unchanged from r414386, head/www/seamonkey/files/patch-bug1269165 Modified: branches/2016Q2/Mk/bsd.gecko.mk branches/2016Q2/mail/thunderbird/Makefile branches/2016Q2/www/firefox-esr/Makefile branches/2016Q2/www/firefox/Makefile branches/2016Q2/www/libxul/Makefile branches/2016Q2/www/seamonkey/Makefile Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/Mk/bsd.gecko.mk ============================================================================== --- branches/2016Q2/Mk/bsd.gecko.mk Mon May 2 05:35:26 2016 (r414434) +++ branches/2016Q2/Mk/bsd.gecko.mk Mon May 2 05:37:29 2016 (r414435) @@ -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: branches/2016Q2/mail/thunderbird/Makefile ============================================================================== --- branches/2016Q2/mail/thunderbird/Makefile Mon May 2 05:35:26 2016 (r414434) +++ branches/2016Q2/mail/thunderbird/Makefile Mon May 2 05:37:29 2016 (r414435) @@ -3,6 +3,7 @@ PORTNAME= thunderbird DISTVERSION= 38.7.1 +PORTREVISION= 1 CATEGORIES= mail news net-im ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source Copied: branches/2016Q2/mail/thunderbird/files/patch-bug1269165 (from r414386, head/mail/thunderbird/files/patch-bug1269165) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q2/mail/thunderbird/files/patch-bug1269165 Mon May 2 05:37:29 2016 (r414435, copy of r414386, head/mail/thunderbird/files/patch-bug1269165) @@ -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: branches/2016Q2/www/firefox-esr/Makefile ============================================================================== --- branches/2016Q2/www/firefox-esr/Makefile Mon May 2 05:35:26 2016 (r414434) +++ branches/2016Q2/www/firefox-esr/Makefile Mon May 2 05:37:29 2016 (r414435) @@ -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 \ Copied: branches/2016Q2/www/firefox-esr/files/patch-bug1269165 (from r414386, head/www/firefox-esr/files/patch-bug1269165) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q2/www/firefox-esr/files/patch-bug1269165 Mon May 2 05:37:29 2016 (r414435, copy of r414386, head/www/firefox-esr/files/patch-bug1269165) @@ -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: branches/2016Q2/www/firefox/Makefile ============================================================================== --- branches/2016Q2/www/firefox/Makefile Mon May 2 05:35:26 2016 (r414434) +++ branches/2016Q2/www/firefox/Makefile Mon May 2 05:37:29 2016 (r414435) @@ -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 \ Copied: branches/2016Q2/www/firefox/files/patch-bug1269165 (from r414386, head/www/firefox/files/patch-bug1269165) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q2/www/firefox/files/patch-bug1269165 Mon May 2 05:37:29 2016 (r414435, copy of r414386, head/www/firefox/files/patch-bug1269165) @@ -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: branches/2016Q2/www/libxul/Makefile ============================================================================== --- branches/2016Q2/www/libxul/Makefile Mon May 2 05:35:26 2016 (r414434) +++ branches/2016Q2/www/libxul/Makefile Mon May 2 05:37:29 2016 (r414435) @@ -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 Copied: branches/2016Q2/www/libxul/files/patch-bug1269165 (from r414386, head/www/libxul/files/patch-bug1269165) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q2/www/libxul/files/patch-bug1269165 Mon May 2 05:37:29 2016 (r414435, copy of r414386, head/www/libxul/files/patch-bug1269165) @@ -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: branches/2016Q2/www/seamonkey/Makefile ============================================================================== --- branches/2016Q2/www/seamonkey/Makefile Mon May 2 05:35:26 2016 (r414434) +++ branches/2016Q2/www/seamonkey/Makefile Mon May 2 05:37:29 2016 (r414435) @@ -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 Copied: branches/2016Q2/www/seamonkey/files/patch-bug1269165 (from r414386, head/www/seamonkey/files/patch-bug1269165) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q2/www/seamonkey/files/patch-bug1269165 Mon May 2 05:37:29 2016 (r414435, copy of r414386, head/www/seamonkey/files/patch-bug1269165) @@ -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) + {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605020537.u425bUJ4058067>