Date: Fri, 2 Nov 2012 12:47:25 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1093 - in trunk: . mail/thunderbird mail/thunderbird/files www/firefox www/firefox-nightly www/firefox-nightly/files www/firefox/files www/seamonkey www/seamonkey/files Message-ID: <201211021247.qA2ClPF7046592@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Fri Nov 2 12:47:25 2012
New Revision: 1093
Log:
update
Deleted:
trunk/mail/thunderbird/files/patch-bug786690
trunk/mail/thunderbird/files/patch-bug803811
trunk/www/firefox/files/patch-bug786690
Modified:
trunk/Gecko_ChangeLog
trunk/Gecko_TODO
trunk/mail/thunderbird/Makefile
trunk/mail/thunderbird/distinfo
trunk/mail/thunderbird/files/patch-bug806139
trunk/www/firefox-nightly/Makefile
trunk/www/firefox-nightly/Makefile.hgrev
trunk/www/firefox-nightly/distinfo
trunk/www/firefox-nightly/files/patch-bug806139
trunk/www/firefox-nightly/files/patch-bug807492
trunk/www/firefox/Makefile
trunk/www/firefox/distinfo
trunk/www/firefox/files/patch-bug806139
trunk/www/seamonkey/Makefile
trunk/www/seamonkey/distinfo
trunk/www/seamonkey/files/patch-bug806139
Modified: trunk/Gecko_ChangeLog
==============================================================================
--- trunk/Gecko_ChangeLog Fri Nov 2 03:54:12 2012 (r1092)
+++ trunk/Gecko_ChangeLog Fri Nov 2 12:47:25 2012 (r1093)
@@ -1,10 +1,2 @@
17.0:
- support more h264 codecs when using GSTREAMER with YouTube
-
-16.0.2:
-- with GNOMEVFS2 option build its extension, too [1]
-- make heap-committed and heap-dirty reporters work in about:memory
-- properly mark QT4 as experimental (needs love upstream)
-- *miscellaneous cleanups and fixups*
-
-PR: ports/173052 [1]
Modified: trunk/Gecko_TODO
==============================================================================
--- trunk/Gecko_TODO Fri Nov 2 03:54:12 2012 (r1092)
+++ trunk/Gecko_TODO Fri Nov 2 12:47:25 2012 (r1093)
@@ -22,7 +22,7 @@
jbeich:
- webrtc (testing?)
-- push --ignore-unresolved-symbol upstream (needs tests/approval from author)
+- switch to --ignore-unresolved-symbol (waiting for binutils 2.24)
- add Gtk3 support (waiting for upstream)
- move PGO to bsd.gecko.mk (blocked by USE_PYTHON_BUILD in *-esr)
- port tools/profiler (NS_StackWalk or not?)
Modified: trunk/mail/thunderbird/Makefile
==============================================================================
--- trunk/mail/thunderbird/Makefile Fri Nov 2 03:54:12 2012 (r1092)
+++ trunk/mail/thunderbird/Makefile Fri Nov 2 12:47:25 2012 (r1093)
@@ -6,7 +6,7 @@
#
PORTNAME= thunderbird
-DISTVERSION= 17.0b1
+DISTVERSION= 17.0b2
CATEGORIES= mail ipv6
MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source
Modified: trunk/mail/thunderbird/distinfo
==============================================================================
--- trunk/mail/thunderbird/distinfo Fri Nov 2 03:54:12 2012 (r1092)
+++ trunk/mail/thunderbird/distinfo Fri Nov 2 12:47:25 2012 (r1093)
@@ -1,4 +1,4 @@
-SHA256 (thunderbird-17.0b1.source.tar.bz2) = d563a9ea290e08e2b27de0d9c40403eec753d11cc1fdeed3b5f5b9a817d22a44
-SIZE (thunderbird-17.0b1.source.tar.bz2) = 113248011
+SHA256 (thunderbird-17.0b2.source.tar.bz2) = 32e22234d87541483e22e1bc6725b8da570fcc69a281d473be8470769e6aaf28
+SIZE (thunderbird-17.0b2.source.tar.bz2) = 113367956
SHA256 (enigmail-1.4.5.tar.gz) = fa59491fba21de9414a003933349074a8ec1833a1d64cac9f0a9f7020ed6c020
SIZE (enigmail-1.4.5.tar.gz) = 1269207
Deleted: trunk/mail/thunderbird/files/patch-bug786690
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug786690 Fri Nov 2 12:47:25 2012 (r1092)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,26 +0,0 @@
-commit 38301c3
-Author: Michael Wu <mwu@mozilla.com>
-Date: Fri Aug 31 10:18:46 2012 -0300
-
- Bug 786690 - Fix buffered streams on 16 bit outputs, r=kinetik
----
- content/media/nsAudioStream.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git content/media/nsAudioStream.cpp content/media/nsAudioStream.cpp
-index ac8ef58..8087d31 100644
---- mozilla/content/media/nsAudioStream.cpp
-+++ mozilla/content/media/nsAudioStream.cpp
-@@ -953,10 +953,11 @@ nsBufferedAudioStream::Init(int32_t aNumChannels, int32_t aRate)
- params.channels = aNumChannels;
- #ifdef MOZ_SAMPLE_TYPE_S16LE
- params.format = CUBEB_SAMPLE_S16NE;
-+ mBytesPerFrame = sizeof(int16_t) * aNumChannels;
- #else /* MOZ_SAMPLE_TYPE_FLOAT32 */
- params.format = CUBEB_SAMPLE_FLOAT32NE;
--#endif
- mBytesPerFrame = sizeof(float) * aNumChannels;
-+#endif
-
- {
- cubeb_stream* stream;
Deleted: trunk/mail/thunderbird/files/patch-bug803811
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug803811 Fri Nov 2 12:47:25 2012 (r1092)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,111 +0,0 @@
-commit 4ff5f0c
-Author: Landry Breuil <landry@openbsd.org>
-Date: Wed Oct 24 09:56:51 2012 +0400
-
- Bug 803811 - Fix system zlib detection by porting bug #763651
----
- aclocal.m4 | 1 +
- configure.in | 46 ++++++----------------------------------------
- 2 files changed, 7 insertions(+), 40 deletions(-)
-
-diff --git aclocal.m4 aclocal.m4
-index f5486dd..a3924d1 100644
---- aclocal.m4
-+++ aclocal.m4
-@@ -16,6 +16,7 @@ builtin(include, mozilla/build/autoconf/acwinpaths.m4)dnl
- builtin(include, mozilla/build/autoconf/lto.m4)dnl
- builtin(include, mozilla/build/autoconf/frameptr.m4)dnl
- builtin(include, mozilla/build/autoconf/compiler-opts.m4)dnl
-+builtin(include, mozilla/build/autoconf/zlib.m4)dnl
-
- MOZ_PROG_CHECKMSYS()
-
-diff --git configure.in configure.in
-index be833e8..c90fe39 100644
---- configure.in
-+++ configure.in
-@@ -63,7 +63,6 @@ dnl Set the version number of the libs included with mozilla
- dnl ========================================================
- MOZJPEG=62
- MOZPNG=10401
--MOZZLIB=0x1230
- NSPR_VERSION=4
- NSS_VERSION=3
-
-@@ -868,8 +867,6 @@ MOZ_USER_DIR=".mozilla"
-
- MOZ_JPEG_CFLAGS=
- MOZ_JPEG_LIBS='$(call EXPAND_LIBNAME_PATH,mozjpeg,$(DEPTH)/mozilla/jpeg)'
--MOZ_ZLIB_CFLAGS=
--MOZ_ZLIB_LIBS='$(call EXPAND_LIBNAME_PATH,mozz,$(DEPTH)/mozilla/modules/zlib/src)'
- MOZ_BZ2_CFLAGS=
- MOZ_BZ2_LIBS='$(call EXPAND_LIBNAME_PATH,bz2,$(DEPTH)/mozilla/modules/libbz2/src)'
- MOZ_PNG_CFLAGS=
-@@ -3957,47 +3954,19 @@ if test -n "${JPEG_DIR}" -a -d "${JPEG_DIR}" -a "$MOZ_NATIVE_JPEG" = 1; then
- MOZ_JPEG_CFLAGS="-I${JPEG_DIR}/include"
- MOZ_JPEG_LIBS="-L${JPEG_DIR}/lib ${MOZ_JPEG_LIBS}"
- fi
-+fi # SKIP_LIBRARY_CHECKS
-
- dnl system ZLIB support
- dnl ========================================================
--MOZ_ARG_WITH_STRING(system-zlib,
--[ --with-system-zlib[=PFX]
-- Use system libz [installed at prefix PFX]],
-- ZLIB_DIR=$withval)
-
--_SAVE_CFLAGS=$CFLAGS
--_SAVE_LDFLAGS=$LDFLAGS
--_SAVE_LIBS=$LIBS
--if test -n "${ZLIB_DIR}" -a "${ZLIB_DIR}" != "yes"; then
-- CFLAGS="-I${ZLIB_DIR}/include $CFLAGS"
-- LDFLAGS="-L${ZLIB_DIR}/lib $LDFLAGS"
--fi
--if test -z "$ZLIB_DIR" -o "$ZLIB_DIR" = no; then
-- MOZ_NATIVE_ZLIB=
--else
-- AC_CHECK_LIB(z, gzread, [MOZ_NATIVE_ZLIB=1 MOZ_ZLIB_LIBS="-lz"],
-- [MOZ_NATIVE_ZLIB=])
--fi
--if test "$MOZ_NATIVE_ZLIB" = 1; then
-- MOZZLIBNUM=`echo $MOZZLIB | awk -F. '{printf "0x%x\n", ((($1 * 16 + $2) * 16) + $3) * 16 + $4}'`
-- AC_TRY_COMPILE([ #include <stdio.h>
-- #include <string.h>
-- #include <zlib.h> ],
-- [ #if ZLIB_VERNUM < $MOZZLIBNUM
-- #error "Insufficient zlib version ($MOZZLIBNUM required)."
-- #endif ],
-- MOZ_NATIVE_ZLIB=1,
--AC_MSG_ERROR([Insufficient zlib version for --with-system-zlib ($MOZZLIB required)]))
--fi
--CFLAGS=$_SAVE_CFLAGS
--LDFLAGS=$_SAVE_LDFLAGS
--LIBS=$_SAVE_LIBS
-+MOZ_ZLIB_CHECK([1.2.3])
-
--if test "${ZLIB_DIR}" -a -d "${ZLIB_DIR}" -a "$MOZ_NATIVE_ZLIB" = 1; then
-- MOZ_ZLIB_CFLAGS="-I${ZLIB_DIR}/include"
-- MOZ_ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}"
-+if test "$MOZ_NATIVE_ZLIB" != 1; then
-+ MOZ_ZLIB_CFLAGS=
-+ MOZ_ZLIB_LIBS='$(call EXPAND_LIBNAME_PATH,mozz,$(DEPTH)/mozilla/modules/zlib/src)'
- fi
-
-+if test -z "$SKIP_LIBRARY_CHECKS"; then
- dnl system BZIP2 Support
- dnl ========================================================
- MOZ_ARG_WITH_STRING(system-bz2,
-@@ -6556,13 +6525,10 @@ AC_SUBST(MOZ_NATIVE_MAKEDEPEND)
- AC_SUBST(SYSTEM_LIBXUL)
- AC_SUBST(MOZ_NATIVE_JPEG)
- AC_SUBST(MOZ_NATIVE_PNG)
--AC_SUBST(MOZ_NATIVE_ZLIB)
- AC_SUBST(MOZ_NATIVE_BZ2)
-
- AC_SUBST(MOZ_JPEG_CFLAGS)
- AC_SUBST(MOZ_JPEG_LIBS)
--AC_SUBST(MOZ_ZLIB_CFLAGS)
--AC_SUBST(MOZ_ZLIB_LIBS)
- AC_SUBST(MOZ_BZ2_CFLAGS)
- AC_SUBST(MOZ_BZ2_LIBS)
- AC_SUBST(MOZ_PNG_CFLAGS)
Modified: trunk/mail/thunderbird/files/patch-bug806139
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug806139 Fri Nov 2 03:54:12 2012 (r1092)
+++ trunk/mail/thunderbird/files/patch-bug806139 Fri Nov 2 12:47:25 2012 (r1093)
@@ -8,7 +8,7 @@
+ static char const *const gH264Codecs[9];
#endif
- #ifdef MOZ_WIDGET_GONK
+ #ifdef MOZ_MEDIA_PLUGINS
--- mozilla/content/html/content/src/nsHTMLMediaElement.cpp~
+++ mozilla/content/html/content/src/nsHTMLMediaElement.cpp
@@ -2114,12 +2114,14 @@ const char nsHTMLMediaElement::gH264Type
Modified: trunk/www/firefox-nightly/Makefile
==============================================================================
--- trunk/www/firefox-nightly/Makefile Fri Nov 2 03:54:12 2012 (r1092)
+++ trunk/www/firefox-nightly/Makefile Fri Nov 2 12:47:25 2012 (r1093)
@@ -78,7 +78,7 @@
.if ${PORT_OPTIONS:MWEBRTC}
BUILD_DEPENDS+= ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
. if ! ${PORT_OPTIONS:MALSA}
-IGNORE= only ALSA sound backend has a chance to work
+IGNORE= WEBRTC works only with ALSA audio backend
. endif
.else
MOZ_OPTIONS+= --disable-webrtc
@@ -116,8 +116,6 @@
post-patch:
@${REINPLACE_CMD} -e '/MOZPNG/s/=[0-9]*/=10511/' \
- -e '/AM_PATH_NSPR/s/([0-9.]*,/(4.9.2,/' \
- -e '/AM_PATH_NSS/s/([0-9.]*,/(3.13.6,/' \
${WRKSRC}/configure.in
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
${WRKSRC}/browser/app/nsBrowserApp.cpp
Modified: trunk/www/firefox-nightly/Makefile.hgrev
==============================================================================
--- trunk/www/firefox-nightly/Makefile.hgrev Fri Nov 2 03:54:12 2012 (r1092)
+++ trunk/www/firefox-nightly/Makefile.hgrev Fri Nov 2 12:47:25 2012 (r1093)
@@ -1 +1 @@
-HGREV= 110988:acf7f73e8b18
+HGREV= 112086:00c925c90f86
Modified: trunk/www/firefox-nightly/distinfo
==============================================================================
--- trunk/www/firefox-nightly/distinfo Fri Nov 2 03:54:12 2012 (r1092)
+++ trunk/www/firefox-nightly/distinfo Fri Nov 2 12:47:25 2012 (r1093)
@@ -1,2 +1,2 @@
-SHA256 (firefox-nightly/acf7f73e8b18.tar.bz2) = 9f28ba8f8bfa1e5177cd333bd3e703f9a49e5641fe827a1af81e07eb51cc5f06
-SIZE (firefox-nightly/acf7f73e8b18.tar.bz2) = 95110689
+SHA256 (firefox-nightly/00c925c90f86.tar.bz2) = 229a0fb0016b28a934afc2b8227b773f54801ea72791de758f8ea3f666d2923e
+SIZE (firefox-nightly/00c925c90f86.tar.bz2) = 96092989
Modified: trunk/www/firefox-nightly/files/patch-bug806139
==============================================================================
--- trunk/www/firefox-nightly/files/patch-bug806139 Fri Nov 2 03:54:12 2012 (r1092)
+++ trunk/www/firefox-nightly/files/patch-bug806139 Fri Nov 2 12:47:25 2012 (r1093)
@@ -1,14 +1,24 @@
--- content/html/content/public/nsHTMLMediaElement.h~
+++ content/html/content/public/nsHTMLMediaElement.h
-@@ -311,7 +311,7 @@ public:
- static bool IsH264Enabled();
+@@ -312,14 +312,16 @@ public:
+ static bool IsGStreamerSupportedType(const nsACString& aType);
static bool IsH264Type(const nsACString& aType);
static const char gH264Types[3][16];
- static char const *const gH264Codecs[7];
-+ static char const *const gH264Codecs[9];
#endif
#ifdef MOZ_WIDGET_GONK
+ static bool IsOmxEnabled();
+ static bool IsOmxSupportedType(const nsACString& aType);
+ static const char gOmxTypes[5][16];
+- static char const *const gH264Codecs[7];
++#endif
++
++#if defined(MOZ_GSTREAMER) || defined(MOZ_WIDGET_GONK)
++ static char const *const gH264Codecs[9];
+ #endif
+
+ #ifdef MOZ_MEDIA_PLUGINS
--- content/html/content/src/nsHTMLMediaElement.cpp~
+++ content/html/content/src/nsHTMLMediaElement.cpp
@@ -2134,12 +2134,14 @@ nsHTMLMediaElement::IsWebMType(const nsA
Modified: trunk/www/firefox-nightly/files/patch-bug807492
==============================================================================
--- trunk/www/firefox-nightly/files/patch-bug807492 Fri Nov 2 03:54:12 2012 (r1092)
+++ trunk/www/firefox-nightly/files/patch-bug807492 Fri Nov 2 12:47:25 2012 (r1093)
@@ -14,10 +14,10 @@
+err.h
+xlocale.h
diff --git configure.in configure.in
-index bb7780f..7353b5e 100644
+index c167461..8346c11 100644
--- configure.in
+++ configure.in
-@@ -1424,16 +1424,27 @@ if test "$GNU_CC"; then
+@@ -1413,16 +1413,27 @@ if test "$GNU_CC"; then
_SAVE_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS -mssse3"
AC_TRY_COMPILE([asm ("pmaddubsw %xmm2,%xmm3");],,AC_MSG_RESULT([yes])
@@ -45,7 +45,7 @@
# -Werror=return-type - catches missing returns, zero false positives
# -Wtype-limits - catches overflow bugs, few false positives
# -Wempty-body - catches bugs, e.g. "if (c); foo();", few false positives
-@@ -5243,17 +5254,17 @@ dnl Turn off webrtc for OS's we don't handle yet, but allow
+@@ -5232,17 +5243,17 @@ dnl Turn off webrtc for OS's we don't handle yet, but allow
dnl --enable-webrtc to override. Can disable for everything in
dnl the master list above.
if test -n "$MOZ_WEBRTC"; then
@@ -64,7 +64,7 @@
;;
esac
fi
-@@ -8882,16 +8893,21 @@ if test "${OS_TARGET}" = "WINNT"; then
+@@ -8865,16 +8876,21 @@ if test "${OS_TARGET}" = "WINNT"; then
if test "$HAVE_64BIT_OS"; then
OS_BITS=64
else
@@ -102,10 +102,11 @@
+err.h
+xlocale.h
diff --git media/mtransport/objs.mk media/mtransport/objs.mk
-index f1fc85f..f0b11f0 100644
+index f1fc85f..141e8ca 100644
--- media/mtransport/objs.mk
+++ media/mtransport/objs.mk
-@@ -19,21 +19,28 @@ LOCAL_INCLUDES += \
+@@ -18,22 +18,26 @@ LOCAL_INCLUDES += \
+ -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/util/libekr \
-I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/log \
-I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/registry \
-I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/stats \
@@ -113,20 +114,17 @@
-I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/event \
$(NULL)
- ifeq ($(OS_ARCH), Darwin)
-+DEFINES += -DDARWIN
-+endif
-+
-+ifneq (,$(filter DragonFly FreeBSD NetBSD OpenBSD,$(OS_TARGET)))
-+DEFINES += -DBSD
-+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 \
-I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/generic/include \
$(NULL)
--DEFINES += -DDARWIN
++ifeq ($(OS_ARCH), Darwin)
+ DEFINES += -DDARWIN
++else
++DEFINES += -DBSD
++endif
endif
ifeq ($(OS_ARCH), Linux)
@@ -136,10 +134,10 @@
$(NULL)
DEFINES += -DLINUX
diff --git media/mtransport/third_party/nICEr/nicer.gyp media/mtransport/third_party/nICEr/nicer.gyp
-index 0e1f8b4..7b731bd 100644
+index 0e1f8b4..9a4b995 100644
--- media/mtransport/third_party/nICEr/nicer.gyp
+++ media/mtransport/third_party/nICEr/nicer.gyp
-@@ -124,26 +124,38 @@
+@@ -124,26 +124,36 @@
'R_DEFINED_UINT2=uint16_t',
'R_DEFINED_INT4=int32_t',
'R_DEFINED_UINT4=uint32_t',
@@ -151,19 +149,17 @@
- ## Mac
+ ## Mac and BSDs
[ 'OS == "mac"', {
-+ 'defines' : [
-+ 'DARWIN',
-+ 'HAVE_XLOCALE',
-+ ],
++ 'defines' : [
++ 'DARWIN',
++ 'HAVE_XLOCALE',
++ ],
+ }],
-+ [ 'OS == "dragonfly" or OS == "freebsd" or OS == "netbsd" or \
-+ OS == "openbsd"', {
-+ 'defines' : [
-+ 'BSD',
-+ ],
++ [ 'os_bsd == 1', {
++ 'defines' : [
++ 'BSD',
++ ],
+ }],
-+ [ 'OS == "mac" or OS == "dragonfly" or OS == "freebsd" or \
-+ OS == "netbsd" or OS == "openbsd"', {
++ [ 'OS == "mac" or os_bsd == 1', {
'cflags_mozilla': [
'-Wall',
'-Wno-parentheses',
@@ -349,10 +345,10 @@
assert(0);
ABORT(R_BAD_DATA);
diff --git media/mtransport/third_party/nrappkit/nrappkit.gyp media/mtransport/third_party/nrappkit/nrappkit.gyp
-index 3cc8e1c..4fc9270 100644
+index 3cc8e1c..74016c6 100644
--- media/mtransport/third_party/nrappkit/nrappkit.gyp
+++ media/mtransport/third_party/nrappkit/nrappkit.gyp
-@@ -142,26 +142,37 @@
+@@ -142,26 +142,35 @@
'R_DEFINED_UINT2=uint16_t',
'R_DEFINED_INT4=int32_t',
'R_DEFINED_UINT4=uint32_t',
@@ -364,18 +360,16 @@
- ## Mac
+ ## Mac and BSDs
[ 'OS == "mac"', {
-+ 'defines' : [
-+ 'DARWIN',
-+ ],
++ 'defines' : [
++ 'DARWIN',
++ ],
+ }],
-+ [ 'OS == "dragonfly" or OS == "freebsd" or OS == "netbsd" or \
-+ OS == "openbsd"', {
-+ 'defines' : [
-+ 'BSD',
-+ ],
++ [ 'os_bsd == 1', {
++ 'defines' : [
++ 'BSD',
++ ],
+ }],
-+ [ 'OS == "mac" or OS == "dragonfly" or OS == "freebsd" or \
-+ OS == "netbsd" or OS == "openbsd"', {
++ [ 'OS == "mac" or os_bsd == 1', {
'cflags_mozilla': [
'-Wall',
'-Wno-parentheses',
@@ -393,7 +387,7 @@
'RETSIGTYPE=void',
'TIME_WITH_SYS_TIME_H=1',
diff --git media/mtransport/third_party/nrappkit/src/port/darwin/include/csi_platform.h media/mtransport/third_party/nrappkit/src/port/darwin/include/csi_platform.h
-index 15452e3..0df3b9a 100644
+index 15452e3..2c9651a 100644
--- media/mtransport/third_party/nrappkit/src/port/darwin/include/csi_platform.h
+++ media/mtransport/third_party/nrappkit/src/port/darwin/include/csi_platform.h
@@ -37,16 +37,21 @@
@@ -485,7 +479,7 @@
if (! buf)
diff --git media/webrtc/signaling/signaling.gyp media/webrtc/signaling/signaling.gyp
-index f0cbf870..c01b264 100644
+index f0cbf870..ba0f801 100644
--- media/webrtc/signaling/signaling.gyp
+++ media/webrtc/signaling/signaling.gyp
@@ -208,16 +208,29 @@
@@ -497,7 +491,7 @@
'cflags_mozilla': [
],
}],
-+ ['OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
++ ['os_bsd==1', {
+ 'include_dirs': [
+ ],
+ 'defines': [
@@ -518,7 +512,7 @@
'OSX',
'_FORTIFY_SOURCE=2',
],
-@@ -701,17 +714,18 @@
+@@ -701,17 +714,17 @@
'EXTERNAL_TICK_REQUIRED',
'GIPS_VER=3480',
],
@@ -528,8 +522,7 @@
}],
- ['OS=="mac"', {
-+ ['OS=="mac" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" \
-+ or OS=="openbsd"', {
++ ['OS=="mac" or os_bsd==1', {
'include_dirs': [
],
@@ -538,7 +531,7 @@
# SIPSTACK
'./src/sipcc/core/sipstack/sip_platform_task.c',
-@@ -746,24 +760,23 @@
+@@ -746,24 +759,23 @@
'./src/sipcc/cpr/darwin/cpr_darwin_timers_using_select.c',
'./src/sipcc/cpr/darwin/cpr_darwin_tst.h',
'./src/sipcc/cpr/darwin/cpr_darwin_types.h',
@@ -564,11 +557,111 @@
}],
],
+diff --git media/webrtc/trunk/build/common.gypi media/webrtc/trunk/build/common.gypi
+index 6ca2f70..5d261cb 100644
+--- media/webrtc/trunk/build/common.gypi
++++ media/webrtc/trunk/build/common.gypi
+@@ -75,22 +75,31 @@
+ # ash. This rule should be removed for the future when Windows is
+ # using the aura windows without the ash interface.
+ ['use_aura==1 and OS=="win"', {
+ 'use_ash%': 1,
+ }],
+ ['use_ash==1', {
+ 'use_aura%': 1,
+ }],
++
++ # A flag for BSD platforms
++ ['OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or \
++ OS=="openbsd"', {
++ 'os_bsd%': 1,
++ }, {
++ 'os_bsd%': 0,
++ }],
+ ],
+ },
+ # Copy conditionally-set variables out one scope.
+ 'chromeos%': '<(chromeos)',
+ 'use_aura%': '<(use_aura)',
+ 'use_ash%': '<(use_ash)',
++ 'os_bsd%': '<(os_bsd)',
+ 'use_openssl%': '<(use_openssl)',
+ 'use_ibus%': '<(use_ibus)',
+ 'enable_viewport%': '<(enable_viewport)',
+ 'enable_hidpi%': '<(enable_hidpi)',
+ 'enable_touch_ui%': '<(enable_touch_ui)',
+ 'android_upstream_bringup%': '<(android_upstream_bringup)',
+ 'buildtype%': '<(buildtype)',
+
+@@ -114,17 +123,17 @@
+ # Set default value of toolkit_views based on OS.
+ ['OS=="win" or chromeos==1 or use_aura==1', {
+ 'toolkit_views%': 1,
+ }, {
+ 'toolkit_views%': 0,
+ }],
+
+ # Set toolkit_uses_gtk for the Chromium browser on Linux.
+- ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and use_aura==0', {
++ ['(OS=="linux" or OS=="solaris" or os_bsd==1) and use_aura==0', {
+ 'toolkit_uses_gtk%': 1,
+ }, {
+ 'toolkit_uses_gtk%': 0,
+ }],
+
+ # Enable HiDPI on Mac OS and Chrome OS.
+ ['OS=="mac" or chromeos==1', {
+ 'enable_hidpi%': 1,
+@@ -139,16 +148,17 @@
+
+ # Copy conditionally-set variables out one scope.
+ 'chromeos%': '<(chromeos)',
+ 'host_arch%': '<(host_arch)',
+ 'toolkit_views%': '<(toolkit_views)',
+ 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
+ 'use_aura%': '<(use_aura)',
+ 'use_ash%': '<(use_ash)',
++ 'os_bsd%': '<(os_bsd)',
+ 'use_openssl%': '<(use_openssl)',
+ 'use_ibus%': '<(use_ibus)',
+ 'enable_viewport%': '<(enable_viewport)',
+ 'enable_hidpi%': '<(enable_hidpi)',
+ 'enable_touch_ui%': '<(enable_touch_ui)',
+ 'android_upstream_bringup%': '<(android_upstream_bringup)',
+ 'android_build_type%': '<(android_build_type)',
+
+@@ -397,25 +407,18 @@
+
+ # A flag for POSIX platforms
+ ['OS=="win"', {
+ 'os_posix%': 0,
+ }, {
+ 'os_posix%': 1,
+ }],
+
+- # A flag for BSD platforms
+- ['OS=="freebsd" or OS=="openbsd"', {
+- 'os_bsd%': 1,
+- }, {
+- 'os_bsd%': 0,
+- }],
+-
+ # NSS usage.
+- ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and use_openssl==0', {
++ ['(OS=="linux" or OS=="solaris" or os_bsd==1) and use_openssl==0', {
+ 'use_nss%': 1,
+ }, {
+ 'use_nss%': 0,
+ }],
+
+ # Flags to use X11 on non-Mac POSIX platforms
+ ['OS=="win" or OS=="mac" or OS=="ios" or OS=="android"', {
+ 'use_glib%': 0,
diff --git media/webrtc/trunk/src/build/common.gypi media/webrtc/trunk/src/build/common.gypi
-index 9ca9f7c..1f54712 100644
+index 9ca9f7c..d5c4ab9 100644
--- media/webrtc/trunk/src/build/common.gypi
+++ media/webrtc/trunk/src/build/common.gypi
-@@ -101,16 +101,24 @@
+@@ -101,16 +101,23 @@
'enable_protobuf%': 1,
'include_tests%': 1,
@@ -577,8 +670,7 @@
# http://code.google.com/p/webrtc/issues/detail?id=163
'clang_use_chrome_plugins%': 0,
}],
-+ ['OS=="linux" or OS=="solaris" or OS=="dragonfly" or OS=="freebsd" or \
-+ OS=="netbsd" or OS=="openbsd"', {
++ ['OS=="linux" or OS=="solaris" or os_bsd==1', {
+ 'include_alsa_audio%': 1,
+ 'include_v4l2_video_capture%': 1,
+ }, {
@@ -593,7 +685,7 @@
'..','../..',
],
'defines': [
-@@ -174,16 +182,28 @@
+@@ -174,16 +181,28 @@
'defines': [
'WEBRTC_LINUX',
'WEBRTC_THREAD_RR',
@@ -602,7 +694,7 @@
#'WEBRTC_CLOCK_TYPE_REALTIME',
],
}],
-+ ['OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
++ ['os_bsd==1', {
+ 'defines': [
+ 'WEBRTC_BSD',
+ 'WEBRTC_THREAD_RR',
@@ -1812,7 +1904,7 @@
{
_shared->SetLastError(VE_NOT_INITED, kTraceError);
diff --git media/webrtc/trunk/src/voice_engine/voice_engine_defines.h media/webrtc/trunk/src/voice_engine/voice_engine_defines.h
-index 7d4c729..a28a8cf 100644
+index 7d4c729..4104719 100644
--- media/webrtc/trunk/src/voice_engine/voice_engine_defines.h
+++ media/webrtc/trunk/src/voice_engine/voice_engine_defines.h
@@ -434,41 +434,44 @@ namespace webrtc
Modified: trunk/www/firefox/Makefile
==============================================================================
--- trunk/www/firefox/Makefile Fri Nov 2 03:54:12 2012 (r1092)
+++ trunk/www/firefox/Makefile Fri Nov 2 12:47:25 2012 (r1093)
@@ -6,7 +6,7 @@
#
PORTNAME= firefox
-DISTVERSION= 17.0b2
+DISTVERSION= 17.0b4
PORTEPOCH= 1
CATEGORIES= www ipv6
MASTER_SITES= ${MASTER_SITE_MOZILLA}
Modified: trunk/www/firefox/distinfo
==============================================================================
--- trunk/www/firefox/distinfo Fri Nov 2 03:54:12 2012 (r1092)
+++ trunk/www/firefox/distinfo Fri Nov 2 12:47:25 2012 (r1093)
@@ -1,2 +1,2 @@
-SHA256 (firefox-17.0b2.source.tar.bz2) = 8d926563c15b22d240751e88bf7695b746ac193130ad5710a5f7ffc35dc6e725
-SIZE (firefox-17.0b2.source.tar.bz2) = 90986633
+SHA256 (firefox-17.0b4.source.tar.bz2) = 77b881d67cc95693e9facc9c8bf97908cd024a3bf68c3629599c3ce5f9f994b2
+SIZE (firefox-17.0b4.source.tar.bz2) = 90966156
Deleted: trunk/www/firefox/files/patch-bug786690
==============================================================================
--- trunk/www/firefox/files/patch-bug786690 Fri Nov 2 12:47:25 2012 (r1092)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,26 +0,0 @@
-commit 38301c3
-Author: Michael Wu <mwu@mozilla.com>
-Date: Fri Aug 31 10:18:46 2012 -0300
-
- Bug 786690 - Fix buffered streams on 16 bit outputs, r=kinetik
----
- content/media/nsAudioStream.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git content/media/nsAudioStream.cpp content/media/nsAudioStream.cpp
-index ac8ef58..8087d31 100644
---- content/media/nsAudioStream.cpp
-+++ content/media/nsAudioStream.cpp
-@@ -953,10 +953,11 @@ nsBufferedAudioStream::Init(int32_t aNumChannels, int32_t aRate)
- params.channels = aNumChannels;
- #ifdef MOZ_SAMPLE_TYPE_S16LE
- params.format = CUBEB_SAMPLE_S16NE;
-+ mBytesPerFrame = sizeof(int16_t) * aNumChannels;
- #else /* MOZ_SAMPLE_TYPE_FLOAT32 */
- params.format = CUBEB_SAMPLE_FLOAT32NE;
--#endif
- mBytesPerFrame = sizeof(float) * aNumChannels;
-+#endif
-
- {
- cubeb_stream* stream;
Modified: trunk/www/firefox/files/patch-bug806139
==============================================================================
--- trunk/www/firefox/files/patch-bug806139 Fri Nov 2 03:54:12 2012 (r1092)
+++ trunk/www/firefox/files/patch-bug806139 Fri Nov 2 12:47:25 2012 (r1093)
@@ -8,7 +8,7 @@
+ static char const *const gH264Codecs[9];
#endif
- #ifdef MOZ_WIDGET_GONK
+ #ifdef MOZ_MEDIA_PLUGINS
--- content/html/content/src/nsHTMLMediaElement.cpp~
+++ content/html/content/src/nsHTMLMediaElement.cpp
@@ -2114,12 +2114,14 @@ const char nsHTMLMediaElement::gH264Type
Modified: trunk/www/seamonkey/Makefile
==============================================================================
--- trunk/www/seamonkey/Makefile Fri Nov 2 03:54:12 2012 (r1092)
+++ trunk/www/seamonkey/Makefile Fri Nov 2 12:47:25 2012 (r1093)
@@ -6,7 +6,7 @@
#
PORTNAME= seamonkey
-DISTVERSION= 2.14b1
+DISTVERSION= 2.14b2
CATEGORIES?= www ipv6
MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED}
MASTER_SITE_SUBDIR= seamonkey/releases/${DISTVERSION}/source
Modified: trunk/www/seamonkey/distinfo
==============================================================================
--- trunk/www/seamonkey/distinfo Fri Nov 2 03:54:12 2012 (r1092)
+++ trunk/www/seamonkey/distinfo Fri Nov 2 12:47:25 2012 (r1093)
@@ -1,4 +1,4 @@
-SHA256 (seamonkey-2.14b1.source.tar.bz2) = e9416c46a7d2e2d6c477d7eb0a030965a42cd20479a05e6a968239099199a40c
-SIZE (seamonkey-2.14b1.source.tar.bz2) = 113981679
+SHA256 (seamonkey-2.14b2.source.tar.bz2) = a4e166fe62c6b9016b8f9fe82151004ed9eb28bade51ea1d6fff28c3fa571013
+SIZE (seamonkey-2.14b2.source.tar.bz2) = 114029145
SHA256 (enigmail-1.4.5.tar.gz) = fa59491fba21de9414a003933349074a8ec1833a1d64cac9f0a9f7020ed6c020
SIZE (enigmail-1.4.5.tar.gz) = 1269207
Modified: trunk/www/seamonkey/files/patch-bug806139
==============================================================================
--- trunk/www/seamonkey/files/patch-bug806139 Fri Nov 2 03:54:12 2012 (r1092)
+++ trunk/www/seamonkey/files/patch-bug806139 Fri Nov 2 12:47:25 2012 (r1093)
@@ -8,7 +8,7 @@
+ static char const *const gH264Codecs[9];
#endif
- #ifdef MOZ_WIDGET_GONK
+ #ifdef MOZ_MEDIA_PLUGINS
--- mozilla/content/html/content/src/nsHTMLMediaElement.cpp~
+++ mozilla/content/html/content/src/nsHTMLMediaElement.cpp
@@ -2114,12 +2114,14 @@ const char nsHTMLMediaElement::gH264Type
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211021247.qA2ClPF7046592>