From owner-freebsd-gecko@FreeBSD.ORG Wed Aug 6 23:07:46 2014 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 42921465 for ; Wed, 6 Aug 2014 23:07:46 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.244.247]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CBDD12778 for ; Wed, 6 Aug 2014 23:07:45 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.244.247]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id s76N7gZU006456 for ; Wed, 6 Aug 2014 23:07:42 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id s76N7b7r004236 for freebsd-gecko@freebsd.org; Wed, 6 Aug 2014 23:07:37 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Wed, 6 Aug 2014 23:07:37 GMT Message-Id: <201408062307.s76N7b7r004236@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1654 - in trunk: security/ca_root_nss security/nss www/firefox-nightly www/firefox-nightly/files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reply-To: freebsd-gecko@freebsd.org X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Aug 2014 23:07:46 -0000 Author: jbeich Date: Wed Aug 6 23:07:36 2014 New Revision: 1654 Log: update Deleted: trunk/www/firefox-nightly/files/patch-bug1046224 Modified: trunk/security/ca_root_nss/Makefile trunk/security/ca_root_nss/distinfo trunk/security/nss/Makefile trunk/security/nss/distinfo trunk/www/firefox-nightly/Makefile trunk/www/firefox-nightly/Makefile.hgrev trunk/www/firefox-nightly/distinfo trunk/www/firefox-nightly/files/patch-bug826985 trunk/www/firefox-nightly/files/patch-bug847568 trunk/www/firefox-nightly/files/patch-z-bug517422 Modified: trunk/security/ca_root_nss/Makefile ============================================================================== --- trunk/security/ca_root_nss/Makefile Wed Aug 6 15:58:46 2014 (r1653) +++ trunk/security/ca_root_nss/Makefile Wed Aug 6 23:07:36 2014 (r1654) @@ -26,7 +26,7 @@ # !!! Please DO NOT submit patches for new version until it has !!! # !!! been committed there first. !!! # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -VERSION_NSS= 3.16.3 +VERSION_NSS= 3.16.4 #NSS_SUFFIX= .with.ckbi.1.93 CERTDATA_TXT_PATH= nss-${VERSION_NSS}/nss/lib/ckfw/builtins/certdata.txt BUNDLE_PROCESSOR= MAca-bundle.pl Modified: trunk/security/ca_root_nss/distinfo ============================================================================== --- trunk/security/ca_root_nss/distinfo Wed Aug 6 15:58:46 2014 (r1653) +++ trunk/security/ca_root_nss/distinfo Wed Aug 6 23:07:36 2014 (r1654) @@ -1,2 +1,2 @@ -SHA256 (nss-3.16.3.tar.gz) = 657711ff7a4058043b69019a66f44101d0234eae2b6b80ab900439dbf02add60 -SIZE (nss-3.16.3.tar.gz) = 6426732 +SHA256 (nss-3.16.4.tar.gz) = adcd1e655fd9508e7f13847452fd5887a835eff882e3f0d3c42dfcd651650b77 +SIZE (nss-3.16.4.tar.gz) = 6428795 Modified: trunk/security/nss/Makefile ============================================================================== --- trunk/security/nss/Makefile Wed Aug 6 15:58:46 2014 (r1653) +++ trunk/security/nss/Makefile Wed Aug 6 23:07:36 2014 (r1654) @@ -2,7 +2,7 @@ # $FreeBSD: head/security/nss/Makefile 362631 2014-07-23 07:49:43Z delphij $ PORTNAME= nss -PORTVERSION= 3.16.3 +PORTVERSION= 3.16.4 #DISTVERSIONSUFFIX= .with.ckbi.1.93 CATEGORIES= security MASTER_SITES= MOZILLA/security/${PORTNAME}/releases/${DISTNAME:tu:C/[-.]/_/g}_RTM/src Modified: trunk/security/nss/distinfo ============================================================================== --- trunk/security/nss/distinfo Wed Aug 6 15:58:46 2014 (r1653) +++ trunk/security/nss/distinfo Wed Aug 6 23:07:36 2014 (r1654) @@ -1,2 +1,2 @@ -SHA256 (nss-3.16.3.tar.gz) = 657711ff7a4058043b69019a66f44101d0234eae2b6b80ab900439dbf02add60 -SIZE (nss-3.16.3.tar.gz) = 6426732 +SHA256 (nss-3.16.4.tar.gz) = adcd1e655fd9508e7f13847452fd5887a835eff882e3f0d3c42dfcd651650b77 +SIZE (nss-3.16.4.tar.gz) = 6428795 Modified: trunk/www/firefox-nightly/Makefile ============================================================================== --- trunk/www/firefox-nightly/Makefile Wed Aug 6 15:58:46 2014 (r1653) +++ trunk/www/firefox-nightly/Makefile Wed Aug 6 23:07:36 2014 (r1654) @@ -17,7 +17,6 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \ sqlite3>=3.8.5:${PORTSDIR}/databases/sqlite3 \ - nss>=3.16.1:${PORTSDIR}/security/nss \ v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \ soundtouch>=1.8.0:${PORTSDIR}/audio/soundtouch \ harfbuzz>=0.9.25:${PORTSDIR}/print/harfbuzz \ @@ -29,6 +28,7 @@ zip:${PORTSDIR}/archivers/zip \ unzip:${PORTSDIR}/archivers/unzip # cairo>=1.12.16,2:${PORTSDIR}/graphics/cairo \ +# nss>=3.17:${PORTSDIR}/security/nss \ LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l @@ -40,7 +40,7 @@ CPE_VERSION= ${PORTVERSION:R} CPE_UPDATE= alpha1 MOZ_PKGCONFIG_FILES= # empty -USE_MOZILLA= -cairo +USE_MOZILLA= -cairo -nss MOZILLA_NAME= Firefox Nightly MOZILLA_SUFX= -nightly MOZILLA= ${PORTNAME}${MOZILLA_SUFX} Modified: trunk/www/firefox-nightly/Makefile.hgrev ============================================================================== --- trunk/www/firefox-nightly/Makefile.hgrev Wed Aug 6 15:58:46 2014 (r1653) +++ trunk/www/firefox-nightly/Makefile.hgrev Wed Aug 6 23:07:36 2014 (r1654) @@ -1 +1 @@ -HGREV= 197871:20fe2c176690 +HGREV= 198180:a581d8e16968 Modified: trunk/www/firefox-nightly/distinfo ============================================================================== --- trunk/www/firefox-nightly/distinfo Wed Aug 6 15:58:46 2014 (r1653) +++ trunk/www/firefox-nightly/distinfo Wed Aug 6 23:07:36 2014 (r1654) @@ -1,2 +1,2 @@ -SHA256 (firefox-nightly/20fe2c176690.tar.bz2) = d98b8817781fde8ab5a58ea1e4081e6fd10e985493cbf9dd811786f6c0482ffd -SIZE (firefox-nightly/20fe2c176690.tar.bz2) = 153402306 +SHA256 (firefox-nightly/a581d8e16968.tar.bz2) = 6313fcab11e7cd2c47321d9b2cd0c00320c463120ef4b108adebe914fda413bb +SIZE (firefox-nightly/a581d8e16968.tar.bz2) = 152946200 Deleted: trunk/www/firefox-nightly/files/patch-bug1046224 ============================================================================== --- trunk/www/firefox-nightly/files/patch-bug1046224 Wed Aug 6 23:07:36 2014 (r1653) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,26 +0,0 @@ -diff --git configure.in configure.in -index 1853029..559bd45 100644 ---- configure.in -+++ configure.in -@@ -2651,7 +2651,7 @@ if test "$ac_cv_sockaddr_sa_len" = true ; then - AC_DEFINE(HAVE_SA_LEN) - fi - --AC_ARG_ENABLE(dtrace, -+MOZ_ARG_ENABLE_BOOL(dtrace, - [ --enable-dtrace build with dtrace support if available (default=no)], - [enable_dtrace="yes"],) - if test "x$enable_dtrace" = "xyes"; then -diff --git js/src/configure.in js/src/configure.in -index 134dfd3..682c1fb 100644 ---- js/src/configure.in -+++ js/src/configure.in -@@ -2153,7 +2153,7 @@ dnl Quota support - MOZ_CHECK_HEADERS(sys/quota.h) - MOZ_CHECK_HEADERS(linux/quota.h) - --AC_ARG_ENABLE(dtrace, -+MOZ_ARG_ENABLE_BOOL(dtrace, - [ --enable-dtrace build with dtrace support if available (default=no)], - [enable_dtrace="yes"],) - if test "x$enable_dtrace" = "xyes"; then Modified: trunk/www/firefox-nightly/files/patch-bug826985 ============================================================================== --- trunk/www/firefox-nightly/files/patch-bug826985 Wed Aug 6 15:58:46 2014 (r1653) +++ trunk/www/firefox-nightly/files/patch-bug826985 Wed Aug 6 23:07:36 2014 (r1654) @@ -38,18 +38,18 @@ # basic stuff for everything 'include_internal_video_render': 0, 'clang_use_chrome_plugins': 0, -diff --git media/webrtc/signaling/test/Makefile.in media/webrtc/signaling/test/Makefile.in +diff --git media/webrtc/signaling/test/moz.build media/webrtc/signaling/test/moz.build index b483cd1..f1dd1f0 100644 ---- media/webrtc/signaling/test/Makefile.in -+++ media/webrtc/signaling/test/Makefile.in -@@ -8,6 +8,7 @@ EXTRA_LIBS += \ - $(NULL) +--- media/webrtc/signaling/test/moz.build ++++ media/webrtc/signaling/test/moz.build +@@ -122,6 +122,7 @@ if CONFIG['JS_SHARED_LIBRARY']: + 'js', + ] + ++OS_LIBS += CONFIG['MOZ_LIBV4L2_LIBS'] + OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS'] + OS_LIBS += CONFIG['REALTIME_LIBS'] - OS_LIBS += \ -+ $(MOZ_LIBV4L2_LIBS) \ - $(MOZ_WEBRTC_X11_LIBS) \ - $(REALTIME_LIBS) \ - $(NULL) diff --git media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc index 239a292..bab496c 100644 --- media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc Modified: trunk/www/firefox-nightly/files/patch-bug847568 ============================================================================== --- trunk/www/firefox-nightly/files/patch-bug847568 Wed Aug 6 15:58:46 2014 (r1653) +++ trunk/www/firefox-nightly/files/patch-bug847568 Wed Aug 6 23:07:36 2014 (r1654) @@ -33,7 +33,7 @@ index ac38f40..87536b7 100644 --- configure.in +++ configure.in -@@ -8032,6 +8032,50 @@ if test "$USE_FC_FREETYPE"; then +@@ -8032,6 +8032,48 @@ if test "$USE_FC_FREETYPE"; then fi dnl ======================================================== @@ -50,7 +50,6 @@ +fi + +AC_SUBST(MOZ_NATIVE_HARFBUZZ) -+AC_SUBST(MOZ_HARFBUZZ_LIBS) + +dnl ======================================================== +dnl Check for graphite2 @@ -78,7 +77,6 @@ +fi + +AC_SUBST(MOZ_NATIVE_GRAPHITE2) -+AC_SUBST(MOZ_GRAPHITE2_LIBS) + +dnl ======================================================== dnl Check for pixman and cairo @@ -191,22 +189,20 @@ + +if CONFIG['MOZ_NATIVE_HARFBUZZ']: + CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] -diff --git toolkit/library/libxul.mk toolkit/library/libxul.mk +diff --git toolkit/library/moz.build toolkit/library/moz.build index 67f0db9..d42137a 100644 ---- toolkit/library/libxul.mk -+++ toolkit/library/libxul.mk -@@ -89,6 +89,14 @@ ifndef MOZ_TREE_PIXMAN - OS_LIBS += $(MOZ_PIXMAN_LIBS) - endif - -+ifdef MOZ_NATIVE_GRAPHITE2 -+OS_LIBS += $(MOZ_GRAPHITE2_LIBS) -+endif -+ -+ifdef MOZ_NATIVE_HARFBUZZ -+OS_LIBS += $(MOZ_HARFBUZZ_LIBS) -+endif -+ - ifdef MOZ_WEBRTC - ifeq (WINNT,$(OS_TARGET)) - ifndef MOZ_HAS_WINSDK_WITH_D3D +--- toolkit/library/moz.build ++++ toolkit/library/moz.build +@@ -186,6 +186,12 @@ if CONFIG['MOZ_NATIVE_LIBVPX']: + if not CONFIG['MOZ_TREE_PIXMAN']: + OS_LIBS += CONFIG['MOZ_PIXMAN_LIBS'] + ++if CONFIG['MOZ_NATIVE_GRAPHITE2']: ++ OS_LIBS += CONFIG['MOZ_GRAPHITE2_LIBS'] ++ ++if CONFIG['MOZ_NATIVE_HARFBUZZ']: ++ OS_LIBS += CONFIG['MOZ_HARFBUZZ_LIBS'] ++ + if CONFIG['MOZ_ALSA']: + OS_LIBS += CONFIG['MOZ_ALSA_LIBS'] + Modified: trunk/www/firefox-nightly/files/patch-z-bug517422 ============================================================================== --- trunk/www/firefox-nightly/files/patch-z-bug517422 Wed Aug 6 15:58:46 2014 (r1653) +++ trunk/www/firefox-nightly/files/patch-z-bug517422 Wed Aug 6 23:07:36 2014 (r1654) @@ -120,7 +120,7 @@ index 87db361..7947626 100644 --- configure.in +++ configure.in -@@ -5211,6 +5211,60 @@ if test "${ac_cv_c_attribute_aligned}" != "0"; then +@@ -5211,6 +5211,57 @@ if test "${ac_cv_c_attribute_aligned}" != "0"; then fi dnl ======================================================== @@ -143,7 +143,6 @@ +fi + +AC_SUBST(MOZ_NATIVE_OGG) -+AC_SUBST(MOZ_OGG_LIBS) + +dnl ======================================================== +dnl Check for libvorbis @@ -159,7 +158,6 @@ +fi + +AC_SUBST(MOZ_NATIVE_VORBIS) -+AC_SUBST(MOZ_VORBIS_LIBS) + +dnl ======================================================== +dnl Check for integer-only libvorbis aka tremor @@ -175,13 +173,12 @@ +fi + +AC_SUBST(MOZ_NATIVE_TREMOR) -+AC_SUBST(MOZ_TREMOR_LIBS) + +dnl ======================================================== dnl = Disable Opus audio codec support dnl ======================================================== MOZ_ARG_DISABLE_BOOL(opus, -@@ -5219,6 +5274,93 @@ MOZ_ARG_DISABLE_BOOL(opus, +@@ -5219,6 +5274,89 @@ MOZ_ARG_DISABLE_BOOL(opus, MOZ_OPUS=1) dnl ======================================================== @@ -200,7 +197,6 @@ +fi + +AC_SUBST(MOZ_NATIVE_OPUS) -+AC_SUBST(MOZ_OPUS_LIBS) + +dnl ======================================================== +dnl Check for libtheora @@ -216,7 +212,6 @@ +fi + +AC_SUBST(MOZ_NATIVE_THEORA) -+AC_SUBST(MOZ_THEORA_LIBS) + +dnl ======================================================== +dnl Check for libspeex resampler @@ -232,7 +227,6 @@ +fi + +AC_SUBST(MOZ_NATIVE_SPEEX) -+AC_SUBST(MOZ_SPEEX_LIBS) + +dnl ======================================================== +dnl Check for libsoundtouch @@ -269,7 +263,6 @@ +fi + +AC_SUBST(MOZ_NATIVE_SOUNDTOUCH) -+AC_SUBST(MOZ_SOUNDTOUCH_LIBS) + +dnl ======================================================== dnl = Disable VP8 decoder support @@ -351,23 +344,20 @@ +if CONFIG['MOZ_NATIVE_OGG']: + CFLAGS += CONFIG['MOZ_OGG_CFLAGS'] -diff --git media/webrtc/signaling/test/Makefile.in media/webrtc/signaling/test/Makefile.in +diff --git media/webrtc/signaling/test/moz.build media/webrtc/signaling/test/moz.build index bbc971c..6ed7e41 100644 ---- media/webrtc/signaling/test/Makefile.in -+++ media/webrtc/signaling/test/Makefile.in -@@ -48,6 +48,12 @@ LIBS += \ - $(NULL) - endif - -+ifdef MOZ_NATIVE_OPUS -+OS_LIBS += \ -+ $(MOZ_OPUS_LIBS) \ -+ $(NULL) -+endif -+ - ifdef MOZ_NATIVE_LIBVPX - OS_LIBS += \ - $(MOZ_LIBVPX_LIBS) \ +--- media/webrtc/signaling/test/moz.build ++++ media/webrtc/signaling/test/moz.build +@@ -131,6 +131,9 @@ if CONFIG['MOZ_ALSA']: + if CONFIG['MOZ_NATIVE_JPEG']: + OS_LIBS += CONFIG['MOZ_JPEG_LIBS'] + ++if CONFIG['MOZ_NATIVE_OPUS']: ++ OS_LIBS += CONFIG['MOZ_OPUS_LIBS'] ++ + if CONFIG['MOZ_NATIVE_LIBVPX']: + OS_LIBS += CONFIG['MOZ_LIBVPX_LIBS'] + diff --git media/webrtc/trunk/webrtc/modules/audio_coding/codecs/opus/opus.gypi media/webrtc/trunk/webrtc/modules/audio_coding/codecs/opus/opus.gypi index 00e77e7..55f48ab 100644 --- media/webrtc/trunk/webrtc/modules/audio_coding/codecs/opus/opus.gypi @@ -385,45 +375,38 @@ }, { 'dependencies': [ '<(DEPTH)/third_party/opus/opus.gyp:opus' -diff --git toolkit/library/libxul.mk toolkit/library/libxul.mk +diff --git toolkit/library/moz.build toolkit/library/moz.build index d42137a..695e75a8 100644 ---- toolkit/library/libxul.mk -+++ toolkit/library/libxul.mk -@@ -77,6 +77,34 @@ ifdef MOZ_NATIVE_HUNSPELL - OS_LIBS += $(MOZ_HUNSPELL_LIBS) - endif - -+ifdef MOZ_NATIVE_OGG -+OS_LIBS += $(MOZ_OGG_LIBS) -+endif -+ -+ifdef MOZ_NATIVE_THEORA -+OS_LIBS += $(MOZ_THEORA_LIBS) -+endif -+ -+ifdef MOZ_NATIVE_VORBIS -+OS_LIBS += $(MOZ_VORBIS_LIBS) -+endif -+ -+ifdef MOZ_NATIVE_TREMOR -+OS_LIBS += $(MOZ_TREMOR_LIBS) -+endif -+ -+ifdef MOZ_NATIVE_OPUS -+OS_LIBS += $(MOZ_OPUS_LIBS) -+endif -+ -+ifdef MOZ_NATIVE_SPEEX -+OS_LIBS += $(MOZ_SPEEX_LIBS) -+endif -+ -+ifdef MOZ_NATIVE_SOUNDTOUCH -+OS_LIBS += $(MOZ_SOUNDTOUCH_LIBS) -+endif -+ - ifdef MOZ_NATIVE_LIBEVENT - OS_LIBS += $(MOZ_LIBEVENT_LIBS) - endif +--- toolkit/library/moz.build ++++ toolkit/library/moz.build +@@ -177,6 +177,27 @@ if CONFIG['MOZ_NATIVE_ZLIB']: + if CONFIG['MOZ_NATIVE_HUNSPELL']: + OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS'] + ++if CONFIG['MOZ_NATIVE_OGG']: ++ OS_LIBS += CONFIG['MOZ_OGG_LIBS'] ++ ++if CONFIG['MOZ_NATIVE_THEORA']: ++ OS_LIBS += CONFIG['MOZ_THEORA_LIBS'] ++ ++if CONFIG['MOZ_NATIVE_VORBIS']: ++ OS_LIBS += CONFIG['MOZ_VORBIS_LIBS'] ++ ++if CONFIG['MOZ_NATIVE_TREMOR']: ++ OS_LIBS += CONFIG['MOZ_TREMOR_LIBS'] ++ ++if CONFIG['MOZ_NATIVE_OPUS']: ++ OS_LIBS += CONFIG['MOZ_OPUS_LIBS'] ++ ++if CONFIG['MOZ_NATIVE_SPEEX']: ++ OS_LIBS += CONFIG['MOZ_SPEEX_LIBS'] ++ ++if CONFIG['MOZ_NATIVE_SOUNDTOUCH']: ++ OS_LIBS += CONFIG['MOZ_SOUNDTOUCH_LIBS'] ++ + if CONFIG['MOZ_NATIVE_LIBEVENT']: + OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS'] + diff --git xpcom/build/nsXPComInit.cpp xpcom/build/nsXPComInit.cpp index 2cf281e..6d7af0e 100644 --- xpcom/build/nsXPComInit.cpp