Mon May 15 15:49:27 2017 UTC ()
firefox: default to oss everywhere but linux, which defaults to pulseaudio.

alsa is not supported upstream, and checks for failures by calling assert,
which means the default setup crashes whenever audio is played.

bump pkgrevision


(maya)
diff -r1.294 -r1.295 pkgsrc/www/firefox/Makefile
diff -r1.40 -r1.41 pkgsrc/www/firefox/options.mk
cvs diff -r1.294 -r1.295 pkgsrc/www/firefox/Makefile (expand / switch to unified diff)

--- pkgsrc/www/firefox/Makefile 2017/05/08 15:33:43 1.294
+++ pkgsrc/www/firefox/Makefile 2017/05/15 15:49:27 1.295
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1# $NetBSD: Makefile,v 1.294 2017/05/08 15:33:43 ryoon Exp $ 1# $NetBSD: Makefile,v 1.295 2017/05/15 15:49:27 maya Exp $
2 2
3FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR} 3FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
4MOZ_BRANCH= 53.0 4MOZ_BRANCH= 53.0
5MOZ_BRANCH_MINOR= .2 5MOZ_BRANCH_MINOR= .2
 6PKGREVISION= 1
6 7
7DISTNAME= firefox-${FIREFOX_VER}.source 8DISTNAME= firefox-${FIREFOX_VER}.source
8PKGNAME= firefox-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//} 9PKGNAME= firefox-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//}
9CATEGORIES= www 10CATEGORIES= www
10MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/} 11MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
11MASTER_SITES+= ${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/} 12MASTER_SITES+= ${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/}
12EXTRACT_SUFX= .tar.xz 13EXTRACT_SUFX= .tar.xz
13 14
14WRKSRC= ${WRKDIR}/${DISTNAME:S/.source//} 15WRKSRC= ${WRKDIR}/${DISTNAME:S/.source//}
15 16
16MAINTAINER= ryoon@NetBSD.org 17MAINTAINER= ryoon@NetBSD.org
17HOMEPAGE= http://www.mozilla.com/en-US/firefox/ 18HOMEPAGE= http://www.mozilla.com/en-US/firefox/
18COMMENT= Web browser with support for extensions (version ${MOZ_BRANCH:C/\..*//}) 19COMMENT= Web browser with support for extensions (version ${MOZ_BRANCH:C/\..*//})
cvs diff -r1.40 -r1.41 pkgsrc/www/firefox/options.mk (expand / switch to unified diff)

--- pkgsrc/www/firefox/options.mk 2017/03/20 13:39:33 1.40
+++ pkgsrc/www/firefox/options.mk 2017/05/15 15:49:27 1.41
@@ -1,36 +1,30 @@ @@ -1,36 +1,30 @@
1# $NetBSD: options.mk,v 1.40 2017/03/20 13:39:33 ryoon Exp $ 1# $NetBSD: options.mk,v 1.41 2017/05/15 15:49:27 maya Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.firefox 3PKG_OPTIONS_VAR= PKG_OPTIONS.firefox
4 4
5PKG_OPTIONS_REQUIRED_GROUPS= gtk 5PKG_OPTIONS_REQUIRED_GROUPS= gtk
6PKG_OPTIONS_GROUP.gtk= gtk2 gtk3 6PKG_OPTIONS_GROUP.gtk= gtk2 gtk3
7PKG_SUGGESTED_OPTIONS= gtk3 7PKG_SUGGESTED_OPTIONS= gtk3
8 8
9PKG_SUPPORTED_OPTIONS= official-mozilla-branding 9PKG_SUPPORTED_OPTIONS= official-mozilla-branding
10PKG_SUPPORTED_OPTIONS+= debug debug-info mozilla-jemalloc webrtc 10PKG_SUPPORTED_OPTIONS+= debug debug-info mozilla-jemalloc webrtc
11PKG_SUPPORTED_OPTIONS+= alsa oss pulseaudio dbus 11PKG_SUPPORTED_OPTIONS+= alsa oss pulseaudio dbus
12PLIST_VARS+= gnome jemalloc debug 12PLIST_VARS+= gnome jemalloc debug
13 13
14.if ${OPSYS} == "Linux" 14.if ${OPSYS} == "Linux"
15PKG_SUGGESTED_OPTIONS+= alsa mozilla-jemalloc dbus 15PKG_SUGGESTED_OPTIONS+= pulseaudio mozilla-jemalloc dbus
16.elif ${OPSYS} == "NetBSD" 
17PKG_SUGGESTED_OPTIONS+= alsa dbus 
18.elif ${OPSYS} == "FreeBSD" 
19PKG_SUGGESTED_OPTIONS+= oss dbus 
20.elif ${OPSYS} == "DragonFly" 
21PKG_SUGGESTED_OPTIONS+= oss dbus 
22.else 16.else
23PKG_SUGGESTED_OPTIONS+= dbus pulseaudio 17PKG_SUGGESTED_OPTIONS+= oss dbus
24.endif 18.endif
25 19
26# On NetBSD/amd64 6.99.21 libxul.so is invalid when --enable-webrtc is set. 20# On NetBSD/amd64 6.99.21 libxul.so is invalid when --enable-webrtc is set.
27PKG_SUGGESTED_OPTIONS.Linux+= webrtc 21PKG_SUGGESTED_OPTIONS.Linux+= webrtc
28 22
29.include "../../mk/bsd.options.mk" 23.include "../../mk/bsd.options.mk"
30 24
31PLIST_VARS+= gtk3 25PLIST_VARS+= gtk3
32.if !empty(PKG_OPTIONS:Mgtk2) 26.if !empty(PKG_OPTIONS:Mgtk2)
33CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk2 27CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk2
34BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.18.3nb1 28BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.18.3nb1
35.include "../../x11/gtk2/buildlink3.mk" 29.include "../../x11/gtk2/buildlink3.mk"
36.endif 30.endif