www/firefox build problem with option oss

["Ian D. Leroux" <idleroux%fastmail.fm@localhost>]

Building firefox-46.0nb1 is failing for me, specifically at the point
of compiling cubeb_oss.o.  I see a bunch of compiler warnings
(reproduced below) but the only error I see is

/build/pkgsrc/www/firefox/work/firefox-46.0/media/libcubeb/src/cubeb_oss.c:119:5:
  error: too few arguments to function 'stream->data_callback'

I'm guessing that this is related to my non-default build options.
Make show-options yields:

	These options are currently enabled:
	        oss

Would someone who understands patch-media_libcubeb_src_cubeb__oss.c
kindly take a look?  Thanks!

Compiler warnings (manually rewrapped for legibility):

/build/pkgsrc/www/firefox/work/firefox-46.0/media/libcubeb/src/cubeb_oss.c:
  In function 'run_data_callback':
/build/pkgsrc/www/firefox/work/firefox-46.0/media/libcubeb/src/cubeb_oss.c:119:5:
  warning: passing argument 4 of 'stream->data_callback' makes pointer from integer
  without a cast [enabled by default]
     got = stream->data_callback(stream, stream->user_ptr, buffer, nframes);
     ^
/build/pkgsrc/www/firefox/work/firefox-46.0/media/libcubeb/src/cubeb_oss.c:119:5:
  note: expected 'void *' but argument is of type 'long int'
/build/pkgsrc/www/firefox/work/firefox-46.0/media/libcubeb/src/cubeb_oss.c:119:5:
  error: too few arguments to function 'stream->data_callback'
/build/pkgsrc/www/firefox/work/firefox-46.0/media/libcubeb/src/cubeb_oss.c:
  In function 'oss_try_set_latency':
/build/pkgsrc/www/firefox/work/firefox-46.0/media/libcubeb/src/cubeb_oss.c:207:16:
  warning: unused variable 'frag_size' [-Wunused-variable]
   unsigned int frag_size=1024;
                ^
/build/pkgsrc/www/firefox/work/firefox-46.0/media/libcubeb/src/cubeb_oss.c:
  At top level:
/build/pkgsrc/www/firefox/work/firefox-46.0/media/libcubeb/src/cubeb_oss.c:391:3:
  warning: initialization from incompatible pointer type [enabled by default]
   .stream_init = oss_stream_init,
   ^
/build/pkgsrc/www/firefox/work/firefox-46.0/media/libcubeb/src/cubeb_oss.c:391:3:
  warning: (near initialization for 'oss_ops.stream_init') [enabled by default]
/build/pkgsrc/www/firefox/work/firefox-46.0/config/rules.mk:928:
  recipe for target 'cubeb_oss.o' failed

--
IDL