CVS commit: pkgsrc/www/firefox

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Sat Feb 11 08:27:33 UTC 2017

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

Log Message:
Remove assert to enable alsa-plugins-oss audio playback. Bump PKGREVISION

Your NetBSD system should have ~/.asoundrc like as follows.
However OSS audio playback is not ver stable.

pcm.oss {
        type oss
        device /dev/audio
}

pcm.!default {
        type plug
        slave {
                pcm oss
                format S16_LE
        }
}

ctl.!default {
        type oss
        device /dev/mixer
}


To generate a diff of this commit:
cvs rdiff -u -r1.283 -r1.284 pkgsrc/www/firefox/Makefile
cvs rdiff -u -r1.271 -r1.272 pkgsrc/www/firefox/distinfo
cvs rdiff -u -r1.19 -r1.20 \
    pkgsrc/www/firefox/patches/patch-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/firefox/Makefile
diff -u pkgsrc/www/firefox/Makefile:1.283 pkgsrc/www/firefox/Makefile:1.284
--- pkgsrc/www/firefox/Makefile:1.283   Mon Feb  6 19:00:44 2017
+++ pkgsrc/www/firefox/Makefile Sat Feb 11 08:27:33 2017
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.283 2017/02/06 19:00:44 martin Exp $
+# $NetBSD: Makefile,v 1.284 2017/02/11 08:27:33 ryoon Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=            51.0
 MOZ_BRANCH_MINOR=      .1
-PKGREVISION=           1
 
 DISTNAME=      firefox-${FIREFOX_VER}.source
 PKGNAME=       firefox-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//}
-PKGREVISION=   1
+PKGREVISION=   2
 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/firefox/distinfo
diff -u pkgsrc/www/firefox/distinfo:1.271 pkgsrc/www/firefox/distinfo:1.272
--- pkgsrc/www/firefox/distinfo:1.271   Mon Feb  6 19:00:44 2017
+++ pkgsrc/www/firefox/distinfo Sat Feb 11 08:27:33 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.271 2017/02/06 19:00:44 martin Exp $
+$NetBSD: distinfo,v 1.272 2017/02/11 08:27:33 ryoon Exp $
 
 SHA1 (firefox-51.0.1.source.tar.xz) = b73255fd4f90fd0c1b107b566679da2df3f31cf1
 RMD160 (firefox-51.0.1.source.tar.xz) = 6acc6fc8e3e317842d75b0233a24b0f19c9d3f34
@@ -77,7 +77,7 @@ SHA1 (patch-js_xpconnect_src_XPCConvert.
 SHA1 (patch-js_xpconnect_src_xpcprivate.h) = e09e37819961bae40a9f276ae1ee510d2956c23e
 SHA1 (patch-layout_style_GenerateCSSPropsGenerated.py) = 6e2267d2ffda97923e6e39ed2517f86fb7316b86
 SHA1 (patch-media_libcubeb_src_cubeb.c) = 91eb24595c423b7e086670bb67e73cfd0bfb5559
-SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = 12e0a63540d9a08394bbedfb46c4db3c89618357
+SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = c59eaf40973193885f32819b465b401c1ba45fce
 SHA1 (patch-media_libcubeb_src_cubeb__oss.c) = e15cc2d0c220738ccfd57f79eec242095c8ea536
 SHA1 (patch-media_libcubeb_src_moz.build) = 2b6d7e3bb265220decf9629b1d4b980cadb363fb
 SHA1 (patch-media_libcubeb_tests_moz.build) = 63d8b749a6ebbe8fd662ce1e2bde6aa9cb0b807d

Index: pkgsrc/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c
diff -u pkgsrc/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c:1.19 pkgsrc/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c:1.20
--- pkgsrc/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c:1.19      Mon Feb  6 19:00:44 2017
+++ pkgsrc/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c   Sat Feb 11 08:27:33 2017
@@ -1,4 +1,4 @@
-$NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.19 2017/02/06 19:00:44 martin Exp $
+$NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.20 2017/02/11 08:27:33 ryoon Exp $
 
 * Support alsa audio under NetBSD
 * Avoid https://github.com/kinetiknz/cubeb/issues/226
@@ -72,7 +72,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
  /* ALSA is not thread-safe.  snd_pcm_t instances are individually protected
     by the owning cubeb_stream's mutex.  snd_pcm_t creation and destruction
     is not thread-safe until ALSA 1.0.24 (see alsa-lib.git commit 91c9c8f1),
-@@ -65,6 +113,8 @@
+@@ -65,6 +113,8 @@ struct cubeb {
       workaround is not required. */
    snd_config_t * local_config;
    int is_pa;
@@ -81,7 +81,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
  };
  
  enum stream_state {
-@@ -260,10 +310,10 @@
+@@ -260,10 +310,10 @@ alsa_refill_stream(cubeb_stream * stm)
  
    pthread_mutex_lock(&stm->mutex);
  
@@ -95,7 +95,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
    }
  
    /* Failed to recover from an xrun, this stream must be broken. */
-@@ -286,7 +336,7 @@
+@@ -286,7 +336,7 @@ alsa_refill_stream(cubeb_stream * stm)
      return RUNNING;
    }
  
@@ -104,7 +104,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
    assert(p);
  
    pthread_mutex_unlock(&stm->mutex);
-@@ -312,10 +362,10 @@
+@@ -312,10 +362,10 @@ alsa_refill_stream(cubeb_stream * stm)
          b[i] *= stm->volume;
        }
      }
@@ -118,7 +118,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
      }
      assert(wrote >= 0 && wrote == got);
      stm->write_position += wrote;
-@@ -327,7 +377,7 @@
+@@ -327,7 +377,7 @@ alsa_refill_stream(cubeb_stream * stm)
  
      /* Fill the remaining buffer with silence to guarantee one full period
         has been written. */
@@ -127,7 +127,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
  
      set_timeout(&stm->drain_timeout, buffer_time * 1000);
  
-@@ -440,26 +490,26 @@
+@@ -440,26 +490,26 @@ get_slave_pcm_node(snd_config_t * lconf,
  
    slave_def = NULL;
  
@@ -159,7 +159,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
      if (r < 0) {
        break;
      }
-@@ -468,7 +518,7 @@
+@@ -468,7 +518,7 @@ get_slave_pcm_node(snd_config_t * lconf,
      if (r < 0 || r > (int) sizeof(node_name)) {
        break;
      }
@@ -168,7 +168,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
      if (r < 0) {
        break;
      }
-@@ -477,7 +527,7 @@
+@@ -477,7 +527,7 @@ get_slave_pcm_node(snd_config_t * lconf,
    } while (0);
  
    if (slave_def) {
@@ -177,7 +177,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
    }
  
    return NULL;
-@@ -500,22 +550,22 @@
+@@ -500,22 +550,22 @@ init_local_config_with_workaround(char c
  
    lconf = NULL;
  
@@ -204,7 +204,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
      if (r < 0) {
        break;
      }
-@@ -524,7 +574,7 @@
+@@ -524,7 +574,7 @@ init_local_config_with_workaround(char c
      if (r < 0 || r > (int) sizeof(node_name)) {
        break;
      }
@@ -213,7 +213,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
      if (r < 0) {
        break;
      }
-@@ -535,12 +585,12 @@
+@@ -535,12 +585,12 @@ init_local_config_with_workaround(char c
      }
  
      /* Fetch the PCM node's type, and bail out if it's not the PulseAudio plugin. */
@@ -228,7 +228,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
      if (r < 0) {
        break;
      }
-@@ -551,18 +601,18 @@
+@@ -551,18 +601,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. */
@@ -250,7 +250,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
      if (r < 0) {
        break;
      }
-@@ -570,7 +620,7 @@
+@@ -570,7 +620,7 @@ init_local_config_with_workaround(char c
      return lconf;
    } while (0);
  
@@ -259,7 +259,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
  
    return NULL;
  }
-@@ -582,9 +632,9 @@
+@@ -582,9 +632,9 @@ alsa_locked_pcm_open(snd_pcm_t ** pcm, s
  
    pthread_mutex_lock(&cubeb_alsa_mutex);
    if (local_config) {
@@ -271,7 +271,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
    }
    pthread_mutex_unlock(&cubeb_alsa_mutex);
  
-@@ -597,7 +647,7 @@
+@@ -597,7 +647,7 @@ alsa_locked_pcm_close(snd_pcm_t * pcm)
    int r;
  
    pthread_mutex_lock(&cubeb_alsa_mutex);
@@ -280,7 +280,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
    pthread_mutex_unlock(&cubeb_alsa_mutex);
  
    return r;
-@@ -654,12 +704,65 @@
+@@ -654,12 +704,65 @@ alsa_init(cubeb ** context, char const *
    pthread_attr_t attr;
    snd_pcm_t * dummy;
  
@@ -347,7 +347,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
      cubeb_alsa_error_handler_set = 1;
    }
    pthread_mutex_unlock(&cubeb_alsa_mutex);
-@@ -667,6 +770,8 @@
+@@ -667,6 +770,8 @@ alsa_init(cubeb ** context, char const *
    ctx = calloc(1, sizeof(*ctx));
    assert(ctx);
  
@@ -356,7 +356,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
    ctx->ops = &alsa_ops;
  
    r = pthread_mutex_init(&ctx->mutex, NULL);
-@@ -716,7 +821,7 @@
+@@ -716,7 +821,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);
@@ -365,7 +365,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
        pthread_mutex_unlock(&cubeb_alsa_mutex);
        ctx->local_config = NULL;
      } else if (r >= 0) {
-@@ -755,9 +860,13 @@
+@@ -755,9 +860,13 @@ alsa_destroy(cubeb * ctx)
    pthread_mutex_destroy(&ctx->mutex);
    free(ctx->fds);
  
@@ -380,7 +380,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
      pthread_mutex_unlock(&cubeb_alsa_mutex);
    }
  
-@@ -836,13 +945,16 @@
+@@ -836,13 +945,16 @@ alsa_stream_init(cubeb * ctx, cubeb_stre
    r = pthread_mutex_init(&stm->mutex, NULL);
    assert(r == 0);
  
@@ -398,7 +398,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
    assert(r == 0);
  
    latency_us = latency_frames * 1e6 / stm->params.rate;
-@@ -855,7 +967,7 @@
+@@ -855,7 +967,7 @@ alsa_stream_init(cubeb * ctx, cubeb_stre
      latency_us = latency_us < min_latency ? min_latency: latency_us;
    }
  
@@ -407,7 +407,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
                           stm->params.channels, stm->params.rate, 1,
                           latency_us);
    if (r < 0) {
-@@ -863,20 +975,17 @@
+@@ -863,20 +975,17 @@ alsa_stream_init(cubeb * ctx, cubeb_stre
      return CUBEB_ERROR_INVALID_FORMAT;
    }
  
@@ -431,7 +431,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
    if (alsa_register_stream(ctx, stm) != 0) {
      alsa_stream_destroy(stm);
      return CUBEB_ERROR;
-@@ -902,7 +1011,7 @@
+@@ -902,7 +1011,7 @@ alsa_stream_destroy(cubeb_stream * stm)
    pthread_mutex_lock(&stm->mutex);
    if (stm->pcm) {
      if (stm->state == DRAINING) {
@@ -440,7 +440,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
      }
      alsa_locked_pcm_close(stm->pcm);
      stm->pcm = NULL;
-@@ -944,12 +1053,12 @@
+@@ -944,12 +1053,12 @@ alsa_get_max_channel_count(cubeb * ctx, 
      return CUBEB_ERROR;
    }
  
@@ -455,7 +455,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
    if (r < 0) {
      return CUBEB_ERROR;
    }
-@@ -969,34 +1078,34 @@
+@@ -969,34 +1078,34 @@ alsa_get_preferred_sample_rate(cubeb * c
  
    /* get a pcm, disabling resampling, so we get a rate the
     * hardware/dmix/pulse/etc. supports. */
@@ -498,7 +498,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
  
    return CUBEB_OK;
  }
-@@ -1020,7 +1129,7 @@
+@@ -1020,7 +1129,7 @@ alsa_stream_start(cubeb_stream * stm)
    ctx = stm->context;
  
    pthread_mutex_lock(&stm->mutex);
@@ -507,7 +507,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
    gettimeofday(&stm->last_activity, NULL);
    pthread_mutex_unlock(&stm->mutex);
  
-@@ -1054,7 +1163,7 @@
+@@ -1054,7 +1163,7 @@ alsa_stream_stop(cubeb_stream * stm)
    pthread_mutex_unlock(&ctx->mutex);
  
    pthread_mutex_lock(&stm->mutex);
@@ -516,7 +516,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
    pthread_mutex_unlock(&stm->mutex);
  
    return CUBEB_OK;
-@@ -1070,8 +1179,8 @@
+@@ -1070,14 +1179,15 @@ alsa_stream_get_position(cubeb_stream * 
    pthread_mutex_lock(&stm->mutex);
  
    delay = -1;
@@ -527,7 +527,15 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
      *position = stm->last_position;
      pthread_mutex_unlock(&stm->mutex);
      return CUBEB_OK;
-@@ -1096,7 +1205,7 @@
+   }
+ 
+-  assert(delay >= 0);
++  // Comment out to enable alsa-plugins-oss audio playback
++  // assert(delay >= 0);
+ 
+   *position = 0;
+   if (stm->write_position >= (snd_pcm_uframes_t) delay) {
+@@ -1096,7 +1206,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. */