Date: Sun, 8 Jul 2012 12:46:45 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r858 - in branches/experimental: mail/thunderbird mail/thunderbird/files www/firefox www/firefox/files www/seamonkey www/seamonkey/files Message-ID: <201207081246.q68Ckj69037450@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Sun Jul 8 12:46:45 2012
New Revision: 858
Log:
start preparing for the next release a week before
Added:
branches/experimental/mail/thunderbird/files/patch-mozilla-content-media-gstreamer-nsGStreamerReader.cpp
branches/experimental/www/firefox/files/patch-content-media-gstreamer-nsGStreamerReader.cpp
branches/experimental/www/seamonkey/files/patch-mozilla-content-media-gstreamer-nsGStreamerReader.cpp
Deleted:
branches/experimental/mail/thunderbird/files/patch-bug741737
branches/experimental/www/firefox/files/patch-bug741737
branches/experimental/www/seamonkey/files/patch-bug741737
Modified:
branches/experimental/mail/thunderbird/Makefile
branches/experimental/mail/thunderbird/distinfo
branches/experimental/mail/thunderbird/files/patch-alsapulse
branches/experimental/mail/thunderbird/files/patch-mozilla-js-src-jsnum.cpp
branches/experimental/mail/thunderbird/files/patch-mozilla-layout-generic-Makefile.in
branches/experimental/mail/thunderbird/files/patch-mozilla-memory-mozalloc-mozalloc.cpp
branches/experimental/mail/thunderbird/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp
branches/experimental/www/firefox/Makefile
branches/experimental/www/firefox/distinfo
branches/experimental/www/firefox/files/patch-alsapulse
branches/experimental/www/firefox/files/patch-js_src_jsnum.cpp
branches/experimental/www/firefox/files/patch-layout_generic_Makefile.in
branches/experimental/www/firefox/files/patch-memory-mozalloc-mozalloc.cpp
branches/experimental/www/firefox/files/patch-toolkit-xre-nsAppRunner.cpp
branches/experimental/www/seamonkey/Makefile
branches/experimental/www/seamonkey/distinfo
branches/experimental/www/seamonkey/files/patch-alsapulse
branches/experimental/www/seamonkey/files/patch-mozilla-memory-mozalloc-mozalloc.cpp
branches/experimental/www/seamonkey/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp
Modified: branches/experimental/mail/thunderbird/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird/Makefile Sun Jul 8 12:46:33 2012 (r857)
+++ branches/experimental/mail/thunderbird/Makefile Sun Jul 8 12:46:45 2012 (r858)
@@ -6,7 +6,7 @@
#
PORTNAME= thunderbird
-DISTVERSION= 13.0.1
+DISTVERSION= 14.0b4
CATEGORIES= mail ipv6
MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source
@@ -17,7 +17,7 @@
BUILD_DEPENDS= nspr>=4.9:${PORTSDIR}/devel/nspr \
nss>=3.13.2:${PORTSDIR}/security/nss \
- sqlite3>=3.7.10:${PORTSDIR}/databases/sqlite3 \
+ sqlite3>=3.7.11:${PORTSDIR}/databases/sqlite3 \
cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \
unzip:${PORTSDIR}/archivers/unzip
LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo
@@ -57,11 +57,11 @@
MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome
OPTIONS_DEFAULT=DBUS GTK2 LOGGING OSS
-OPTIONS_DEFINE= LIGHTNING
+OPTIONS_DEFINE= GSTREAMER LIGHTNING
.include <bsd.port.pre.mk>
-WRKSRC= ${WRKDIR}/comm-release
+WRKSRC= ${WRKDIR}/comm-beta
MOZSRC:= ${WRKSRC}/mozilla
.if ${ARCH} == amd64
Modified: branches/experimental/mail/thunderbird/distinfo
==============================================================================
--- branches/experimental/mail/thunderbird/distinfo Sun Jul 8 12:46:33 2012 (r857)
+++ branches/experimental/mail/thunderbird/distinfo Sun Jul 8 12:46:45 2012 (r858)
@@ -1,2 +1,2 @@
-SHA256 (thunderbird-13.0.1.source.tar.bz2) = 5696620746cf440c327aeedea428d24d513603a651a4edda02ae0072036ac434
-SIZE (thunderbird-13.0.1.source.tar.bz2) = 102705807
+SHA256 (thunderbird-14.0b4.source.tar.bz2) = b1868a1709d18ca899f73db157d245553d4e750ca2fd7143a889e6b51a3aec04
+SIZE (thunderbird-14.0b4.source.tar.bz2) = 105439671
Modified: branches/experimental/mail/thunderbird/files/patch-alsapulse
==============================================================================
--- branches/experimental/mail/thunderbird/files/patch-alsapulse Sun Jul 8 12:46:33 2012 (r857)
+++ branches/experimental/mail/thunderbird/files/patch-alsapulse Sun Jul 8 12:46:45 2012 (r858)
@@ -1,12 +1,12 @@
--- mozilla/config/autoconf.mk.in~
+++ mozilla/config/autoconf.mk.in
-@@ -568,7 +568,13 @@ MOZ_LIBNOTIFY_CFLAGS = @MOZ_LIBNOTIFY_CF
+@@ -568,8 +568,13 @@ MOZ_LIBNOTIFY_CFLAGS = @MOZ_LIBNOTIFY_CF
MOZ_LIBNOTIFY_LIBS = @MOZ_LIBNOTIFY_LIBS@
MOZ_ENABLE_LIBNOTIFY = @MOZ_ENABLE_LIBNOTIFY@
+MOZ_ALSA = @MOZ_ALSA@
MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS@
-+MOZ_ALSA_CFLAGS = @MOZ_ALSA_CFLAGS@
+ MOZ_ALSA_CFLAGS = @MOZ_ALSA_CFLAGS@
+
+MOZ_PULSEAUDIO = @MOZ_PULSEAUDIO@
+MOZ_PULSEAUDIO_LIBS = @MOZ_PULSEAUDIO_LIBS@
@@ -16,7 +16,7 @@
GLIB_LIBS = @GLIB_LIBS@
--- mozilla/configure.in~
+++ mozilla/configure.in
-@@ -5758,17 +5775,48 @@ dnl ====================================
+@@ -5758,17 +5775,47 @@ dnl ====================================
dnl = Check alsa availability on Linux if using sydneyaudio
dnl ========================================================
@@ -43,7 +43,6 @@
- esac
fi
-+AC_SUBST(MOZ_ALSA_CFLAGS)
+AC_SUBST(MOZ_ALSA)
+
+dnl ========================================================
Deleted: branches/experimental/mail/thunderbird/files/patch-bug741737
==============================================================================
--- branches/experimental/mail/thunderbird/files/patch-bug741737 Sun Jul 8 12:46:45 2012 (r857)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,93 +0,0 @@
-changeset: 91900:eee73897136b
-user: Martin Stransky <stransky@redhat.com>
-date: Tue Apr 17 19:57:40 2012 -0400
-summary: Bug 741737 - Configure libvpx with pkgconfig. r=khuey, a=npotb
-
-diff --git a/configure.in b/configure.in
---- mozilla/configure.in
-+++ mozilla/configure.in
-@@ -5591,12 +5591,10 @@ MOZ_ARG_DISABLE_BOOL(webm,
-
- dnl system libvpx Support
- dnl ========================================================
--MOZ_ARG_WITH_STRING(system-libvpx,
--[ --with-system-libvpx=[PFX]
-- Use system libvpx [installed at prefix PFX]],
-- LIBVPX_DIR=$withval)
--
--MOZ_NATIVE_LIBVPX=
-+MOZ_ARG_WITH_BOOL(system-libvpx,
-+[ --with-system-libvpx Use system libvpx (located with pkgconfig)],
-+ MOZ_NATIVE_LIBVPX=1)
-+
- MOZ_LIBVPX_INCLUDES=
- MOZ_LIBVPX_LIBS=
-
-@@ -5609,54 +5607,18 @@ if test -n "$MOZ_WEBM"; then
- AC_DEFINE(MOZ_VP8_ENCODER)
- fi
-
-- if test -n "$LIBVPX_DIR" -a "$LIBVPX_DIR" != no; then
-- _SAVE_CFLAGS=$CFLAGS
-- _SAVE_LDFLAGS=$LDFLAGS
-- _SAVE_LIBS=$LIBS
-- if test "${LIBVPX_DIR}" = "yes"; then
-- LIBVPX_DIR=/usr
-- fi
-- CFLAGS="-I${LIBVPX_DIR}/include $CFLAGS"
-- LDFLAGS="-L${LIBVPX_DIR}/lib $LDFLAGS"
-- MOZ_NATIVE_LIBVPX_DEC_TEST=
-- MOZ_CHECK_HEADER(vpx/vpx_decoder.h,
-- [if test ! -f "${LIBVPX_DIR}/include/vpx/vpx_decoder.h"; then
-- AC_MSG_ERROR([vpx/vpx_decoder.h found, but is not in ${LIBVPX_DIR}/include])
-- fi],
-- AC_MSG_ERROR([--with-system-libvpx requested but vpx/vpx_decoder.h not found]))
-- AC_CHECK_LIB(vpx, vpx_codec_dec_init_ver,
-- [MOZ_NATIVE_LIBVPX_DEC_TEST=1],
-- ([--with-system-libvpx requested but symbol vpx_codec_dec_init_ver not found]))
-- if test -n "$MOZ_NATIVE_LIBVPX_DEC_TEST" ; then
-- AC_MSG_CHECKING([for libvpx version >= v1.0.0])
-- dnl We need at least v1.0.0 to fix several crash bugs (for which we
-- dnl had local patches prior to v1.0.0).
-- dnl
-- dnl This is a terrible test for the library version, but we don't
-- dnl have a good one. There is no version number in a public header,
-- dnl and testing the headers still doesn't guarantee we link against
-- dnl the right version. While we could call vpx_codec_version() at
-- dnl run-time, that would break cross-compiling. There are no
-- dnl additional exported decoder symbols between the v1.0.0 release
-- dnl and the v0.9.7 one to check for.
-- AC_TRY_COMPILE([
-- #include <vpx/vpx_decoder.h>
-- #if !defined(VPX_CODEC_USE_INPUT_FRAGMENTS)
-- #error "test failed."
-- #endif
-- ],
-- [return 0;],
-- [AC_MSG_RESULT([yes])
-- MOZ_NATIVE_LIBVPX=1
-- AC_DEFINE(MOZ_NATIVE_LIBVPX)
-- MOZ_LIBVPX_INCLUDES="-I${LIBVPX_DIR}/include"
-- MOZ_LIBVPX_LIBS="-L${LIBVPX_DIR}/lib -lvpx"],
-- [AC_MSG_RESULT([no])
-- AC_MSG_ERROR([--with-system-libvpx requested but it is not v1.0.0 or later])])
-- fi
-- CFLAGS=$_SAVE_CFLAGS
-- LDFLAGS=$_SAVE_LDFLAGS
-- LIBS=$_SAVE_LIBS
-+ if test -n "$MOZ_NATIVE_LIBVPX"; then
-+ dnl ============================
-+ dnl === libvpx Version check ===
-+ dnl ============================
-+ dnl Check to see if we have a system libvpx package.
-+ PKG_CHECK_MODULES(LIBVPX, vpx >= 1.0.0)
-+
-+ MOZ_CHECK_HEADER([vpx/vpx_decoder.h], [],
-+ [AC_MSG_ERROR([Couldn't find vpx/vpx_decoder.h which is required for build with system libvpx. Use --without-system-libvpx to build with in-tree libvpx.])])
-+
-+ AC_CHECK_LIB(vpx, vpx_codec_dec_init_ver, [],
-+ [AC_MSG_ERROR([--with-system-libvpx requested but symbol vpx_codec_dec_init_ver not found])])
- fi
- fi
-
-
Added: branches/experimental/mail/thunderbird/files/patch-mozilla-content-media-gstreamer-nsGStreamerReader.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/mail/thunderbird/files/patch-mozilla-content-media-gstreamer-nsGStreamerReader.cpp Sun Jul 8 12:46:45 2012 (r858)
@@ -0,0 +1,76 @@
+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);
+
+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);
+ }
Modified: branches/experimental/mail/thunderbird/files/patch-mozilla-js-src-jsnum.cpp
==============================================================================
--- branches/experimental/mail/thunderbird/files/patch-mozilla-js-src-jsnum.cpp Sun Jul 8 12:46:33 2012 (r857)
+++ branches/experimental/mail/thunderbird/files/patch-mozilla-js-src-jsnum.cpp Sun Jul 8 12:46:45 2012 (r858)
@@ -1,28 +1,31 @@
---- mozilla/js/src/jsnum.cpp.orig Sun Nov 5 18:37:07 2006
-+++ mozilla/js/src/jsnum.cpp Sun Nov 5 18:42:31 2006
-@@ -45,6 +45,9 @@
- #if defined(XP_WIN) || defined(XP_OS2)
- #include <float.h>
- #endif
+--- mozilla/js/src/jsnum.cpp.orig 2010-01-05 22:35:17.000000000 -0500
++++ mozilla/js/src/jsnum.cpp 2010-01-11 05:10:19.000000000 -0500
+@@ -49,6 +49,9 @@
+ // Avoid warnings about ASSERT being defined by the assembler as well.
+ #undef ASSERT
+
+#if defined(__FreeBSD__)
+#include <sys/param.h>
+#endif
- #include <locale.h>
- #include <limits.h>
- #include <math.h>
-@@ -532,7 +535,15 @@ static jsdouble NaN;
+ #ifdef XP_OS2
+ #define _PC_53 PC_53
+ #define _MCW_EM MCW_EM
+@@ -691,8 +694,18 @@
#else
-+#if defined(__FreeBSD__) && __FreeBSD_version >= 601000
++#if defined(__FreeBSD__)
++#if __BSD_VISIBLE == 0
++#error __BSD_VISIBLE is zero, so fedisableexcept is not defined
++#endif
+#include <fenv.h>
-+#define FIX_FPU() (fedisableexcept(FE_ALL_EXCEPT))
-+
++#define FIX_FPU() ((void)fedisableexcept(FE_ALL_EXCEPT))
+#else
+
#define FIX_FPU() ((void)0)
-+
-+#endif /* defined(__FreeBSD__) && __FreeBSD_version >= 503000 */
++#endif /* defined(__FreeBSD__) && __FreeBSD_version >= 503000 */
++
#endif
+ JSBool
Modified: branches/experimental/mail/thunderbird/files/patch-mozilla-layout-generic-Makefile.in
==============================================================================
--- branches/experimental/mail/thunderbird/files/patch-mozilla-layout-generic-Makefile.in Sun Jul 8 12:46:33 2012 (r857)
+++ branches/experimental/mail/thunderbird/files/patch-mozilla-layout-generic-Makefile.in Sun Jul 8 12:46:45 2012 (r858)
@@ -1,15 +1,14 @@
---- mozilla/layout/generic/Makefile.in.orig 2011-07-06 05:09:28.000000000 +0200
-+++ mozilla/layout/generic/Makefile.in 2011-07-06 21:49:25.105659269 +0200
-@@ -159,9 +159,10 @@
- -I$(srcdir)/../../content/html/content/src \
+--- mozilla/layout/generic/Makefile.in~
++++ mozilla/layout/generic/Makefile.in
+@@ -154,9 +154,10 @@ LOCAL_INCLUDES += \
-I$(srcdir)/../../dom/base \
-I$(srcdir)/../../dom/plugins/base \
+ -I$(srcdir)/../svg/base/src \
- $(MOZ_CAIRO_CFLAGS) \
$(NULL)
-+ CXXFLAGS += $(MOZ_CAIRO_CFLAGS)
++CXXFLAGS += $(MOZ_CAIRO_CFLAGS)
+
ifdef MOZ_ENABLE_GTK2
CXXFLAGS += $(MOZ_GTK2_CFLAGS)
endif
-
Modified: branches/experimental/mail/thunderbird/files/patch-mozilla-memory-mozalloc-mozalloc.cpp
==============================================================================
--- branches/experimental/mail/thunderbird/files/patch-mozilla-memory-mozalloc-mozalloc.cpp Sun Jul 8 12:46:33 2012 (r857)
+++ branches/experimental/mail/thunderbird/files/patch-mozilla-memory-mozalloc-mozalloc.cpp Sun Jul 8 12:46:45 2012 (r858)
@@ -1,6 +1,6 @@
--- mozilla/memory/mozalloc/mozalloc.cpp~
+++ mozilla/memory/mozalloc/mozalloc.cpp
-@@ -52,6 +52,9 @@
+@@ -19,6 +19,9 @@
#if defined(XP_UNIX)
# include <unistd.h> // for valloc on *BSD
#endif //if defined(XP_UNIX)
@@ -8,14 +8,14 @@
+# include <malloc_np.h> // for malloc_usable_size
+#endif
- #if defined(MOZ_MEMORY)
- // jemalloc.h doesn't redeclare symbols if they're provided by the OS
-@@ -259,7 +262,7 @@ moz_malloc_usable_size(void *ptr)
+ #if defined(XP_WIN) || (defined(XP_OS2) && defined(__declspec))
+ # define MOZALLOC_EXPORT __declspec(dllexport)
+@@ -210,7 +213,7 @@ moz_malloc_usable_size(void *ptr)
#if defined(XP_MACOSX)
return malloc_size(ptr);
--#elif defined(MOZ_MEMORY) || defined(XP_LINUX)
-+#elif defined(MOZ_MEMORY) || defined(XP_LINUX) || defined(__FreeBSD__)
- // XXX: the |defined(XP_LINUX)| may be too lax; some Linux installations
- // might use a libc that doesn't have malloc_usable_size. Let's fix this
- // if/when it happens.
+-#elif defined(MOZ_MEMORY) || (defined(XP_LINUX) && !defined(ANDROID))
++#elif defined(MOZ_MEMORY) || (defined(XP_LINUX) && !defined(ANDROID)) || defined(__FreeBSD__)
+ // Android bionic libc doesn't have malloc_usable_size.
+ return malloc_usable_size(ptr);
+ #elif defined(XP_WIN)
Modified: branches/experimental/mail/thunderbird/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp
==============================================================================
--- branches/experimental/mail/thunderbird/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp Sun Jul 8 12:46:33 2012 (r857)
+++ branches/experimental/mail/thunderbird/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp Sun Jul 8 12:46:45 2012 (r858)
@@ -1,11 +1,11 @@
--- mozilla/toolkit/xre/nsAppRunner.cpp~
+++ mozilla/toolkit/xre/nsAppRunner.cpp
-@@ -2998,7 +2998,7 @@ XRE_main(int argc, char* argv[], const n
- gQtOnlyArgv[gQtOnlyArgc] = nsnull;
- #endif
+@@ -3819,7 +3819,7 @@ XREMain::XRE_main(int argc, char* argv[]
+ ScopedLogging log;
+
#if defined(MOZ_WIDGET_GTK2)
-#ifdef MOZ_MEMORY
+#if defined(MOZ_MEMORY) || defined(__FreeBSD__)
- // Disable the slice allocator, since jemalloc already uses similar layout
- // algorithms, and using a sub-allocator tends to increase fragmentation.
- // This must be done before g_thread_init() is called.
+ // Disable the slice allocator, since jemalloc already uses similar layout
+ // algorithms, and using a sub-allocator tends to increase fragmentation.
+ // This must be done before g_thread_init() is called.
Modified: branches/experimental/www/firefox/Makefile
==============================================================================
--- branches/experimental/www/firefox/Makefile Sun Jul 8 12:46:33 2012 (r857)
+++ branches/experimental/www/firefox/Makefile Sun Jul 8 12:46:45 2012 (r858)
@@ -6,7 +6,7 @@
#
PORTNAME= firefox
-DISTVERSION= 13.0.1
+DISTVERSION= 14.0b11
PORTEPOCH= 1
CATEGORIES= www ipv6
MASTER_SITES= ${MASTER_SITE_MOZILLA}
@@ -18,7 +18,7 @@
BUILD_DEPENDS= nspr>=4.9:${PORTSDIR}/devel/nspr \
nss>=3.13.2:${PORTSDIR}/security/nss \
- sqlite3>=3.7.10:${PORTSDIR}/databases/sqlite3 \
+ sqlite3>=3.7.11:${PORTSDIR}/databases/sqlite3 \
cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \
unzip:${PORTSDIR}/archivers/unzip
LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo
@@ -54,11 +54,11 @@
--disable-necko-wifi
OPTIONS_DEFAULT=DBUS GTK2 LOGGING OSS
-OPTIONS_DEFINE= PGO
+OPTIONS_DEFINE= GSTREAMER PGO
.include <bsd.port.pre.mk>
-WRKSRC:= ${WRKDIR}/mozilla-release
+WRKSRC:= ${WRKDIR}/mozilla-beta
.if ${ARCH} == amd64
CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL}
Modified: branches/experimental/www/firefox/distinfo
==============================================================================
--- branches/experimental/www/firefox/distinfo Sun Jul 8 12:46:33 2012 (r857)
+++ branches/experimental/www/firefox/distinfo Sun Jul 8 12:46:45 2012 (r858)
@@ -1,2 +1,2 @@
-SHA256 (firefox-13.0.1.source.tar.bz2) = c196d07db249735cbe61949ecafe20b9df262b817b44b8a595d3e6daf2d09be3
-SIZE (firefox-13.0.1.source.tar.bz2) = 79561773
+SHA256 (firefox-14.0b11.source.tar.bz2) = ca8de2d2c87d54369bd1e35a75f4a5dc755edec8a382c2c6dc1baa7696917994
+SIZE (firefox-14.0b11.source.tar.bz2) = 82257494
Modified: branches/experimental/www/firefox/files/patch-alsapulse
==============================================================================
--- branches/experimental/www/firefox/files/patch-alsapulse Sun Jul 8 12:46:33 2012 (r857)
+++ branches/experimental/www/firefox/files/patch-alsapulse Sun Jul 8 12:46:45 2012 (r858)
@@ -1,12 +1,12 @@
--- config/autoconf.mk.in~
+++ config/autoconf.mk.in
-@@ -568,7 +568,13 @@ MOZ_LIBNOTIFY_CFLAGS = @MOZ_LIBNOTIFY_CF
+@@ -568,8 +568,13 @@ MOZ_LIBNOTIFY_CFLAGS = @MOZ_LIBNOTIFY_CF
MOZ_LIBNOTIFY_LIBS = @MOZ_LIBNOTIFY_LIBS@
MOZ_ENABLE_LIBNOTIFY = @MOZ_ENABLE_LIBNOTIFY@
+MOZ_ALSA = @MOZ_ALSA@
MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS@
-+MOZ_ALSA_CFLAGS = @MOZ_ALSA_CFLAGS@
+ MOZ_ALSA_CFLAGS = @MOZ_ALSA_CFLAGS@
+
+MOZ_PULSEAUDIO = @MOZ_PULSEAUDIO@
+MOZ_PULSEAUDIO_LIBS = @MOZ_PULSEAUDIO_LIBS@
@@ -16,7 +16,7 @@
GLIB_LIBS = @GLIB_LIBS@
--- configure.in~
+++ configure.in
-@@ -5758,17 +5775,48 @@ dnl ====================================
+@@ -5758,17 +5775,47 @@ dnl ====================================
dnl = Check alsa availability on Linux if using sydneyaudio
dnl ========================================================
@@ -43,7 +43,6 @@
- esac
fi
-+AC_SUBST(MOZ_ALSA_CFLAGS)
+AC_SUBST(MOZ_ALSA)
+
+dnl ========================================================
Deleted: branches/experimental/www/firefox/files/patch-bug741737
==============================================================================
--- branches/experimental/www/firefox/files/patch-bug741737 Sun Jul 8 12:46:45 2012 (r857)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,93 +0,0 @@
-changeset: 91900:eee73897136b
-user: Martin Stransky <stransky@redhat.com>
-date: Tue Apr 17 19:57:40 2012 -0400
-summary: Bug 741737 - Configure libvpx with pkgconfig. r=khuey, a=npotb
-
-diff --git a/configure.in b/configure.in
---- configure.in
-+++ configure.in
-@@ -5591,12 +5591,10 @@ MOZ_ARG_DISABLE_BOOL(webm,
-
- dnl system libvpx Support
- dnl ========================================================
--MOZ_ARG_WITH_STRING(system-libvpx,
--[ --with-system-libvpx=[PFX]
-- Use system libvpx [installed at prefix PFX]],
-- LIBVPX_DIR=$withval)
--
--MOZ_NATIVE_LIBVPX=
-+MOZ_ARG_WITH_BOOL(system-libvpx,
-+[ --with-system-libvpx Use system libvpx (located with pkgconfig)],
-+ MOZ_NATIVE_LIBVPX=1)
-+
- MOZ_LIBVPX_INCLUDES=
- MOZ_LIBVPX_LIBS=
-
-@@ -5609,54 +5607,18 @@ if test -n "$MOZ_WEBM"; then
- AC_DEFINE(MOZ_VP8_ENCODER)
- fi
-
-- if test -n "$LIBVPX_DIR" -a "$LIBVPX_DIR" != no; then
-- _SAVE_CFLAGS=$CFLAGS
-- _SAVE_LDFLAGS=$LDFLAGS
-- _SAVE_LIBS=$LIBS
-- if test "${LIBVPX_DIR}" = "yes"; then
-- LIBVPX_DIR=/usr
-- fi
-- CFLAGS="-I${LIBVPX_DIR}/include $CFLAGS"
-- LDFLAGS="-L${LIBVPX_DIR}/lib $LDFLAGS"
-- MOZ_NATIVE_LIBVPX_DEC_TEST=
-- MOZ_CHECK_HEADER(vpx/vpx_decoder.h,
-- [if test ! -f "${LIBVPX_DIR}/include/vpx/vpx_decoder.h"; then
-- AC_MSG_ERROR([vpx/vpx_decoder.h found, but is not in ${LIBVPX_DIR}/include])
-- fi],
-- AC_MSG_ERROR([--with-system-libvpx requested but vpx/vpx_decoder.h not found]))
-- AC_CHECK_LIB(vpx, vpx_codec_dec_init_ver,
-- [MOZ_NATIVE_LIBVPX_DEC_TEST=1],
-- ([--with-system-libvpx requested but symbol vpx_codec_dec_init_ver not found]))
-- if test -n "$MOZ_NATIVE_LIBVPX_DEC_TEST" ; then
-- AC_MSG_CHECKING([for libvpx version >= v1.0.0])
-- dnl We need at least v1.0.0 to fix several crash bugs (for which we
-- dnl had local patches prior to v1.0.0).
-- dnl
-- dnl This is a terrible test for the library version, but we don't
-- dnl have a good one. There is no version number in a public header,
-- dnl and testing the headers still doesn't guarantee we link against
-- dnl the right version. While we could call vpx_codec_version() at
-- dnl run-time, that would break cross-compiling. There are no
-- dnl additional exported decoder symbols between the v1.0.0 release
-- dnl and the v0.9.7 one to check for.
-- AC_TRY_COMPILE([
-- #include <vpx/vpx_decoder.h>
-- #if !defined(VPX_CODEC_USE_INPUT_FRAGMENTS)
-- #error "test failed."
-- #endif
-- ],
-- [return 0;],
-- [AC_MSG_RESULT([yes])
-- MOZ_NATIVE_LIBVPX=1
-- AC_DEFINE(MOZ_NATIVE_LIBVPX)
-- MOZ_LIBVPX_INCLUDES="-I${LIBVPX_DIR}/include"
-- MOZ_LIBVPX_LIBS="-L${LIBVPX_DIR}/lib -lvpx"],
-- [AC_MSG_RESULT([no])
-- AC_MSG_ERROR([--with-system-libvpx requested but it is not v1.0.0 or later])])
-- fi
-- CFLAGS=$_SAVE_CFLAGS
-- LDFLAGS=$_SAVE_LDFLAGS
-- LIBS=$_SAVE_LIBS
-+ if test -n "$MOZ_NATIVE_LIBVPX"; then
-+ dnl ============================
-+ dnl === libvpx Version check ===
-+ dnl ============================
-+ dnl Check to see if we have a system libvpx package.
-+ PKG_CHECK_MODULES(LIBVPX, vpx >= 1.0.0)
-+
-+ MOZ_CHECK_HEADER([vpx/vpx_decoder.h], [],
-+ [AC_MSG_ERROR([Couldn't find vpx/vpx_decoder.h which is required for build with system libvpx. Use --without-system-libvpx to build with in-tree libvpx.])])
-+
-+ AC_CHECK_LIB(vpx, vpx_codec_dec_init_ver, [],
-+ [AC_MSG_ERROR([--with-system-libvpx requested but symbol vpx_codec_dec_init_ver not found])])
- fi
- fi
-
-
Added: branches/experimental/www/firefox/files/patch-content-media-gstreamer-nsGStreamerReader.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox/files/patch-content-media-gstreamer-nsGStreamerReader.cpp Sun Jul 8 12:46:45 2012 (r858)
@@ -0,0 +1,76 @@
+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);
+
+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);
+ }
Modified: branches/experimental/www/firefox/files/patch-js_src_jsnum.cpp
==============================================================================
--- branches/experimental/www/firefox/files/patch-js_src_jsnum.cpp Sun Jul 8 12:46:33 2012 (r857)
+++ branches/experimental/www/firefox/files/patch-js_src_jsnum.cpp Sun Jul 8 12:46:45 2012 (r858)
@@ -1,9 +1,9 @@
--- js/src/jsnum.cpp.orig 2010-01-05 22:35:17.000000000 -0500
+++ js/src/jsnum.cpp 2010-01-11 05:10:19.000000000 -0500
-@@ -43,6 +43,9 @@
- /*
- * JS number type and wrapper class.
- */
+@@ -49,6 +49,9 @@
+ // Avoid warnings about ASSERT being defined by the assembler as well.
+ #undef ASSERT
+
+#if defined(__FreeBSD__)
+#include <sys/param.h>
+#endif
Modified: branches/experimental/www/firefox/files/patch-layout_generic_Makefile.in
==============================================================================
--- branches/experimental/www/firefox/files/patch-layout_generic_Makefile.in Sun Jul 8 12:46:33 2012 (r857)
+++ branches/experimental/www/firefox/files/patch-layout_generic_Makefile.in Sun Jul 8 12:46:45 2012 (r858)
@@ -1,9 +1,9 @@
---- layout/generic/Makefile.in.orig 2011-07-06 05:09:28.000000000 +0200
-+++ layout/generic/Makefile.in 2011-07-06 21:49:25.105659269 +0200
-@@ -159,9 +159,10 @@
- -I$(srcdir)/../../content/html/content/src \
+--- layout/generic/Makefile.in~
++++ layout/generic/Makefile.in
+@@ -154,9 +154,10 @@ LOCAL_INCLUDES += \
-I$(srcdir)/../../dom/base \
-I$(srcdir)/../../dom/plugins/base \
+ -I$(srcdir)/../svg/base/src \
- $(MOZ_CAIRO_CFLAGS) \
$(NULL)
Modified: branches/experimental/www/firefox/files/patch-memory-mozalloc-mozalloc.cpp
==============================================================================
--- branches/experimental/www/firefox/files/patch-memory-mozalloc-mozalloc.cpp Sun Jul 8 12:46:33 2012 (r857)
+++ branches/experimental/www/firefox/files/patch-memory-mozalloc-mozalloc.cpp Sun Jul 8 12:46:45 2012 (r858)
@@ -1,6 +1,6 @@
--- memory/mozalloc/mozalloc.cpp~
+++ memory/mozalloc/mozalloc.cpp
-@@ -52,6 +52,9 @@
+@@ -19,6 +19,9 @@
#if defined(XP_UNIX)
# include <unistd.h> // for valloc on *BSD
#endif //if defined(XP_UNIX)
@@ -8,14 +8,14 @@
+# include <malloc_np.h> // for malloc_usable_size
+#endif
- #if defined(MOZ_MEMORY)
- // jemalloc.h doesn't redeclare symbols if they're provided by the OS
-@@ -259,7 +262,7 @@ moz_malloc_usable_size(void *ptr)
+ #if defined(XP_WIN) || (defined(XP_OS2) && defined(__declspec))
+ # define MOZALLOC_EXPORT __declspec(dllexport)
+@@ -210,7 +213,7 @@ moz_malloc_usable_size(void *ptr)
#if defined(XP_MACOSX)
return malloc_size(ptr);
--#elif defined(MOZ_MEMORY) || defined(XP_LINUX)
-+#elif defined(MOZ_MEMORY) || defined(XP_LINUX) || defined(__FreeBSD__)
- // XXX: the |defined(XP_LINUX)| may be too lax; some Linux installations
- // might use a libc that doesn't have malloc_usable_size. Let's fix this
- // if/when it happens.
+-#elif defined(MOZ_MEMORY) || (defined(XP_LINUX) && !defined(ANDROID))
++#elif defined(MOZ_MEMORY) || (defined(XP_LINUX) && !defined(ANDROID)) || defined(__FreeBSD__)
+ // Android bionic libc doesn't have malloc_usable_size.
+ return malloc_usable_size(ptr);
+ #elif defined(XP_WIN)
Modified: branches/experimental/www/firefox/files/patch-toolkit-xre-nsAppRunner.cpp
==============================================================================
--- branches/experimental/www/firefox/files/patch-toolkit-xre-nsAppRunner.cpp Sun Jul 8 12:46:33 2012 (r857)
+++ branches/experimental/www/firefox/files/patch-toolkit-xre-nsAppRunner.cpp Sun Jul 8 12:46:45 2012 (r858)
@@ -1,11 +1,11 @@
--- toolkit/xre/nsAppRunner.cpp~
+++ toolkit/xre/nsAppRunner.cpp
-@@ -3133,7 +3133,7 @@ XRE_main(int argc, char* argv[], const n
- gQtOnlyArgv[gQtOnlyArgc] = nsnull;
- #endif
+@@ -3819,7 +3819,7 @@ XREMain::XRE_main(int argc, char* argv[]
+ ScopedLogging log;
+
#if defined(MOZ_WIDGET_GTK2)
-#ifdef MOZ_MEMORY
+#if defined(MOZ_MEMORY) || defined(__FreeBSD__)
- // Disable the slice allocator, since jemalloc already uses similar layout
- // algorithms, and using a sub-allocator tends to increase fragmentation.
- // This must be done before g_thread_init() is called.
+ // Disable the slice allocator, since jemalloc already uses similar layout
+ // algorithms, and using a sub-allocator tends to increase fragmentation.
+ // This must be done before g_thread_init() is called.
Modified: branches/experimental/www/seamonkey/Makefile
==============================================================================
--- branches/experimental/www/seamonkey/Makefile Sun Jul 8 12:46:33 2012 (r857)
+++ branches/experimental/www/seamonkey/Makefile Sun Jul 8 12:46:45 2012 (r858)
@@ -6,7 +6,7 @@
#
PORTNAME= seamonkey
-DISTVERSION= 2.10.1
+DISTVERSION= 2.11b5
CATEGORIES?= www ipv6
MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED}
MASTER_SITE_SUBDIR= seamonkey/releases/${DISTVERSION}/source
@@ -17,7 +17,7 @@
BUILD_DEPENDS= nspr>=4.9:${PORTSDIR}/devel/nspr \
nss>=3.13.2:${PORTSDIR}/security/nss \
- sqlite3>=3.7.10:${PORTSDIR}/databases/sqlite3 \
+ sqlite3>=3.7.11:${PORTSDIR}/databases/sqlite3 \
unzip:${PORTSDIR}/archivers/unzip
LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo
@@ -53,7 +53,7 @@
NOT_FOR_ARCHS= ia64
OPTIONS_DEFAULT=DBUS CHATZILLA COMPOSER GTK2 LDAP LOGGING MAILNEWS OSS
-OPTIONS_DEFINE= CHATZILLA COMPOSER LDAP LIGHTNING MAILNEWS
+OPTIONS_DEFINE= CHATZILLA COMPOSER GSTREAMER LDAP LIGHTNING MAILNEWS
CHATZILLA_DESC?=Chatzilla IRC module
COMPOSER_DESC?= HTML Composer module
@@ -62,8 +62,8 @@
.include <bsd.port.pre.mk>
-MOZSRC:= ${WRKDIR}/comm-release/mozilla
-WRKSRC= ${WRKDIR}/comm-release
+WRKSRC= ${WRKDIR}/comm-beta
+MOZSRC:= ${WRKSRC}/mozilla
.if ${ARCH} == amd64
CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL}
Modified: branches/experimental/www/seamonkey/distinfo
==============================================================================
--- branches/experimental/www/seamonkey/distinfo Sun Jul 8 12:46:33 2012 (r857)
+++ branches/experimental/www/seamonkey/distinfo Sun Jul 8 12:46:45 2012 (r858)
@@ -1,2 +1,2 @@
-SHA256 (seamonkey-2.10.1.source.tar.bz2) = 96e9542393d14a7522d05993b54239b2d45bc7198389a56e1e56af97038cac8f
-SIZE (seamonkey-2.10.1.source.tar.bz2) = 103439433
+SHA256 (seamonkey-2.11b5.source.tar.bz2) = 01970ea15584f016c08798e73507466eb2289744a6c6b335f7a3ccfe67a40544
+SIZE (seamonkey-2.11b5.source.tar.bz2) = 105779527
Modified: branches/experimental/www/seamonkey/files/patch-alsapulse
==============================================================================
--- branches/experimental/www/seamonkey/files/patch-alsapulse Sun Jul 8 12:46:33 2012 (r857)
+++ branches/experimental/www/seamonkey/files/patch-alsapulse Sun Jul 8 12:46:45 2012 (r858)
@@ -1,12 +1,12 @@
--- mozilla/config/autoconf.mk.in~
+++ mozilla/config/autoconf.mk.in
-@@ -568,7 +568,13 @@ MOZ_LIBNOTIFY_CFLAGS = @MOZ_LIBNOTIFY_CF
+@@ -568,8 +568,13 @@ MOZ_LIBNOTIFY_CFLAGS = @MOZ_LIBNOTIFY_CF
MOZ_LIBNOTIFY_LIBS = @MOZ_LIBNOTIFY_LIBS@
MOZ_ENABLE_LIBNOTIFY = @MOZ_ENABLE_LIBNOTIFY@
+MOZ_ALSA = @MOZ_ALSA@
MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS@
-+MOZ_ALSA_CFLAGS = @MOZ_ALSA_CFLAGS@
+ MOZ_ALSA_CFLAGS = @MOZ_ALSA_CFLAGS@
+
+MOZ_PULSEAUDIO = @MOZ_PULSEAUDIO@
+MOZ_PULSEAUDIO_LIBS = @MOZ_PULSEAUDIO_LIBS@
@@ -16,7 +16,7 @@
GLIB_LIBS = @GLIB_LIBS@
--- mozilla/configure.in~
+++ mozilla/configure.in
-@@ -5758,17 +5775,48 @@ dnl ====================================
+@@ -5758,17 +5775,47 @@ dnl ====================================
dnl = Check alsa availability on Linux if using sydneyaudio
dnl ========================================================
@@ -43,7 +43,6 @@
- esac
fi
-+AC_SUBST(MOZ_ALSA_CFLAGS)
+AC_SUBST(MOZ_ALSA)
+
+dnl ========================================================
Deleted: branches/experimental/www/seamonkey/files/patch-bug741737
==============================================================================
--- branches/experimental/www/seamonkey/files/patch-bug741737 Sun Jul 8 12:46:45 2012 (r857)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,93 +0,0 @@
-changeset: 91900:eee73897136b
-user: Martin Stransky <stransky@redhat.com>
-date: Tue Apr 17 19:57:40 2012 -0400
-summary: Bug 741737 - Configure libvpx with pkgconfig. r=khuey, a=npotb
-
-diff --git a/configure.in b/configure.in
---- mozilla/configure.in
-+++ mozilla/configure.in
-@@ -5591,12 +5591,10 @@ MOZ_ARG_DISABLE_BOOL(webm,
-
- dnl system libvpx Support
- dnl ========================================================
--MOZ_ARG_WITH_STRING(system-libvpx,
--[ --with-system-libvpx=[PFX]
-- Use system libvpx [installed at prefix PFX]],
-- LIBVPX_DIR=$withval)
--
--MOZ_NATIVE_LIBVPX=
-+MOZ_ARG_WITH_BOOL(system-libvpx,
-+[ --with-system-libvpx Use system libvpx (located with pkgconfig)],
-+ MOZ_NATIVE_LIBVPX=1)
-+
- MOZ_LIBVPX_INCLUDES=
- MOZ_LIBVPX_LIBS=
-
-@@ -5609,54 +5607,18 @@ if test -n "$MOZ_WEBM"; then
- AC_DEFINE(MOZ_VP8_ENCODER)
- fi
-
-- if test -n "$LIBVPX_DIR" -a "$LIBVPX_DIR" != no; then
-- _SAVE_CFLAGS=$CFLAGS
-- _SAVE_LDFLAGS=$LDFLAGS
-- _SAVE_LIBS=$LIBS
-- if test "${LIBVPX_DIR}" = "yes"; then
-- LIBVPX_DIR=/usr
-- fi
-- CFLAGS="-I${LIBVPX_DIR}/include $CFLAGS"
-- LDFLAGS="-L${LIBVPX_DIR}/lib $LDFLAGS"
-- MOZ_NATIVE_LIBVPX_DEC_TEST=
-- MOZ_CHECK_HEADER(vpx/vpx_decoder.h,
-- [if test ! -f "${LIBVPX_DIR}/include/vpx/vpx_decoder.h"; then
-- AC_MSG_ERROR([vpx/vpx_decoder.h found, but is not in ${LIBVPX_DIR}/include])
-- fi],
-- AC_MSG_ERROR([--with-system-libvpx requested but vpx/vpx_decoder.h not found]))
-- AC_CHECK_LIB(vpx, vpx_codec_dec_init_ver,
-- [MOZ_NATIVE_LIBVPX_DEC_TEST=1],
-- ([--with-system-libvpx requested but symbol vpx_codec_dec_init_ver not found]))
-- if test -n "$MOZ_NATIVE_LIBVPX_DEC_TEST" ; then
-- AC_MSG_CHECKING([for libvpx version >= v1.0.0])
-- dnl We need at least v1.0.0 to fix several crash bugs (for which we
-- dnl had local patches prior to v1.0.0).
-- dnl
-- dnl This is a terrible test for the library version, but we don't
-- dnl have a good one. There is no version number in a public header,
-- dnl and testing the headers still doesn't guarantee we link against
-- dnl the right version. While we could call vpx_codec_version() at
-- dnl run-time, that would break cross-compiling. There are no
-- dnl additional exported decoder symbols between the v1.0.0 release
-- dnl and the v0.9.7 one to check for.
-- AC_TRY_COMPILE([
-- #include <vpx/vpx_decoder.h>
-- #if !defined(VPX_CODEC_USE_INPUT_FRAGMENTS)
-- #error "test failed."
-- #endif
-- ],
-- [return 0;],
-- [AC_MSG_RESULT([yes])
-- MOZ_NATIVE_LIBVPX=1
-- AC_DEFINE(MOZ_NATIVE_LIBVPX)
-- MOZ_LIBVPX_INCLUDES="-I${LIBVPX_DIR}/include"
-- MOZ_LIBVPX_LIBS="-L${LIBVPX_DIR}/lib -lvpx"],
-- [AC_MSG_RESULT([no])
-- AC_MSG_ERROR([--with-system-libvpx requested but it is not v1.0.0 or later])])
-- fi
-- CFLAGS=$_SAVE_CFLAGS
-- LDFLAGS=$_SAVE_LDFLAGS
-- LIBS=$_SAVE_LIBS
-+ if test -n "$MOZ_NATIVE_LIBVPX"; then
-+ dnl ============================
-+ dnl === libvpx Version check ===
-+ dnl ============================
-+ dnl Check to see if we have a system libvpx package.
-+ PKG_CHECK_MODULES(LIBVPX, vpx >= 1.0.0)
-+
-+ MOZ_CHECK_HEADER([vpx/vpx_decoder.h], [],
-+ [AC_MSG_ERROR([Couldn't find vpx/vpx_decoder.h which is required for build with system libvpx. Use --without-system-libvpx to build with in-tree libvpx.])])
-+
-+ AC_CHECK_LIB(vpx, vpx_codec_dec_init_ver, [],
-+ [AC_MSG_ERROR([--with-system-libvpx requested but symbol vpx_codec_dec_init_ver not found])])
- fi
- fi
-
-
Added: branches/experimental/www/seamonkey/files/patch-mozilla-content-media-gstreamer-nsGStreamerReader.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/seamonkey/files/patch-mozilla-content-media-gstreamer-nsGStreamerReader.cpp Sun Jul 8 12:46:45 2012 (r858)
@@ -0,0 +1,76 @@
+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);
+
+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);
+ }
Modified: branches/experimental/www/seamonkey/files/patch-mozilla-memory-mozalloc-mozalloc.cpp
==============================================================================
--- branches/experimental/www/seamonkey/files/patch-mozilla-memory-mozalloc-mozalloc.cpp Sun Jul 8 12:46:33 2012 (r857)
+++ branches/experimental/www/seamonkey/files/patch-mozilla-memory-mozalloc-mozalloc.cpp Sun Jul 8 12:46:45 2012 (r858)
@@ -1,6 +1,6 @@
--- mozilla/memory/mozalloc/mozalloc.cpp~
+++ mozilla/memory/mozalloc/mozalloc.cpp
-@@ -52,6 +52,9 @@
+@@ -19,6 +19,9 @@
#if defined(XP_UNIX)
# include <unistd.h> // for valloc on *BSD
#endif //if defined(XP_UNIX)
@@ -8,14 +8,14 @@
+# include <malloc_np.h> // for malloc_usable_size
+#endif
- #if defined(MOZ_MEMORY)
- // jemalloc.h doesn't redeclare symbols if they're provided by the OS
-@@ -259,7 +262,7 @@ moz_malloc_usable_size(void *ptr)
+ #if defined(XP_WIN) || (defined(XP_OS2) && defined(__declspec))
+ # define MOZALLOC_EXPORT __declspec(dllexport)
+@@ -210,7 +213,7 @@ moz_malloc_usable_size(void *ptr)
#if defined(XP_MACOSX)
return malloc_size(ptr);
--#elif defined(MOZ_MEMORY) || defined(XP_LINUX)
-+#elif defined(MOZ_MEMORY) || defined(XP_LINUX) || defined(__FreeBSD__)
- // XXX: the |defined(XP_LINUX)| may be too lax; some Linux installations
- // might use a libc that doesn't have malloc_usable_size. Let's fix this
- // if/when it happens.
+-#elif defined(MOZ_MEMORY) || (defined(XP_LINUX) && !defined(ANDROID))
++#elif defined(MOZ_MEMORY) || (defined(XP_LINUX) && !defined(ANDROID)) || defined(__FreeBSD__)
+ // Android bionic libc doesn't have malloc_usable_size.
+ return malloc_usable_size(ptr);
+ #elif defined(XP_WIN)
Modified: branches/experimental/www/seamonkey/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp
==============================================================================
--- branches/experimental/www/seamonkey/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp Sun Jul 8 12:46:33 2012 (r857)
+++ branches/experimental/www/seamonkey/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp Sun Jul 8 12:46:45 2012 (r858)
@@ -1,11 +1,11 @@
--- mozilla/toolkit/xre/nsAppRunner.cpp~
+++ mozilla/toolkit/xre/nsAppRunner.cpp
-@@ -2998,7 +2998,7 @@ XRE_main(int argc, char* argv[], const n
- gQtOnlyArgv[gQtOnlyArgc] = nsnull;
- #endif
+@@ -3819,7 +3819,7 @@ XREMain::XRE_main(int argc, char* argv[]
+ ScopedLogging log;
+
#if defined(MOZ_WIDGET_GTK2)
-#ifdef MOZ_MEMORY
+#if defined(MOZ_MEMORY) || defined(__FreeBSD__)
- // Disable the slice allocator, since jemalloc already uses similar layout
- // algorithms, and using a sub-allocator tends to increase fragmentation.
- // This must be done before g_thread_init() is called.
+ // Disable the slice allocator, since jemalloc already uses similar layout
+ // algorithms, and using a sub-allocator tends to increase fragmentation.
+ // This must be done before g_thread_init() is called.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201207081246.q68Ckj69037450>