Date: Fri, 7 Sep 2012 12:59:35 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r999 - 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: <201209071259.q87CxZb7063494@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Fri Sep 7 12:59:35 2012
New Revision: 999
Log:
update
Added:
trunk/mail/thunderbird/files/patch-bug788955
trunk/mail/thunderbird/files/patch-config-baseconfig.mk
trunk/www/firefox/files/patch-bug788955
trunk/www/firefox/files/patch-config-baseconfig.mk
trunk/www/seamonkey/files/patch-bug788955
trunk/www/seamonkey/files/patch-config-autoconf.mk.in
- copied, changed from r998, trunk/www/firefox/files/patch-config_autoconf.mk.in
trunk/www/seamonkey/files/patch-config-baseconfig.mk
Deleted:
trunk/mail/thunderbird/files/patch-bug723860
trunk/mail/thunderbird/files/patch-bug759459
trunk/mail/thunderbird/files/patch-bug760899
trunk/mail/thunderbird/files/patch-bug761030
trunk/mail/thunderbird/files/patch-bug761419
trunk/mail/thunderbird/files/patch-mozilla-config_autoconf.mk.in
trunk/www/firefox-nightly/files/patch-bug786995
trunk/www/firefox-nightly/files/patch-bug788039
trunk/www/firefox-nightly/files/patch-bug788108
trunk/www/firefox/files/patch-bug723860
trunk/www/firefox/files/patch-bug752895
trunk/www/firefox/files/patch-bug759459
trunk/www/firefox/files/patch-bug760899
trunk/www/firefox/files/patch-bug761030
trunk/www/firefox/files/patch-bug761419
trunk/www/firefox/files/patch-config_autoconf.mk.in
trunk/www/seamonkey/files/patch-bug723860
trunk/www/seamonkey/files/patch-bug759459
trunk/www/seamonkey/files/patch-bug760899
trunk/www/seamonkey/files/patch-bug761030
trunk/www/seamonkey/files/patch-bug761419
trunk/www/seamonkey/files/patch-config_autoconf.mk.in
Modified:
trunk/mail/thunderbird/Makefile
trunk/mail/thunderbird/distinfo
trunk/mail/thunderbird/files/extra-bug780531
trunk/mail/thunderbird/files/patch-bug753046
trunk/mail/thunderbird/files/patch-bug778056
trunk/mail/thunderbird/files/patch-bug778078
trunk/mail/thunderbird/files/patch-bug784776
trunk/www/firefox-nightly/Makefile.hgrev
trunk/www/firefox-nightly/distinfo
trunk/www/firefox/Makefile
trunk/www/firefox/distinfo
trunk/www/firefox/files/extra-bug780531
trunk/www/firefox/files/patch-bug753046
trunk/www/firefox/files/patch-bug778056
trunk/www/firefox/files/patch-bug778078
trunk/www/firefox/files/patch-bug784776
trunk/www/seamonkey/Makefile
trunk/www/seamonkey/distinfo
trunk/www/seamonkey/files/extra-bug780531
trunk/www/seamonkey/files/patch-bug753046
trunk/www/seamonkey/files/patch-bug778056
trunk/www/seamonkey/files/patch-bug778078
trunk/www/seamonkey/files/patch-bug784776
Modified: trunk/mail/thunderbird/Makefile
==============================================================================
--- trunk/mail/thunderbird/Makefile Fri Sep 7 12:59:20 2012 (r998)
+++ trunk/mail/thunderbird/Makefile Fri Sep 7 12:59:35 2012 (r999)
@@ -6,7 +6,7 @@
#
PORTNAME= thunderbird
-DISTVERSION= 15.0
+DISTVERSION= 16.0b2
CATEGORIES= mail ipv6
MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source
@@ -57,7 +57,7 @@
.include "${.CURDIR}/../../www/firefox/Makefile.options"
.include <bsd.port.pre.mk>
-WRKSRC= ${WRKDIR}/comm-release
+WRKSRC= ${WRKDIR}/comm-beta
MOZSRC:= ${WRKSRC}/mozilla
.if ${ARCH} == amd64
Modified: trunk/mail/thunderbird/distinfo
==============================================================================
--- trunk/mail/thunderbird/distinfo Fri Sep 7 12:59:20 2012 (r998)
+++ trunk/mail/thunderbird/distinfo Fri Sep 7 12:59:35 2012 (r999)
@@ -1,2 +1,2 @@
-SHA256 (thunderbird-15.0.source.tar.bz2) = acbf31d36c49a878eeefd59c37e2fd9e2173c99482c93310dfd9c6c799bb3d4d
-SIZE (thunderbird-15.0.source.tar.bz2) = 105942186
+SHA256 (thunderbird-16.0b2.source.tar.bz2) = bba7d79e2939806c027ac82592c408ea815d3094a70f8f277b959966d1baa511
+SIZE (thunderbird-16.0b2.source.tar.bz2) = 111787029
Modified: trunk/mail/thunderbird/files/extra-bug780531
==============================================================================
--- trunk/mail/thunderbird/files/extra-bug780531 Fri Sep 7 12:59:20 2012 (r998)
+++ trunk/mail/thunderbird/files/extra-bug780531 Fri Sep 7 12:59:35 2012 (r999)
@@ -1,13 +1,12 @@
--- mozilla/configure.in~
+++ mozilla/configure.in
-@@ -5585,10 +5585,13 @@ if test -n "$MOZ_OGG"; then
+@@ -5282,10 +5282,13 @@ if test -n "$MOZ_OGG"; then
MOZ_SYDNEYAUDIO=1
MOZ_CUBEB=1
MOZ_MEDIA=1
- case "$target_cpu" in
-- arm*)
+ case "$target" in
-+ arm-*-linux*)
+ arm*)
MOZ_TREMOR=1
;;
+ *-freebsd*)
@@ -16,14 +15,13 @@
*)
MOZ_VORBIS=1
;;
-@@ -5715,10 +5720,13 @@ if test -n "$MOZ_WEBM" -a -z "$MOZ_NATIV
+@@ -5417,10 +5420,13 @@ if test "$MOZ_WEBM"; then
MOZ_SYDNEYAUDIO=1
MOZ_CUBEB=1
MOZ_MEDIA=1
- case "$target_cpu" in
-- arm*)
+ case "$target" in
-+ arm-*-linux*)
+ arm*)
MOZ_TREMOR=1
;;
+ *-freebsd*)
Deleted: trunk/mail/thunderbird/files/patch-bug723860
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug723860 Fri Sep 7 12:59:35 2012 (r998)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,54 +0,0 @@
-commit 4e07587
-Author: Matthew Gregan <kinetik@flim.org>
-Date: Wed Jun 6 17:58:07 2012 +1200
-
- Bug 723860 - Early bail from reader's GetBuffered() if not yet initialized. r=doublec
----
- content/media/gstreamer/nsGStreamerReader.cpp | 4 ++++
- content/media/ogg/nsOggReader.cpp | 3 +--
- content/media/wave/nsWaveReader.cpp | 3 +++
- 3 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git mozilla/content/media/gstreamer/nsGStreamerReader.cpp mozilla/content/media/gstreamer/nsGStreamerReader.cpp
-index 164fb2e..06a09b5 100644
---- mozilla/content/media/gstreamer/nsGStreamerReader.cpp
-+++ mozilla/content/media/gstreamer/nsGStreamerReader.cpp
-@@ -505,6 +505,10 @@ nsresult nsGStreamerReader::Seek(PRInt64 aTarget,
- nsresult nsGStreamerReader::GetBuffered(nsTimeRanges* aBuffered,
- PRInt64 aStartTime)
- {
-+ if (!mInfo.mHasVideo && !mInfo.mHasAudio) {
-+ return NS_OK;
-+ }
-+
- GstFormat format = GST_FORMAT_TIME;
- MediaResource* resource = mDecoder->GetResource();
- gint64 resourceLength = resource->GetLength();
-diff --git mozilla/content/media/ogg/nsOggReader.cpp mozilla/content/media/ogg/nsOggReader.cpp
-index c6ff008..8d40e2c 100644
---- mozilla/content/media/ogg/nsOggReader.cpp
-+++ mozilla/content/media/ogg/nsOggReader.cpp
-@@ -1532,8 +1532,7 @@ nsresult nsOggReader::GetBuffered(nsTimeRanges* aBuffered, PRInt64 aStartTime)
- {
- // HasAudio and HasVideo are not used here as they take a lock and cause
- // a deadlock. Accessing mInfo doesn't require a lock - it doesn't change
-- // after metadata is read and GetBuffered isn't called before metadata is
-- // read.
-+ // after metadata is read.
- if (!mInfo.mHasVideo && !mInfo.mHasAudio) {
- // No need to search through the file if there are no audio or video tracks
- return NS_OK;
-diff --git mozilla/content/media/wave/nsWaveReader.cpp mozilla/content/media/wave/nsWaveReader.cpp
-index 7242eb5..60fc1e1 100644
---- mozilla/content/media/wave/nsWaveReader.cpp
-+++ mozilla/content/media/wave/nsWaveReader.cpp
-@@ -239,6 +239,9 @@ static double RoundToUsecs(double aSeconds) {
-
- nsresult nsWaveReader::GetBuffered(nsTimeRanges* aBuffered, PRInt64 aStartTime)
- {
-+ if (!mInfo.mHasAudio) {
-+ return NS_OK;
-+ }
- PRInt64 startOffset = mDecoder->GetResource()->GetNextCachedData(mWavePCMOffset);
- while (startOffset >= 0) {
- PRInt64 endOffset = mDecoder->GetResource()->GetCachedDataEnd(startOffset);
Modified: trunk/mail/thunderbird/files/patch-bug753046
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug753046 Fri Sep 7 12:59:20 2012 (r998)
+++ trunk/mail/thunderbird/files/patch-bug753046 Fri Sep 7 12:59:35 2012 (r999)
@@ -978,57 +978,6 @@
#else
long pages = sysconf(_SC_PHYS_PAGES);
long page_size = sysconf(_SC_PAGE_SIZE);
-$NetBSD: patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h,v 1.2 2012/03/06 12:34:09 ryoon Exp $
-
---- mozilla/ipc/chromium/src/base/third_party/nspr/prcpucfg.h.orig 2011-12-20 23:28:19.000000000 +0000
-+++ mozilla/ipc/chromium/src/base/third_party/nspr/prcpucfg.h
-@@ -34,7 +34,7 @@
- #include "base/third_party/nspr/prcpucfg_win.h"
- #elif defined(__APPLE__)
- #include "base/third_party/nspr/prcpucfg_mac.h"
--#elif defined(__linux__) || defined(ANDROID)
-+#elif defined(__linux__) || defined(ANDROID) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
- #include "base/third_party/nspr/prcpucfg_linux.h"
- #elif defined(__OpenBSD__)
- #include "base/third_party/nspr/prcpucfg_openbsd.h"
-$NetBSD: patch-ipc_chromium_src_base_third__party_nspr_prtime.cc,v 1.1 2012/03/06 12:34:09 ryoon Exp $
-
---- mozilla/ipc/chromium/src/base/third_party/nspr/prtime.cc.orig 2011-12-20 23:28:19.000000000 +0000
-+++ mozilla/ipc/chromium/src/base/third_party/nspr/prtime.cc
-@@ -212,7 +212,7 @@ PR_ImplodeTime(const PRExplodedTime *exp
- LL_ADD(retVal, retVal, temp);
-
- return retVal;
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_DRAGONFLY)
- struct tm exp_tm = {0};
- exp_tm.tm_sec = exploded->tm_sec;
- exp_tm.tm_min = exploded->tm_min;
-@@ -245,6 +245,24 @@ PR_ImplodeTime(const PRExplodedTime *exp
- result *= kSecondsToMicroseconds;
- result += exploded->tm_usec;
- return result;
-+#elif defined(OS_FREEBSD) || defined(OS_NETBSD)
-+ struct tm exp_tm = {0};
-+ exp_tm.tm_sec = exploded->tm_sec;
-+ exp_tm.tm_min = exploded->tm_min;
-+ exp_tm.tm_hour = exploded->tm_hour;
-+ exp_tm.tm_mday = exploded->tm_mday;
-+ exp_tm.tm_mon = exploded->tm_month;
-+ exp_tm.tm_year = exploded->tm_year - 1900;
-+
-+ // time_t is 64bit
-+ time_t absolute_time = timegm(&exp_tm);
-+
-+ PRTime result = static_cast<PRTime>(absolute_time);
-+ result -= exploded->tm_params.tp_gmt_offset +
-+ exploded->tm_params.tp_dst_offset;
-+ result *= kSecondsToMicroseconds;
-+ result += exploded->tm_usec;
-+ return result;
- #else
- #error No PR_ImplodeTime implemented on your platform.
- #endif
diff --git ipc/chromium/src/base/time_posix.cc ipc/chromium/src/base/time_posix.cc
index abf2a56..48791f6 100644
--- mozilla/ipc/chromium/src/base/time_posix.cc
Deleted: trunk/mail/thunderbird/files/patch-bug759459
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug759459 Fri Sep 7 12:59:35 2012 (r998)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,24 +0,0 @@
-commit 4d0c5b9
-Author: Marco Perez <bugmail@millibyte.net>
-Date: Sat Jun 9 12:24:56 2012 -0400
-
- Bug 759459 - Build broken on FreeBSD since patch for bug 745034 landed. r=terrence
----
- js/src/gc/Memory.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git js/src/gc/Memory.cpp js/src/gc/Memory.cpp
-index 815e90b..10c1a91 100644
---- mozilla/js/src/gc/Memory.cpp
-+++ mozilla/js/src/gc/Memory.cpp
-@@ -292,9 +292,9 @@ GetPageFaultCount()
- #elif defined(XP_UNIX) || defined(XP_MACOSX) || defined(DARWIN)
-
- #include <sys/mman.h>
--#include <unistd.h>
- #include <sys/time.h>
- #include <sys/resource.h>
-+#include <unistd.h>
-
- void
- InitMemorySubsystem()
Deleted: trunk/mail/thunderbird/files/patch-bug760899
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug760899 Fri Sep 7 12:59:35 2012 (r998)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,54 +0,0 @@
-commit 667daed
-Author: Stephen Moehle <stephen.moehle@gmail.com>
-Date: Tue Jun 5 11:32:36 2012 +1200
-
- Bug 760899 - Fix debug builds with gstreamer enabled - r=kinetik
-
- --HG--
- extra : rebase_source : 22598bc470d35d94991ea9f1b14df11ba19a461a
----
- content/media/gstreamer/nsGStreamerReader.cpp | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git content/media/gstreamer/nsGStreamerReader.cpp content/media/gstreamer/nsGStreamerReader.cpp
-index 6a50e09..164fb2e 100644
---- mozilla/content/media/gstreamer/nsGStreamerReader.cpp
-+++ mozilla/content/media/gstreamer/nsGStreamerReader.cpp
-@@ -278,7 +278,7 @@ nsresult nsGStreamerReader::ReadMetadata(nsVideoInfo* aInfo)
- if (gst_element_query_duration(GST_ELEMENT(mPlayBin),
- &format, &duration) && format == GST_FORMAT_TIME) {
- ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor());
-- LOG(PR_LOG_DEBUG, ("returning duration %"GST_TIME_FORMAT,
-+ LOG(PR_LOG_DEBUG, ("returning duration %" GST_TIME_FORMAT,
- GST_TIME_ARGS (duration)));
- duration = GST_TIME_AS_USECONDS (duration);
- mDecoder->GetStateMachine()->SetDuration(duration);
-@@ -422,8 +422,8 @@ bool nsGStreamerReader::DecodeVideoFrame(bool &aKeyFrameSkip,
- nextTimestamp += gst_util_uint64_scale(GST_USECOND, fpsNum, fpsDen);
-
- if (timestamp < aTimeThreshold) {
-- LOG(PR_LOG_DEBUG, ("skipping frame %"GST_TIME_FORMAT
-- " threshold %"GST_TIME_FORMAT,
-+ LOG(PR_LOG_DEBUG, ("skipping frame %" GST_TIME_FORMAT
-+ " threshold %" GST_TIME_FORMAT,
- GST_TIME_ARGS(timestamp), GST_TIME_ARGS(aTimeThreshold)));
- gst_buffer_unref(buffer);
- buffer = NULL;
-@@ -489,7 +489,7 @@ nsresult nsGStreamerReader::Seek(PRInt64 aTarget,
- NS_ASSERTION(mDecoder->OnDecodeThread(), "Should be on decode thread.");
-
- gint64 seekPos = aTarget * GST_USECOND;
-- LOG(PR_LOG_DEBUG, ("%p About to seek to %"GST_TIME_FORMAT,
-+ LOG(PR_LOG_DEBUG, ("%p About to seek to %" GST_TIME_FORMAT,
- mDecoder, GST_TIME_ARGS(seekPos)));
-
- if (!gst_element_seek_simple(mPlayBin, GST_FORMAT_TIME,
-@@ -592,7 +592,7 @@ PRInt64 nsGStreamerReader::QueryDuration()
- if (gst_element_query_duration(GST_ELEMENT(mPlayBin),
- &format, &duration)) {
- if (format == GST_FORMAT_TIME) {
-- LOG(PR_LOG_DEBUG, ("pipeline duration %"GST_TIME_FORMAT,
-+ LOG(PR_LOG_DEBUG, ("pipeline duration %" GST_TIME_FORMAT,
- GST_TIME_ARGS (duration)));
- duration = GST_TIME_AS_USECONDS (duration);
- }
Deleted: trunk/mail/thunderbird/files/patch-bug761030
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug761030 Fri Sep 7 12:59:35 2012 (r998)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,25 +0,0 @@
-commit 8bc9e15
-Author: Stephen Moehle <stephen.moehle@gmail.com>
-Date: Tue Jun 5 11:31:13 2012 +1200
-
- Bug 761030 - Fix crash with HTML 5 video with GStreamer enabled - r=kinetik
-
- --HG--
- extra : rebase_source : 5e884550f9870bd2fda247d50bebd472e8368588
----
- content/media/gstreamer/nsGStreamerReader.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git mozilla/content/media/gstreamer/nsGStreamerReader.cpp mozilla/content/media/gstreamer/nsGStreamerReader.cpp
-index 17374a3..6a50e09 100644
---- mozilla/content/media/gstreamer/nsGStreamerReader.cpp
-+++ mozilla/content/media/gstreamer/nsGStreamerReader.cpp
-@@ -452,6 +452,8 @@ bool nsGStreamerReader::DecodeVideoFrame(bool &aKeyFrameSkip,
- i, height);
- b.mPlanes[i].mWidth = gst_video_format_get_component_width(format,
- i, width);
-+ b.mPlanes[i].mOffset = 0;
-+ b.mPlanes[i].mSkip = 0;
- }
-
- bool isKeyframe = !GST_BUFFER_FLAG_IS_SET(buffer,
Deleted: trunk/mail/thunderbird/files/patch-bug761419
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug761419 Fri Sep 7 12:59:35 2012 (r998)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,22 +0,0 @@
-commit f0a73aa
-Author: Paul Adenot <paul@paul.cx>
-Date: Thu Jun 21 20:44:39 2012 -0400
-
- Bug 761419 - Build failure in content/media/gstreamer/nsGStreamerReader.cpp when using clang r=kinetik
----
- content/media/gstreamer/nsGStreamerReader.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git content/media/gstreamer/nsGStreamerReader.cpp content/media/gstreamer/nsGStreamerReader.cpp
-index 06a09b5..c48f92e 100644
---- mozilla/content/media/gstreamer/nsGStreamerReader.cpp
-+++ mozilla/content/media/gstreamer/nsGStreamerReader.cpp
-@@ -191,7 +191,7 @@ nsresult nsGStreamerReader::ReadMetadata(nsVideoInfo* aInfo)
- * stream but that are otherwise decodeable.
- */
- guint flags[3] = {GST_PLAY_FLAG_VIDEO|GST_PLAY_FLAG_AUDIO,
-- ~GST_PLAY_FLAG_AUDIO, ~GST_PLAY_FLAG_VIDEO};
-+ static_cast<guint>(~GST_PLAY_FLAG_AUDIO), static_cast<guint>(~GST_PLAY_FLAG_VIDEO)};
- guint default_flags, current_flags;
- g_object_get(mPlayBin, "flags", &default_flags, NULL);
-
Modified: trunk/mail/thunderbird/files/patch-bug778056
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug778056 Fri Sep 7 12:59:20 2012 (r998)
+++ trunk/mail/thunderbird/files/patch-bug778056 Fri Sep 7 12:59:35 2012 (r999)
@@ -4,9 +4,9 @@
#if defined(XP_UNIX)
# include <unistd.h> // for valloc on *BSD
#endif //if defined(XP_UNIX)
-+#ifdef __FreeBSD__
++#if defined(__FreeBSD__)
+# include <malloc_np.h> // for malloc_usable_size
-+#endif
++#endif // if defined(__FreeBSD__)
#if defined(XP_WIN) || (defined(XP_OS2) && defined(__declspec))
# define MOZALLOC_EXPORT __declspec(dllexport)
Modified: trunk/mail/thunderbird/files/patch-bug778078
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug778078 Fri Sep 7 12:59:20 2012 (r998)
+++ trunk/mail/thunderbird/files/patch-bug778078 Fri Sep 7 12:59:35 2012 (r999)
@@ -1,9 +1,9 @@
--- mozilla/toolkit/xre/nsAppRunner.cpp~
+++ mozilla/toolkit/xre/nsAppRunner.cpp
-@@ -3819,7 +3819,7 @@ XREMain::XRE_main(int argc, char* argv[]
+@@ -3833,7 +3833,7 @@ XREMain::XRE_main(int argc, char* argv[]
ScopedLogging log;
- #if defined(MOZ_WIDGET_GTK2)
+ #if defined(MOZ_WIDGET_GTK)
-#ifdef MOZ_MEMORY
+#if defined(MOZ_MEMORY) || defined(__FreeBSD__) || defined(__NetBSD__)
// Disable the slice allocator, since jemalloc already uses similar layout
Modified: trunk/mail/thunderbird/files/patch-bug784776
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug784776 Fri Sep 7 12:59:20 2012 (r998)
+++ trunk/mail/thunderbird/files/patch-bug784776 Fri Sep 7 12:59:35 2012 (r999)
@@ -1,20 +1,3 @@
---- mozilla/content/media/MediaEngineDefault.cpp~
-+++ mozilla/content/media/MediaEngineDefault.cpp
-@@ -232,12 +232,12 @@ nsresult
- MediaEngineDefaultAudioSource::Start(SourceMediaStream* aStream, TrackID aID)
- {
- if (mState != kAllocated) {
-- return NULL;
-+ return 0;
- }
-
- mTimer = do_CreateInstance(NS_TIMER_CONTRACTID);
- if (!mTimer) {
-- return NULL;
-+ return 0;
- }
-
- mSource = aStream;
--- mozilla/gfx/layers/opengl/ImageLayerOGL.cpp~
+++ mozilla/gfx/layers/opengl/ImageLayerOGL.cpp
@@ -936,7 +936,7 @@ ShadowImageLayerOGL::CleanupResources()
Added: trunk/mail/thunderbird/files/patch-bug788955
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/mail/thunderbird/files/patch-bug788955 Fri Sep 7 12:59:35 2012 (r999)
@@ -0,0 +1,205 @@
+diff --git Makefile.in Makefile.in
+index e341462..26d19ad 100644
+--- mozilla/Makefile.in
++++ mozilla/Makefile.in
+@@ -47,7 +47,7 @@ endif
+
+ ifdef MOZ_MEMORY
+ tier_base_dirs += memory/mozjemalloc
+-ifdef MOZ_JEMALLOC
++ifeq (1_,$(MOZ_JEMALLOC)_$(MOZ_NATIVE_JEMALLOC))
+ tier_base_dirs += memory/jemalloc
+ endif
+ tier_base_dirs += memory/build
+--- mozilla/config/autoconf.mk.in
++++ mozilla/config/autoconf.mk.in
+@@ -74,6 +74,7 @@ MOZ_JSDEBUGGER = @MOZ_JSDEBUGGER@
+ MOZ_IPDL_TESTS = @MOZ_IPDL_TESTS@
+ MOZ_MEMORY = @MOZ_MEMORY@
+ MOZ_JEMALLOC = @MOZ_JEMALLOC@
++MOZ_NATIVE_JEMALLOC = @MOZ_NATIVE_JEMALLOC@
+ MOZ_PROFILING = @MOZ_PROFILING@
+ MOZ_ENABLE_PROFILER_SPS = @MOZ_ENABLE_PROFILER_SPS@
+ MOZ_JPROF = @MOZ_JPROF@
+diff --git configure.in configure.in
+index 4070d8c..3b39473 100644
+--- mozilla/configure.in
++++ mozilla/configure.in
+@@ -3670,21 +3670,22 @@ fi
+
+ dnl Check for the existence of various allocation headers/functions
+
++MALLOC_HEADERS="malloc.h malloc_np.h malloc/malloc.h sys/malloc.h"
+ MALLOC_H=
+-MOZ_CHECK_HEADER(malloc.h, [MALLOC_H=malloc.h])
+-if test "$MALLOC_H" = ""; then
+- MOZ_CHECK_HEADER(malloc/malloc.h, [MALLOC_H=malloc/malloc.h])
+- if test "$MALLOC_H" = ""; then
+- MOZ_CHECK_HEADER(sys/malloc.h, [MALLOC_H=sys/malloc.h])
++
++for file in $MALLOC_HEADERS; do
++ MOZ_CHECK_HEADER($file, [MALLOC_H=$file])
++ if test "$MALLOC_H" != ""; then
++ AC_DEFINE_UNQUOTED(MALLOC_H, <$MALLOC_H>)
++ break
+ fi
+-fi
+-if test "$MALLOC_H" != ""; then
+- AC_DEFINE_UNQUOTED(MALLOC_H, <$MALLOC_H>)
+-fi
++done
+
+ MOZ_ALLOCATING_FUNCS="strndup posix_memalign memalign valloc"
+ AC_CHECK_FUNCS(strndup posix_memalign memalign valloc)
+
++AC_CHECK_FUNCS(malloc_usable_size)
++
+ dnl See if compiler supports some gcc-style attributes
+
+ AC_CACHE_CHECK(for __attribute__((always_inline)),
+@@ -6902,7 +6903,21 @@ if test -z "$MOZ_MEMORY"; then
+ AC_MSG_WARN([When not building jemalloc, you need to set WIN32_REDIST_DIR to the path to the Visual C++ Redist (usually VCINSTALLDIR\redist\x86\Microsoft.VC80.CRT, for VC++ v8) if you intend to distribute your build.])
+ fi
+ ;;
++ *-freebsd*)
++ MOZ_JEMALLOC=1
++ ;;
+ esac
++
++ if test -n "$MOZ_JEMALLOC"; then
++ AC_CHECK_FUNCS(mallctl nallocm,
++ [MOZ_NATIVE_JEMALLOC=1 MOZ_MEMORY=1],
++ [MOZ_NATIVE_JEMALLOC= MOZ_MEMORY=])
++ fi
++ if test -n "$MOZ_NATIVE_JEMALLOC"; then
++ AC_DEFINE(MOZ_NATIVE_JEMALLOC)
++ AC_DEFINE(MOZ_MEMORY)
++ AC_DEFINE(MOZ_JEMALLOC)
++ fi
+ else
+ dnl Don't try to run compiler tests on Windows
+ if test "$OS_ARCH" = "WINNT"; then
+@@ -6988,6 +7003,7 @@ else
+ ;;
+ esac
+ fi # MOZ_MEMORY
++AC_SUBST(MOZ_NATIVE_JEMALLOC)
+ AC_SUBST(MOZ_MEMORY)
+ AC_SUBST(MOZ_JEMALLOC)
+ AC_SUBST(MOZ_GLUE_LDFLAGS)
+@@ -8754,7 +8770,7 @@ fi
+
+ # Run jemalloc configure script
+
+-if test "$MOZ_JEMALLOC" -a "$MOZ_MEMORY"; then
++if test -z "$MOZ_NATIVE_JEMALLOC" -a "$MOZ_JEMALLOC" -a "$MOZ_MEMORY" ; then
+ ac_configure_args="$_SUBDIR_CONFIG_ARGS --build=$build --host=$target --enable-stats --with-jemalloc-prefix=je_"
+ if test "$OS_ARCH" = "Linux"; then
+ MANGLE="malloc calloc valloc free realloc memalign posix_memalign malloc_usable_size"
+diff --git memory/build/Makefile.in memory/build/Makefile.in
+index dca0f48..af93ee0 100644
+--- mozilla/memory/build/Makefile.in
++++ mozilla/memory/build/Makefile.in
+@@ -22,7 +22,9 @@ CSRCS = extraMallocFuncs.c
+
+ ifdef MOZ_JEMALLOC
+ CSRCS += mozjemalloc_compat.c
++ifndef MOZ_NATIVE_JEMALLOC
+ SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,jemalloc,$(DEPTH)/memory/jemalloc)
++endif
+ else
+ SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,jemalloc,$(DEPTH)/memory/mozjemalloc)
+ endif
+diff --git memory/build/mozjemalloc_compat.c memory/build/mozjemalloc_compat.c
+index 10a845a..57245f6 100644
+--- mozilla/memory/build/mozjemalloc_compat.c
++++ mozilla/memory/build/mozjemalloc_compat.c
+@@ -5,7 +5,15 @@
+ #include "mozilla/Types.h"
+ #include "jemalloc_types.h"
+
++#if defined(MALLOC_H)
++#include MALLOC_H /* for mallctl */
++#endif
++
++#if defined(MOZ_NATIVE_JEMALLOC)
++#define je_mallctl mallctl
++#else
+ extern int je_mallctl(const char*, void*, size_t*, void*, size_t);
++#endif
+
+ MOZ_EXPORT_API (void)
+ jemalloc_stats(jemalloc_stats_t *stats)
+diff --git memory/mozalloc/mozalloc.cpp memory/mozalloc/mozalloc.cpp
+index 5b61050b..16bba36 100644
+--- mozilla/memory/mozalloc/mozalloc.cpp
++++ mozilla/memory/mozalloc/mozalloc.cpp
+@@ -12,16 +12,13 @@
+ #include <sys/types.h>
+
+ #if defined(MALLOC_H)
+-# include MALLOC_H // for memalign, valloc where available
++# include MALLOC_H // for memalign, valloc, malloc_size, malloc_usable_size
+ #endif // if defined(MALLOC_H)
+ #include <stddef.h> // for size_t
+ #include <stdlib.h> // for malloc, free
+ #if defined(XP_UNIX)
+ # include <unistd.h> // for valloc on *BSD
+ #endif //if defined(XP_UNIX)
+-#if defined(__FreeBSD__)
+-# include <malloc_np.h> // for malloc_usable_size
+-#endif // if defined(__FreeBSD__)
+
+ #if defined(XP_WIN) || (defined(XP_OS2) && defined(__declspec))
+ # define MOZALLOC_EXPORT __declspec(dllexport)
+@@ -213,8 +210,7 @@ moz_malloc_usable_size(void *ptr)
+
+ #if defined(XP_MACOSX)
+ return malloc_size(ptr);
+-#elif defined(MOZ_MEMORY) || (defined(XP_LINUX) && !defined(ANDROID)) || defined(__FreeBSD__)
+- // Android bionic libc doesn't have malloc_usable_size.
++#elif defined(MOZ_MEMORY) || defined(HAVE_MALLOC_USABLE_SIZE)
+ return malloc_usable_size(ptr);
+ #elif defined(XP_WIN)
+ return _msize(ptr);
+diff --git memory/mozjemalloc/jemalloc.h memory/mozjemalloc/jemalloc.h
+index f0e0878..8f78123 100644
+--- mozilla/memory/mozjemalloc/jemalloc.h
++++ mozilla/memory/mozjemalloc/jemalloc.h
+@@ -32,8 +32,8 @@
+ #ifndef _JEMALLOC_H_
+ #define _JEMALLOC_H_
+
+-#if defined(MOZ_MEMORY_DARWIN)
+-#include <malloc/malloc.h>
++#if defined(MALLOC_H)
++#include MALLOC_H /* for malloc_good_size and nallocm */
+ #endif
+ #include "jemalloc_types.h"
+
+@@ -51,7 +51,9 @@ void jemalloc_stats(jemalloc_stats_t *stats);
+ #if defined(MOZ_MEMORY_LINUX)
+ __attribute__((weak))
+ #endif
+-#if defined(MOZ_JEMALLOC)
++#if defined(MOZ_NATIVE_JEMALLOC)
++#define je_nallocm nallocm
++#elif defined(MOZ_JEMALLOC)
+ int je_nallocm(size_t *rsize, size_t size, int flags);
+ #else
+ size_t je_malloc_good_size(size_t size);
+diff --git toolkit/library/Makefile.in toolkit/library/Makefile.in
+index 7dbbbc6..0b06ad0 100644
+--- mozilla/toolkit/library/Makefile.in
++++ mozilla/toolkit/library/Makefile.in
+@@ -346,6 +346,10 @@ EXTRA_DSO_LDOPTS += \
+ $(SQLITE_LIBS) \
+ $(NULL)
+
++ifdef MOZ_NATIVE_JEMALLOC
++EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,memory,$(DIST)/lib)
++endif
++
+ ifdef MOZ_NATIVE_JPEG
+ EXTRA_DSO_LDOPTS += $(MOZ_JPEG_LIBS)
+ endif
Added: trunk/mail/thunderbird/files/patch-config-baseconfig.mk
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/mail/thunderbird/files/patch-config-baseconfig.mk Fri Sep 7 12:59:35 2012 (r999)
@@ -0,0 +1,16 @@
+--- mozilla/config/baseconfig.mk~
++++ mozilla/config/baseconfig.mk
+@@ -1,9 +1,9 @@
+ INCLUDED_AUTOCONF_MK = 1
+
+-includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++includedir := $(includedir)/%%MOZILLA%%
++idldir = $(datadir)/idl/%%MOZILLA%%
++installdir = $(libdir)/%%MOZILLA%%
++sdkdir = $(libdir)/%%MOZILLA%%
+ DIST = $(DEPTH)/dist
+
+ # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
Deleted: trunk/mail/thunderbird/files/patch-mozilla-config_autoconf.mk.in
==============================================================================
--- trunk/mail/thunderbird/files/patch-mozilla-config_autoconf.mk.in Fri Sep 7 12:59:35 2012 (r998)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,22 +0,0 @@
---- mozilla/config/autoconf.mk.in.orig 2007-08-28 12:02:43.000000000 -0400
-+++ mozilla/config/autoconf.mk.in 2007-09-26 14:21:51.000000000 -0400
-@@ -58,14 +58,14 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- bindir = @bindir@
--includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+includedir = @includedir@/%%MOZILLA%%
- libdir = @libdir@
- datadir = @datadir@
- mandir = @mandir@
--idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+idldir = $(datadir)/idl/%%MOZILLA%%
-
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+installdir = $(libdir)/%%MOZILLA%%
-+sdkdir = $(libdir)/%%MOZILLA%%
-
- DIST = $(DEPTH)/dist
- LIBXUL_SDK = @LIBXUL_SDK@
-
Modified: trunk/www/firefox-nightly/Makefile.hgrev
==============================================================================
--- trunk/www/firefox-nightly/Makefile.hgrev Fri Sep 7 12:59:20 2012 (r998)
+++ trunk/www/firefox-nightly/Makefile.hgrev Fri Sep 7 12:59:35 2012 (r999)
@@ -1 +1 @@
-HGREV= 104183:7c75cd38626a
+HGREV= 104498:36427d4b2cf6
Modified: trunk/www/firefox-nightly/distinfo
==============================================================================
--- trunk/www/firefox-nightly/distinfo Fri Sep 7 12:59:20 2012 (r998)
+++ trunk/www/firefox-nightly/distinfo Fri Sep 7 12:59:35 2012 (r999)
@@ -1,2 +1,2 @@
-SHA256 (firefox-nightly/7c75cd38626a.tar.bz2) = 1285ebbeaba294da12c47fc9323db488eb8c193e5be1bd475c3ad492d3acd385
-SIZE (firefox-nightly/7c75cd38626a.tar.bz2) = 88492019
+SHA256 (firefox-nightly/36427d4b2cf6.tar.bz2) = 204602a5866150bc943d5b59966c63b9ea8d7f8b5808a4da1a1d2da958370dcb
+SIZE (firefox-nightly/36427d4b2cf6.tar.bz2) = 88616803
Deleted: trunk/www/firefox-nightly/files/patch-bug786995
==============================================================================
--- trunk/www/firefox-nightly/files/patch-bug786995 Fri Sep 7 12:59:35 2012 (r998)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,36 +0,0 @@
-# Bug 786995 - configure should check for SSSE3 support in the whole toolchain
-
---- configure.in.orig 2012-09-02 00:37:29.000000000 +0200
-+++ configure.in 2012-09-02 00:38:50.000000000 +0200
-@@ -1710,15 +1710,15 @@
- _MOZ_RTTI_FLAGS_OFF=-fno-rtti
-
- # Check for -mssse3 on $CC
-- AC_MSG_CHECKING([for -mssse3 option to $CC])
-- HAVE_COMPILER_FLAG_MSSSE3=
-+ AC_MSG_CHECKING([if toolchain supports -mssse3 option])
-+ HAVE_TOOLCHAIN_SUPPORT_MSSSE3=
- _SAVE_CFLAGS=$CFLAGS
- CFLAGS="$CFLAGS -mssse3"
-- AC_TRY_COMPILE(,,AC_MSG_RESULT([yes])
-- [HAVE_COMPILER_FLAG_MSSSE3=1],
-+ AC_TRY_COMPILE([asm ("pmaddubsw %xmm2,%xmm3");],,AC_MSG_RESULT([yes])
-+ [HAVE_TOOLCHAIN_SUPPORT_MSSSE3=1],
- AC_MSG_RESULT([no]))
- CFLAGS=$_SAVE_CFLAGS
-- AC_SUBST(HAVE_COMPILER_FLAG_MSSSE3)
-+ AC_SUBST(HAVE_TOOLCHAIN_SUPPORT_MSSSE3)
-
- # Turn on GNU-specific warnings:
- # -Wall - turn on a lot of warnings
---- gfx/skia/Makefile.in.orig 2012-09-02 00:39:00.000000000 +0200
-+++ gfx/skia/Makefile.in 2012-09-02 00:39:21.000000000 +0200
-@@ -365,7 +365,7 @@
- SkUtils_opts_SSE2.cpp \
- opts_check_SSE2.cpp \
- $(NULL)
--ifdef HAVE_COMPILER_FLAG_MSSSE3
-+ifdef HAVE_TOOLCHAIN_SUPPORT_MSSSE3
- DEFINES += -DSK_BUILD_SSSE3
- CPPSRCS += SkBitmapProcState_opts_SSSE3.cpp
- endif
Deleted: trunk/www/firefox-nightly/files/patch-bug788039
==============================================================================
--- trunk/www/firefox-nightly/files/patch-bug788039 Fri Sep 7 12:59:35 2012 (r998)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,48 +0,0 @@
-# Bug 788039 - With no prefix search libevent via pkg-config.
-
---- configure.in
-+++ configure.in
-@@ -3854,7 +3854,7 @@ fi
- dnl system libevent Support
- dnl ========================================================
- MOZ_ARG_WITH_STRING(system-libevent,
--[ --with-system-libevent=[PFX]
-+[ --with-system-libevent[=PFX]
- Use system libevent [installed at prefix PFX]],
- LIBEVENT_DIR=$withval)
-
-@@ -3863,10 +3863,11 @@ _SAVE_LDFLAGS=$LDFLAGS
- _SAVE_LIBS=$LIBS
- if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then
- MOZ_NATIVE_LIBEVENT=
-+elif test "$LIBEVENT_DIR" = yes; then
-+ PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent,
-+ MOZ_NATIVE_LIBEVENT=1,
-+ AC_MSG_ERROR([--with-system-libevent requested but libevent package not found]))
- else
-- if test "${LIBEVENT_DIR}" = "yes"; then
-- LIBEVENT_DIR=/usr
-- fi
- CFLAGS="-I${LIBEVENT_DIR}/include $CFLAGS"
- LDFLAGS="-L${LIBEVENT_DIR}/lib $LDFLAGS"
- MOZ_CHECK_HEADER(event.h,
-@@ -3876,16 +3877,16 @@ else
- AC_MSG_ERROR([--with-system-libevent requested but event.h not found]))
- AC_CHECK_LIB(event, event_init,
- [MOZ_NATIVE_LIBEVENT=1
-- MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include"
-+ MOZ_LIBEVENT_CFLAGS="-I${LIBEVENT_DIR}/include"
- MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"],
-- [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=])
-+ [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_CFLAGS= MOZ_LIBEVENT_LIBS=])
- fi
- CFLAGS=$_SAVE_CFLAGS
- LDFLAGS=$_SAVE_LDFLAGS
- LIBS=$_SAVE_LIBS
-
- AC_SUBST(MOZ_NATIVE_LIBEVENT)
--AC_SUBST(MOZ_LIBEVENT_INCLUDES)
-+AC_SUBST(MOZ_LIBEVENT_CFLAGS)
- AC_SUBST(MOZ_LIBEVENT_LIBS)
-
- dnl ========================================================
Deleted: trunk/www/firefox-nightly/files/patch-bug788108
==============================================================================
--- trunk/www/firefox-nightly/files/patch-bug788108 Fri Sep 7 12:59:35 2012 (r998)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,20 +0,0 @@
---- content/base/public/nsContentUtils.h~
-+++ content/base/public/nsContentUtils.h
-@@ -18,17 +18,6 @@
- #include <ieeefp.h>
- #endif
-
--//A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
--#ifdef __FreeBSD__
--#include <ieeefp.h>
--#if !defined(__i386__) && !defined(__x86_64__)
--static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
--#else
--static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML;
--#endif
--static fp_except_t oldmask = fpsetmask(~allmask);
--#endif
--
- #include "nsAString.h"
- #include "nsIStatefulFrame.h"
- #include "nsNodeInfoManager.h"
Modified: trunk/www/firefox/Makefile
==============================================================================
--- trunk/www/firefox/Makefile Fri Sep 7 12:59:20 2012 (r998)
+++ trunk/www/firefox/Makefile Fri Sep 7 12:59:35 2012 (r999)
@@ -6,7 +6,7 @@
#
PORTNAME= firefox
-DISTVERSION= 15.0
+DISTVERSION= 16.0b2
PORTEPOCH= 1
CATEGORIES= www ipv6
MASTER_SITES= ${MASTER_SITE_MOZILLA}
@@ -53,7 +53,7 @@
.include "${.CURDIR}/../../www/firefox/Makefile.options"
.include <bsd.port.pre.mk>
-WRKSRC:= ${WRKDIR}/mozilla-release
+WRKSRC:= ${WRKDIR}/mozilla-beta
.if ${ARCH} == amd64
CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL}
Modified: trunk/www/firefox/distinfo
==============================================================================
--- trunk/www/firefox/distinfo Fri Sep 7 12:59:20 2012 (r998)
+++ trunk/www/firefox/distinfo Fri Sep 7 12:59:35 2012 (r999)
@@ -1,2 +1,2 @@
-SHA256 (firefox-15.0.source.tar.bz2) = 5416f0d6ab139846343deb86f604352d06a487ed142920613a2d2d3dd96bc789
-SIZE (firefox-15.0.source.tar.bz2) = 83713360
+SHA256 (firefox-16.0b2.source.tar.bz2) = cb578278304815992144703de1a0d85fdadcf683cb501398c668be8cef9c2be6
+SIZE (firefox-16.0b2.source.tar.bz2) = 89195582
Modified: trunk/www/firefox/files/extra-bug780531
==============================================================================
--- trunk/www/firefox/files/extra-bug780531 Fri Sep 7 12:59:20 2012 (r998)
+++ trunk/www/firefox/files/extra-bug780531 Fri Sep 7 12:59:35 2012 (r999)
@@ -1,13 +1,12 @@
--- configure.in~
+++ configure.in
-@@ -5585,10 +5585,13 @@ if test -n "$MOZ_OGG"; then
+@@ -5282,10 +5282,13 @@ if test -n "$MOZ_OGG"; then
MOZ_SYDNEYAUDIO=1
MOZ_CUBEB=1
MOZ_MEDIA=1
- case "$target_cpu" in
-- arm*)
+ case "$target" in
-+ arm-*-linux*)
+ arm*)
MOZ_TREMOR=1
;;
+ *-freebsd*)
@@ -16,14 +15,13 @@
*)
MOZ_VORBIS=1
;;
-@@ -5715,10 +5720,13 @@ if test -n "$MOZ_WEBM" -a -z "$MOZ_NATIV
+@@ -5417,10 +5420,13 @@ if test "$MOZ_WEBM"; then
MOZ_SYDNEYAUDIO=1
MOZ_CUBEB=1
MOZ_MEDIA=1
- case "$target_cpu" in
-- arm*)
+ case "$target" in
-+ arm-*-linux*)
+ arm*)
MOZ_TREMOR=1
;;
+ *-freebsd*)
Deleted: trunk/www/firefox/files/patch-bug723860
==============================================================================
--- trunk/www/firefox/files/patch-bug723860 Fri Sep 7 12:59:35 2012 (r998)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,54 +0,0 @@
-commit 4e07587
-Author: Matthew Gregan <kinetik@flim.org>
-Date: Wed Jun 6 17:58:07 2012 +1200
-
- Bug 723860 - Early bail from reader's GetBuffered() if not yet initialized. r=doublec
----
- content/media/gstreamer/nsGStreamerReader.cpp | 4 ++++
- content/media/ogg/nsOggReader.cpp | 3 +--
- content/media/wave/nsWaveReader.cpp | 3 +++
- 3 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git content/media/gstreamer/nsGStreamerReader.cpp content/media/gstreamer/nsGStreamerReader.cpp
-index 164fb2e..06a09b5 100644
---- content/media/gstreamer/nsGStreamerReader.cpp
-+++ content/media/gstreamer/nsGStreamerReader.cpp
-@@ -505,6 +505,10 @@ nsresult nsGStreamerReader::Seek(PRInt64 aTarget,
- nsresult nsGStreamerReader::GetBuffered(nsTimeRanges* aBuffered,
- PRInt64 aStartTime)
- {
-+ if (!mInfo.mHasVideo && !mInfo.mHasAudio) {
-+ return NS_OK;
-+ }
-+
- GstFormat format = GST_FORMAT_TIME;
- MediaResource* resource = mDecoder->GetResource();
- gint64 resourceLength = resource->GetLength();
-diff --git content/media/ogg/nsOggReader.cpp content/media/ogg/nsOggReader.cpp
-index c6ff008..8d40e2c 100644
---- content/media/ogg/nsOggReader.cpp
-+++ content/media/ogg/nsOggReader.cpp
-@@ -1532,8 +1532,7 @@ nsresult nsOggReader::GetBuffered(nsTimeRanges* aBuffered, PRInt64 aStartTime)
- {
- // HasAudio and HasVideo are not used here as they take a lock and cause
- // a deadlock. Accessing mInfo doesn't require a lock - it doesn't change
-- // after metadata is read and GetBuffered isn't called before metadata is
-- // read.
-+ // after metadata is read.
- if (!mInfo.mHasVideo && !mInfo.mHasAudio) {
- // No need to search through the file if there are no audio or video tracks
- return NS_OK;
-diff --git content/media/wave/nsWaveReader.cpp content/media/wave/nsWaveReader.cpp
-index 7242eb5..60fc1e1 100644
---- content/media/wave/nsWaveReader.cpp
-+++ content/media/wave/nsWaveReader.cpp
-@@ -239,6 +239,9 @@ static double RoundToUsecs(double aSeconds) {
-
- nsresult nsWaveReader::GetBuffered(nsTimeRanges* aBuffered, PRInt64 aStartTime)
- {
-+ if (!mInfo.mHasAudio) {
-+ return NS_OK;
-+ }
- PRInt64 startOffset = mDecoder->GetResource()->GetNextCachedData(mWavePCMOffset);
- while (startOffset >= 0) {
- PRInt64 endOffset = mDecoder->GetResource()->GetCachedDataEnd(startOffset);
Deleted: trunk/www/firefox/files/patch-bug752895
==============================================================================
--- trunk/www/firefox/files/patch-bug752895 Fri Sep 7 12:59:35 2012 (r998)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,71 +0,0 @@
-commit de14ddd
-Author: Andrew Benton <b3nton@gmail.com>
-Date: Tue Jun 12 09:10:09 2012 +0200
-
- Bug 752895 - Don't try to install nspr, nss and sqlite when using system libraries. r=glandium
----
- browser/installer/Makefile.in | 8 ++++++++
- browser/installer/package-manifest.in | 6 ++++++
- 2 files changed, 14 insertions(+)
-
-diff --git browser/installer/Makefile.in browser/installer/Makefile.in
-index 975b1f4..c791872 100644
---- browser/installer/Makefile.in
-+++ browser/installer/Makefile.in
-@@ -44,6 +44,14 @@ ifeq (gtk2, $(MOZ_WIDGET_TOOLKIT))
- DEFINES += -DMOZ_GTK2=1
- endif
-
-+ifdef MOZ_NATIVE_NSPR
-+DEFINES += -DMOZ_NATIVE_NSPR=1
-+endif
-+
-+ifdef MOZ_NATIVE_NSS
-+DEFINES += -DMOZ_NATIVE_NSS=1
-+endif
-+
- ifdef NSS_DISABLE_DBM
- DEFINES += -DNSS_DISABLE_DBM=1
- endif
-diff --git browser/installer/package-manifest.in browser/installer/package-manifest.in
-index 2969643..b8fddf0 100644
---- browser/installer/package-manifest.in
-+++ browser/installer/package-manifest.in
-@@ -58,9 +58,11 @@
- #ifndef MOZ_STATIC_JS
- @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
- #endif
-+#ifndef MOZ_NATIVE_NSPR
- @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@
-+#endif
- @BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@
- #ifdef XP_MACOSX
- @BINPATH@/XUL
-@@ -109,7 +111,9 @@
- #endif
- @BINPATH@/platform.ini
- #ifndef XP_OS2
-+#ifndef MOZ_NATIVE_SQLITE
- @BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
-+#endif
- #else
- @BINPATH@/mozsqlt3@DLL_SUFFIX@
- #endif
-@@ -583,6 +587,7 @@
- ; NSS libraries are signed in the staging directory,
- ; meaning their .chk files are created there directly.
- ;
-+#ifndef MOZ_NATIVE_NSS
- @BINPATH@/@DLL_PREFIX@freebl3@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@nss3@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@nssckbi@DLL_SUFFIX@
-@@ -593,6 +598,7 @@
- @BINPATH@/@DLL_PREFIX@smime3@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@softokn3@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@ssl3@DLL_SUFFIX@
-+#endif
- @BINPATH@/chrome/pippki@JAREXT@
- @BINPATH@/chrome/pippki.manifest
- @BINPATH@/components/pipboot.xpt
Modified: trunk/www/firefox/files/patch-bug753046
==============================================================================
--- trunk/www/firefox/files/patch-bug753046 Fri Sep 7 12:59:20 2012 (r998)
+++ trunk/www/firefox/files/patch-bug753046 Fri Sep 7 12:59:35 2012 (r999)
@@ -978,57 +978,6 @@
#else
long pages = sysconf(_SC_PHYS_PAGES);
long page_size = sysconf(_SC_PAGE_SIZE);
-$NetBSD: patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h,v 1.2 2012/03/06 12:34:09 ryoon Exp $
-
---- ipc/chromium/src/base/third_party/nspr/prcpucfg.h.orig 2011-12-20 23:28:19.000000000 +0000
-+++ ipc/chromium/src/base/third_party/nspr/prcpucfg.h
-@@ -34,7 +34,7 @@
- #include "base/third_party/nspr/prcpucfg_win.h"
- #elif defined(__APPLE__)
- #include "base/third_party/nspr/prcpucfg_mac.h"
--#elif defined(__linux__) || defined(ANDROID)
-+#elif defined(__linux__) || defined(ANDROID) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
- #include "base/third_party/nspr/prcpucfg_linux.h"
- #elif defined(__OpenBSD__)
- #include "base/third_party/nspr/prcpucfg_openbsd.h"
-$NetBSD: patch-ipc_chromium_src_base_third__party_nspr_prtime.cc,v 1.1 2012/03/06 12:34:09 ryoon Exp $
-
---- ipc/chromium/src/base/third_party/nspr/prtime.cc.orig 2011-12-20 23:28:19.000000000 +0000
-+++ ipc/chromium/src/base/third_party/nspr/prtime.cc
-@@ -212,7 +212,7 @@ PR_ImplodeTime(const PRExplodedTime *exp
- LL_ADD(retVal, retVal, temp);
-
- return retVal;
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_DRAGONFLY)
- struct tm exp_tm = {0};
- exp_tm.tm_sec = exploded->tm_sec;
- exp_tm.tm_min = exploded->tm_min;
-@@ -245,6 +245,24 @@ PR_ImplodeTime(const PRExplodedTime *exp
- result *= kSecondsToMicroseconds;
- result += exploded->tm_usec;
- return result;
-+#elif defined(OS_FREEBSD) || defined(OS_NETBSD)
-+ struct tm exp_tm = {0};
-+ exp_tm.tm_sec = exploded->tm_sec;
-+ exp_tm.tm_min = exploded->tm_min;
-+ exp_tm.tm_hour = exploded->tm_hour;
-+ exp_tm.tm_mday = exploded->tm_mday;
-+ exp_tm.tm_mon = exploded->tm_month;
-+ exp_tm.tm_year = exploded->tm_year - 1900;
-+
-+ // time_t is 64bit
-+ time_t absolute_time = timegm(&exp_tm);
-+
-+ PRTime result = static_cast<PRTime>(absolute_time);
-+ result -= exploded->tm_params.tp_gmt_offset +
-+ exploded->tm_params.tp_dst_offset;
-+ result *= kSecondsToMicroseconds;
-+ result += exploded->tm_usec;
-+ return result;
- #else
- #error No PR_ImplodeTime implemented on your platform.
- #endif
diff --git ipc/chromium/src/base/time_posix.cc ipc/chromium/src/base/time_posix.cc
index abf2a56..48791f6 100644
--- ipc/chromium/src/base/time_posix.cc
Deleted: trunk/www/firefox/files/patch-bug759459
==============================================================================
--- trunk/www/firefox/files/patch-bug759459 Fri Sep 7 12:59:35 2012 (r998)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,24 +0,0 @@
-commit 4d0c5b9
-Author: Marco Perez <bugmail@millibyte.net>
-Date: Sat Jun 9 12:24:56 2012 -0400
-
- Bug 759459 - Build broken on FreeBSD since patch for bug 745034 landed. r=terrence
----
- js/src/gc/Memory.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git js/src/gc/Memory.cpp js/src/gc/Memory.cpp
-index 815e90b..10c1a91 100644
---- js/src/gc/Memory.cpp
-+++ js/src/gc/Memory.cpp
-@@ -292,9 +292,9 @@ GetPageFaultCount()
- #elif defined(XP_UNIX) || defined(XP_MACOSX) || defined(DARWIN)
-
- #include <sys/mman.h>
--#include <unistd.h>
- #include <sys/time.h>
- #include <sys/resource.h>
-+#include <unistd.h>
-
- void
- InitMemorySubsystem()
Deleted: trunk/www/firefox/files/patch-bug760899
==============================================================================
--- trunk/www/firefox/files/patch-bug760899 Fri Sep 7 12:59:35 2012 (r998)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,54 +0,0 @@
-commit 667daed
-Author: Stephen Moehle <stephen.moehle@gmail.com>
-Date: Tue Jun 5 11:32:36 2012 +1200
-
- Bug 760899 - Fix debug builds with gstreamer enabled - r=kinetik
-
- --HG--
- extra : rebase_source : 22598bc470d35d94991ea9f1b14df11ba19a461a
----
- content/media/gstreamer/nsGStreamerReader.cpp | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git content/media/gstreamer/nsGStreamerReader.cpp content/media/gstreamer/nsGStreamerReader.cpp
-index 6a50e09..164fb2e 100644
---- content/media/gstreamer/nsGStreamerReader.cpp
-+++ content/media/gstreamer/nsGStreamerReader.cpp
-@@ -278,7 +278,7 @@ nsresult nsGStreamerReader::ReadMetadata(nsVideoInfo* aInfo)
- if (gst_element_query_duration(GST_ELEMENT(mPlayBin),
- &format, &duration) && format == GST_FORMAT_TIME) {
- ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor());
-- LOG(PR_LOG_DEBUG, ("returning duration %"GST_TIME_FORMAT,
-+ LOG(PR_LOG_DEBUG, ("returning duration %" GST_TIME_FORMAT,
- GST_TIME_ARGS (duration)));
- duration = GST_TIME_AS_USECONDS (duration);
- mDecoder->GetStateMachine()->SetDuration(duration);
-@@ -422,8 +422,8 @@ bool nsGStreamerReader::DecodeVideoFrame(bool &aKeyFrameSkip,
- nextTimestamp += gst_util_uint64_scale(GST_USECOND, fpsNum, fpsDen);
-
- if (timestamp < aTimeThreshold) {
-- LOG(PR_LOG_DEBUG, ("skipping frame %"GST_TIME_FORMAT
-- " threshold %"GST_TIME_FORMAT,
-+ LOG(PR_LOG_DEBUG, ("skipping frame %" GST_TIME_FORMAT
-+ " threshold %" GST_TIME_FORMAT,
- GST_TIME_ARGS(timestamp), GST_TIME_ARGS(aTimeThreshold)));
- gst_buffer_unref(buffer);
- buffer = NULL;
-@@ -489,7 +489,7 @@ nsresult nsGStreamerReader::Seek(PRInt64 aTarget,
- NS_ASSERTION(mDecoder->OnDecodeThread(), "Should be on decode thread.");
-
- gint64 seekPos = aTarget * GST_USECOND;
-- LOG(PR_LOG_DEBUG, ("%p About to seek to %"GST_TIME_FORMAT,
-+ LOG(PR_LOG_DEBUG, ("%p About to seek to %" GST_TIME_FORMAT,
- mDecoder, GST_TIME_ARGS(seekPos)));
-
- if (!gst_element_seek_simple(mPlayBin, GST_FORMAT_TIME,
-@@ -592,7 +592,7 @@ PRInt64 nsGStreamerReader::QueryDuration()
- if (gst_element_query_duration(GST_ELEMENT(mPlayBin),
- &format, &duration)) {
- if (format == GST_FORMAT_TIME) {
-- LOG(PR_LOG_DEBUG, ("pipeline duration %"GST_TIME_FORMAT,
-+ LOG(PR_LOG_DEBUG, ("pipeline duration %" GST_TIME_FORMAT,
- GST_TIME_ARGS (duration)));
- duration = GST_TIME_AS_USECONDS (duration);
- }
Deleted: trunk/www/firefox/files/patch-bug761030
==============================================================================
--- trunk/www/firefox/files/patch-bug761030 Fri Sep 7 12:59:35 2012 (r998)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,25 +0,0 @@
-commit 8bc9e15
-Author: Stephen Moehle <stephen.moehle@gmail.com>
-Date: Tue Jun 5 11:31:13 2012 +1200
-
- Bug 761030 - Fix crash with HTML 5 video with GStreamer enabled - r=kinetik
-
- --HG--
- extra : rebase_source : 5e884550f9870bd2fda247d50bebd472e8368588
----
- content/media/gstreamer/nsGStreamerReader.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git content/media/gstreamer/nsGStreamerReader.cpp content/media/gstreamer/nsGStreamerReader.cpp
-index 17374a3..6a50e09 100644
---- content/media/gstreamer/nsGStreamerReader.cpp
-+++ content/media/gstreamer/nsGStreamerReader.cpp
-@@ -452,6 +452,8 @@ bool nsGStreamerReader::DecodeVideoFrame(bool &aKeyFrameSkip,
- i, height);
- b.mPlanes[i].mWidth = gst_video_format_get_component_width(format,
- i, width);
-+ b.mPlanes[i].mOffset = 0;
-+ b.mPlanes[i].mSkip = 0;
- }
-
- bool isKeyframe = !GST_BUFFER_FLAG_IS_SET(buffer,
Deleted: trunk/www/firefox/files/patch-bug761419
==============================================================================
--- trunk/www/firefox/files/patch-bug761419 Fri Sep 7 12:59:35 2012 (r998)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,22 +0,0 @@
-commit f0a73aa
-Author: Paul Adenot <paul@paul.cx>
-Date: Thu Jun 21 20:44:39 2012 -0400
-
- Bug 761419 - Build failure in content/media/gstreamer/nsGStreamerReader.cpp when using clang r=kinetik
----
- content/media/gstreamer/nsGStreamerReader.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git content/media/gstreamer/nsGStreamerReader.cpp content/media/gstreamer/nsGStreamerReader.cpp
-index 06a09b5..c48f92e 100644
---- content/media/gstreamer/nsGStreamerReader.cpp
-+++ content/media/gstreamer/nsGStreamerReader.cpp
-@@ -191,7 +191,7 @@ nsresult nsGStreamerReader::ReadMetadata(nsVideoInfo* aInfo)
- * stream but that are otherwise decodeable.
- */
- guint flags[3] = {GST_PLAY_FLAG_VIDEO|GST_PLAY_FLAG_AUDIO,
-- ~GST_PLAY_FLAG_AUDIO, ~GST_PLAY_FLAG_VIDEO};
-+ static_cast<guint>(~GST_PLAY_FLAG_AUDIO), static_cast<guint>(~GST_PLAY_FLAG_VIDEO)};
- guint default_flags, current_flags;
- g_object_get(mPlayBin, "flags", &default_flags, NULL);
-
Modified: trunk/www/firefox/files/patch-bug778056
==============================================================================
--- trunk/www/firefox/files/patch-bug778056 Fri Sep 7 12:59:20 2012 (r998)
+++ trunk/www/firefox/files/patch-bug778056 Fri Sep 7 12:59:35 2012 (r999)
@@ -4,9 +4,9 @@
#if defined(XP_UNIX)
# include <unistd.h> // for valloc on *BSD
#endif //if defined(XP_UNIX)
-+#ifdef __FreeBSD__
++#if defined(__FreeBSD__)
+# include <malloc_np.h> // for malloc_usable_size
-+#endif
++#endif // if defined(__FreeBSD__)
#if defined(XP_WIN) || (defined(XP_OS2) && defined(__declspec))
# define MOZALLOC_EXPORT __declspec(dllexport)
Modified: trunk/www/firefox/files/patch-bug778078
==============================================================================
--- trunk/www/firefox/files/patch-bug778078 Fri Sep 7 12:59:20 2012 (r998)
+++ trunk/www/firefox/files/patch-bug778078 Fri Sep 7 12:59:35 2012 (r999)
@@ -1,9 +1,9 @@
--- toolkit/xre/nsAppRunner.cpp~
+++ toolkit/xre/nsAppRunner.cpp
-@@ -3819,7 +3819,7 @@ XREMain::XRE_main(int argc, char* argv[]
+@@ -3833,7 +3833,7 @@ XREMain::XRE_main(int argc, char* argv[]
ScopedLogging log;
- #if defined(MOZ_WIDGET_GTK2)
+ #if defined(MOZ_WIDGET_GTK)
-#ifdef MOZ_MEMORY
+#if defined(MOZ_MEMORY) || defined(__FreeBSD__) || defined(__NetBSD__)
// Disable the slice allocator, since jemalloc already uses similar layout
Modified: trunk/www/firefox/files/patch-bug784776
==============================================================================
--- trunk/www/firefox/files/patch-bug784776 Fri Sep 7 12:59:20 2012 (r998)
+++ trunk/www/firefox/files/patch-bug784776 Fri Sep 7 12:59:35 2012 (r999)
@@ -1,20 +1,3 @@
---- content/media/MediaEngineDefault.cpp~
-+++ content/media/MediaEngineDefault.cpp
-@@ -232,12 +232,12 @@ nsresult
- MediaEngineDefaultAudioSource::Start(SourceMediaStream* aStream, TrackID aID)
- {
- if (mState != kAllocated) {
-- return NULL;
-+ return 0;
- }
-
- mTimer = do_CreateInstance(NS_TIMER_CONTRACTID);
- if (!mTimer) {
-- return NULL;
-+ return 0;
- }
-
- mSource = aStream;
--- gfx/layers/opengl/ImageLayerOGL.cpp~
+++ gfx/layers/opengl/ImageLayerOGL.cpp
@@ -936,7 +936,7 @@ ShadowImageLayerOGL::CleanupResources()
Added: trunk/www/firefox/files/patch-bug788955
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox/files/patch-bug788955 Fri Sep 7 12:59:35 2012 (r999)
@@ -0,0 +1,205 @@
+diff --git Makefile.in Makefile.in
+index e341462..26d19ad 100644
+--- Makefile.in
++++ Makefile.in
+@@ -47,7 +47,7 @@ endif
+
+ ifdef MOZ_MEMORY
+ tier_base_dirs += memory/mozjemalloc
+-ifdef MOZ_JEMALLOC
++ifeq (1_,$(MOZ_JEMALLOC)_$(MOZ_NATIVE_JEMALLOC))
+ tier_base_dirs += memory/jemalloc
+ endif
+ tier_base_dirs += memory/build
+--- config/autoconf.mk.in
++++ config/autoconf.mk.in
+@@ -74,6 +74,7 @@ MOZ_JSDEBUGGER = @MOZ_JSDEBUGGER@
+ MOZ_IPDL_TESTS = @MOZ_IPDL_TESTS@
+ MOZ_MEMORY = @MOZ_MEMORY@
+ MOZ_JEMALLOC = @MOZ_JEMALLOC@
++MOZ_NATIVE_JEMALLOC = @MOZ_NATIVE_JEMALLOC@
+ MOZ_PROFILING = @MOZ_PROFILING@
+ MOZ_ENABLE_PROFILER_SPS = @MOZ_ENABLE_PROFILER_SPS@
+ MOZ_JPROF = @MOZ_JPROF@
+diff --git configure.in configure.in
+index 4070d8c..3b39473 100644
+--- configure.in
++++ configure.in
+@@ -3670,21 +3670,22 @@ fi
+
+ dnl Check for the existence of various allocation headers/functions
+
++MALLOC_HEADERS="malloc.h malloc_np.h malloc/malloc.h sys/malloc.h"
+ MALLOC_H=
+-MOZ_CHECK_HEADER(malloc.h, [MALLOC_H=malloc.h])
+-if test "$MALLOC_H" = ""; then
+- MOZ_CHECK_HEADER(malloc/malloc.h, [MALLOC_H=malloc/malloc.h])
+- if test "$MALLOC_H" = ""; then
+- MOZ_CHECK_HEADER(sys/malloc.h, [MALLOC_H=sys/malloc.h])
++
++for file in $MALLOC_HEADERS; do
++ MOZ_CHECK_HEADER($file, [MALLOC_H=$file])
++ if test "$MALLOC_H" != ""; then
++ AC_DEFINE_UNQUOTED(MALLOC_H, <$MALLOC_H>)
++ break
+ fi
+-fi
+-if test "$MALLOC_H" != ""; then
+- AC_DEFINE_UNQUOTED(MALLOC_H, <$MALLOC_H>)
+-fi
++done
+
+ MOZ_ALLOCATING_FUNCS="strndup posix_memalign memalign valloc"
+ AC_CHECK_FUNCS(strndup posix_memalign memalign valloc)
+
++AC_CHECK_FUNCS(malloc_usable_size)
++
+ dnl See if compiler supports some gcc-style attributes
+
+ AC_CACHE_CHECK(for __attribute__((always_inline)),
+@@ -6902,7 +6903,21 @@ if test -z "$MOZ_MEMORY"; then
+ AC_MSG_WARN([When not building jemalloc, you need to set WIN32_REDIST_DIR to the path to the Visual C++ Redist (usually VCINSTALLDIR\redist\x86\Microsoft.VC80.CRT, for VC++ v8) if you intend to distribute your build.])
+ fi
+ ;;
++ *-freebsd*)
++ MOZ_JEMALLOC=1
++ ;;
+ esac
++
++ if test -n "$MOZ_JEMALLOC"; then
++ AC_CHECK_FUNCS(mallctl nallocm,
++ [MOZ_NATIVE_JEMALLOC=1 MOZ_MEMORY=1],
++ [MOZ_NATIVE_JEMALLOC= MOZ_MEMORY=])
++ fi
++ if test -n "$MOZ_NATIVE_JEMALLOC"; then
++ AC_DEFINE(MOZ_NATIVE_JEMALLOC)
++ AC_DEFINE(MOZ_MEMORY)
++ AC_DEFINE(MOZ_JEMALLOC)
++ fi
+ else
+ dnl Don't try to run compiler tests on Windows
+ if test "$OS_ARCH" = "WINNT"; then
+@@ -6988,6 +7003,7 @@ else
+ ;;
+ esac
+ fi # MOZ_MEMORY
++AC_SUBST(MOZ_NATIVE_JEMALLOC)
+ AC_SUBST(MOZ_MEMORY)
+ AC_SUBST(MOZ_JEMALLOC)
+ AC_SUBST(MOZ_GLUE_LDFLAGS)
+@@ -8754,7 +8770,7 @@ fi
+
+ # Run jemalloc configure script
+
+-if test "$MOZ_JEMALLOC" -a "$MOZ_MEMORY"; then
++if test -z "$MOZ_NATIVE_JEMALLOC" -a "$MOZ_JEMALLOC" -a "$MOZ_MEMORY" ; then
+ ac_configure_args="$_SUBDIR_CONFIG_ARGS --build=$build --host=$target --enable-stats --with-jemalloc-prefix=je_"
+ if test "$OS_ARCH" = "Linux"; then
+ MANGLE="malloc calloc valloc free realloc memalign posix_memalign malloc_usable_size"
+diff --git memory/build/Makefile.in memory/build/Makefile.in
+index dca0f48..af93ee0 100644
+--- memory/build/Makefile.in
++++ memory/build/Makefile.in
+@@ -22,7 +22,9 @@ CSRCS = extraMallocFuncs.c
+
+ ifdef MOZ_JEMALLOC
+ CSRCS += mozjemalloc_compat.c
++ifndef MOZ_NATIVE_JEMALLOC
+ SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,jemalloc,$(DEPTH)/memory/jemalloc)
++endif
+ else
+ SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,jemalloc,$(DEPTH)/memory/mozjemalloc)
+ endif
+diff --git memory/build/mozjemalloc_compat.c memory/build/mozjemalloc_compat.c
+index 10a845a..57245f6 100644
+--- memory/build/mozjemalloc_compat.c
++++ memory/build/mozjemalloc_compat.c
+@@ -5,7 +5,15 @@
+ #include "mozilla/Types.h"
+ #include "jemalloc_types.h"
+
++#if defined(MALLOC_H)
++#include MALLOC_H /* for mallctl */
++#endif
++
++#if defined(MOZ_NATIVE_JEMALLOC)
++#define je_mallctl mallctl
++#else
+ extern int je_mallctl(const char*, void*, size_t*, void*, size_t);
++#endif
+
+ MOZ_EXPORT_API (void)
+ jemalloc_stats(jemalloc_stats_t *stats)
+diff --git memory/mozalloc/mozalloc.cpp memory/mozalloc/mozalloc.cpp
+index 5b61050b..16bba36 100644
+--- memory/mozalloc/mozalloc.cpp
++++ memory/mozalloc/mozalloc.cpp
+@@ -12,16 +12,13 @@
+ #include <sys/types.h>
+
+ #if defined(MALLOC_H)
+-# include MALLOC_H // for memalign, valloc where available
++# include MALLOC_H // for memalign, valloc, malloc_size, malloc_usable_size
+ #endif // if defined(MALLOC_H)
+ #include <stddef.h> // for size_t
+ #include <stdlib.h> // for malloc, free
+ #if defined(XP_UNIX)
+ # include <unistd.h> // for valloc on *BSD
+ #endif //if defined(XP_UNIX)
+-#if defined(__FreeBSD__)
+-# include <malloc_np.h> // for malloc_usable_size
+-#endif // if defined(__FreeBSD__)
+
+ #if defined(XP_WIN) || (defined(XP_OS2) && defined(__declspec))
+ # define MOZALLOC_EXPORT __declspec(dllexport)
+@@ -213,8 +210,7 @@ moz_malloc_usable_size(void *ptr)
+
+ #if defined(XP_MACOSX)
+ return malloc_size(ptr);
+-#elif defined(MOZ_MEMORY) || (defined(XP_LINUX) && !defined(ANDROID)) || defined(__FreeBSD__)
+- // Android bionic libc doesn't have malloc_usable_size.
++#elif defined(MOZ_MEMORY) || defined(HAVE_MALLOC_USABLE_SIZE)
+ return malloc_usable_size(ptr);
+ #elif defined(XP_WIN)
+ return _msize(ptr);
+diff --git memory/mozjemalloc/jemalloc.h memory/mozjemalloc/jemalloc.h
+index f0e0878..8f78123 100644
+--- memory/mozjemalloc/jemalloc.h
++++ memory/mozjemalloc/jemalloc.h
+@@ -32,8 +32,8 @@
+ #ifndef _JEMALLOC_H_
+ #define _JEMALLOC_H_
+
+-#if defined(MOZ_MEMORY_DARWIN)
+-#include <malloc/malloc.h>
++#if defined(MALLOC_H)
++#include MALLOC_H /* for malloc_good_size and nallocm */
+ #endif
+ #include "jemalloc_types.h"
+
+@@ -51,7 +51,9 @@ void jemalloc_stats(jemalloc_stats_t *stats);
+ #if defined(MOZ_MEMORY_LINUX)
+ __attribute__((weak))
+ #endif
+-#if defined(MOZ_JEMALLOC)
++#if defined(MOZ_NATIVE_JEMALLOC)
++#define je_nallocm nallocm
++#elif defined(MOZ_JEMALLOC)
+ int je_nallocm(size_t *rsize, size_t size, int flags);
+ #else
+ size_t je_malloc_good_size(size_t size);
+diff --git toolkit/library/Makefile.in toolkit/library/Makefile.in
+index 7dbbbc6..0b06ad0 100644
+--- toolkit/library/Makefile.in
++++ toolkit/library/Makefile.in
+@@ -346,6 +346,10 @@ EXTRA_DSO_LDOPTS += \
+ $(SQLITE_LIBS) \
+ $(NULL)
+
++ifdef MOZ_NATIVE_JEMALLOC
++EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,memory,$(DIST)/lib)
++endif
++
+ ifdef MOZ_NATIVE_JPEG
+ EXTRA_DSO_LDOPTS += $(MOZ_JPEG_LIBS)
+ endif
Added: trunk/www/firefox/files/patch-config-baseconfig.mk
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox/files/patch-config-baseconfig.mk Fri Sep 7 12:59:35 2012 (r999)
@@ -0,0 +1,16 @@
+--- config/baseconfig.mk~
++++ config/baseconfig.mk
+@@ -1,9 +1,9 @@
+ INCLUDED_AUTOCONF_MK = 1
+
+-includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++includedir := $(includedir)/%%MOZILLA%%
++idldir = $(datadir)/idl/%%MOZILLA%%
++installdir = $(libdir)/%%MOZILLA%%
++sdkdir = $(libdir)/%%MOZILLA%%
+ DIST = $(DEPTH)/dist
+
+ # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
Deleted: trunk/www/firefox/files/patch-config_autoconf.mk.in
==============================================================================
--- trunk/www/firefox/files/patch-config_autoconf.mk.in Fri Sep 7 12:59:35 2012 (r998)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,21 +0,0 @@
---- config/autoconf.mk.in.orig 2009-04-24 03:46:37.000000000 +0200
-+++ config/autoconf.mk.in 2009-05-11 15:03:26.000000000 +0200
-@@ -57,14 +57,14 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- bindir = @bindir@
--includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+includedir = @includedir@/%%MOZILLA%%
- libdir = @libdir@
- datadir = @datadir@
- mandir = @mandir@
--idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+idldir = $(datadir)/idl/%%MOZILLA%%
-
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+installdir = $(libdir)/%%MOZILLA%%
-+sdkdir = $(libdir)/%%MOZILLA%%
-
- DIST = $(DEPTH)/dist
- LIBXUL_SDK = @LIBXUL_SDK@
Modified: trunk/www/seamonkey/Makefile
==============================================================================
--- trunk/www/seamonkey/Makefile Fri Sep 7 12:59:20 2012 (r998)
+++ trunk/www/seamonkey/Makefile Fri Sep 7 12:59:35 2012 (r999)
@@ -6,7 +6,7 @@
#
PORTNAME= seamonkey
-DISTVERSION= 2.12
+DISTVERSION= 2.13b1
CATEGORIES?= www ipv6
MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED}
MASTER_SITE_SUBDIR= seamonkey/releases/${DISTVERSION}/source
@@ -56,7 +56,7 @@
.include "${.CURDIR}/../../www/firefox/Makefile.options"
.include <bsd.port.pre.mk>
-WRKSRC= ${WRKDIR}/comm-release
+WRKSRC= ${WRKDIR}/comm-beta
MOZSRC:= ${WRKSRC}/mozilla
.if ${ARCH} == amd64
Modified: trunk/www/seamonkey/distinfo
==============================================================================
--- trunk/www/seamonkey/distinfo Fri Sep 7 12:59:20 2012 (r998)
+++ trunk/www/seamonkey/distinfo Fri Sep 7 12:59:35 2012 (r999)
@@ -1,2 +1,2 @@
-SHA256 (seamonkey-2.12.source.tar.bz2) = 04f4d938a77bd651201497a768908ca75c95d44fda8adbc11f40a967f7a9605a
-SIZE (seamonkey-2.12.source.tar.bz2) = 106854466
+SHA256 (seamonkey-2.13b1.source.tar.bz2) = 7469a70c29ea5e7f41cd0ca7638739a53d4aa7dd1b5745e54189a7f35607af81
+SIZE (seamonkey-2.13b1.source.tar.bz2) = 112039009
Modified: trunk/www/seamonkey/files/extra-bug780531
==============================================================================
--- trunk/www/seamonkey/files/extra-bug780531 Fri Sep 7 12:59:20 2012 (r998)
+++ trunk/www/seamonkey/files/extra-bug780531 Fri Sep 7 12:59:35 2012 (r999)
@@ -1,13 +1,12 @@
--- mozilla/configure.in~
+++ mozilla/configure.in
-@@ -5585,10 +5585,13 @@ if test -n "$MOZ_OGG"; then
+@@ -5282,10 +5282,13 @@ if test -n "$MOZ_OGG"; then
MOZ_SYDNEYAUDIO=1
MOZ_CUBEB=1
MOZ_MEDIA=1
- case "$target_cpu" in
-- arm*)
+ case "$target" in
-+ arm-*-linux*)
+ arm*)
MOZ_TREMOR=1
;;
+ *-freebsd*)
@@ -16,14 +15,13 @@
*)
MOZ_VORBIS=1
;;
-@@ -5715,10 +5720,13 @@ if test -n "$MOZ_WEBM" -a -z "$MOZ_NATIV
+@@ -5417,10 +5420,13 @@ if test "$MOZ_WEBM"; then
MOZ_SYDNEYAUDIO=1
MOZ_CUBEB=1
MOZ_MEDIA=1
- case "$target_cpu" in
-- arm*)
+ case "$target" in
-+ arm-*-linux*)
+ arm*)
MOZ_TREMOR=1
;;
+ *-freebsd*)
Deleted: trunk/www/seamonkey/files/patch-bug723860
==============================================================================
--- trunk/www/seamonkey/files/patch-bug723860 Fri Sep 7 12:59:35 2012 (r998)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,54 +0,0 @@
-commit 4e07587
-Author: Matthew Gregan <kinetik@flim.org>
-Date: Wed Jun 6 17:58:07 2012 +1200
-
- Bug 723860 - Early bail from reader's GetBuffered() if not yet initialized. r=doublec
----
- content/media/gstreamer/nsGStreamerReader.cpp | 4 ++++
- content/media/ogg/nsOggReader.cpp | 3 +--
- content/media/wave/nsWaveReader.cpp | 3 +++
- 3 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git mozilla/content/media/gstreamer/nsGStreamerReader.cpp mozilla/content/media/gstreamer/nsGStreamerReader.cpp
-index 164fb2e..06a09b5 100644
---- mozilla/content/media/gstreamer/nsGStreamerReader.cpp
-+++ mozilla/content/media/gstreamer/nsGStreamerReader.cpp
-@@ -505,6 +505,10 @@ nsresult nsGStreamerReader::Seek(PRInt64 aTarget,
- nsresult nsGStreamerReader::GetBuffered(nsTimeRanges* aBuffered,
- PRInt64 aStartTime)
- {
-+ if (!mInfo.mHasVideo && !mInfo.mHasAudio) {
-+ return NS_OK;
-+ }
-+
- GstFormat format = GST_FORMAT_TIME;
- MediaResource* resource = mDecoder->GetResource();
- gint64 resourceLength = resource->GetLength();
-diff --git mozilla/content/media/ogg/nsOggReader.cpp mozilla/content/media/ogg/nsOggReader.cpp
-index c6ff008..8d40e2c 100644
---- mozilla/content/media/ogg/nsOggReader.cpp
-+++ mozilla/content/media/ogg/nsOggReader.cpp
-@@ -1532,8 +1532,7 @@ nsresult nsOggReader::GetBuffered(nsTimeRanges* aBuffered, PRInt64 aStartTime)
- {
- // HasAudio and HasVideo are not used here as they take a lock and cause
- // a deadlock. Accessing mInfo doesn't require a lock - it doesn't change
-- // after metadata is read and GetBuffered isn't called before metadata is
-- // read.
-+ // after metadata is read.
- if (!mInfo.mHasVideo && !mInfo.mHasAudio) {
- // No need to search through the file if there are no audio or video tracks
- return NS_OK;
-diff --git mozilla/content/media/wave/nsWaveReader.cpp mozilla/content/media/wave/nsWaveReader.cpp
-index 7242eb5..60fc1e1 100644
---- mozilla/content/media/wave/nsWaveReader.cpp
-+++ mozilla/content/media/wave/nsWaveReader.cpp
-@@ -239,6 +239,9 @@ static double RoundToUsecs(double aSeconds) {
-
- nsresult nsWaveReader::GetBuffered(nsTimeRanges* aBuffered, PRInt64 aStartTime)
- {
-+ if (!mInfo.mHasAudio) {
-+ return NS_OK;
-+ }
- PRInt64 startOffset = mDecoder->GetResource()->GetNextCachedData(mWavePCMOffset);
- while (startOffset >= 0) {
- PRInt64 endOffset = mDecoder->GetResource()->GetCachedDataEnd(startOffset);
Modified: trunk/www/seamonkey/files/patch-bug753046
==============================================================================
--- trunk/www/seamonkey/files/patch-bug753046 Fri Sep 7 12:59:20 2012 (r998)
+++ trunk/www/seamonkey/files/patch-bug753046 Fri Sep 7 12:59:35 2012 (r999)
@@ -978,57 +978,6 @@
#else
long pages = sysconf(_SC_PHYS_PAGES);
long page_size = sysconf(_SC_PAGE_SIZE);
-$NetBSD: patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h,v 1.2 2012/03/06 12:34:09 ryoon Exp $
-
---- mozilla/ipc/chromium/src/base/third_party/nspr/prcpucfg.h.orig 2011-12-20 23:28:19.000000000 +0000
-+++ mozilla/ipc/chromium/src/base/third_party/nspr/prcpucfg.h
-@@ -34,7 +34,7 @@
- #include "base/third_party/nspr/prcpucfg_win.h"
- #elif defined(__APPLE__)
- #include "base/third_party/nspr/prcpucfg_mac.h"
--#elif defined(__linux__) || defined(ANDROID)
-+#elif defined(__linux__) || defined(ANDROID) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
- #include "base/third_party/nspr/prcpucfg_linux.h"
- #elif defined(__OpenBSD__)
- #include "base/third_party/nspr/prcpucfg_openbsd.h"
-$NetBSD: patch-ipc_chromium_src_base_third__party_nspr_prtime.cc,v 1.1 2012/03/06 12:34:09 ryoon Exp $
-
---- mozilla/ipc/chromium/src/base/third_party/nspr/prtime.cc.orig 2011-12-20 23:28:19.000000000 +0000
-+++ mozilla/ipc/chromium/src/base/third_party/nspr/prtime.cc
-@@ -212,7 +212,7 @@ PR_ImplodeTime(const PRExplodedTime *exp
- LL_ADD(retVal, retVal, temp);
-
- return retVal;
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_DRAGONFLY)
- struct tm exp_tm = {0};
- exp_tm.tm_sec = exploded->tm_sec;
- exp_tm.tm_min = exploded->tm_min;
-@@ -245,6 +245,24 @@ PR_ImplodeTime(const PRExplodedTime *exp
- result *= kSecondsToMicroseconds;
- result += exploded->tm_usec;
- return result;
-+#elif defined(OS_FREEBSD) || defined(OS_NETBSD)
-+ struct tm exp_tm = {0};
-+ exp_tm.tm_sec = exploded->tm_sec;
-+ exp_tm.tm_min = exploded->tm_min;
-+ exp_tm.tm_hour = exploded->tm_hour;
-+ exp_tm.tm_mday = exploded->tm_mday;
-+ exp_tm.tm_mon = exploded->tm_month;
-+ exp_tm.tm_year = exploded->tm_year - 1900;
-+
-+ // time_t is 64bit
-+ time_t absolute_time = timegm(&exp_tm);
-+
-+ PRTime result = static_cast<PRTime>(absolute_time);
-+ result -= exploded->tm_params.tp_gmt_offset +
-+ exploded->tm_params.tp_dst_offset;
-+ result *= kSecondsToMicroseconds;
-+ result += exploded->tm_usec;
-+ return result;
- #else
- #error No PR_ImplodeTime implemented on your platform.
- #endif
diff --git ipc/chromium/src/base/time_posix.cc ipc/chromium/src/base/time_posix.cc
index abf2a56..48791f6 100644
--- mozilla/ipc/chromium/src/base/time_posix.cc
Deleted: trunk/www/seamonkey/files/patch-bug759459
==============================================================================
--- trunk/www/seamonkey/files/patch-bug759459 Fri Sep 7 12:59:35 2012 (r998)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,24 +0,0 @@
-commit 4d0c5b9
-Author: Marco Perez <bugmail@millibyte.net>
-Date: Sat Jun 9 12:24:56 2012 -0400
-
- Bug 759459 - Build broken on FreeBSD since patch for bug 745034 landed. r=terrence
----
- js/src/gc/Memory.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git js/src/gc/Memory.cpp js/src/gc/Memory.cpp
-index 815e90b..10c1a91 100644
---- mozilla/js/src/gc/Memory.cpp
-+++ mozilla/js/src/gc/Memory.cpp
-@@ -292,9 +292,9 @@ GetPageFaultCount()
- #elif defined(XP_UNIX) || defined(XP_MACOSX) || defined(DARWIN)
-
- #include <sys/mman.h>
--#include <unistd.h>
- #include <sys/time.h>
- #include <sys/resource.h>
-+#include <unistd.h>
-
- void
- InitMemorySubsystem()
Deleted: trunk/www/seamonkey/files/patch-bug760899
==============================================================================
--- trunk/www/seamonkey/files/patch-bug760899 Fri Sep 7 12:59:35 2012 (r998)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,54 +0,0 @@
-commit 667daed
-Author: Stephen Moehle <stephen.moehle@gmail.com>
-Date: Tue Jun 5 11:32:36 2012 +1200
-
- Bug 760899 - Fix debug builds with gstreamer enabled - r=kinetik
-
- --HG--
- extra : rebase_source : 22598bc470d35d94991ea9f1b14df11ba19a461a
----
- content/media/gstreamer/nsGStreamerReader.cpp | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git content/media/gstreamer/nsGStreamerReader.cpp content/media/gstreamer/nsGStreamerReader.cpp
-index 6a50e09..164fb2e 100644
---- mozilla/content/media/gstreamer/nsGStreamerReader.cpp
-+++ mozilla/content/media/gstreamer/nsGStreamerReader.cpp
-@@ -278,7 +278,7 @@ nsresult nsGStreamerReader::ReadMetadata(nsVideoInfo* aInfo)
- if (gst_element_query_duration(GST_ELEMENT(mPlayBin),
- &format, &duration) && format == GST_FORMAT_TIME) {
- ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor());
-- LOG(PR_LOG_DEBUG, ("returning duration %"GST_TIME_FORMAT,
-+ LOG(PR_LOG_DEBUG, ("returning duration %" GST_TIME_FORMAT,
- GST_TIME_ARGS (duration)));
- duration = GST_TIME_AS_USECONDS (duration);
- mDecoder->GetStateMachine()->SetDuration(duration);
-@@ -422,8 +422,8 @@ bool nsGStreamerReader::DecodeVideoFrame(bool &aKeyFrameSkip,
- nextTimestamp += gst_util_uint64_scale(GST_USECOND, fpsNum, fpsDen);
-
- if (timestamp < aTimeThreshold) {
-- LOG(PR_LOG_DEBUG, ("skipping frame %"GST_TIME_FORMAT
-- " threshold %"GST_TIME_FORMAT,
-+ LOG(PR_LOG_DEBUG, ("skipping frame %" GST_TIME_FORMAT
-+ " threshold %" GST_TIME_FORMAT,
- GST_TIME_ARGS(timestamp), GST_TIME_ARGS(aTimeThreshold)));
- gst_buffer_unref(buffer);
- buffer = NULL;
-@@ -489,7 +489,7 @@ nsresult nsGStreamerReader::Seek(PRInt64 aTarget,
- NS_ASSERTION(mDecoder->OnDecodeThread(), "Should be on decode thread.");
-
- gint64 seekPos = aTarget * GST_USECOND;
-- LOG(PR_LOG_DEBUG, ("%p About to seek to %"GST_TIME_FORMAT,
-+ LOG(PR_LOG_DEBUG, ("%p About to seek to %" GST_TIME_FORMAT,
- mDecoder, GST_TIME_ARGS(seekPos)));
-
- if (!gst_element_seek_simple(mPlayBin, GST_FORMAT_TIME,
-@@ -592,7 +592,7 @@ PRInt64 nsGStreamerReader::QueryDuration()
- if (gst_element_query_duration(GST_ELEMENT(mPlayBin),
- &format, &duration)) {
- if (format == GST_FORMAT_TIME) {
-- LOG(PR_LOG_DEBUG, ("pipeline duration %"GST_TIME_FORMAT,
-+ LOG(PR_LOG_DEBUG, ("pipeline duration %" GST_TIME_FORMAT,
- GST_TIME_ARGS (duration)));
- duration = GST_TIME_AS_USECONDS (duration);
- }
Deleted: trunk/www/seamonkey/files/patch-bug761030
==============================================================================
--- trunk/www/seamonkey/files/patch-bug761030 Fri Sep 7 12:59:35 2012 (r998)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,25 +0,0 @@
-commit 8bc9e15
-Author: Stephen Moehle <stephen.moehle@gmail.com>
-Date: Tue Jun 5 11:31:13 2012 +1200
-
- Bug 761030 - Fix crash with HTML 5 video with GStreamer enabled - r=kinetik
-
- --HG--
- extra : rebase_source : 5e884550f9870bd2fda247d50bebd472e8368588
----
- content/media/gstreamer/nsGStreamerReader.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git mozilla/content/media/gstreamer/nsGStreamerReader.cpp mozilla/content/media/gstreamer/nsGStreamerReader.cpp
-index 17374a3..6a50e09 100644
---- mozilla/content/media/gstreamer/nsGStreamerReader.cpp
-+++ mozilla/content/media/gstreamer/nsGStreamerReader.cpp
-@@ -452,6 +452,8 @@ bool nsGStreamerReader::DecodeVideoFrame(bool &aKeyFrameSkip,
- i, height);
- b.mPlanes[i].mWidth = gst_video_format_get_component_width(format,
- i, width);
-+ b.mPlanes[i].mOffset = 0;
-+ b.mPlanes[i].mSkip = 0;
- }
-
- bool isKeyframe = !GST_BUFFER_FLAG_IS_SET(buffer,
Deleted: trunk/www/seamonkey/files/patch-bug761419
==============================================================================
--- trunk/www/seamonkey/files/patch-bug761419 Fri Sep 7 12:59:35 2012 (r998)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,22 +0,0 @@
-commit f0a73aa
-Author: Paul Adenot <paul@paul.cx>
-Date: Thu Jun 21 20:44:39 2012 -0400
-
- Bug 761419 - Build failure in content/media/gstreamer/nsGStreamerReader.cpp when using clang r=kinetik
----
- content/media/gstreamer/nsGStreamerReader.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git content/media/gstreamer/nsGStreamerReader.cpp content/media/gstreamer/nsGStreamerReader.cpp
-index 06a09b5..c48f92e 100644
---- mozilla/content/media/gstreamer/nsGStreamerReader.cpp
-+++ mozilla/content/media/gstreamer/nsGStreamerReader.cpp
-@@ -191,7 +191,7 @@ nsresult nsGStreamerReader::ReadMetadata(nsVideoInfo* aInfo)
- * stream but that are otherwise decodeable.
- */
- guint flags[3] = {GST_PLAY_FLAG_VIDEO|GST_PLAY_FLAG_AUDIO,
-- ~GST_PLAY_FLAG_AUDIO, ~GST_PLAY_FLAG_VIDEO};
-+ static_cast<guint>(~GST_PLAY_FLAG_AUDIO), static_cast<guint>(~GST_PLAY_FLAG_VIDEO)};
- guint default_flags, current_flags;
- g_object_get(mPlayBin, "flags", &default_flags, NULL);
-
Modified: trunk/www/seamonkey/files/patch-bug778056
==============================================================================
--- trunk/www/seamonkey/files/patch-bug778056 Fri Sep 7 12:59:20 2012 (r998)
+++ trunk/www/seamonkey/files/patch-bug778056 Fri Sep 7 12:59:35 2012 (r999)
@@ -4,9 +4,9 @@
#if defined(XP_UNIX)
# include <unistd.h> // for valloc on *BSD
#endif //if defined(XP_UNIX)
-+#ifdef __FreeBSD__
++#if defined(__FreeBSD__)
+# include <malloc_np.h> // for malloc_usable_size
-+#endif
++#endif // if defined(__FreeBSD__)
#if defined(XP_WIN) || (defined(XP_OS2) && defined(__declspec))
# define MOZALLOC_EXPORT __declspec(dllexport)
Modified: trunk/www/seamonkey/files/patch-bug778078
==============================================================================
--- trunk/www/seamonkey/files/patch-bug778078 Fri Sep 7 12:59:20 2012 (r998)
+++ trunk/www/seamonkey/files/patch-bug778078 Fri Sep 7 12:59:35 2012 (r999)
@@ -1,9 +1,9 @@
--- mozilla/toolkit/xre/nsAppRunner.cpp~
+++ mozilla/toolkit/xre/nsAppRunner.cpp
-@@ -3819,7 +3819,7 @@ XREMain::XRE_main(int argc, char* argv[]
+@@ -3833,7 +3833,7 @@ XREMain::XRE_main(int argc, char* argv[]
ScopedLogging log;
- #if defined(MOZ_WIDGET_GTK2)
+ #if defined(MOZ_WIDGET_GTK)
-#ifdef MOZ_MEMORY
+#if defined(MOZ_MEMORY) || defined(__FreeBSD__) || defined(__NetBSD__)
// Disable the slice allocator, since jemalloc already uses similar layout
Modified: trunk/www/seamonkey/files/patch-bug784776
==============================================================================
--- trunk/www/seamonkey/files/patch-bug784776 Fri Sep 7 12:59:20 2012 (r998)
+++ trunk/www/seamonkey/files/patch-bug784776 Fri Sep 7 12:59:35 2012 (r999)
@@ -1,20 +1,3 @@
---- mozilla/content/media/MediaEngineDefault.cpp~
-+++ mozilla/content/media/MediaEngineDefault.cpp
-@@ -232,12 +232,12 @@ nsresult
- MediaEngineDefaultAudioSource::Start(SourceMediaStream* aStream, TrackID aID)
- {
- if (mState != kAllocated) {
-- return NULL;
-+ return 0;
- }
-
- mTimer = do_CreateInstance(NS_TIMER_CONTRACTID);
- if (!mTimer) {
-- return NULL;
-+ return 0;
- }
-
- mSource = aStream;
--- mozilla/gfx/layers/opengl/ImageLayerOGL.cpp~
+++ mozilla/gfx/layers/opengl/ImageLayerOGL.cpp
@@ -936,7 +936,7 @@ ShadowImageLayerOGL::CleanupResources()
Added: trunk/www/seamonkey/files/patch-bug788955
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/seamonkey/files/patch-bug788955 Fri Sep 7 12:59:35 2012 (r999)
@@ -0,0 +1,205 @@
+diff --git Makefile.in Makefile.in
+index e341462..26d19ad 100644
+--- mozilla/Makefile.in
++++ mozilla/Makefile.in
+@@ -47,7 +47,7 @@ endif
+
+ ifdef MOZ_MEMORY
+ tier_base_dirs += memory/mozjemalloc
+-ifdef MOZ_JEMALLOC
++ifeq (1_,$(MOZ_JEMALLOC)_$(MOZ_NATIVE_JEMALLOC))
+ tier_base_dirs += memory/jemalloc
+ endif
+ tier_base_dirs += memory/build
+--- mozilla/config/autoconf.mk.in
++++ mozilla/config/autoconf.mk.in
+@@ -74,6 +74,7 @@ MOZ_JSDEBUGGER = @MOZ_JSDEBUGGER@
+ MOZ_IPDL_TESTS = @MOZ_IPDL_TESTS@
+ MOZ_MEMORY = @MOZ_MEMORY@
+ MOZ_JEMALLOC = @MOZ_JEMALLOC@
++MOZ_NATIVE_JEMALLOC = @MOZ_NATIVE_JEMALLOC@
+ MOZ_PROFILING = @MOZ_PROFILING@
+ MOZ_ENABLE_PROFILER_SPS = @MOZ_ENABLE_PROFILER_SPS@
+ MOZ_JPROF = @MOZ_JPROF@
+diff --git configure.in configure.in
+index 4070d8c..3b39473 100644
+--- mozilla/configure.in
++++ mozilla/configure.in
+@@ -3670,21 +3670,22 @@ fi
+
+ dnl Check for the existence of various allocation headers/functions
+
++MALLOC_HEADERS="malloc.h malloc_np.h malloc/malloc.h sys/malloc.h"
+ MALLOC_H=
+-MOZ_CHECK_HEADER(malloc.h, [MALLOC_H=malloc.h])
+-if test "$MALLOC_H" = ""; then
+- MOZ_CHECK_HEADER(malloc/malloc.h, [MALLOC_H=malloc/malloc.h])
+- if test "$MALLOC_H" = ""; then
+- MOZ_CHECK_HEADER(sys/malloc.h, [MALLOC_H=sys/malloc.h])
++
++for file in $MALLOC_HEADERS; do
++ MOZ_CHECK_HEADER($file, [MALLOC_H=$file])
++ if test "$MALLOC_H" != ""; then
++ AC_DEFINE_UNQUOTED(MALLOC_H, <$MALLOC_H>)
++ break
+ fi
+-fi
+-if test "$MALLOC_H" != ""; then
+- AC_DEFINE_UNQUOTED(MALLOC_H, <$MALLOC_H>)
+-fi
++done
+
+ MOZ_ALLOCATING_FUNCS="strndup posix_memalign memalign valloc"
+ AC_CHECK_FUNCS(strndup posix_memalign memalign valloc)
+
++AC_CHECK_FUNCS(malloc_usable_size)
++
+ dnl See if compiler supports some gcc-style attributes
+
+ AC_CACHE_CHECK(for __attribute__((always_inline)),
+@@ -6902,7 +6903,21 @@ if test -z "$MOZ_MEMORY"; then
+ AC_MSG_WARN([When not building jemalloc, you need to set WIN32_REDIST_DIR to the path to the Visual C++ Redist (usually VCINSTALLDIR\redist\x86\Microsoft.VC80.CRT, for VC++ v8) if you intend to distribute your build.])
+ fi
+ ;;
++ *-freebsd*)
++ MOZ_JEMALLOC=1
++ ;;
+ esac
++
++ if test -n "$MOZ_JEMALLOC"; then
++ AC_CHECK_FUNCS(mallctl nallocm,
++ [MOZ_NATIVE_JEMALLOC=1 MOZ_MEMORY=1],
++ [MOZ_NATIVE_JEMALLOC= MOZ_MEMORY=])
++ fi
++ if test -n "$MOZ_NATIVE_JEMALLOC"; then
++ AC_DEFINE(MOZ_NATIVE_JEMALLOC)
++ AC_DEFINE(MOZ_MEMORY)
++ AC_DEFINE(MOZ_JEMALLOC)
++ fi
+ else
+ dnl Don't try to run compiler tests on Windows
+ if test "$OS_ARCH" = "WINNT"; then
+@@ -6988,6 +7003,7 @@ else
+ ;;
+ esac
+ fi # MOZ_MEMORY
++AC_SUBST(MOZ_NATIVE_JEMALLOC)
+ AC_SUBST(MOZ_MEMORY)
+ AC_SUBST(MOZ_JEMALLOC)
+ AC_SUBST(MOZ_GLUE_LDFLAGS)
+@@ -8754,7 +8770,7 @@ fi
+
+ # Run jemalloc configure script
+
+-if test "$MOZ_JEMALLOC" -a "$MOZ_MEMORY"; then
++if test -z "$MOZ_NATIVE_JEMALLOC" -a "$MOZ_JEMALLOC" -a "$MOZ_MEMORY" ; then
+ ac_configure_args="$_SUBDIR_CONFIG_ARGS --build=$build --host=$target --enable-stats --with-jemalloc-prefix=je_"
+ if test "$OS_ARCH" = "Linux"; then
+ MANGLE="malloc calloc valloc free realloc memalign posix_memalign malloc_usable_size"
+diff --git memory/build/Makefile.in memory/build/Makefile.in
+index dca0f48..af93ee0 100644
+--- mozilla/memory/build/Makefile.in
++++ mozilla/memory/build/Makefile.in
+@@ -22,7 +22,9 @@ CSRCS = extraMallocFuncs.c
+
+ ifdef MOZ_JEMALLOC
+ CSRCS += mozjemalloc_compat.c
++ifndef MOZ_NATIVE_JEMALLOC
+ SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,jemalloc,$(DEPTH)/memory/jemalloc)
++endif
+ else
+ SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,jemalloc,$(DEPTH)/memory/mozjemalloc)
+ endif
+diff --git memory/build/mozjemalloc_compat.c memory/build/mozjemalloc_compat.c
+index 10a845a..57245f6 100644
+--- mozilla/memory/build/mozjemalloc_compat.c
++++ mozilla/memory/build/mozjemalloc_compat.c
+@@ -5,7 +5,15 @@
+ #include "mozilla/Types.h"
+ #include "jemalloc_types.h"
+
++#if defined(MALLOC_H)
++#include MALLOC_H /* for mallctl */
++#endif
++
++#if defined(MOZ_NATIVE_JEMALLOC)
++#define je_mallctl mallctl
++#else
+ extern int je_mallctl(const char*, void*, size_t*, void*, size_t);
++#endif
+
+ MOZ_EXPORT_API (void)
+ jemalloc_stats(jemalloc_stats_t *stats)
+diff --git memory/mozalloc/mozalloc.cpp memory/mozalloc/mozalloc.cpp
+index 5b61050b..16bba36 100644
+--- mozilla/memory/mozalloc/mozalloc.cpp
++++ mozilla/memory/mozalloc/mozalloc.cpp
+@@ -12,16 +12,13 @@
+ #include <sys/types.h>
+
+ #if defined(MALLOC_H)
+-# include MALLOC_H // for memalign, valloc where available
++# include MALLOC_H // for memalign, valloc, malloc_size, malloc_usable_size
+ #endif // if defined(MALLOC_H)
+ #include <stddef.h> // for size_t
+ #include <stdlib.h> // for malloc, free
+ #if defined(XP_UNIX)
+ # include <unistd.h> // for valloc on *BSD
+ #endif //if defined(XP_UNIX)
+-#if defined(__FreeBSD__)
+-# include <malloc_np.h> // for malloc_usable_size
+-#endif // if defined(__FreeBSD__)
+
+ #if defined(XP_WIN) || (defined(XP_OS2) && defined(__declspec))
+ # define MOZALLOC_EXPORT __declspec(dllexport)
+@@ -213,8 +210,7 @@ moz_malloc_usable_size(void *ptr)
+
+ #if defined(XP_MACOSX)
+ return malloc_size(ptr);
+-#elif defined(MOZ_MEMORY) || (defined(XP_LINUX) && !defined(ANDROID)) || defined(__FreeBSD__)
+- // Android bionic libc doesn't have malloc_usable_size.
++#elif defined(MOZ_MEMORY) || defined(HAVE_MALLOC_USABLE_SIZE)
+ return malloc_usable_size(ptr);
+ #elif defined(XP_WIN)
+ return _msize(ptr);
+diff --git memory/mozjemalloc/jemalloc.h memory/mozjemalloc/jemalloc.h
+index f0e0878..8f78123 100644
+--- mozilla/memory/mozjemalloc/jemalloc.h
++++ mozilla/memory/mozjemalloc/jemalloc.h
+@@ -32,8 +32,8 @@
+ #ifndef _JEMALLOC_H_
+ #define _JEMALLOC_H_
+
+-#if defined(MOZ_MEMORY_DARWIN)
+-#include <malloc/malloc.h>
++#if defined(MALLOC_H)
++#include MALLOC_H /* for malloc_good_size and nallocm */
+ #endif
+ #include "jemalloc_types.h"
+
+@@ -51,7 +51,9 @@ void jemalloc_stats(jemalloc_stats_t *stats);
+ #if defined(MOZ_MEMORY_LINUX)
+ __attribute__((weak))
+ #endif
+-#if defined(MOZ_JEMALLOC)
++#if defined(MOZ_NATIVE_JEMALLOC)
++#define je_nallocm nallocm
++#elif defined(MOZ_JEMALLOC)
+ int je_nallocm(size_t *rsize, size_t size, int flags);
+ #else
+ size_t je_malloc_good_size(size_t size);
+diff --git toolkit/library/Makefile.in toolkit/library/Makefile.in
+index 7dbbbc6..0b06ad0 100644
+--- mozilla/toolkit/library/Makefile.in
++++ mozilla/toolkit/library/Makefile.in
+@@ -346,6 +346,10 @@ EXTRA_DSO_LDOPTS += \
+ $(SQLITE_LIBS) \
+ $(NULL)
+
++ifdef MOZ_NATIVE_JEMALLOC
++EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,memory,$(DIST)/lib)
++endif
++
+ ifdef MOZ_NATIVE_JPEG
+ EXTRA_DSO_LDOPTS += $(MOZ_JPEG_LIBS)
+ endif
Copied and modified: trunk/www/seamonkey/files/patch-config-autoconf.mk.in (from r998, trunk/www/firefox/files/patch-config_autoconf.mk.in)
==============================================================================
Added: trunk/www/seamonkey/files/patch-config-baseconfig.mk
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/seamonkey/files/patch-config-baseconfig.mk Fri Sep 7 12:59:35 2012 (r999)
@@ -0,0 +1,16 @@
+--- mozilla/config/baseconfig.mk~
++++ mozilla/config/baseconfig.mk
+@@ -1,9 +1,9 @@
+ INCLUDED_AUTOCONF_MK = 1
+
+-includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++includedir := $(includedir)/%%MOZILLA%%
++idldir = $(datadir)/idl/%%MOZILLA%%
++installdir = $(libdir)/%%MOZILLA%%
++sdkdir = $(libdir)/%%MOZILLA%%
+ DIST = $(DEPTH)/dist
+
+ # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
Deleted: trunk/www/seamonkey/files/patch-config_autoconf.mk.in
==============================================================================
--- trunk/www/seamonkey/files/patch-config_autoconf.mk.in Fri Sep 7 12:59:35 2012 (r998)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,21 +0,0 @@
---- config/autoconf.mk.in.orig 2011-08-17 10:26:35.000000000 +0200
-+++ config/autoconf.mk.in 2011-08-17 10:27:16.000000000 +0200
-@@ -60,14 +60,14 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- bindir = @bindir@
--includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+includedir = @includedir@/%%MOZILLA%%
- libdir = @libdir@
- datadir = @datadir@
- mandir = @mandir@
--idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+idldir = $(datadir)/idl/%%MOZILLA%%
-
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+installdir = $(libdir)/%%MOZILLA%%
-+sdkdir = $(libdir)/%%MOZILLA%%
-
- MOZDEPTH = $(DEPTH)/mozilla
- DIST = $(MOZDEPTH)/dist
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209071259.q87CxZb7063494>