From owner-freebsd-gecko@FreeBSD.ORG Sun Dec 23 02:22:05 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 44FA77AB for ; Sun, 23 Dec 2012 02:22:05 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id CFCE68FC0C for ; Sun, 23 Dec 2012 02:22:04 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id qBN2LuRe047570 for ; Sun, 23 Dec 2012 02:21:56 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id qBN2Lp3R045845 for freebsd-gecko@freebsd.org; Sun, 23 Dec 2012 02:21:51 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sun, 23 Dec 2012 02:21:51 GMT Message-Id: <201212230221.qBN2Lp3R045845@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] r1127 - in trunk/www: firefox firefox-nightly firefox-nightly/files seamonkey MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Dec 2012 02:22:05 -0000 Author: jbeich Date: Sun Dec 23 02:21:51 2012 New Revision: 1127 Log: update Modified: trunk/www/firefox-nightly/Makefile trunk/www/firefox-nightly/Makefile.hgrev trunk/www/firefox-nightly/distinfo trunk/www/firefox-nightly/files/patch-bug807492 trunk/www/firefox/Makefile trunk/www/firefox/distinfo trunk/www/seamonkey/Makefile trunk/www/seamonkey/distinfo Modified: trunk/www/firefox-nightly/Makefile ============================================================================== --- trunk/www/firefox-nightly/Makefile Sun Dec 16 16:18:38 2012 (r1126) +++ trunk/www/firefox-nightly/Makefile Sun Dec 23 02:21:51 2012 (r1127) @@ -18,18 +18,18 @@ COMMENT= Web browser based on the browser portion of Mozilla BUILD_DEPENDS= nspr>=4.9.4:${PORTSDIR}/devel/nspr \ - nss>=3.14.1:${PORTSDIR}/security/nss \ sqlite3>=3.7.14.1:${PORTSDIR}/databases/sqlite3 \ ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \ unzip:${PORTSDIR}/archivers/unzip +# nss>=3.14.2:${PORTSDIR}/security/nss \ USE_AUTOTOOLS= autoconf213:env USE_PYTHON_BUILD=-2.7 OBJDIR_BUILD= # in-tree build broken after bug 789837 USE_GECKO= gecko MOZ_PKGCONFIG_FILES= # empty -USE_MOZILLA= # empty +USE_MOZILLA= -nss MOZILLA_NAME= Nightly MOZILLA_SUFX= -nightly MOZILLA= ${PORTNAME}${MOZILLA_SUFX} Modified: trunk/www/firefox-nightly/Makefile.hgrev ============================================================================== --- trunk/www/firefox-nightly/Makefile.hgrev Sun Dec 16 16:18:38 2012 (r1126) +++ trunk/www/firefox-nightly/Makefile.hgrev Sun Dec 23 02:21:51 2012 (r1127) @@ -1 +1 @@ -HGREV= 115909:8a72b2a22450 +HGREV= 116860:84320dffec6e Modified: trunk/www/firefox-nightly/distinfo ============================================================================== --- trunk/www/firefox-nightly/distinfo Sun Dec 16 16:18:38 2012 (r1126) +++ trunk/www/firefox-nightly/distinfo Sun Dec 23 02:21:51 2012 (r1127) @@ -1,2 +1,2 @@ -SHA256 (firefox-nightly/8a72b2a22450.tar.bz2) = 44890b65e04452ad4941be406f2515cc61487892972d263c0ca788a600c3a535 -SIZE (firefox-nightly/8a72b2a22450.tar.bz2) = 97468989 +SHA256 (firefox-nightly/84320dffec6e.tar.bz2) = 49547c2ae2bc71ff4626929d0cac0225cc4893ec240bdcbdc46fa7f79d96415d +SIZE (firefox-nightly/84320dffec6e.tar.bz2) = 98210863 Modified: trunk/www/firefox-nightly/files/patch-bug807492 ============================================================================== --- trunk/www/firefox-nightly/files/patch-bug807492 Sun Dec 16 16:18:38 2012 (r1126) +++ trunk/www/firefox-nightly/files/patch-bug807492 Sun Dec 23 02:21:51 2012 (r1127) @@ -311,13 +311,13 @@ if (!(my_locale = r_strdup(setlocale(LC_CTYPE, 0)))) ABORT(R_NO_MEMORY); -@@ -91,28 +99,28 @@ mbslen(const char *s, size_t *ncharsp) - if (!strstr(my_locale, "UTF-8")) - ABORT(R_NOT_FOUND); +@@ -93,28 +101,28 @@ mbslen(const char *s, size_t *ncharsp) #else - /* can't count UTF-8 characters with mbrlen if the locale isn't UTF-8 */ - if (! strcasestr(setlocale(LC_CTYPE, 0), "UTF-8")) - ABORT(R_NOT_FOUND); + /* can't count UTF-8 characters with mbrlen if the locale isn't UTF-8 */ + /* null-checking setlocale is required because Android */ + char *locale = setlocale(LC_CTYPE, 0); + if (!locale || !strcasestr(locale, "UTF-8")) + ABORT(R_NOT_FOUND); #endif -#ifdef DARWIN Modified: trunk/www/firefox/Makefile ============================================================================== --- trunk/www/firefox/Makefile Sun Dec 16 16:18:38 2012 (r1126) +++ trunk/www/firefox/Makefile Sun Dec 23 02:21:51 2012 (r1127) @@ -6,7 +6,7 @@ # PORTNAME= firefox -DISTVERSION= 18.0b4 +DISTVERSION= 18.0b5 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} Modified: trunk/www/firefox/distinfo ============================================================================== --- trunk/www/firefox/distinfo Sun Dec 16 16:18:38 2012 (r1126) +++ trunk/www/firefox/distinfo Sun Dec 23 02:21:51 2012 (r1127) @@ -1,2 +1,2 @@ -SHA256 (firefox-18.0b4.source.tar.bz2) = 5b0a3eb952171b4bdf78b80e1b18f5cf6c31cdeb8bedc3aebd090a91abfb041b -SIZE (firefox-18.0b4.source.tar.bz2) = 96916801 +SHA256 (firefox-18.0b5.source.tar.bz2) = 66a6670553db0593fa524e690b1abaa82566da8552503214c2588bda6b2720dc +SIZE (firefox-18.0b5.source.tar.bz2) = 96992471 Modified: trunk/www/seamonkey/Makefile ============================================================================== --- trunk/www/seamonkey/Makefile Sun Dec 16 16:18:38 2012 (r1126) +++ trunk/www/seamonkey/Makefile Sun Dec 23 02:21:51 2012 (r1127) @@ -2,7 +2,7 @@ # $FreeBSD: ports/www/seamonkey/Makefile,v 1.326 2012/06/01 05:25:02 dinoex Exp $ PORTNAME= seamonkey -DISTVERSION= 2.15b3 +DISTVERSION= 2.15b5 CATEGORIES?= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} MASTER_SITE_SUBDIR= seamonkey/releases/${DISTVERSION}/source @@ -13,7 +13,7 @@ COMMENT= The open source, standards compliant web browser BUILD_DEPENDS= nspr>=4.9.3:${PORTSDIR}/devel/nspr \ - nss>=3.14:${PORTSDIR}/security/nss \ + nss>=3.14.1:${PORTSDIR}/security/nss \ sqlite3>=3.7.14.1:${PORTSDIR}/databases/sqlite3 \ ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \ unzip:${PORTSDIR}/archivers/unzip Modified: trunk/www/seamonkey/distinfo ============================================================================== --- trunk/www/seamonkey/distinfo Sun Dec 16 16:18:38 2012 (r1126) +++ trunk/www/seamonkey/distinfo Sun Dec 23 02:21:51 2012 (r1127) @@ -1,4 +1,4 @@ -SHA256 (seamonkey-2.15b3.source.tar.bz2) = 87be84196bbf86039a6bc2773919ff42af1f56f673e8b1cedd8caa8b5b5b2eb9 -SIZE (seamonkey-2.15b3.source.tar.bz2) = 120120509 +SHA256 (seamonkey-2.15b5.source.tar.bz2) = 83969c1e38be9228ac2d91acd5c373e400b23440624377692d1321811d8d3c4f +SIZE (seamonkey-2.15b5.source.tar.bz2) = 119838471 SHA256 (enigmail-1.4.6.tar.gz) = f3771d1faa26676818bab5e2c50dce85013b9de30b82de526159eaa7ca34f036 SIZE (enigmail-1.4.6.tar.gz) = 1262280 From owner-freebsd-gecko@FreeBSD.ORG Mon Dec 24 11:06:57 2012 Return-Path: Delivered-To: gecko@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C23236D8 for ; Mon, 24 Dec 2012 11:06:57 +0000 (UTC) (envelope-from owner-bugmaster@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 8E3F78FC1B for ; Mon, 24 Dec 2012 11:06:57 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id qBOB6vDs066336 for ; Mon, 24 Dec 2012 11:06:57 GMT (envelope-from owner-bugmaster@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id qBOB6vmq066334 for gecko@FreeBSD.org; Mon, 24 Dec 2012 11:06:57 GMT (envelope-from owner-bugmaster@FreeBSD.org) Date: Mon, 24 Dec 2012 11:06:57 GMT Message-Id: <201212241106.qBOB6vmq066334@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: gnats set sender to owner-bugmaster@FreeBSD.org using -f From: FreeBSD bugmaster To: gecko@FreeBSD.org Subject: Current problem reports assigned to gecko@FreeBSD.org X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Dec 2012 11:06:57 -0000 Note: to view an individual PR, use: http://www.freebsd.org/cgi/query-pr.cgi?pr=(number). The following is a listing of current problems submitted by FreeBSD users. These represent problem reports covering all versions including experimental development code and obsolete releases. S Tracker Resp. Description -------------------------------------------------------------------------------- o ports/174096 gecko mail/thunderbird 17 and 16 crashes when try write a ne o ports/173937 gecko mail/thunderbird core dumps when using enigmail to gen p ports/171255 gecko Fix www/firefox on FreeBSD 7.4/amd64 o ports/171219 gecko www/firefox-i18n russian language pack don't translate o ports/170402 gecko www/linux-firefox: crash with flashplugin o ports/170310 gecko mail/thunderbird: coredump/crash when used with OpenLD o ports/169729 gecko www/firefox-esr "make package" produces package with z o ports/169366 gecko www/xpi-* ports need re-install after each Firefox upd o ports/169241 gecko www/firefox Right mouse buttom click freeze screen o ports/168091 gecko Mk/bsd.gecko.mk error: USE_FIREFOX doesn't work correc o ports/167397 gecko mail/thunderbird-i18n Version 12.0 and freebsd 9.0: ca o ports/167298 gecko mail/thunderbird-i18n and www/firefox-i18n fail to fet f ports/165263 gecko mail/thunderbird: core dumping most time when users ar o ports/164239 gecko [PATCH] mail/thunderbird: crash with nss_ldap o ports/164013 gecko www/firefox: Firefox-9 Icons & xpi-addons from ports o ports/162939 gecko www/firefox crashes with Zotero add-on o ports/162075 gecko www/firefox >= 7.0.1_2 bug with respect to pentadactyl o ports/160387 gecko security/ca_root_nss: Allow user to trust extra local o ports/156335 gecko www/firefox: Repeatable firefox-4.0_1,1 crash f ports/155949 gecko www/firefox: firefox 4, WITH_PGO, better Text against o ports/144044 gecko [PATCH] www/firefox: Makefile.webplugins target order 21 problems total. From owner-freebsd-gecko@FreeBSD.ORG Tue Dec 25 15:34:25 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 171DA3C4 for ; Tue, 25 Dec 2012 15:34:25 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 54ACE8FC12 for ; Tue, 25 Dec 2012 15:34:24 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id qBPFYHJf049846 for ; Tue, 25 Dec 2012 15:34:17 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id qBPFYCIf047947 for freebsd-gecko@freebsd.org; Tue, 25 Dec 2012 15:34:12 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Tue, 25 Dec 2012 15:34:12 GMT Message-Id: <201212251534.qBPFYCIf047947@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] r1128 - in trunk: mail/thunderbird/files www/firefox-nightly/files www/firefox/files www/seamonkey/files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Dec 2012 15:34:25 -0000 Author: jbeich Date: Tue Dec 25 15:34:11 2012 New Revision: 1128 Log: unbreak tests with webrtc To build with tests remove --disable-tests from bsd.gecko.mk. And run them as usual e.g., $ gmake check -C $(make -V MOZ_OBJDIR) $ gmake reftest -C $(make -V MOZ_OBJDIR) ... Added: trunk/mail/thunderbird/files/patch-bug817481 trunk/mail/thunderbird/files/patch-z-bug815916 trunk/www/firefox-nightly/files/patch-bug815916 trunk/www/firefox/files/patch-bug817481 trunk/www/firefox/files/patch-z-bug815916 trunk/www/seamonkey/files/patch-bug817481 trunk/www/seamonkey/files/patch-z-bug815916 Modified: trunk/mail/thunderbird/files/patch-bug807492 trunk/www/firefox-nightly/files/patch-bug807492 trunk/www/firefox/files/patch-bug807492 trunk/www/seamonkey/files/patch-bug807492 Modified: trunk/mail/thunderbird/files/patch-bug807492 ============================================================================== --- trunk/mail/thunderbird/files/patch-bug807492 Sun Dec 23 02:21:51 2012 (r1127) +++ trunk/mail/thunderbird/files/patch-bug807492 Tue Dec 25 15:34:11 2012 (r1128) @@ -133,6 +133,36 @@ -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/generic/include \ $(NULL) DEFINES += -DLINUX +diff --git media/mtransport/test/Makefile.in media/mtransport/test/Makefile.in +index c1d5bf4..2ecf2c7 100644 +--- mozilla/media/mtransport/test/Makefile.in ++++ mozilla/media/mtransport/test/Makefile.in +@@ -67,22 +67,24 @@ DEFINES += -D__Userspace_os_FreeBSD=1 + else + #default_fallback; probably doesn't work + DEFINES += -D__Userspace_os_$(OS_TARGET)=1 + endif + endif + endif + endif + +-ifeq ($(OS_ARCH), Darwin) ++ifneq (,$(filter Darwin DragonFly FreeBSD NetBSD OpenBSD,$(OS_TARGET))) + LOCAL_INCLUDES += -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/darwin/include ++ifeq ($(OS_TARGET), Darwin) + DEFINES += \ + -DGTEST_USE_OWN_TR1_TUPLE=1 \ + $(NULL) + endif ++endif + + ifeq ($(OS_ARCH), Linux) + LOCAL_INCLUDES += -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/linux/include + endif + + ifneq ($(OS_TARGET),WINNT) + CPP_UNIT_TESTS = \ + ice_unittest.cpp \ diff --git media/mtransport/third_party/nICEr/nicer.gyp media/mtransport/third_party/nICEr/nicer.gyp index 0e1f8b4..9a4b995 100644 --- mozilla/media/mtransport/third_party/nICEr/nicer.gyp @@ -587,6 +617,45 @@ msgq = (cpr_msg_queue_t *) msgQueue; if (msgq == NULL) { +diff --git media/webrtc/signaling/test/Makefile.in media/webrtc/signaling/test/Makefile.in +index a30e330..cfbd8a3 100644 +--- mozilla/media/webrtc/signaling/test/Makefile.in ++++ mozilla/media/webrtc/signaling/test/Makefile.in +@@ -22,32 +22,32 @@ LIBS = \ + $(DEPTH)/media/webrtc/signalingtest/signaling_ecc/$(LIB_PREFIX)ecc.$(LIB_SUFFIX) \ + $(DEPTH)/media/webrtc/signalingtest/signaling_sipcc/$(LIB_PREFIX)sipcc.$(LIB_SUFFIX) \ + $(DEPTH)/layout/media/$(LIB_PREFIX)gkmedias.$(LIB_SUFFIX) \ + $(DEPTH)/media/webrtc/trunk/testing/gtest_gtest/$(LIB_PREFIX)gtest.$(LIB_SUFFIX) \ + $(DEPTH)/netwerk/srtp/src/$(LIB_PREFIX)nksrtp_s.$(LIB_SUFFIX) \ + $(NULL) + + ifdef MOZ_SYDNEYAUDIO +-ifeq ($(OS_ARCH),Linux) ++ifneq (,$(filter Linux DragonFly FreeBSD NetBSD OpenBSD,$(OS_TARGET))) + LIBS += \ + $(MOZ_ALSA_LIBS) \ + $(NULL) + endif + endif + + ifeq (gtk2,$(MOZ_WIDGET_TOOLKIT)) + LIBS += \ + $(XLIBS) \ + $(MOZ_GTK2_LIBS) \ + -lgthread-2.0 \ + $(NULL) + endif + +-ifeq ($(OS_ARCH),Linux) ++ifneq (,$(filter Linux DragonFly FreeBSD NetBSD OpenBSD,$(OS_TARGET))) + LIBS += \ + $(MOZ_CAIRO_OSLIBS) \ + $(NULL) + endif + + ifeq ($(OS_ARCH),Darwin) + LIBS += \ + -framework AudioToolbox \ diff --git media/webrtc/trunk/build/common.gypi media/webrtc/trunk/build/common.gypi index 6ca2f70..5d261cb 100644 --- mozilla/media/webrtc/trunk/build/common.gypi Added: trunk/mail/thunderbird/files/patch-bug817481 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/mail/thunderbird/files/patch-bug817481 Tue Dec 25 15:34:11 2012 (r1128) @@ -0,0 +1,26 @@ +commit 93d56d2 +Author: Makoto Kato +Date: Mon Dec 3 17:01:16 2012 +0900 + + Bug 817481 - Build failure on WebRTC unit test with --with-system-libvpx. r=jesup +--- + media/webrtc/signaling/test/Makefile.in | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git media/webrtc/signaling/test/Makefile.in media/webrtc/signaling/test/Makefile.in +index 81a38ff..e10e869 100644 +--- mozilla/media/webrtc/signaling/test/Makefile.in ++++ mozilla/media/webrtc/signaling/test/Makefile.in +@@ -34,6 +34,12 @@ LIBS += \ + endif + endif + ++ifdef MOZ_NATIVE_LIBVPX ++LIBS += \ ++ $(MOZ_LIBVPX_LIBS) \ ++ $(NULL) ++endif ++ + ifeq (gtk2,$(MOZ_WIDGET_TOOLKIT)) + LIBS += \ + $(XLIBS) \ Added: trunk/mail/thunderbird/files/patch-z-bug815916 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/mail/thunderbird/files/patch-z-bug815916 Tue Dec 25 15:34:11 2012 (r1128) @@ -0,0 +1,27 @@ +--- mozilla/media/webrtc/signaling/test/Makefile.in~ ++++ mozilla/media/webrtc/signaling/test/Makefile.in +@@ -34,12 +34,24 @@ LIBS += \ + endif + endif + ++ifdef MOZ_NATIVE_JPEG ++LIBS += \ ++ $(MOZ_JPEG_LIBS) \ ++ $(NULL) ++endif ++ + ifdef MOZ_NATIVE_LIBVPX + LIBS += \ + $(MOZ_LIBVPX_LIBS) \ + $(NULL) + endif + ++ifndef MOZ_TREE_PIXMAN ++LIBS += \ ++ $(MOZ_PIXMAN_LIBS) \ ++ $(NULL) ++endif ++ + ifeq (gtk2,$(MOZ_WIDGET_TOOLKIT)) + LIBS += \ + $(XLIBS) \ Modified: trunk/www/firefox-nightly/files/patch-bug807492 ============================================================================== --- trunk/www/firefox-nightly/files/patch-bug807492 Sun Dec 23 02:21:51 2012 (r1127) +++ trunk/www/firefox-nightly/files/patch-bug807492 Tue Dec 25 15:34:11 2012 (r1128) @@ -133,6 +133,36 @@ -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/generic/include \ $(NULL) DEFINES += -DLINUX +diff --git media/mtransport/test/Makefile.in media/mtransport/test/Makefile.in +index c1d5bf4..2ecf2c7 100644 +--- media/mtransport/test/Makefile.in ++++ media/mtransport/test/Makefile.in +@@ -67,22 +67,24 @@ DEFINES += -D__Userspace_os_FreeBSD=1 + else + #default_fallback; probably doesn't work + DEFINES += -D__Userspace_os_$(OS_TARGET)=1 + endif + endif + endif + endif + +-ifeq ($(OS_TARGET), Darwin) ++ifneq (,$(filter Darwin DragonFly FreeBSD NetBSD OpenBSD,$(OS_TARGET))) + LOCAL_INCLUDES += -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/darwin/include ++ifeq ($(OS_TARGET), Darwin) + DEFINES += \ + -DGTEST_USE_OWN_TR1_TUPLE=1 \ + $(NULL) + endif ++endif + + ifeq ($(OS_TARGET), Linux) + LOCAL_INCLUDES += -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/linux/include + endif + + ifeq ($(OS_TARGET), Android) + LOCAL_INCLUDES += -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/android/include + diff --git media/mtransport/third_party/nICEr/nicer.gyp media/mtransport/third_party/nICEr/nicer.gyp index 0e1f8b4..9a4b995 100644 --- media/mtransport/third_party/nICEr/nicer.gyp @@ -587,6 +617,48 @@ msgq = (cpr_msg_queue_t *) msgQueue; if (msgq == NULL) { +diff --git media/webrtc/signaling/test/Makefile.in media/webrtc/signaling/test/Makefile.in +index a30e330..cfbd8a3 100644 +--- media/webrtc/signaling/test/Makefile.in ++++ media/webrtc/signaling/test/Makefile.in +@@ -22,17 +22,17 @@ LIBS = \ + $(DEPTH)/media/webrtc/signalingtest/signaling_ecc/$(LIB_PREFIX)ecc.$(LIB_SUFFIX) \ + $(DEPTH)/media/webrtc/signalingtest/signaling_sipcc/$(LIB_PREFIX)sipcc.$(LIB_SUFFIX) \ + $(DEPTH)/layout/media/$(LIB_PREFIX)gkmedias.$(LIB_SUFFIX) \ + $(DEPTH)/media/webrtc/trunk/testing/gtest_gtest/$(LIB_PREFIX)gtest.$(LIB_SUFFIX) \ + $(DEPTH)/netwerk/srtp/src/$(LIB_PREFIX)nksrtp_s.$(LIB_SUFFIX) \ + $(NULL) + + ifdef MOZ_SYDNEYAUDIO +-ifeq ($(OS_TARGET),Linux) ++ifneq (,$(filter Linux DragonFly FreeBSD NetBSD OpenBSD,$(OS_TARGET))) + LIBS += \ + $(MOZ_ALSA_LIBS) \ + $(NULL) + endif + endif + + ifeq ($(OS_TARGET),Android) + LIBS += \ +@@ -65,17 +65,17 @@ endif + ifeq (qt,$(MOZ_WIDGET_TOOLKIT)) + LIBS += \ + $(XLIBS) \ + $(TK_LIBS) \ + $(MOZ_PANGO_LIBS) \ + $(NULL) + endif + +-ifeq ($(OS_TARGET),Linux) ++ifneq (,$(filter Linux DragonFly FreeBSD NetBSD OpenBSD,$(OS_TARGET))) + LIBS += \ + $(MOZ_CAIRO_OSLIBS) \ + $(NULL) + endif + + ifeq ($(OS_TARGET),Darwin) + LIBS += \ + -framework AudioToolbox \ diff --git media/webrtc/trunk/build/common.gypi media/webrtc/trunk/build/common.gypi index 6ca2f70..5d261cb 100644 --- media/webrtc/trunk/build/common.gypi Added: trunk/www/firefox-nightly/files/patch-bug815916 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox-nightly/files/patch-bug815916 Tue Dec 25 15:34:11 2012 (r1128) @@ -0,0 +1,27 @@ +--- media/webrtc/signaling/test/Makefile.in~ ++++ media/webrtc/signaling/test/Makefile.in +@@ -47,6 +47,11 @@ DEFINES += \ + $(NULL) + endif + ++ifdef MOZ_NATIVE_JPEG ++LIBS += \ ++ $(MOZ_JPEG_LIBS) \ ++ $(NULL) ++endif + + ifdef MOZ_NATIVE_LIBVPX + LIBS += \ +@@ -54,6 +59,12 @@ LIBS += \ + $(NULL) + endif + ++ifndef MOZ_TREE_PIXMAN ++LIBS += \ ++ $(MOZ_PIXMAN_LIBS) \ ++ $(NULL) ++endif ++ + ifeq (gtk2,$(MOZ_WIDGET_TOOLKIT)) + LIBS += \ + $(XLIBS) \ Modified: trunk/www/firefox/files/patch-bug807492 ============================================================================== --- trunk/www/firefox/files/patch-bug807492 Sun Dec 23 02:21:51 2012 (r1127) +++ trunk/www/firefox/files/patch-bug807492 Tue Dec 25 15:34:11 2012 (r1128) @@ -133,6 +133,36 @@ -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/generic/include \ $(NULL) DEFINES += -DLINUX +diff --git media/mtransport/test/Makefile.in media/mtransport/test/Makefile.in +index c1d5bf4..2ecf2c7 100644 +--- media/mtransport/test/Makefile.in ++++ media/mtransport/test/Makefile.in +@@ -67,22 +67,24 @@ DEFINES += -D__Userspace_os_FreeBSD=1 + else + #default_fallback; probably doesn't work + DEFINES += -D__Userspace_os_$(OS_TARGET)=1 + endif + endif + endif + endif + +-ifeq ($(OS_ARCH), Darwin) ++ifneq (,$(filter Darwin DragonFly FreeBSD NetBSD OpenBSD,$(OS_TARGET))) + LOCAL_INCLUDES += -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/darwin/include ++ifeq ($(OS_TARGET), Darwin) + DEFINES += \ + -DGTEST_USE_OWN_TR1_TUPLE=1 \ + $(NULL) + endif ++endif + + ifeq ($(OS_ARCH), Linux) + LOCAL_INCLUDES += -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/linux/include + endif + + ifneq ($(OS_TARGET),WINNT) + CPP_UNIT_TESTS = \ + ice_unittest.cpp \ diff --git media/mtransport/third_party/nICEr/nicer.gyp media/mtransport/third_party/nICEr/nicer.gyp index 0e1f8b4..9a4b995 100644 --- media/mtransport/third_party/nICEr/nicer.gyp @@ -587,6 +617,45 @@ msgq = (cpr_msg_queue_t *) msgQueue; if (msgq == NULL) { +diff --git media/webrtc/signaling/test/Makefile.in media/webrtc/signaling/test/Makefile.in +index a30e330..cfbd8a3 100644 +--- media/webrtc/signaling/test/Makefile.in ++++ media/webrtc/signaling/test/Makefile.in +@@ -22,32 +22,32 @@ LIBS = \ + $(DEPTH)/media/webrtc/signalingtest/signaling_ecc/$(LIB_PREFIX)ecc.$(LIB_SUFFIX) \ + $(DEPTH)/media/webrtc/signalingtest/signaling_sipcc/$(LIB_PREFIX)sipcc.$(LIB_SUFFIX) \ + $(DEPTH)/layout/media/$(LIB_PREFIX)gkmedias.$(LIB_SUFFIX) \ + $(DEPTH)/media/webrtc/trunk/testing/gtest_gtest/$(LIB_PREFIX)gtest.$(LIB_SUFFIX) \ + $(DEPTH)/netwerk/srtp/src/$(LIB_PREFIX)nksrtp_s.$(LIB_SUFFIX) \ + $(NULL) + + ifdef MOZ_SYDNEYAUDIO +-ifeq ($(OS_ARCH),Linux) ++ifneq (,$(filter Linux DragonFly FreeBSD NetBSD OpenBSD,$(OS_TARGET))) + LIBS += \ + $(MOZ_ALSA_LIBS) \ + $(NULL) + endif + endif + + ifeq (gtk2,$(MOZ_WIDGET_TOOLKIT)) + LIBS += \ + $(XLIBS) \ + $(MOZ_GTK2_LIBS) \ + -lgthread-2.0 \ + $(NULL) + endif + +-ifeq ($(OS_ARCH),Linux) ++ifneq (,$(filter Linux DragonFly FreeBSD NetBSD OpenBSD,$(OS_TARGET))) + LIBS += \ + $(MOZ_CAIRO_OSLIBS) \ + $(NULL) + endif + + ifeq ($(OS_ARCH),Darwin) + LIBS += \ + -framework AudioToolbox \ diff --git media/webrtc/trunk/build/common.gypi media/webrtc/trunk/build/common.gypi index 6ca2f70..5d261cb 100644 --- media/webrtc/trunk/build/common.gypi Added: trunk/www/firefox/files/patch-bug817481 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox/files/patch-bug817481 Tue Dec 25 15:34:11 2012 (r1128) @@ -0,0 +1,26 @@ +commit 93d56d2 +Author: Makoto Kato +Date: Mon Dec 3 17:01:16 2012 +0900 + + Bug 817481 - Build failure on WebRTC unit test with --with-system-libvpx. r=jesup +--- + media/webrtc/signaling/test/Makefile.in | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git media/webrtc/signaling/test/Makefile.in media/webrtc/signaling/test/Makefile.in +index 81a38ff..e10e869 100644 +--- media/webrtc/signaling/test/Makefile.in ++++ media/webrtc/signaling/test/Makefile.in +@@ -34,6 +34,12 @@ LIBS += \ + endif + endif + ++ifdef MOZ_NATIVE_LIBVPX ++LIBS += \ ++ $(MOZ_LIBVPX_LIBS) \ ++ $(NULL) ++endif ++ + ifeq (gtk2,$(MOZ_WIDGET_TOOLKIT)) + LIBS += \ + $(XLIBS) \ Added: trunk/www/firefox/files/patch-z-bug815916 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox/files/patch-z-bug815916 Tue Dec 25 15:34:11 2012 (r1128) @@ -0,0 +1,27 @@ +--- media/webrtc/signaling/test/Makefile.in~ ++++ media/webrtc/signaling/test/Makefile.in +@@ -34,12 +34,24 @@ LIBS += \ + endif + endif + ++ifdef MOZ_NATIVE_JPEG ++LIBS += \ ++ $(MOZ_JPEG_LIBS) \ ++ $(NULL) ++endif ++ + ifdef MOZ_NATIVE_LIBVPX + LIBS += \ + $(MOZ_LIBVPX_LIBS) \ + $(NULL) + endif + ++ifndef MOZ_TREE_PIXMAN ++LIBS += \ ++ $(MOZ_PIXMAN_LIBS) \ ++ $(NULL) ++endif ++ + ifeq (gtk2,$(MOZ_WIDGET_TOOLKIT)) + LIBS += \ + $(XLIBS) \ Modified: trunk/www/seamonkey/files/patch-bug807492 ============================================================================== --- trunk/www/seamonkey/files/patch-bug807492 Sun Dec 23 02:21:51 2012 (r1127) +++ trunk/www/seamonkey/files/patch-bug807492 Tue Dec 25 15:34:11 2012 (r1128) @@ -133,6 +133,36 @@ -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/generic/include \ $(NULL) DEFINES += -DLINUX +diff --git media/mtransport/test/Makefile.in media/mtransport/test/Makefile.in +index c1d5bf4..2ecf2c7 100644 +--- mozilla/media/mtransport/test/Makefile.in ++++ mozilla/media/mtransport/test/Makefile.in +@@ -67,22 +67,24 @@ DEFINES += -D__Userspace_os_FreeBSD=1 + else + #default_fallback; probably doesn't work + DEFINES += -D__Userspace_os_$(OS_TARGET)=1 + endif + endif + endif + endif + +-ifeq ($(OS_ARCH), Darwin) ++ifneq (,$(filter Darwin DragonFly FreeBSD NetBSD OpenBSD,$(OS_TARGET))) + LOCAL_INCLUDES += -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/darwin/include ++ifeq ($(OS_TARGET), Darwin) + DEFINES += \ + -DGTEST_USE_OWN_TR1_TUPLE=1 \ + $(NULL) + endif ++endif + + ifeq ($(OS_ARCH), Linux) + LOCAL_INCLUDES += -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/linux/include + endif + + ifneq ($(OS_TARGET),WINNT) + CPP_UNIT_TESTS = \ + ice_unittest.cpp \ diff --git media/mtransport/third_party/nICEr/nicer.gyp media/mtransport/third_party/nICEr/nicer.gyp index 0e1f8b4..9a4b995 100644 --- mozilla/media/mtransport/third_party/nICEr/nicer.gyp @@ -587,6 +617,45 @@ msgq = (cpr_msg_queue_t *) msgQueue; if (msgq == NULL) { +diff --git media/webrtc/signaling/test/Makefile.in media/webrtc/signaling/test/Makefile.in +index a30e330..cfbd8a3 100644 +--- mozilla/media/webrtc/signaling/test/Makefile.in ++++ mozilla/media/webrtc/signaling/test/Makefile.in +@@ -22,32 +22,32 @@ LIBS = \ + $(DEPTH)/media/webrtc/signalingtest/signaling_ecc/$(LIB_PREFIX)ecc.$(LIB_SUFFIX) \ + $(DEPTH)/media/webrtc/signalingtest/signaling_sipcc/$(LIB_PREFIX)sipcc.$(LIB_SUFFIX) \ + $(DEPTH)/layout/media/$(LIB_PREFIX)gkmedias.$(LIB_SUFFIX) \ + $(DEPTH)/media/webrtc/trunk/testing/gtest_gtest/$(LIB_PREFIX)gtest.$(LIB_SUFFIX) \ + $(DEPTH)/netwerk/srtp/src/$(LIB_PREFIX)nksrtp_s.$(LIB_SUFFIX) \ + $(NULL) + + ifdef MOZ_SYDNEYAUDIO +-ifeq ($(OS_ARCH),Linux) ++ifneq (,$(filter Linux DragonFly FreeBSD NetBSD OpenBSD,$(OS_TARGET))) + LIBS += \ + $(MOZ_ALSA_LIBS) \ + $(NULL) + endif + endif + + ifeq (gtk2,$(MOZ_WIDGET_TOOLKIT)) + LIBS += \ + $(XLIBS) \ + $(MOZ_GTK2_LIBS) \ + -lgthread-2.0 \ + $(NULL) + endif + +-ifeq ($(OS_ARCH),Linux) ++ifneq (,$(filter Linux DragonFly FreeBSD NetBSD OpenBSD,$(OS_TARGET))) + LIBS += \ + $(MOZ_CAIRO_OSLIBS) \ + $(NULL) + endif + + ifeq ($(OS_ARCH),Darwin) + LIBS += \ + -framework AudioToolbox \ diff --git media/webrtc/trunk/build/common.gypi media/webrtc/trunk/build/common.gypi index 6ca2f70..5d261cb 100644 --- mozilla/media/webrtc/trunk/build/common.gypi Added: trunk/www/seamonkey/files/patch-bug817481 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-bug817481 Tue Dec 25 15:34:11 2012 (r1128) @@ -0,0 +1,26 @@ +commit 93d56d2 +Author: Makoto Kato +Date: Mon Dec 3 17:01:16 2012 +0900 + + Bug 817481 - Build failure on WebRTC unit test with --with-system-libvpx. r=jesup +--- + media/webrtc/signaling/test/Makefile.in | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git media/webrtc/signaling/test/Makefile.in media/webrtc/signaling/test/Makefile.in +index 81a38ff..e10e869 100644 +--- mozilla/media/webrtc/signaling/test/Makefile.in ++++ mozilla/media/webrtc/signaling/test/Makefile.in +@@ -34,6 +34,12 @@ LIBS += \ + endif + endif + ++ifdef MOZ_NATIVE_LIBVPX ++LIBS += \ ++ $(MOZ_LIBVPX_LIBS) \ ++ $(NULL) ++endif ++ + ifeq (gtk2,$(MOZ_WIDGET_TOOLKIT)) + LIBS += \ + $(XLIBS) \ Added: trunk/www/seamonkey/files/patch-z-bug815916 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-z-bug815916 Tue Dec 25 15:34:11 2012 (r1128) @@ -0,0 +1,27 @@ +--- mozilla/media/webrtc/signaling/test/Makefile.in~ ++++ mozilla/media/webrtc/signaling/test/Makefile.in +@@ -34,12 +34,24 @@ LIBS += \ + endif + endif + ++ifdef MOZ_NATIVE_JPEG ++LIBS += \ ++ $(MOZ_JPEG_LIBS) \ ++ $(NULL) ++endif ++ + ifdef MOZ_NATIVE_LIBVPX + LIBS += \ + $(MOZ_LIBVPX_LIBS) \ + $(NULL) + endif + ++ifndef MOZ_TREE_PIXMAN ++LIBS += \ ++ $(MOZ_PIXMAN_LIBS) \ ++ $(NULL) ++endif ++ + ifeq (gtk2,$(MOZ_WIDGET_TOOLKIT)) + LIBS += \ + $(XLIBS) \