CVS commit: pkgsrc/www/seamonkey

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Jun  1 20:41:45 UTC 2019

Modified Files:
        pkgsrc/www/seamonkey: Makefile distinfo options.mk
        pkgsrc/www/seamonkey/patches:
            patch-mozilla_media_libcubeb_src_cubeb__oss.c
            patch-mozilla_old-configure.in

Log Message:
seamonkey: Sync audio improvements from firefox.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.189 -r1.190 pkgsrc/www/seamonkey/Makefile
cvs rdiff -u -r1.155 -r1.156 pkgsrc/www/seamonkey/distinfo
cvs rdiff -u -r1.39 -r1.40 pkgsrc/www/seamonkey/options.mk
cvs rdiff -u -r1.5 -r1.6 \
    pkgsrc/www/seamonkey/patches/patch-mozilla_media_libcubeb_src_cubeb__oss.c
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/www/seamonkey/patches/patch-mozilla_old-configure.in

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

Modified files:

Index: pkgsrc/www/seamonkey/Makefile
diff -u pkgsrc/www/seamonkey/Makefile:1.189 pkgsrc/www/seamonkey/Makefile:1.190
--- pkgsrc/www/seamonkey/Makefile:1.189 Sun May  5 22:49:53 2019
+++ pkgsrc/www/seamonkey/Makefile       Sat Jun  1 20:41:45 2019
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.189 2019/05/05 22:49:53 ryoon Exp $
+# $NetBSD: Makefile,v 1.190 2019/06/01 20:41:45 nia Exp $
 
 DISTNAME=      seamonkey-${SM_VER}.source
 PKGNAME=       seamonkey-${SM_VER:S/b/beta/}
-PKGREVISION=   7
+PKGREVISION=   8
 SM_VER=                2.49.4
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_MOZILLA:=seamonkey/releases/${SM_VER}/source/}

Index: pkgsrc/www/seamonkey/distinfo
diff -u pkgsrc/www/seamonkey/distinfo:1.155 pkgsrc/www/seamonkey/distinfo:1.156
--- pkgsrc/www/seamonkey/distinfo:1.155 Tue Oct 23 22:55:13 2018
+++ pkgsrc/www/seamonkey/distinfo       Sat Jun  1 20:41:45 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.155 2018/10/23 22:55:13 maya Exp $
+$NetBSD: distinfo,v 1.156 2019/06/01 20:41:45 nia Exp $
 
 SHA1 (seamonkey-2.49.4.source.tar.xz) = e9fa6d1c57e9141a299f6ec093683fb105ea6657
 RMD160 (seamonkey-2.49.4.source.tar.xz) = 072caadf376b7726356d6121abff87cc1fb62144
@@ -65,7 +65,7 @@ SHA1 (patch-mozilla_js_xpconnect_src_XPC
 SHA1 (patch-mozilla_js_xpconnect_src_xpcprivate.h) = 6a836224fa46f2b30d337a7893c668ab0cf807cd
 SHA1 (patch-mozilla_media_libcubeb_src_cubeb.c) = b760a10ef1fdff5360b2644913df34d60f2ffbf6
 SHA1 (patch-mozilla_media_libcubeb_src_cubeb__alsa.c) = 06d21721261b85412085b3336aa8c3712c0d5551
-SHA1 (patch-mozilla_media_libcubeb_src_cubeb__oss.c) = 05d5e3a93a9cde21c2aece2ac4c83e70488a25d5
+SHA1 (patch-mozilla_media_libcubeb_src_cubeb__oss.c) = 4b4e698c410fd9a8496296aa85f2f8a423ddf95f
 SHA1 (patch-mozilla_media_libcubeb_src_moz.build) = 20cd45532c053be8b57177c4161537047e365be3
 SHA1 (patch-mozilla_media_libcubeb_tests_moz.build) = af24f693c6cf0cd7c6dfb2d7ca4ad17d6a77cc97
 SHA1 (patch-mozilla_media_libcubeb_update.sh) = 2ff28e8691e97787ba881b836065b6e4eecd72af
@@ -88,7 +88,7 @@ SHA1 (patch-mozilla_modules_libjar_nsZip
 SHA1 (patch-mozilla_mozglue_build_arm.cpp) = 592ae5ce1a404227cc2ab6a06418cc813c5743c9
 SHA1 (patch-mozilla_mozglue_build_arm.h) = 94e2b1a1a9ebf20bfa8a542066aa0dad475db320
 SHA1 (patch-mozilla_netwerk_dns_moz.build) = d87c07ebfa01d32ca826932af733b37ce586e9f7
-SHA1 (patch-mozilla_old-configure.in) = f6283698884f616c1c4a38450a43b2465b16efab
+SHA1 (patch-mozilla_old-configure.in) = 100f03e97fb362defbf4d26b82b64508855debbe
 SHA1 (patch-mozilla_toolkit_components_osfile_modules_osfile__unix__back.jsm) = db4084f6a7dba2fc5d35cd256c6f149fabbf7bc7
 SHA1 (patch-mozilla_toolkit_components_osfile_modules_osfile__unix__front.jsm) = 1e8d0883d3cc12541020c7df0b1d67f60e7391f5
 SHA1 (patch-mozilla_toolkit_components_protobuf_src_google_protobuf_stubs_atomicops.h) = 0b5cad33bc9a90f4ae2d6346065707b642aba3a9

Index: pkgsrc/www/seamonkey/options.mk
diff -u pkgsrc/www/seamonkey/options.mk:1.39 pkgsrc/www/seamonkey/options.mk:1.40
--- pkgsrc/www/seamonkey/options.mk:1.39        Fri Nov 10 22:45:27 2017
+++ pkgsrc/www/seamonkey/options.mk     Sat Jun  1 20:41:45 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.39 2017/11/10 22:45:27 ryoon Exp $
+# $NetBSD: options.mk,v 1.40 2019/06/01 20:41:45 nia Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.seamonkey
 
@@ -20,9 +20,9 @@ PKG_SUGGESTED_OPTIONS+=       webrtc
 .endif
 
 .if ${OPSYS} == "Linux"
-PKG_SUGGESTED_OPTIONS+=        alsa dbus
-.else
 PKG_SUGGESTED_OPTIONS+=        dbus pulseaudio
+.else
+PKG_SUGGESTED_OPTIONS+=        dbus
 .endif
 
 .include "../../mk/bsd.options.mk"

Index: pkgsrc/www/seamonkey/patches/patch-mozilla_media_libcubeb_src_cubeb__oss.c
diff -u pkgsrc/www/seamonkey/patches/patch-mozilla_media_libcubeb_src_cubeb__oss.c:1.5 pkgsrc/www/seamonkey/patches/patch-mozilla_media_libcubeb_src_cubeb__oss.c:1.6
--- pkgsrc/www/seamonkey/patches/patch-mozilla_media_libcubeb_src_cubeb__oss.c:1.5      Fri Aug 18 23:55:07 2017
+++ pkgsrc/www/seamonkey/patches/patch-mozilla_media_libcubeb_src_cubeb__oss.c  Sat Jun  1 20:41:45 2019
@@ -1,6 +1,6 @@
-$NetBSD: patch-mozilla_media_libcubeb_src_cubeb__oss.c,v 1.5 2017/08/18 23:55:07 ryoon Exp $
+$NetBSD: patch-mozilla_media_libcubeb_src_cubeb__oss.c,v 1.6 2019/06/01 20:41:45 nia Exp $
 
---- mozilla/media/libcubeb/src/cubeb_oss.c.orig        2017-08-18 14:25:23.144584317 +0000
+--- mozilla/media/libcubeb/src/cubeb_oss.c.orig        2019-06-01 19:18:55.359909154 +0000
 +++ mozilla/media/libcubeb/src/cubeb_oss.c
 @@ -0,0 +1,442 @@
 +/*
@@ -235,7 +235,7 @@ $NetBSD: patch-mozilla_media_libcubeb_sr
 +  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;
@@ -243,7 +243,7 @@ $NetBSD: patch-mozilla_media_libcubeb_sr
 +  unsigned int frag_size=1024;
 +  unsigned int frag_log=10; /* 2^frag_log = frag_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 */
@@ -256,7 +256,7 @@ $NetBSD: patch-mozilla_media_libcubeb_sr
 +                           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)
 +{
@@ -287,7 +287,7 @@ $NetBSD: patch-mozilla_media_libcubeb_sr
 +  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);

Index: pkgsrc/www/seamonkey/patches/patch-mozilla_old-configure.in
diff -u pkgsrc/www/seamonkey/patches/patch-mozilla_old-configure.in:1.3 pkgsrc/www/seamonkey/patches/patch-mozilla_old-configure.in:1.4
--- pkgsrc/www/seamonkey/patches/patch-mozilla_old-configure.in:1.3     Fri Nov 10 22:45:27 2017
+++ pkgsrc/www/seamonkey/patches/patch-mozilla_old-configure.in Sat Jun  1 20:41:45 2019
@@ -1,6 +1,6 @@
-$NetBSD: patch-mozilla_old-configure.in,v 1.3 2017/11/10 22:45:27 ryoon Exp $
+$NetBSD: patch-mozilla_old-configure.in,v 1.4 2019/06/01 20:41:45 nia Exp $
 
---- mozilla/old-configure.in.orig      2017-10-16 07:19:40.000000000 +0000
+--- mozilla/old-configure.in.orig      2018-07-12 02:18:02.000000000 +0000
 +++ mozilla/old-configure.in
 @@ -2159,11 +2159,7 @@ if test "$MOZ_SYSTEM_JPEG" = 1; then
                       #include <jpeglib.h> ],
@@ -200,7 +200,7 @@ $NetBSD: patch-mozilla_old-configure.in,
 +
 +    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