CVS commit: pkgsrc/www/firefox60

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed May 29 12:31:33 UTC 2019

Modified Files:
        pkgsrc/www/firefox60: Makefile distinfo
        pkgsrc/www/firefox60/patches: patch-media_libcubeb_src_cubeb__oss.c

Log Message:
firefox60: update to 60.7.0nb1.

copy tsutsui's commit to firefox:

fix wrong latency unit in stream_init() function.

Based on a patch in PR pkg/54206 from Y.Sugahara.
Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 pkgsrc/www/firefox60/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/www/firefox60/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/www/firefox60/patches/patch-media_libcubeb_src_cubeb__oss.c

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

Modified files:

Index: pkgsrc/www/firefox60/Makefile
diff -u pkgsrc/www/firefox60/Makefile:1.23 pkgsrc/www/firefox60/Makefile:1.24
--- pkgsrc/www/firefox60/Makefile:1.23  Mon May 27 13:01:20 2019
+++ pkgsrc/www/firefox60/Makefile       Wed May 29 12:31:33 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2019/05/27 13:01:20 ryoon Exp $
+# $NetBSD: Makefile,v 1.24 2019/05/29 12:31:33 wiz Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=            60.7
@@ -6,6 +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=   1
 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.12 pkgsrc/www/firefox60/distinfo:1.13
--- pkgsrc/www/firefox60/distinfo:1.12  Mon May 27 13:01:20 2019
+++ pkgsrc/www/firefox60/distinfo       Wed May 29 12:31:33 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2019/05/27 13:01:20 ryoon Exp $
+$NetBSD: distinfo,v 1.13 2019/05/29 12:31:33 wiz Exp $
 
 SHA1 (firefox-60.7.0esr.source.tar.xz) = 733187de6b20f8902fa207f08ec85f952a2c2e40
 RMD160 (firefox-60.7.0esr.source.tar.xz) = 21176def2d22c83042d36844c5d148d324199ac6
@@ -24,7 +24,7 @@ SHA1 (patch-js_src_wasm_WasmSignalHandle
 SHA1 (patch-media_libcubeb_gtest_moz.build) = 921a001726cda9e9782df5e59ae02b19d76ef47e
 SHA1 (patch-media_libcubeb_src_cubeb.c) = 1b1b8d57eb710cad13518ded79a0ddee2681881b
 SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = 3ee36f58bb525767c7d2b9e814ba4ccaa4868717
-SHA1 (patch-media_libcubeb_src_cubeb__oss.c) = ccd7ad6f09977dab358632107cfd9078b4649f99
+SHA1 (patch-media_libcubeb_src_cubeb__oss.c) = 103f751d5a7bc14a81a6ed43e1afc722bc092f7e
 SHA1 (patch-media_libcubeb_src_moz.build) = f243068c8908dcb16434221edef8c65db3bb0c83
 SHA1 (patch-media_libcubeb_update.sh) = 3a322de06bbe9aafba9da349954ef022bd094992
 SHA1 (patch-media_libpng_pngpriv.h) = c8084332560017cd7c9b519b61d125fa28af0dbc

Index: pkgsrc/www/firefox60/patches/patch-media_libcubeb_src_cubeb__oss.c
diff -u pkgsrc/www/firefox60/patches/patch-media_libcubeb_src_cubeb__oss.c:1.1 pkgsrc/www/firefox60/patches/patch-media_libcubeb_src_cubeb__oss.c:1.2
--- pkgsrc/www/firefox60/patches/patch-media_libcubeb_src_cubeb__oss.c:1.1      Thu Jun 28 14:04:10 2018
+++ pkgsrc/www/firefox60/patches/patch-media_libcubeb_src_cubeb__oss.c  Wed May 29 12:31:33 2019
@@ -1,10 +1,11 @@
-$NetBSD: patch-media_libcubeb_src_cubeb__oss.c,v 1.1 2018/06/28 14:04:10 ryoon Exp $
+$NetBSD: patch-media_libcubeb_src_cubeb__oss.c,v 1.2 2019/05/29 12:31:33 wiz Exp $
 
 * Restore OSS audio support code
+* fix wrong latency values in stream_init (PR pkg/54206)
 
---- media/libcubeb/src/cubeb_oss.c.orig        2018-05-09 10:25:44.118207555 +0000
+--- media/libcubeb/src/cubeb_oss.c.orig        2019-05-24 13:05:19.117086384 +0000
 +++ media/libcubeb/src/cubeb_oss.c
-@@ -0,0 +1,454 @@
+@@ -0,0 +1,453 @@
 +/*
 + * Copyright © 2014 Mozilla Foundation
 + *
@@ -240,14 +241,14 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
 +  return NULL;
 +}
 +
-+static void oss_try_set_latency(cubeb_stream* stream, unsigned int latency)
++static void oss_try_set_latency(cubeb_stream* stream, unsigned int latency_frames)
 +{
 +  unsigned int latency_bytes, n_frag;
 +  int frag;
 +  /* fragment size of 1024 is a good choice with good chances to be accepted */
 +  unsigned int frag_log=10; /* 2^frag_log = fragment size */
 +  latency_bytes =
-+    latency*stream->params.rate*stream->params.channels*sizeof(uint16_t)/1000;
++    latency_frames*stream->params.channels*sizeof(uint16_t);
 +  n_frag = latency_bytes>>frag_log;
 +  frag = (n_frag<<16) | frag_log;
 +  /* Even if this fails we wish to continue, not checking for errors */
@@ -260,7 +261,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
 +                           cubeb_stream_params * input_stream_params,
 +                           cubeb_devid output_device,
 +                           cubeb_stream_params * output_stream_params,
-+                           unsigned int latency,
++                           unsigned int latency_frames,
 +                           cubeb_data_callback data_callback,
 +                           cubeb_state_callback state_callback, void * user_ptr)
 +{
@@ -296,7 +297,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
 +  stream->volume = 1.0;
 +  stream->panning = 0.0;
 +
-+  oss_try_set_latency(stream, latency); 
++  oss_try_set_latency(stream, latency_frames); 
 +
 +  stream->floating = 0;
 +  SET(SNDCTL_DSP_CHANNELS, stream->params.channels);
@@ -441,7 +442,6 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
 +  .get_max_channel_count = oss_get_max_channel_count,
 +  .get_min_latency = oss_get_min_latency,
 +  .get_preferred_sample_rate = oss_get_preferred_sample_rate,
-+  .get_preferred_channel_layout = NULL,
 +  .enumerate_devices = NULL,
 +  .device_collection_destroy = NULL,
 +  .destroy = oss_destroy,