Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_15589667665960"
MIME-Version: 1.0
Date: Mon, 27 May 2019 14:19:26 +0000
From: "Izumi Tsutsui" <tsutsui@netbsd.org>
Subject: CVS commit: pkgsrc/www/firefox
To: pkgsrc-changes@NetBSD.org
Reply-To: tsutsui@netbsd.org
Message-Id: <20190527141926.DBA25F996@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_15589667665960
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	tsutsui
Date:		Mon May 27 14:19:26 UTC 2019

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

Log Message:
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.376 -r1.377 pkgsrc/www/firefox/Makefile
cvs rdiff -u -r1.351 -r1.352 pkgsrc/www/firefox/distinfo
cvs rdiff -u -r1.12 -r1.13 \
    pkgsrc/www/firefox/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.


--_----------=_15589667665960
Content-Disposition: inline
Content-Length: 4365
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/www/firefox/Makefile
diff -u pkgsrc/www/firefox/Makefile:1.376 pkgsrc/www/firefox/Makefile:1.377
--- pkgsrc/www/firefox/Makefile:1.376	Sat May 25 20:17:04 2019
+++ pkgsrc/www/firefox/Makefile	Mon May 27 14:19:26 2019
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.376 2019/05/25 20:17:04 szptvlfn Exp $
+# $NetBSD: Makefile,v 1.377 2019/05/27 14:19:26 tsutsui Exp $
 
 FIREFOX_VER=		${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=		67.0
 MOZ_BRANCH_MINOR=	
+PKGREVISION=		1
 
 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.351 pkgsrc/www/firefox/distinfo:1.352
--- pkgsrc/www/firefox/distinfo:1.351	Wed May 22 13:32:51 2019
+++ pkgsrc/www/firefox/distinfo	Mon May 27 14:19:26 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.351 2019/05/22 13:32:51 ryoon Exp $
+$NetBSD: distinfo,v 1.352 2019/05/27 14:19:26 tsutsui Exp $
 
 SHA1 (firefox-67.0.source.tar.xz) = c7a5f3182999e5efed5c714653adc538bb75aa53
 RMD160 (firefox-67.0.source.tar.xz) = 48e96058ef1bfb2939d8da93fd6807d212d0df4e
@@ -25,7 +25,7 @@ SHA1 (patch-js_xpconnect_src_XPCMaps.cpp
 SHA1 (patch-media_libcubeb_gtest_moz.build) = ea6dcc7ceeb76ce1fb9d508cf43080a2eef3a9e4
 SHA1 (patch-media_libcubeb_src_cubeb.c) = 4fe5512c89fa9e0dd64573d2784e5e0f7fd4d866
 SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = f359a66a22f11142d05746e15894d998d3e3bf5a
-SHA1 (patch-media_libcubeb_src_cubeb__oss.c) = 9b29bbd1c923e574aa5a9ecc17170ad5ef4778c0
+SHA1 (patch-media_libcubeb_src_cubeb__oss.c) = 103f751d5a7bc14a81a6ed43e1afc722bc092f7e
 SHA1 (patch-media_libcubeb_src_moz.build) = 10f8355e3b3c6d35cca99f3717246e8658860737
 SHA1 (patch-media_libcubeb_update.sh) = cddb5849fa2972e961e4891bc8a79a650df06d8d
 SHA1 (patch-media_libpng_pngpriv.h) = c8084332560017cd7c9b519b61d125fa28af0dbc

Index: pkgsrc/www/firefox/patches/patch-media_libcubeb_src_cubeb__oss.c
diff -u pkgsrc/www/firefox/patches/patch-media_libcubeb_src_cubeb__oss.c:1.12 pkgsrc/www/firefox/patches/patch-media_libcubeb_src_cubeb__oss.c:1.13
--- pkgsrc/www/firefox/patches/patch-media_libcubeb_src_cubeb__oss.c:1.12	Sun Nov  4 00:38:45 2018
+++ pkgsrc/www/firefox/patches/patch-media_libcubeb_src_cubeb__oss.c	Mon May 27 14:19:26 2019
@@ -1,8 +1,9 @@
-$NetBSD: patch-media_libcubeb_src_cubeb__oss.c,v 1.12 2018/11/04 00:38:45 ryoon Exp $
+$NetBSD: patch-media_libcubeb_src_cubeb__oss.c,v 1.13 2019/05/27 14:19:26 tsutsui Exp $
 
 * Restore OSS audio support code
+* fix wrong latency values in stream_init (PR pkg/54206)
 
---- media/libcubeb/src/cubeb_oss.c.orig	2018-10-25 10:52:12.966650761 +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,453 @@
 +/*
@@ -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);


--_----------=_15589667665960--