CVS commit: pkgsrc/www

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Sat Jun  1 19:11:29 UTC 2019

Modified Files:
        pkgsrc/www/firefox: Makefile distinfo
        pkgsrc/www/firefox/patches: patch-aa
        pkgsrc/www/firefox52: Makefile distinfo
        pkgsrc/www/firefox52/patches: patch-aa
        pkgsrc/www/firefox60: Makefile distinfo
        pkgsrc/www/firefox60/patches: patch-aa

Log Message:
firefox*: don't use /dev/sound on netbsd. it treats "pause" as a sticky
operation and might randomly fail to play audio if another program has
paused its audio.

PR kern/54229


To generate a diff of this commit:
cvs rdiff -u -r1.379 -r1.380 pkgsrc/www/firefox/Makefile
cvs rdiff -u -r1.353 -r1.354 pkgsrc/www/firefox/distinfo
cvs rdiff -u -r1.61 -r1.62 pkgsrc/www/firefox/patches/patch-aa
cvs rdiff -u -r1.41 -r1.42 pkgsrc/www/firefox52/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/www/firefox52/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/firefox52/patches/patch-aa
cvs rdiff -u -r1.25 -r1.26 pkgsrc/www/firefox60/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/www/firefox60/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/firefox60/patches/patch-aa

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/firefox/Makefile
diff -u pkgsrc/www/firefox/Makefile:1.379 pkgsrc/www/firefox/Makefile:1.380
--- pkgsrc/www/firefox/Makefile:1.379   Sat Jun  1 12:52:10 2019
+++ pkgsrc/www/firefox/Makefile Sat Jun  1 19:11:28 2019
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.379 2019/06/01 12:52:10 mef Exp $
+# $NetBSD: Makefile,v 1.380 2019/06/01 19:11:28 maya Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=            67.0
 MOZ_BRANCH_MINOR=      
