Received: by mail.netbsd.org (Postfix, from userid 605) id D7BD584D4D; Fri, 15 Mar 2019 12:52:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 5CA3C84D27 for ; Fri, 15 Mar 2019 12:52:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id PPun7h-zn4d3 for ; Fri, 15 Mar 2019 12:52:42 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id BC5F684CCF for ; Fri, 15 Mar 2019 12:52:42 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id B6879FB16; Fri, 15 Mar 2019 12:52:42 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1552654362157140" MIME-Version: 1.0 Date: Fri, 15 Mar 2019 12:52:42 +0000 From: "Ryo ONODERA" Subject: CVS commit: pkgsrc/www/firefox To: pkgsrc-changes@NetBSD.org Reply-To: ryoon@netbsd.org X-Mailer: log_accum Message-Id: <20190315125242.B6879FB16@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1552654362157140 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: ryoon Date: Fri Mar 15 12:52:42 UTC 2019 Modified Files: pkgsrc/www/firefox: Makefile mozilla-common.mk options.mk Log Message: Fix build with webrtc option, bump PKGREVISION * webrtc option requires the internal libvpx. * And remove widevinecdm option. It is not useful. To generate a diff of this commit: cvs rdiff -u -r1.362 -r1.363 pkgsrc/www/firefox/Makefile cvs rdiff -u -r1.127 -r1.128 pkgsrc/www/firefox/mozilla-common.mk cvs rdiff -u -r1.44 -r1.45 pkgsrc/www/firefox/options.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1552654362157140 Content-Disposition: inline Content-Length: 3118 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/www/firefox/Makefile diff -u pkgsrc/www/firefox/Makefile:1.362 pkgsrc/www/firefox/Makefile:1.363 --- pkgsrc/www/firefox/Makefile:1.362 Mon Mar 4 15:53:06 2019 +++ pkgsrc/www/firefox/Makefile Fri Mar 15 12:52:42 2019 @@ -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 @@ MOZ_BRANCH_MINOR= .2 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 Index: pkgsrc/www/firefox/mozilla-common.mk diff -u pkgsrc/www/firefox/mozilla-common.mk:1.127 pkgsrc/www/firefox/mozilla-common.mk:1.128 --- pkgsrc/www/firefox/mozilla-common.mk:1.127 Mon Mar 4 15:53:06 2019 +++ pkgsrc/www/firefox/mozilla-common.mk Fri Mar 15 12:52:42 2019 @@ -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 @@ CONFIGURE_ARGS+= --disable-tests # 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_API_DEPENDS.clang+= clang>=6.0 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" Index: pkgsrc/www/firefox/options.mk diff -u pkgsrc/www/firefox/options.mk:1.44 pkgsrc/www/firefox/options.mk:1.45 --- pkgsrc/www/firefox/options.mk:1.44 Sun Dec 10 00:45:09 2017 +++ pkgsrc/www/firefox/options.mk Fri Mar 15 12:52:42 2019 @@ -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 @@ PLIST.webrtc= yes .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 --_----------=_1552654362157140--