CVS commit: pkgsrc/www/seamonkey

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

Module Name:    pkgsrc
Committed By:   maya
Date:           Wed Dec  7 22:01:28 UTC 2016

Modified Files:
        pkgsrc/www/seamonkey: distinfo
        pkgsrc/www/seamonkey/patches:
            patch-mozilla_media_libcubeb_src_cubeb__alsa.c

Log Message:
seamonkey: do not add a test for EBADFD in a patch.
besides not being defined on NetBSD (where it is EBADF), it doesn't
make sense to test for it.

>From kre in PR pkg/51666


To generate a diff of this commit:
cvs rdiff -u -r1.139 -r1.140 pkgsrc/www/seamonkey/distinfo
cvs rdiff -u -r1.6 -r1.7 \
    pkgsrc/www/seamonkey/patches/patch-mozilla_media_libcubeb_src_cubeb__alsa.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/seamonkey/distinfo
diff -u pkgsrc/www/seamonkey/distinfo:1.139 pkgsrc/www/seamonkey/distinfo:1.140
--- pkgsrc/www/seamonkey/distinfo:1.139 Thu Nov  3 22:46:43 2016
+++ pkgsrc/www/seamonkey/distinfo       Wed Dec  7 22:01:28 2016
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.139 2016/11/03 22:46:43 joerg Exp $
+$NetBSD: distinfo,v 1.140 2016/12/07 22:01:28 maya Exp $
 
 SHA1 (seamonkey-2.40.source.tar.xz) = ecf99bc7478319835a0e19f35ed5b7b1aa2c0046
 RMD160 (seamonkey-2.40.source.tar.xz) = 4030688f145fdf35a6d2728d097cf7cda8e50231
@@ -80,7 +80,7 @@ SHA1 (patch-mozilla_js_xpconnect_src_XPC
 SHA1 (patch-mozilla_js_xpconnect_src_xpcprivate.h) = 56e9de48605f2310fdc2777b4fcab8ce2de50d0a
 SHA1 (patch-mozilla_media_libcubeb_AUTHORS) = 1a516754289470319fd181315f0bc7a04a4aaf85
 SHA1 (patch-mozilla_media_libcubeb_src_cubeb.c) = f4018f850cfd2b73226c66dbddb310e1efe40475
-SHA1 (patch-mozilla_media_libcubeb_src_cubeb__alsa.c) = 7af1dfbd5e190e4ee57699de2c0d2997a4430cd0
+SHA1 (patch-mozilla_media_libcubeb_src_cubeb__alsa.c) = 94227c01e187365c7021e9bb40f3f65a56d599f5
 SHA1 (patch-mozilla_media_libcubeb_src_cubeb__oss.c) = 808c5b237e83c9db99095def1ef546fdb3ad3b3c
 SHA1 (patch-mozilla_media_libcubeb_src_moz.build) = c701606254f82ee195fd0191ff269b312b14da40
 SHA1 (patch-mozilla_media_libpng_pngpriv.h) = b3bf9d7aeaf00a7cd0c9cc491fe6ac474c002655

Index: pkgsrc/www/seamonkey/patches/patch-mozilla_media_libcubeb_src_cubeb__alsa.c
diff -u pkgsrc/www/seamonkey/patches/patch-mozilla_media_libcubeb_src_cubeb__alsa.c:1.6 pkgsrc/www/seamonkey/patches/patch-mozilla_media_libcubeb_src_cubeb__alsa.c:1.7
--- pkgsrc/www/seamonkey/patches/patch-mozilla_media_libcubeb_src_cubeb__alsa.c:1.6     Fri Oct  2 22:49:36 2015
+++ pkgsrc/www/seamonkey/patches/patch-mozilla_media_libcubeb_src_cubeb__alsa.c Wed Dec  7 22:01:28 2016
@@ -1,4 +1,4 @@
-$NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.6 2015/10/02 22:49:36 ryoon Exp $
+$NetBSD: patch-mozilla_media_libcubeb_src_cubeb__alsa.c,v 1.7 2016/12/07 22:01:28 maya Exp $
 
 --- mozilla/media/libcubeb/src/cubeb_alsa.c.orig       2015-09-25 07:35:08.000000000 +0000
 +++ mozilla/media/libcubeb/src/cubeb_alsa.c
@@ -170,7 +170,7 @@ $NetBSD: patch-mozilla_media_libcubeb_sr
  
      if (stm->params.format == CUBEB_SAMPLE_FLOAT32NE) {
        float * b = (float *) p;
-@@ -328,14 +385,62 @@ alsa_refill_stream(cubeb_stream * stm)
+@@ -328,14 +385,55 @@ alsa_refill_stream(cubeb_stream * stm)
          b[i] *= stm->volume;
        }
      }