-PKGREVISION=           2
+PKGREVISION=           3
 
 DISTNAME=      firefox-${FIREFOX_VER}.source
 PKGNAME=       ${DISTNAME:S/.source//:S/b/beta/:S/esr//}

Index: pkgsrc/www/firefox/distinfo
diff -u pkgsrc/www/firefox/distinfo:1.353 pkgsrc/www/firefox/distinfo:1.354
--- pkgsrc/www/firefox/distinfo:1.353   Fri May 31 10:38:59 2019
+++ pkgsrc/www/firefox/distinfo Sat Jun  1 19:11:28 2019
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.353 2019/05/31 10:38:59 maya Exp $
+$NetBSD: distinfo,v 1.354 2019/06/01 19:11:28 maya Exp $
 
 SHA1 (firefox-67.0.source.tar.xz) = c7a5f3182999e5efed5c714653adc538bb75aa53
 RMD160 (firefox-67.0.source.tar.xz) = 48e96058ef1bfb2939d8da93fd6807d212d0df4e
 SHA512 (firefox-67.0.source.tar.xz) = a1000d6ca8146a9a3c74a3f69041b755c0c5014c8a608298d9c4cbe39577939d43139a7ad742983697ae90b635d3f5d8f9a008fcc2b3778adaadc25acc49ca29
 Size (firefox-67.0.source.tar.xz) = 282874008 bytes
-SHA1 (patch-aa) = 66c2e96c199ed4b0007c9b8b3dd431305502d427
+SHA1 (patch-aa) = c3e9fdbf6d66d527affc13f4045d28fe05707f7b
 SHA1 (patch-browser_app_profile_firefox.js) = 2ea08bf7030853fe9aff3c43c69266c07f0b0b14
 SHA1 (patch-build_moz.configure_old.configure) = 91bab1cbbe02332ec076b49b6e598730202fbc99
 SHA1 (patch-dom_base_nsAttrName.h) = ac7ba441a3b27df2855cf2673eea36b1cb44ad49

Index: pkgsrc/www/firefox/patches/patch-aa
diff -u pkgsrc/www/firefox/patches/patch-aa:1.61 pkgsrc/www/firefox/patches/patch-aa:1.62
--- pkgsrc/www/firefox/patches/patch-aa:1.61    Tue Mar 19 16:11:28 2019
+++ pkgsrc/www/firefox/patches/patch-aa Sat Jun  1 19:11:28 2019
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.61 2019/03/19 16:11:28 ryoon Exp $
+$NetBSD: patch-aa,v 1.62 2019/06/01 19:11:28 maya Exp $
 
 * Add OSS audio support
 * Disable libav-fft on SunOS (relocation errors)
@@ -60,7 +60,7 @@ $NetBSD: patch-aa,v 1.61 2019/03/19 16:1
 +
 +    dnl Assume NetBSD implementation over SunAudio
 +    AC_CHECK_LIB(ossaudio, _oss_ioctl,
-+        [AC_DEFINE_UNQUOTED(CUBEB_OSS_DEFAULT_OUTPUT, "/dev/sound")
++        [AC_DEFINE_UNQUOTED(CUBEB_OSS_DEFAULT_OUTPUT, "/dev/audio")
 +         MOZ_OSS_LIBS="$MOZ_OSS_LIBS -lossaudio"])
 +fi
 +CFLAGS=$_SAVE_CFLAGS

Index: pkgsrc/www/firefox52/Makefile
diff -u pkgsrc/www/firefox52/Makefile:1.41 pkgsrc/www/firefox52/Makefile:1.42
--- pkgsrc/www/firefox52/Makefile:1.41  Sat May 25 20:17:05 2019
+++ pkgsrc/www/firefox52/Makefile       Sat Jun  1 19:11:28 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2019/05/25 20:17:05 szptvlfn Exp $
+# $NetBSD: Makefile,v 1.42 2019/06/01 19:11:28 maya Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=            52.9
@@ -6,7 +6,7 @@ MOZ_BRANCH_MINOR=       .0esr
 
 DISTNAME=      firefox-${FIREFOX_VER}.source
 PKGNAME=       firefox${MOZ_BRANCH:C/\..*$//}-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//}
-PKGREVISION=   14
+PKGREVISION=   15
 CATEGORIES=    www
 MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
 MASTER_SITES+= ${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/}

Index: pkgsrc/www/firefox52/distinfo
diff -u pkgsrc/www/firefox52/distinfo:1.18 pkgsrc/www/firefox52/distinfo:1.19
--- pkgsrc/www/firefox52/distinfo:1.18  Wed Aug  8 08:49:58 2018
+++ pkgsrc/www/firefox52/distinfo       Sat Jun  1 19:11:28 2019
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.18 2018/08/08 08:49:58 martin Exp $
+$NetBSD: distinfo,v 1.19 2019/06/01 19:11:28 maya Exp $
 
 SHA1 (firefox-52.9.0esr.source.tar.xz) = df3d47518b380fe934e32a288515c25435fd82a7
 RMD160 (firefox-52.9.0esr.source.tar.xz) = 8940269f0a515c0066b6ab2eea1da8963d27617b
 SHA512 (firefox-52.9.0esr.source.tar.xz) = bfca42668ca78a12a9fb56368f4aae5334b1f7a71966fbba4c32b9c5e6597aac79a6e340ac3966779d2d5563eb47c054ab33cc40bfb7306172138ccbd3adb2b9
 Size (firefox-52.9.0esr.source.tar.xz) = 214087304 bytes
-SHA1 (patch-aa) = c1084caa275e57b716c3499301f7fc3f99ef5026
+SHA1 (patch-aa) = eb9368360208ba294d3d17e0c69815531aed1abf
 SHA1 (patch-ao) = 8b7125ef3b193fca4d03386142887b2f8d5015c5
 SHA1 (patch-as) = b596132c7b6902c4f7ddb901e28e1437b99bb428
 SHA1 (patch-build_gyp.mozbuild) = 481270e6703e556fb87a3440cb3cfb3d4fcc4c86

Index: pkgsrc/www/firefox52/patches/patch-aa
diff -u pkgsrc/www/firefox52/patches/patch-aa:1.1 pkgsrc/www/firefox52/patches/patch-aa:1.2
--- pkgsrc/www/firefox52/patches/patch-aa:1.1   Thu Apr 27 01:55:57 2017
+++ pkgsrc/www/firefox52/patches/patch-aa       Sat Jun  1 19:11:28 2019
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1 2017/04/27 01:55:57 ryoon Exp $
+$NetBSD: patch-aa,v 1.2 2019/06/01 19:11:28 maya Exp $
 
 * MOZ_ENABLE_PROFILER_SPS is not for users, Disable it
 * Disable libjpeg-turbo check
@@ -205,7 +205,7 @@ $NetBSD: patch-aa,v 1.1 2017/04/27 01:55
 +
 +    dnl Assume NetBSD implementation over SunAudio
 +    AC_CHECK_LIB(ossaudio, _oss_ioctl,
-+        [AC_DEFINE_UNQUOTED(CUBEB_OSS_DEFAULT_OUTPUT, "/dev/sound")
++        [AC_DEFINE_UNQUOTED(CUBEB_OSS_DEFAULT_OUTPUT, "/dev/audio")
 +         MOZ_OSS_LIBS="$MOZ_OSS_LIBS -lossaudio"])
 +fi
 +CFLAGS=$_SAVE_CFLAGS

Index: pkgsrc/www/firefox60/Makefile
diff -u pkgsrc/www/firefox60/Makefile:1.25 pkgsrc/www/firefox60/Makefile:1.26
--- pkgsrc/www/firefox60/Makefile:1.25  Sat Jun  1 15:01:39 2019
+++ pkgsrc/www/firefox60/Makefile       Sat Jun  1 19:11:28 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2019/06/01 15:01:39 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2019/06/01 19:11:28 maya Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=            60.7
@@ -6,7 +6,7 @@ MOZ_BRANCH_MINOR=       .0esr
 
 DISTNAME=      firefox-${FIREFOX_VER}.source
 PKGNAME=       firefox${MOZ_BRANCH:C/\..*$//}-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    www
 MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/www/firefox60/distinfo
diff -u pkgsrc/www/firefox60/distinfo:1.14 pkgsrc/www/firefox60/distinfo:1.15
--- pkgsrc/www/firefox60/distinfo:1.14  Sat Jun  1 15:01:39 2019
+++ pkgsrc/www/firefox60/distinfo       Sat Jun  1 19:11:28 2019
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.14 2019/06/01 15:01:39 wiz Exp $
+$NetBSD: distinfo,v 1.15 2019/06/01 19:11:28 maya Exp $
 
 SHA1 (firefox-60.7.0esr.source.tar.xz) = 733187de6b20f8902fa207f08ec85f952a2c2e40
 RMD160 (firefox-60.7.0esr.source.tar.xz) = 21176def2d22c83042d36844c5d148d324199ac6
 SHA512 (firefox-60.7.0esr.source.tar.xz) = c2152857f5f1c816a12fcf5c450268025ee47ee9299ae3355650d86c7c97191b731123a4964154222ca5ba1edc44fee0d1d5f803ae9515841283ecaff6dc9a55
 Size (firefox-60.7.0esr.source.tar.xz) = 268497160 bytes
-SHA1 (patch-aa) = fdabcc9b055f6439fdbda9b38ab7cec08ff3e231
+SHA1 (patch-aa) = 17ea1093941cabc3dac1c653ba9edd92ec9877da
 SHA1 (patch-browser_app_profile_firefox.js) = 9a43095d94f83f315b9a3ce4a7b0a4301e9c40e6
 SHA1 (patch-build_moz.configure_old.configure) = 1df6867eaf73a350fbe8fcd5bd34e1fcab09d707
 SHA1 (patch-build_moz.configure_rust.configure) = 2818454ba4df3cbd85174edc4828206b3bf0a82b

Index: pkgsrc/www/firefox60/patches/patch-aa
diff -u pkgsrc/www/firefox60/patches/patch-aa:1.1 pkgsrc/www/firefox60/patches/patch-aa:1.2
--- pkgsrc/www/firefox60/patches/patch-aa:1.1   Thu Jun 28 14:04:10 2018
+++ pkgsrc/www/firefox60/patches/patch-aa       Sat Jun  1 19:11:28 2019
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1 2018/06/28 14:04:10 ryoon Exp $
+$NetBSD: patch-aa,v 1.2 2019/06/01 19:11:28 maya Exp $
 
 * Disable libjpeg-turbo check
 * Add system libraries option
@@ -73,7 +73,7 @@ $NetBSD: patch-aa,v 1.1 2018/06/28 14:04
 +
 +    dnl Assume NetBSD implementation over SunAudio
 +    AC_CHECK_LIB(ossaudio, _oss_ioctl,
-+        [AC_DEFINE_UNQUOTED(CUBEB_OSS_DEFAULT_OUTPUT, "/dev/sound")
++        [AC_DEFINE_UNQUOTED(CUBEB_OSS_DEFAULT_OUTPUT, "/dev/audio")
 +         MOZ_OSS_LIBS="$MOZ_OSS_LIBS -lossaudio"])
 +fi
 +CFLAGS=$_SAVE_CFLAGS