[pkgsrc/trunk]: pkgsrc/www/firefox Fix build with webrtc option, bump PKGREVI...

[ryoon <ryoon%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a45439f64e6e
branches:  trunk
changeset: 331247:a45439f64e6e
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Fri Mar 15 12:52:42 2019 +0000

description:
Fix build with webrtc option, bump PKGREVISION

* webrtc option requires the internal libvpx.
* And remove widevinecdm option. It is not useful.

diffstat:

 www/firefox/Makefile          |   4 ++--
 www/firefox/mozilla-common.mk |  10 ++++++----
 www/firefox/options.mk        |   8 +-------
 3 files changed, 9 insertions(+), 13 deletions(-)

diffs (74 lines):

diff -r 7faab1c9811b -r a45439f64e6e www/firefox/Makefile
--- a/www/firefox/Makefile      Fri Mar 15 12:44:40 2019 +0000
+++ b/www/firefox/Makefile      Fri Mar 15 12:52:42 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.362 2019/03/04 15:53:06 ryoon Exp $
+# $NetBSD: Makefile,v 1.363 2019/03/15 12:52:42 ryoon Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=            65.0
@@ -6,7 +6,7 @@
 
 DISTNAME=      firefox-${FIREFOX_VER}.source
 PKGNAME=       ${DISTNAME:S/.source//:S/b/beta/:S/esr//}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    www
 MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
 EXTRACT_SUFX=  .tar.xz
diff -r 7faab1c9811b -r a45439f64e6e www/firefox/mozilla-common.mk
--- a/www/firefox/mozilla-common.mk     Fri Mar 15 12:44:40 2019 +0000
+++ b/www/firefox/mozilla-common.mk     Fri Mar 15 12:52:42 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.127 2019/03/04 15:53:06 ryoon Exp $
+# $NetBSD: mozilla-common.mk,v 1.128 2019/03/15 12:52:42 ryoon Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -84,7 +84,8 @@
 # Mozilla Bug 1432751
 #CONFIGURE_ARGS+=      --enable-system-cairo
 CONFIGURE_ARGS+=       --enable-system-pixman
-CONFIGURE_ARGS+=       --with-system-libvpx
+# webrtc option requires internal libvpx
+#CONFIGURE_ARGS+=      --with-system-libvpx
 CONFIGURE_ARGS+=       --enable-system-ffi
 CONFIGURE_ARGS+=       --with-system-icu
 CONFIGURE_ARGS+=       --with-system-nss
@@ -231,8 +232,9 @@
 BUILDLINK_DEPMETHOD.rust=      build
 BUILDLINK_API_DEPENDS.rust+=   rust>=1.24.0
 .include "../../lang/rust/buildlink3.mk"
-BUILDLINK_API_DEPENDS.libvpx+= libvpx>=1.3.0
-.include "../../multimedia/libvpx/buildlink3.mk"
+# webrtc option requires internal libvpx
+#BUILDLINK_API_DEPENDS.libvpx+=        libvpx>=1.3.0
+#.include "../../multimedia/libvpx/buildlink3.mk"
 .include "../../net/libIDL/buildlink3.mk"
 # textproc/hunspell 1.3 is too old
 #.include "../../textproc/hunspell/buildlink3.mk"
diff -r 7faab1c9811b -r a45439f64e6e www/firefox/options.mk
--- a/www/firefox/options.mk    Fri Mar 15 12:44:40 2019 +0000
+++ b/www/firefox/options.mk    Fri Mar 15 12:52:42 2019 +0000
@@ -1,11 +1,10 @@
-# $NetBSD: options.mk,v 1.44 2017/12/10 00:45:09 ryoon Exp $
+# $NetBSD: options.mk,v 1.45 2019/03/15 12:52:42 ryoon Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.firefox
 
 PKG_SUPPORTED_OPTIONS= official-mozilla-branding
 PKG_SUPPORTED_OPTIONS+=        debug debug-info mozilla-jemalloc webrtc
 PKG_SUPPORTED_OPTIONS+=        alsa oss pulseaudio dbus
-PKG_SUPPORTED_OPTIONS+=        widevinecdm
 PLIST_VARS+=           gnome jemalloc debug
 
 .if ${OPSYS} == "Linux"
@@ -100,8 +99,3 @@
 .else
 CONFIGURE_ARGS+=       --disable-webrtc
 .endif
-
-# Enable Google widevine CDM. This requires external libwidevinecdm.so.
-.if !empty(PKG_OPTIONS:Mwidevinecdm)
-CONFIGURE_ARGS+=       --enable-eme=widevine
-.endif