pkg/51125: firefox 46.0.1 doesn't build in NetBSD-current with oss option

[rcbixler%nyx.net@localhost]

>Number:         51125
>Category:       pkg
>Synopsis:       firefox 46.0.1 doesn't build in NetBSD-current with oss option
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sun May 08 15:45:00 +0000 2016
>Originator:     Roy Bixler
>Release:        current
>Organization:
>Environment:
NetBSD  7.99.29 NetBSD 7.99.29 (GENERIC.201605050540Z) amd64
>Description:
The main different from a standard build is that I do not wish to use Pulseaudio with Firefox, so I have disabled it and enabled OSS instead.  Build fails with the following error:

/usr/pkgsrc/www/firefox/work/firefox-46.0.1/media/libcubeb/src/cubeb_oss.c:119:11: error: too few arguments to function 'stream->data_callback'
     got = stream->data_callback(stream, stream->user_ptr, buffer, nframes);

Fuller context:

gcc -o cubeb_oss.o -c -I/usr/pkgsrc/www/firefox/work/build/dist/system_wrappers -include /usr/pkgsrc/www/firefox/work/firefox-46.0.1/config/gcc_hidden.h -DNDEBUG=1 -DTRIMMED=1 -DUSE_OSS -I/usr/pkgsrc/www/firefox/work/firefox-46.0.1/media/libcubeb/src -I/usr/pkgsrc/www/firefox/work/build/media/libcubeb/src  -I/usr/pkgsrc/www/firefox/work/build/dist/include  -I/usr/pkg/include/nspr -I/usr/pkg/include/nss/nss -I/usr/pkg/include/nss -I/usr/pkg/include/nspr    -I/usr/X11R7/include/pixman-1   -fPIC -DPIC  -include /usr/pkgsrc/www/firefox/work/build/mozilla-config.h -DMOZILLA_CLIENT -MD -MP -MF .deps/cubeb_oss.o.pp -I/usr/pkg/include -I/usr/include -I/usr/pkg/include/nspr -I/usr/pkg/include/nss/nss -I/usr/X11R7/include -I/usr/X11R7/include/libdrm -I/usr/X11R7/include/freetype2 -I/usr/pkg/include/ffmpeg3 -Wall -Wempty-body -Wignored-qualifiers -Wpointer-arith -Wtype-limits -Wcast-align -O2 -I/usr/pkg/include -I/usr/include -I/usr/pkg/include/nspr -I/usr/pkg/include/nss/nss -I/usr/X11R7/inclu
 de -I/usr/X11R7/include/libdrm -I/usr/X11R7/include/freetype2 -I/usr/pkg/include/ffmpeg3 -std=gnu99 -fgnu89-inline -fno-strict-aliasing -Dunix -fno-math-errno -pthread -pipe  -O2 -fomit-frame-pointer    /usr/pkgsrc/www/firefox/work/firefox-46.0.1/media/libcubeb/src/cubeb_oss.c
/usr/pkgsrc/www/firefox/work/firefox-46.0.1/media/libcubeb/src/cubeb_oss.c: In function 'run_data_callback':
/usr/pkgsrc/www/firefox/work/firefox-46.0.1/media/libcubeb/src/cubeb_oss.c:119:67: warning: passing argument 4 of 'stream->data_callback' makes pointer from integer without a cast [-Wint-conversion]
     got = stream->data_callback(stream, stream->user_ptr, buffer, nframes);
                                                                   ^
/usr/pkgsrc/www/firefox/work/firefox-46.0.1/media/libcubeb/src/cubeb_oss.c:119:67: note: expected 'void *' but argument is of type 'long int'
/usr/pkgsrc/www/firefox/work/firefox-46.0.1/media/libcubeb/src/cubeb_oss.c:119:11: error: too few arguments to function 'stream->data_callback'
     got = stream->data_callback(stream, stream->user_ptr, buffer, nframes);
           ^
/usr/pkgsrc/www/firefox/work/firefox-46.0.1/media/libcubeb/src/cubeb_oss.c: In function 'oss_try_set_latency':
/usr/pkgsrc/www/firefox/work/firefox-46.0.1/media/libcubeb/src/cubeb_oss.c:207:16: warning: unused variable 'frag_size' [-Wunused-variable]
   unsigned int frag_size=1024;
                ^
/usr/pkgsrc/www/firefox/work/firefox-46.0.1/media/libcubeb/src/cubeb_oss.c: At top level:
/usr/pkgsrc/www/firefox/work/firefox-46.0.1/media/libcubeb/src/cubeb_oss.c:391:18: warning: initialization from incompatible pointer type [-Wincompatible-pointer-types]
   .stream_init = oss_stream_init,
                  ^
/usr/pkgsrc/www/firefox/work/firefox-46.0.1/media/libcubeb/src/cubeb_oss.c:391:18: note: (near initialization for 'oss_ops.stream_init')
/usr/pkgsrc/www/firefox/work/firefox-46.0.1/config/rules.mk:928: recipe for target 'cubeb_oss.o' failed
gmake[3]: *** [cubeb_oss.o] Error 1
gmake[3]: Leaving directory '/usr/pkgsrc/www/firefox/work/build/media/libcubeb/src'
/usr/pkgsrc/www/firefox/work/firefox-46.0.1/config/recurse.mk:71: recipe for target 'media/libcubeb/src/target' failed
gmake[2]: *** [media/libcubeb/src/target] Error 2
gmake[2]: Leaving directory '/usr/pkgsrc/www/firefox/work/build'
/usr/pkgsrc/www/firefox/work/firefox-46.0.1/config/recurse.mk:32: recipe for target 'compile' failed
gmake[1]: *** [compile] Error 2
gmake[1]: Leaving directory '/usr/pkgsrc/www/firefox/work/build'
/usr/pkgsrc/www/firefox/work/firefox-46.0.1/config/rules.mk:557: recipe for target 'all' failed
gmake: *** [all] Error 2
*** Error code 2

Stop.
make[1]: stopped in /usr/pkgsrc/www/firefox
*** Error code 1

Stop.
make: stopped in /usr/pkgsrc/www/firefox

>How-To-Repeat:
Build pkgsrc-current firefox46.0.1 with the following /etc/mk.conf line:

PKG_OPTIONS.firefox=-pulseaudio oss

>Fix: