pkg/51695: www/firefox FreeBSD and DragonFly build fixes and audio playback options

[davshao%gmail.com@localhost]

>Number:         51695
>Category:       pkg
>Synopsis:       www/firefox FreeBSD and DragonFly build fixes and audio playback options
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Wed Dec 07 03:30:00 +0000 2016
>Originator:     David Shao
>Release:        current pkgsrc
>Organization:
>Environment:
FreeBSD xxxxxx.xxx 11.0-RELEASE-p2 FreeBSD 11.0-RELEASE-p2 #0: Mon Oct 24 06:55:27 UTC 2016     root%amd64-builder.daemonology.net@localhost:/usr/obj/usr/src/sys/GENERIC  amd64

>Description:
I can hear voices no one else can hear.  But this is good because I am hearing them running Youtube in pkgsrc Firefox 50.0.2 on DragonFly 4.7 and FreeBSD 11 release.

There are three separate issues, two for the build, one for audio options.

1) Neither DragonFly nor FreeBSD in pkgsrc support the Google widevine CDM.

2) DragonFly doesn't like it when malloc.h is included.

3) I could get successful audio playback for DragonFly only with options oss and dbus.  This oss dbus combination also works with FreeBSD.

I haven't actually tested the changes to options.mk below; instead, I had selected these options in /usr/pkg/etc/mk.conf  (along with -pulseaudio).


>How-To-Repeat:

>Fix:
diff -Nur www/firefox/distinfo www/firefox.new/distinfo
--- www/firefox/distinfo	2016-12-05 03:54:45.000000000 -0800
+++ www/firefox.new/distinfo	2016-12-05 08:23:14.562418000 -0800
@@ -70,6 +70,8 @@
 SHA1 (patch-js_src_moz.build) = 42d9aba521881cb08065d37889ca29a0071eb632
 SHA1 (patch-js_xpconnect_src_XPCConvert.cpp) = 915777e9bb5366be41866cdb6ea0ad2b1c006dde
 SHA1 (patch-js_xpconnect_src_xpcprivate.h) = e09e37819961bae40a9f276ae1ee510d2956c23e
+SHA1 (patch-media_ffvpx_libavutil_mem.c) = 04b73d2bcdf22bea0a6b78d48a64ada9de7928fc
+SHA1 (patch-media_libav_libavutil_mem.c) = 06815b5e851b0c4216b1bf5699286d2b93ec59ed
 SHA1 (patch-media_libcubeb_src_cubeb.c) = 91eb24595c423b7e086670bb67e73cfd0bfb5559
 SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = cd510e274e2eca1fb045f996d42cbe546fccb726
 SHA1 (patch-media_libcubeb_src_cubeb__oss.c) = e15cc2d0c220738ccfd57f79eec242095c8ea536
diff -Nur www/firefox/mozilla-common.mk www/firefox.new/mozilla-common.mk
--- www/firefox/mozilla-common.mk	2016-12-06 00:14:22.000000000 -0800
+++ www/firefox.new/mozilla-common.mk	2016-12-06 07:07:46.973936000 -0800
@@ -10,9 +10,11 @@
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
 BUILD_DEPENDS+=		yasm>=1.1:../../devel/yasm
 
+.if ${OPSYS} != "DragonFly" && ${OPSYS} != "FreeBSD"
 # Enable Google widevine CDM. This requires external libwidevinecdm.so.
 CONFIGURE_ARGS+=	--enable-eme=widevine
 .endif
+.endif
 
 HAS_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
diff -Nur www/firefox/options.mk www/firefox.new/options.mk
--- www/firefox/options.mk	2016-12-03 03:30:28.000000000 -0800
+++ www/firefox.new/options.mk	2016-12-06 18:50:38.247246000 -0800
@@ -10,6 +10,10 @@
 PKG_SUGGESTED_OPTIONS+=	alsa mozilla-jemalloc dbus
 .elif ${OPSYS} == "NetBSD"
 PKG_SUGGESTED_OPTIONS+=	alsa dbus
+.elif ${OPSYS} == "FreeBSD"
+PKG_SUGGESTED_OPTIONS+=	oss dbus
+.elif ${OPSYS} == "DragonFly"
+PKG_SUGGESTED_OPTIONS+=	oss dbus
 .else
 PKG_SUGGESTED_OPTIONS+= dbus pulseaudio
 .endif
diff -Nur www/firefox/patches/patch-media_ffvpx_libavutil_mem.c www/firefox.new/patches/patch-media_ffvpx_libavutil_mem.c
--- www/firefox/patches/patch-media_ffvpx_libavutil_mem.c	1969-12-31 16:00:00.000000000 -0800
+++ www/firefox.new/patches/patch-media_ffvpx_libavutil_mem.c	2016-04-28 04:20:54.000000000 -0700
@@ -0,0 +1,16 @@
+$NetBSD$
+
+--- media/ffvpx/libavutil/mem.c.orig	2016-04-22 00:37:23.000000000 +0000
++++ media/ffvpx/libavutil/mem.c
+@@ -32,9 +32,11 @@
+ #include <stdint.h>
+ #include <stdlib.h>
+ #include <string.h>
++#ifndef __DragonFly__
+ #if HAVE_MALLOC_H
+ #include <malloc.h>
+ #endif
++#endif /* __DragonFly__*/
+ 
+ #include "avassert.h"
+ #include "avutil.h"
diff -Nur www/firefox/patches/patch-media_libav_libavutil_mem.c www/firefox.new/patches/patch-media_libav_libavutil_mem.c
--- www/firefox/patches/patch-media_libav_libavutil_mem.c	1969-12-31 16:00:00.000000000 -0800
+++ www/firefox.new/patches/patch-media_libav_libavutil_mem.c	2015-12-07 04:00:41.000000000 -0800
@@ -0,0 +1,16 @@
+$NetBSD$
+
+--- media/libav/libavutil/mem.c.orig	2015-10-29 22:17:49.000000000 +0000
++++ media/libav/libavutil/mem.c
+@@ -30,9 +30,11 @@
+ #include <stdint.h>
+ #include <stdlib.h>
+ #include <string.h>
++#if !defined(__DragonFly__)
+ #if HAVE_MALLOC_H
+ #include <malloc.h>
+ #endif
++#endif
+ 
+ #include "avutil.h"
+ #include "common.h"