@@ -206,13 +206,6 @@ $NetBSD: patch-mozilla_media_libcubeb_sr
 +          return ERROR;
 +        }
 +        continue;
-+      case -EBADFD:
-+        fprintf(stderr, "%s: snc_pcm_writei returned -%s, giving up\n",
-+                __func__, "EBADFD");
-+        free(p);
-+        stm->state_callback(stm, stm->user_ptr, CUBEB_STATE_ERROR);
-+        pthread_mutex_unlock(&stm->mutex);
-+        return ERROR;
 +      }
 +      if (wrote < 0) {
 +        fprintf(stderr, "%s: snc_pcm_writei returned unexpected error %lld, "
@@ -241,7 +234,7 @@ $NetBSD: patch-mozilla_media_libcubeb_sr
    }
    if (got != avail) {
      long buffer_fill = stm->buffer_size - (avail - got);
-@@ -343,7 +448,7 @@ alsa_refill_stream(cubeb_stream * stm)
+@@ -343,7 +441,7 @@ alsa_refill_stream(cubeb_stream * stm)
  
      /* Fill the remaining buffer with silence to guarantee one full period
         has been written. */
@@ -250,7 +243,7 @@ $NetBSD: patch-mozilla_media_libcubeb_sr
  
      set_timeout(&stm->drain_timeout, buffer_time * 1000);
  
-@@ -454,26 +559,26 @@ get_slave_pcm_node(snd_config_t * lconf,
+@@ -454,26 +552,26 @@ get_slave_pcm_node(snd_config_t * lconf,
  
    slave_def = NULL;
  
@@ -282,7 +275,7 @@ $NetBSD: patch-mozilla_media_libcubeb_sr
      if (r < 0) {
        break;
      }
-@@ -482,7 +587,7 @@ get_slave_pcm_node(snd_config_t * lconf,
+@@ -482,7 +580,7 @@ get_slave_pcm_node(snd_config_t * lconf,
      if (r < 0 || r > (int) sizeof(node_name)) {
        break;
      }
@@ -291,7 +284,7 @@ $NetBSD: patch-mozilla_media_libcubeb_sr
      if (r < 0) {
        break;
      }
-@@ -491,7 +596,7 @@ get_slave_pcm_node(snd_config_t * lconf,
+@@ -491,7 +589,7 @@ get_slave_pcm_node(snd_config_t * lconf,
    } while (0);
  
    if (slave_def) {
@@ -300,7 +293,7 @@ $NetBSD: patch-mozilla_media_libcubeb_sr
    }
  
    return NULL;
-@@ -514,22 +619,22 @@ init_local_config_with_workaround(char c
+@@ -514,22 +612,22 @@ init_local_config_with_workaround(char c
  
    lconf = NULL;
  
@@ -327,7 +320,7 @@ $NetBSD: patch-mozilla_media_libcubeb_sr
      if (r < 0) {
        break;
      }
-@@ -538,7 +643,7 @@ init_local_config_with_workaround(char c
+@@ -538,7 +636,7 @@ init_local_config_with_workaround(char c
      if (r < 0 || r > (int) sizeof(node_name)) {
        break;
      }
@@ -336,7 +329,7 @@ $NetBSD: patch-mozilla_media_libcubeb_sr
      if (r < 0) {
        break;
      }
-@@ -549,12 +654,12 @@ init_local_config_with_workaround(char c
+@@ -549,12 +647,12 @@ init_local_config_with_workaround(char c
      }
  
      /* Fetch the PCM node's type, and bail out if it's not the PulseAudio plugin. */
@@ -351,7 +344,7 @@ $NetBSD: patch-mozilla_media_libcubeb_sr
      if (r < 0) {
        break;
      }
-@@ -565,18 +670,18 @@ init_local_config_with_workaround(char c
+@@ -565,18 +663,18 @@ init_local_config_with_workaround(char c
  
      /* Don't clobber an explicit existing handle_underrun value, set it only
         if it doesn't already exist. */
@@ -373,7 +366,7 @@ $NetBSD: patch-mozilla_media_libcubeb_sr
      if (r < 0) {
        break;
      }
-@@ -584,7 +689,7 @@ init_local_config_with_workaround(char c
+@@ -584,7 +682,7 @@ init_local_config_with_workaround(char c
      return lconf;
    } while (0);
  
@@ -382,7 +375,7 @@ $NetBSD: patch-mozilla_media_libcubeb_sr
  
    return NULL;
  }
-@@ -596,9 +701,9 @@ alsa_locked_pcm_open(snd_pcm_t ** pcm, s
+@@ -596,9 +694,9 @@ alsa_locked_pcm_open(snd_pcm_t ** pcm, s
  
    pthread_mutex_lock(&cubeb_alsa_mutex);
    if (local_config) {
@@ -394,7 +387,7 @@ $NetBSD: patch-mozilla_media_libcubeb_sr
    }
    pthread_mutex_unlock(&cubeb_alsa_mutex);
  
-@@ -611,7 +716,7 @@ alsa_locked_pcm_close(snd_pcm_t * pcm)
+@@ -611,7 +709,7 @@ alsa_locked_pcm_close(snd_pcm_t * pcm)
    int r;
  
    pthread_mutex_lock(&cubeb_alsa_mutex);
@@ -403,7 +396,7 @@ $NetBSD: patch-mozilla_media_libcubeb_sr
    pthread_mutex_unlock(&cubeb_alsa_mutex);
  
    return r;
-@@ -668,12 +773,65 @@ alsa_init(cubeb ** context, char const *
+@@ -668,12 +766,65 @@ alsa_init(cubeb ** context, char const *
    pthread_attr_t attr;
    snd_pcm_t * dummy;
  
@@ -470,7 +463,7 @@ $NetBSD: patch-mozilla_media_libcubeb_sr
      cubeb_alsa_error_handler_set = 1;
    }
    pthread_mutex_unlock(&cubeb_alsa_mutex);
-@@ -681,6 +839,8 @@ alsa_init(cubeb ** context, char const *
+@@ -681,6 +832,8 @@ alsa_init(cubeb ** context, char const *
    ctx = calloc(1, sizeof(*ctx));
    assert(ctx);
  
@@ -479,7 +472,7 @@ $NetBSD: patch-mozilla_media_libcubeb_sr
    ctx->ops = &alsa_ops;
  
    r = pthread_mutex_init(&ctx->mutex, NULL);
-@@ -730,7 +890,7 @@ alsa_init(cubeb ** context, char const *
+@@ -730,7 +883,7 @@ alsa_init(cubeb ** context, char const *
         config fails with EINVAL, the PA PCM is too old for this workaround. */
      if (r == -EINVAL) {
        pthread_mutex_lock(&cubeb_alsa_mutex);
@@ -488,7 +481,7 @@ $NetBSD: patch-mozilla_media_libcubeb_sr
        pthread_mutex_unlock(&cubeb_alsa_mutex);
        ctx->local_config = NULL;
      } else if (r >= 0) {
-@@ -769,9 +929,13 @@ alsa_destroy(cubeb * ctx)
+@@ -769,9 +922,13 @@ alsa_destroy(cubeb * ctx)
    pthread_mutex_destroy(&ctx->mutex);
    free(ctx->fds);
  
@@ -503,7 +496,7 @@ $NetBSD: patch-mozilla_media_libcubeb_sr
      pthread_mutex_unlock(&cubeb_alsa_mutex);
    }
  
-@@ -839,7 +1003,7 @@ alsa_stream_init(cubeb * ctx, cubeb_stre
+@@ -839,7 +996,7 @@ alsa_stream_init(cubeb * ctx, cubeb_stre
      return CUBEB_ERROR;
    }
  
@@ -512,7 +505,7 @@ $NetBSD: patch-mozilla_media_libcubeb_sr
    assert(r == 0);
  
    /* Ugly hack: the PA ALSA plugin allows buffer configurations that can't
-@@ -849,23 +1013,23 @@ alsa_stream_init(cubeb * ctx, cubeb_stre
+@@ -849,23 +1006,23 @@ alsa_stream_init(cubeb * ctx, cubeb_stre
      latency = latency < 500 ? 500 : latency;
    }
  
@@ -542,7 +535,7 @@ $NetBSD: patch-mozilla_media_libcubeb_sr
    assert((nfds_t) r == stm->nfds);
  
    r = pthread_cond_init(&stm->cond, NULL);
-@@ -896,7 +1060,7 @@ alsa_stream_destroy(cubeb_stream * stm)
+@@ -896,7 +1053,7 @@ alsa_stream_destroy(cubeb_stream * stm)
    pthread_mutex_lock(&stm->mutex);
    if (stm->pcm) {
      if (stm->state == DRAINING) {
@@ -551,7 +544,7 @@ $NetBSD: patch-mozilla_media_libcubeb_sr
      }
      alsa_locked_pcm_close(stm->pcm);
      stm->pcm = NULL;
-@@ -906,7 +1070,10 @@ alsa_stream_destroy(cubeb_stream * stm)
+@@ -906,7 +1063,10 @@ alsa_stream_destroy(cubeb_stream * stm)
    pthread_mutex_destroy(&stm->mutex);
  
    r = pthread_cond_destroy(&stm->cond);
@@ -563,7 +556,7 @@ $NetBSD: patch-mozilla_media_libcubeb_sr
  
    alsa_unregister_stream(stm);
  
-@@ -938,12 +1105,12 @@ alsa_get_max_channel_count(cubeb * ctx, 
+@@ -938,12 +1098,12 @@ alsa_get_max_channel_count(cubeb * ctx, 
      return CUBEB_ERROR;
    }
  
@@ -578,7 +571,7 @@ $NetBSD: patch-mozilla_media_libcubeb_sr
    if (r < 0) {
      return CUBEB_ERROR;
    }
-@@ -963,34 +1130,34 @@ alsa_get_preferred_sample_rate(cubeb * c
+@@ -963,34 +1123,34 @@ alsa_get_preferred_sample_rate(cubeb * c
  
    /* get a pcm, disabling resampling, so we get a rate the
     * hardware/dmix/pulse/etc. supports. */
@@ -621,7 +614,7 @@ $NetBSD: patch-mozilla_media_libcubeb_sr
  
    return CUBEB_OK;
  }
-@@ -1014,7 +1181,7 @@ alsa_stream_start(cubeb_stream * stm)
+@@ -1014,7 +1174,7 @@ alsa_stream_start(cubeb_stream * stm)
    ctx = stm->context;
  
    pthread_mutex_lock(&stm->mutex);
@@ -630,7 +623,7 @@ $NetBSD: patch-mozilla_media_libcubeb_sr
    gettimeofday(&stm->last_activity, NULL);
    pthread_mutex_unlock(&stm->mutex);
  
-@@ -1048,7 +1215,7 @@ alsa_stream_stop(cubeb_stream * stm)
+@@ -1048,7 +1208,7 @@ alsa_stream_stop(cubeb_stream * stm)
    pthread_mutex_unlock(&ctx->mutex);
  
    pthread_mutex_lock(&stm->mutex);
@@ -639,7 +632,7 @@ $NetBSD: patch-mozilla_media_libcubeb_sr
    pthread_mutex_unlock(&stm->mutex);
  
    return CUBEB_OK;
-@@ -1064,14 +1231,17 @@ alsa_stream_get_position(cubeb_stream * 
+@@ -1064,14 +1224,17 @@ alsa_stream_get_position(cubeb_stream * 
    pthread_mutex_lock(&stm->mutex);
  
    delay = -1;
@@ -660,7 +653,7 @@ $NetBSD: patch-mozilla_media_libcubeb_sr
  
    *position = 0;
    if (stm->write_position >= (snd_pcm_uframes_t) delay) {
-@@ -1090,7 +1260,7 @@ alsa_stream_get_latency(cubeb_stream * s
+@@ -1090,7 +1253,7 @@ alsa_stream_get_latency(cubeb_stream * s
    snd_pcm_sframes_t delay;
    /* This function returns the delay in frames until a frame written using
       snd_pcm_writei is sent to the DAC. The DAC delay should be < 1ms anyways. */