From owner-freebsd-gecko@FreeBSD.ORG Sun Jul 8 12:45:37 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7706D106564A for ; Sun, 8 Jul 2012 12:45:37 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 0215C8FC08 for ; Sun, 8 Jul 2012 12:45:36 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q68CjU91016053 for ; Sun, 8 Jul 2012 12:45:30 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q68CjOOg015656 for freebsd-gecko@freebsd.org; Sun, 8 Jul 2012 12:45:24 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sun, 8 Jul 2012 12:45:24 GMT Message-Id: <201207081245.q68CjOOg015656@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r851 - branches/experimental/www/firefox-nightly/files X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Jul 2012 12:45:37 -0000 Author: jbeich Date: Sun Jul 8 12:45:24 2012 New Revision: 851 Log: fix --disable-alsa on linux Modified: branches/experimental/www/firefox-nightly/files/patch-alsapulse Modified: branches/experimental/www/firefox-nightly/files/patch-alsapulse ============================================================================== --- branches/experimental/www/firefox-nightly/files/patch-alsapulse Fri Jul 6 16:40:08 2012 (r850) +++ branches/experimental/www/firefox-nightly/files/patch-alsapulse Sun Jul 8 12:45:24 2012 (r851) @@ -33,17 +33,18 @@ index 5980b76..11f5f77 100644 --- configure.in +++ configure.in -@@ -5632,13 +5632,45 @@ dnl ======================================================== +@@ -5600,13 +5600,45 @@ dnl ======================================================== dnl = Check alsa availability on Linux if using sydneyaudio dnl ======================================================== +MOZ_ARG_ENABLE_BOOL(alsa, +[ --enable-alsa Enable Alsa support], +MOZ_ALSA=1, -+MOZ_ALSA=) ++MOZ_ALSA= MOZ_ALSA_FORCE=$enableval) + dnl If using sydneyaudio with Linux, ensure that the alsa library is available - if test -n "$MOZ_SYDNEYAUDIO" -a "$OS_TARGET" = "Linux"; then +-if test -n "$MOZ_SYDNEYAUDIO" -a "$OS_TARGET" = "Linux"; then ++if test -n "$MOZ_SYDNEYAUDIO" -a "$OS_TARGET" = "Linux" -a "$MOZ_ALSA_FORCE" != "no"; then + MOZ_ALSA=1 +fi + From owner-freebsd-gecko@FreeBSD.ORG Sun Jul 8 12:45:51 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3C5991065672 for ; Sun, 8 Jul 2012 12:45:51 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 64A0F8FC15 for ; Sun, 8 Jul 2012 12:45:50 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q68Cjngw024520 for ; Sun, 8 Jul 2012 12:45:49 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q68CjhIF016643 for freebsd-gecko@freebsd.org; Sun, 8 Jul 2012 12:45:43 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sun, 8 Jul 2012 12:45:43 GMT Message-Id: <201207081245.q68CjhIF016643@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r852 - in branches/experimental: Mk mail/thunderbird mail/thunderbird-esr mail/thunderbird-esr/files mail/thunderbird/files mail/thunderbird3 mail/thunderbird3/files www/firefox www/firefox-esr www/firefox-esr/files www/firefox-nightly www/firefox-nightly/files www/firefox/files www/firefox36 www/firefox36/files www/kompozer www/libxul www/libxul/files www/libxul19 www/libxul19/files www/seamonkey www/seamonkey/files X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Jul 2012 12:45:51 -0000 Author: jbeich Date: Sun Jul 8 12:45:43 2012 New Revision: 852 Log: proliferate alsa/pulse patch from r814 PulseAudio seems to be common on Gnome desktop. Added: branches/experimental/mail/thunderbird-esr/files/patch-alsapulse branches/experimental/mail/thunderbird-esr/files/patch-bug685258 branches/experimental/mail/thunderbird/files/patch-alsapulse branches/experimental/mail/thunderbird/files/patch-bug685258 branches/experimental/mail/thunderbird3/files/patch-alsapulse branches/experimental/mail/thunderbird3/files/patch-bug685258 branches/experimental/www/firefox-esr/files/patch-alsapulse branches/experimental/www/firefox-esr/files/patch-bug685258 branches/experimental/www/firefox/files/patch-alsapulse - copied, changed from r851, branches/experimental/www/firefox-nightly/files/patch-alsapulse branches/experimental/www/firefox/files/patch-bug685258 branches/experimental/www/firefox36/files/patch-alsapulse branches/experimental/www/firefox36/files/patch-bug685258 branches/experimental/www/firefox36/files/patch-media-libsydneyaudio-src-Makefile.in - copied, changed from r851, branches/experimental/www/firefox36/files/libsydney_oss branches/experimental/www/libxul/files/patch-alsapulse branches/experimental/www/libxul/files/patch-bug685258 branches/experimental/www/libxul19/files/patch-alsapulse branches/experimental/www/libxul19/files/patch-bug685258 branches/experimental/www/libxul19/files/patch-media-libsydneyaudio-src-Makefile.in - copied, changed from r851, branches/experimental/www/libxul19/files/libsydney_oss branches/experimental/www/seamonkey/files/patch-alsapulse branches/experimental/www/seamonkey/files/patch-bug685258 Deleted: branches/experimental/www/firefox36/files/libsydney_oss branches/experimental/www/libxul19/files/libsydney_oss branches/experimental/www/libxul19/files/releng6_pulseaudio Modified: branches/experimental/Mk/bsd.gecko.mk branches/experimental/mail/thunderbird-esr/Makefile branches/experimental/mail/thunderbird/Makefile branches/experimental/mail/thunderbird3/Makefile branches/experimental/mail/thunderbird3/files/patch-mozilla-media-libsydneyaudio-src-Makefile.in branches/experimental/www/firefox-esr/Makefile branches/experimental/www/firefox-nightly/Makefile branches/experimental/www/firefox-nightly/files/patch-alsapulse branches/experimental/www/firefox/Makefile branches/experimental/www/firefox36/Makefile branches/experimental/www/kompozer/Makefile branches/experimental/www/libxul/Makefile branches/experimental/www/libxul19/Makefile branches/experimental/www/seamonkey/Makefile Modified: branches/experimental/Mk/bsd.gecko.mk ============================================================================== --- branches/experimental/Mk/bsd.gecko.mk Sun Jul 8 12:45:24 2012 (r851) +++ branches/experimental/Mk/bsd.gecko.mk Sun Jul 8 12:45:43 2012 (r852) @@ -554,6 +554,9 @@ OPTIONS_DEFINE+=DBUS DEBUG GCONF GIO GNOMEVFS2 LIBPROXY LOGGING OPTIMIZED_CFLAGS +OPTIONS_SINGLE+= AUDIO +OPTIONS_SINGLE_AUDIO= ALSA OSS PULSEAUDIO + GIO_DESC?= GIO for file I/O # move to bsd.options.desc.mk LIGHTNING_DESC?=Calendar extension LOGGING_DESC?= Additional log messages @@ -718,6 +721,17 @@ MOZ_OPTIONS+= --disable-libproxy .endif +.if ${PORT_OPTIONS:MALSA} +LIB_DEPENDS+= asound.2:${PORTSDIR}/audio/alsa-lib +RUN_DEPENDS+= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins +MOZ_OPTIONS+= --enable-alsa +.endif + +.if ${PORT_OPTIONS:MPULSEAUDIO} +LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio +MOZ_OPTIONS+= --enable-pulseaudio +.endif + .if !defined(STRIP) || ${STRIP} == "" MOZ_OPTIONS+= --disable-strip --disable-install-strip .else @@ -812,6 +826,7 @@ ${ECHO_CMD} "fenv.h" >> ${MOZSRC}/${subdir}/config/system-headers ; \ ${ECHO_CMD} "malloc_np.h" >> ${MOZSRC}/${subdir}/config/system-headers ; \ ${ECHO_CMD} "pthread_np.h" >> ${MOZSRC}/${subdir}/config/system-headers ; \ + ${ECHO_CMD} "pulse/pulseaudio.h" >> ${MOZSRC}/${subdir}/config/system-headers ; \ ${ECHO_CMD} "unwind.h" >> ${MOZSRC}/${subdir}/config/system-headers ; \ fi .endfor Modified: branches/experimental/mail/thunderbird-esr/Makefile ============================================================================== --- branches/experimental/mail/thunderbird-esr/Makefile Sun Jul 8 12:45:24 2012 (r851) +++ branches/experimental/mail/thunderbird-esr/Makefile Sun Jul 8 12:45:43 2012 (r852) @@ -56,7 +56,7 @@ SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}/defaults/pref/${PORTNAME}.js MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome -OPTIONS_DEFAULT=DBUS +OPTIONS_DEFAULT=DBUS OSS OPTIONS_DEFINE= LIGHTNING .include Added: branches/experimental/mail/thunderbird-esr/files/patch-alsapulse ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird-esr/files/patch-alsapulse Sun Jul 8 12:45:43 2012 (r852) @@ -0,0 +1,119 @@ +--- mozilla/config/autoconf.mk.in~ ++++ mozilla/config/autoconf.mk.in +@@ -568,7 +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_PULSEAUDIO = @MOZ_PULSEAUDIO@ ++MOZ_PULSEAUDIO_LIBS = @MOZ_PULSEAUDIO_LIBS@ ++MOZ_PULSEAUDIO_CFLAGS = @MOZ_PULSEAUDIO_CFLAGS@ + + GLIB_CFLAGS = @GLIB_CFLAGS@ + GLIB_LIBS = @GLIB_LIBS@ +--- mozilla/configure.in~ ++++ mozilla/configure.in +@@ -5758,17 +5775,48 @@ dnl ==================================== + dnl = Check alsa availability on Linux if using sydneyaudio + dnl ======================================================== + ++MOZ_ARG_ENABLE_BOOL(alsa, ++[ --enable-alsa Enable Alsa support], ++MOZ_ALSA=1, ++MOZ_ALSA= MOZ_ALSA_FORCE=$enableval) ++ + dnl If using sydneyaudio with Linux, ensure that the alsa library is available +-if test -n "$MOZ_SYDNEYAUDIO"; then ++if test -n "$MOZ_SYDNEYAUDIO" -a "$MOZ_ALSA_FORCE" != "no"; then + case "$target_os" in + linux*) ++ MOZ_ALSA=1 ++ ;; ++ esac ++fi ++ ++if test -n "$MOZ_ALSA"; then + PKG_CHECK_MODULES(MOZ_ALSA, alsa, , + [echo "$MOZ_ALSA_PKG_ERRORS" + AC_MSG_ERROR([Need alsa for Ogg, Wave or WebM decoding on Linux. Disable with --disable-ogg --disable-wave --disable-webm. (On Ubuntu, you might try installing the package libasound2-dev.)])]) +- ;; +- esac + fi + ++AC_SUBST(MOZ_ALSA_CFLAGS) ++AC_SUBST(MOZ_ALSA) ++ ++dnl ======================================================== ++dnl = Enable PulseAudio ++dnl ======================================================== ++ ++MOZ_ARG_ENABLE_BOOL(pulseaudio, ++[ --enable-pulseaudio Enable PulseAudio support], ++MOZ_PULSEAUDIO=1, ++MOZ_PULSEAUDIO=) ++ ++if test -n "$MOZ_PULSEAUDIO"; then ++ PKG_CHECK_MODULES(MOZ_PULSEAUDIO, libpulse, , ++ [echo "$MOZ_PULSEAUDIO_PKG_ERRORS" ++ AC_MSG_ERROR([pulseaudio audio backend requires libpulse package])]) ++fi ++ ++AC_SUBST(MOZ_PULSEAUDIO_CFLAGS) ++AC_SUBST(MOZ_PULSEAUDIO_LIBS) ++AC_SUBST(MOZ_PULSEAUDIO) ++ + dnl ======================================================== + dnl Permissions System + dnl ======================================================== +--- mozilla/media/libsydneyaudio/src/Makefile.in~ ++++ mozilla/media/libsydneyaudio/src/Makefile.in +@@ -30,10 +30,6 @@ else ifeq ($(MOZ_WIDGET_TOOLKIT),android) + CSRCS = \ + sydney_audio_android.c \ + $(NULL) +-else ifeq ($(OS_ARCH),Linux) +-CSRCS = \ +- sydney_audio_alsa.c \ +- $(NULL) + endif + + ifeq ($(OS_ARCH),WINNT) +@@ -68,6 +64,18 @@ CSRCS = \ + $(NULL) + endif + ++ifdef MOZ_ALSA ++CSRCS = \ ++ sydney_audio_alsa.c \ ++ $(NULL) ++endif ++ ++ifdef MOZ_PULSEAUDIO ++CSRCS = \ ++ sydney_audio_pulseaudio.c \ ++ $(NULL) ++endif ++ + ifeq ($(OS_ARCH),WINNT) + OS_LIBS += winmm.lib + endif +--- mozilla/toolkit/library/libxul-config.mk~ ++++ mozilla/toolkit/library/libxul-config.mk +@@ -348,10 +348,12 @@ ifdef MOZ_NATIVE_LIBVPX + EXTRA_DSO_LDOPTS += $(MOZ_LIBVPX_LIBS) + endif + +-ifdef MOZ_SYDNEYAUDIO +-ifeq ($(OS_ARCH),Linux) ++ifdef MOZ_ALSA + EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS) + endif ++ ++ifdef MOZ_PULSEAUDIO ++EXTRA_DSO_LDOPTS += $(MOZ_PULSEAUDIO_LIBS) + endif + + ifdef HAVE_CLOCK_MONOTONIC Added: branches/experimental/mail/thunderbird-esr/files/patch-bug685258 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird-esr/files/patch-bug685258 Sun Jul 8 12:45:43 2012 (r852) @@ -0,0 +1,17 @@ +# HG changeset patch +# User Oleg Romashin +# Parent a2291c212856ad27622416e83c8311b6a33b52f1 +Bug 685258 - Pulse audio backend does not check provided playback and crashes r=derf + +diff --git a/content/media/nsAudioStream.cpp b/content/media/nsAudioStream.cpp +--- mozilla/content/media/nsAudioStream.cpp ++++ mozilla/content/media/nsAudioStream.cpp +@@ -429,7 +429,7 @@ nsresult nsNativeAudioStream::Init(PRInt32 aNumChannels, PRInt32 aRate, SampleFo + mFormat = aFormat; + + if (sa_stream_create_pcm(reinterpret_cast(&mAudioHandle), +- NULL, ++ "Mozilla", + SA_MODE_WRONLY, + SA_PCM_FORMAT_S16_NE, + aRate, Modified: branches/experimental/mail/thunderbird/Makefile ============================================================================== --- branches/experimental/mail/thunderbird/Makefile Sun Jul 8 12:45:24 2012 (r851) +++ branches/experimental/mail/thunderbird/Makefile Sun Jul 8 12:45:43 2012 (r852) @@ -56,7 +56,7 @@ SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}/defaults/pref/${PORTNAME}.js MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome -OPTIONS_DEFAULT=DBUS +OPTIONS_DEFAULT=DBUS OSS OPTIONS_DEFINE= LIGHTNING .include Added: branches/experimental/mail/thunderbird/files/patch-alsapulse ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird/files/patch-alsapulse Sun Jul 8 12:45:43 2012 (r852) @@ -0,0 +1,119 @@ +--- mozilla/config/autoconf.mk.in~ ++++ mozilla/config/autoconf.mk.in +@@ -568,7 +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_PULSEAUDIO = @MOZ_PULSEAUDIO@ ++MOZ_PULSEAUDIO_LIBS = @MOZ_PULSEAUDIO_LIBS@ ++MOZ_PULSEAUDIO_CFLAGS = @MOZ_PULSEAUDIO_CFLAGS@ + + GLIB_CFLAGS = @GLIB_CFLAGS@ + GLIB_LIBS = @GLIB_LIBS@ +--- mozilla/configure.in~ ++++ mozilla/configure.in +@@ -5758,17 +5775,48 @@ dnl ==================================== + dnl = Check alsa availability on Linux if using sydneyaudio + dnl ======================================================== + ++MOZ_ARG_ENABLE_BOOL(alsa, ++[ --enable-alsa Enable Alsa support], ++MOZ_ALSA=1, ++MOZ_ALSA= MOZ_ALSA_FORCE=$enableval) ++ + dnl If using sydneyaudio with Linux, ensure that the alsa library is available +-if test -n "$MOZ_SYDNEYAUDIO"; then ++if test -n "$MOZ_SYDNEYAUDIO" -a "$MOZ_ALSA_FORCE" != "no"; then + case "$target_os" in + linux*) ++ MOZ_ALSA=1 ++ ;; ++ esac ++fi ++ ++if test -n "$MOZ_ALSA"; then + PKG_CHECK_MODULES(MOZ_ALSA, alsa, , + [echo "$MOZ_ALSA_PKG_ERRORS" + AC_MSG_ERROR([Need alsa for Ogg, Wave or WebM decoding on Linux. Disable with --disable-ogg --disable-wave --disable-webm. (On Ubuntu, you might try installing the package libasound2-dev.)])]) +- ;; +- esac + fi + ++AC_SUBST(MOZ_ALSA_CFLAGS) ++AC_SUBST(MOZ_ALSA) ++ ++dnl ======================================================== ++dnl = Enable PulseAudio ++dnl ======================================================== ++ ++MOZ_ARG_ENABLE_BOOL(pulseaudio, ++[ --enable-pulseaudio Enable PulseAudio support], ++MOZ_PULSEAUDIO=1, ++MOZ_PULSEAUDIO=) ++ ++if test -n "$MOZ_PULSEAUDIO"; then ++ PKG_CHECK_MODULES(MOZ_PULSEAUDIO, libpulse, , ++ [echo "$MOZ_PULSEAUDIO_PKG_ERRORS" ++ AC_MSG_ERROR([pulseaudio audio backend requires libpulse package])]) ++fi ++ ++AC_SUBST(MOZ_PULSEAUDIO_CFLAGS) ++AC_SUBST(MOZ_PULSEAUDIO_LIBS) ++AC_SUBST(MOZ_PULSEAUDIO) ++ + dnl ======================================================== + dnl Permissions System + dnl ======================================================== +--- mozilla/media/libsydneyaudio/src/Makefile.in~ ++++ mozilla/media/libsydneyaudio/src/Makefile.in +@@ -30,10 +30,6 @@ else ifeq ($(MOZ_WIDGET_TOOLKIT),android) + CSRCS = \ + sydney_audio_android.c \ + $(NULL) +-else ifeq ($(OS_ARCH),Linux) +-CSRCS = \ +- sydney_audio_alsa.c \ +- $(NULL) + endif + + ifeq ($(OS_ARCH),WINNT) +@@ -68,6 +64,18 @@ CSRCS = \ + $(NULL) + endif + ++ifdef MOZ_ALSA ++CSRCS = \ ++ sydney_audio_alsa.c \ ++ $(NULL) ++endif ++ ++ifdef MOZ_PULSEAUDIO ++CSRCS = \ ++ sydney_audio_pulseaudio.c \ ++ $(NULL) ++endif ++ + ifeq ($(OS_ARCH),WINNT) + OS_LIBS += winmm.lib + endif +--- mozilla/toolkit/library/Makefile.in~ ++++ mozilla/toolkit/library/Makefile.in +@@ -375,10 +375,12 @@ endif + + EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,gkmedias,$(DIST)/lib) + +-ifdef MOZ_SYDNEYAUDIO +-ifeq ($(OS_ARCH),Linux) ++ifdef MOZ_ALSA + EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS) + endif ++ ++ifdef MOZ_PULSEAUDIO ++EXTRA_DSO_LDOPTS += $(MOZ_PULSEAUDIO_LIBS) + endif + + ifdef HAVE_CLOCK_MONOTONIC Added: branches/experimental/mail/thunderbird/files/patch-bug685258 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird/files/patch-bug685258 Sun Jul 8 12:45:43 2012 (r852) @@ -0,0 +1,17 @@ +# HG changeset patch +# User Oleg Romashin +# Parent a2291c212856ad27622416e83c8311b6a33b52f1 +Bug 685258 - Pulse audio backend does not check provided playback and crashes r=derf + +diff --git a/content/media/nsAudioStream.cpp b/content/media/nsAudioStream.cpp +--- mozilla/content/media/nsAudioStream.cpp ++++ mozilla/content/media/nsAudioStream.cpp +@@ -429,7 +429,7 @@ nsresult nsNativeAudioStream::Init(PRInt32 aNumChannels, PRInt32 aRate, SampleFo + mFormat = aFormat; + + if (sa_stream_create_pcm(reinterpret_cast(&mAudioHandle), +- NULL, ++ "Mozilla", + SA_MODE_WRONLY, + SA_PCM_FORMAT_S16_NE, + aRate, Modified: branches/experimental/mail/thunderbird3/Makefile ============================================================================== --- branches/experimental/mail/thunderbird3/Makefile Sun Jul 8 12:45:24 2012 (r851) +++ branches/experimental/mail/thunderbird3/Makefile Sun Jul 8 12:45:43 2012 (r852) @@ -52,7 +52,7 @@ SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}/defaults/pref/${PORTNAME}.js MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome -OPTIONS_DEFAULT=DBUS +OPTIONS_DEFAULT=DBUS OSS .include Added: branches/experimental/mail/thunderbird3/files/patch-alsapulse ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird3/files/patch-alsapulse Sun Jul 8 12:45:43 2012 (r852) @@ -0,0 +1,122 @@ +--- mozilla/config/autoconf.mk.in~ ++++ mozilla/config/autoconf.mk.in +@@ -555,6 +555,14 @@ 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_PULSEAUDIO = @MOZ_PULSEAUDIO@ ++MOZ_PULSEAUDIO_LIBS = @MOZ_PULSEAUDIO_LIBS@ ++MOZ_PULSEAUDIO_CFLAGS = @MOZ_PULSEAUDIO_CFLAGS@ ++ + GLIB_CFLAGS = @GLIB_CFLAGS@ + GLIB_LIBS = @GLIB_LIBS@ + GLIB_GMODULE_LIBS = @GLIB_GMODULE_LIBS@ +--- mozilla/configure.in~ ++++ mozilla/configure.in +@@ -5660,15 +5660,49 @@ dnl ==================================== + + dnl If using sydneyaudio with Linux, ensure that the alsa library is available + if test "$COMPILE_ENVIRONMENT"; then +-if test -n "$MOZ_SYDNEYAUDIO"; then ++MOZ_ARG_ENABLE_BOOL(alsa, ++[ --enable-alsa Enable Alsa support], ++MOZ_ALSA=1, ++MOZ_ALSA= MOZ_ALSA_FORCE=$enableval) ++ ++if test -n "$MOZ_SYDNEYAUDIO" -a "$MOZ_ALSA_FORCE" != "no"; then + case "$target_os" in + linux*) +- AC_CHECK_LIB(asound, snd_pcm_open,,AC_MSG_ERROR([Ogg support on Linux requires the alsa library])) ++ MOZ_ALSA=1 + ;; + esac + fi ++ ++if test -n "$MOZ_ALSA"; then ++ PKG_CHECK_MODULES(MOZ_ALSA, alsa, , ++ [echo "$MOZ_ALSA_PKG_ERRORS" ++ AC_MSG_ERROR([Need alsa for Ogg, Wave or WebM decoding on Linux. Disable with --disable-ogg --disable-wave --disable-webm. (On Ubuntu, you might try installing the package libasound2-dev.)])]) ++fi + fi + ++AC_SUBST(MOZ_ALSA_CFLAGS) ++AC_SUBST(MOZ_ALSA_LIBS) ++AC_SUBST(MOZ_ALSA) ++ ++dnl ======================================================== ++dnl = Enable PulseAudio ++dnl ======================================================== ++ ++MOZ_ARG_ENABLE_BOOL(pulseaudio, ++[ --enable-pulseaudio Enable PulseAudio support], ++MOZ_PULSEAUDIO=1, ++MOZ_PULSEAUDIO=) ++ ++if test -n "$MOZ_PULSEAUDIO"; then ++ PKG_CHECK_MODULES(MOZ_PULSEAUDIO, libpulse, , ++ [echo "$MOZ_PULSEAUDIO_PKG_ERRORS" ++ AC_MSG_ERROR([pulseaudio audio backend requires libpulse package])]) ++fi ++ ++AC_SUBST(MOZ_PULSEAUDIO_CFLAGS) ++AC_SUBST(MOZ_PULSEAUDIO_LIBS) ++AC_SUBST(MOZ_PULSEAUDIO) ++ + dnl ======================================================== + dnl Splashscreen + dnl ======================================================== +--- mozilla/media/libsydneyaudio/src/Makefile.in~ ++++ mozilla/media/libsydneyaudio/src/Makefile.in +@@ -45,12 +45,6 @@ MODULE = sydneyaudio + LIBRARY_NAME = sydneyaudio + FORCE_STATIC_LIB= 1 + +-ifeq ($(OS_ARCH),Linux) +-CSRCS = \ +- sydney_audio_alsa.c \ +- $(NULL) +-endif +- + ifneq (,$(filter WINNT WINCE,$(OS_ARCH))) + CSRCS = \ + sydney_audio_waveapi.c \ +@@ -83,6 +83,18 @@ CSRCS = \ + $(NULL) + endif + ++ifdef MOZ_ALSA ++CSRCS = \ ++ sydney_audio_alsa.c \ ++ $(NULL) ++endif ++ ++ifdef MOZ_PULSEAUDIO ++CSRCS = \ ++ sydney_audio_pulseaudio.c \ ++ $(NULL) ++endif ++ + ifeq ($(OS_ARCH),WINNT) + OS_LIBS += winmm.lib + endif +--- mozilla/layout/build/Makefile.in~ ++++ mozilla/layout/build/Makefile.in +@@ -277,6 +277,14 @@ ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLK + EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) + endif + ++ifdef MOZ_ALSA ++EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS) ++endif ++ ++ifdef MOZ_PULSEAUDIO ++EXTRA_DSO_LDOPTS += $(MOZ_PULSEAUDIO_LIBS) ++endif ++ + ifdef MOZ_SYDNEYAUDIO + ifeq ($(OS_ARCH),Darwin) + OS_LIBS += -framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon Added: branches/experimental/mail/thunderbird3/files/patch-bug685258 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird3/files/patch-bug685258 Sun Jul 8 12:45:43 2012 (r852) @@ -0,0 +1,17 @@ +# HG changeset patch +# User Oleg Romashin +# Parent a2291c212856ad27622416e83c8311b6a33b52f1 +Bug 685258 - Pulse audio backend does not check provided playback and crashes r=derf + +diff --git a/content/media/nsAudioStream.cpp b/content/media/nsAudioStream.cpp +--- mozilla/content/media/nsAudioStream.cpp ++++ mozilla/content/media/nsAudioStream.cpp +@@ -83,7 +83,7 @@ void nsAudioStream::Init(PRInt32 aNumCha + mChannels = aNumChannels; + mFormat = aFormat; + if (sa_stream_create_pcm(reinterpret_cast(&mAudioHandle), +- NULL, ++ "Mozilla", + SA_MODE_WRONLY, + SA_PCM_FORMAT_S16_NE, + aRate, Modified: branches/experimental/mail/thunderbird3/files/patch-mozilla-media-libsydneyaudio-src-Makefile.in ============================================================================== --- branches/experimental/mail/thunderbird3/files/patch-mozilla-media-libsydneyaudio-src-Makefile.in Sun Jul 8 12:45:24 2012 (r851) +++ branches/experimental/mail/thunderbird3/files/patch-mozilla-media-libsydneyaudio-src-Makefile.in Sun Jul 8 12:45:43 2012 (r852) @@ -10,6 +10,6 @@ + $(NULL) +endif + - ifeq ($(OS_ARCH),Linux) + ifneq (,$(filter WINNT WINCE,$(OS_ARCH))) CSRCS = \ - sydney_audio_alsa.c \ + sydney_audio_waveapi.c \ Modified: branches/experimental/www/firefox-esr/Makefile ============================================================================== --- branches/experimental/www/firefox-esr/Makefile Sun Jul 8 12:45:24 2012 (r851) +++ branches/experimental/www/firefox-esr/Makefile Sun Jul 8 12:45:43 2012 (r852) @@ -53,7 +53,7 @@ --disable-updater \ --disable-necko-wifi -OPTIONS_DEFAULT=DBUS +OPTIONS_DEFAULT=DBUS OSS OPTIONS_DEFINE= PGO .include Added: branches/experimental/www/firefox-esr/files/patch-alsapulse ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox-esr/files/patch-alsapulse Sun Jul 8 12:45:43 2012 (r852) @@ -0,0 +1,119 @@ +--- config/autoconf.mk.in~ ++++ config/autoconf.mk.in +@@ -568,7 +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_PULSEAUDIO = @MOZ_PULSEAUDIO@ ++MOZ_PULSEAUDIO_LIBS = @MOZ_PULSEAUDIO_LIBS@ ++MOZ_PULSEAUDIO_CFLAGS = @MOZ_PULSEAUDIO_CFLAGS@ + + GLIB_CFLAGS = @GLIB_CFLAGS@ + GLIB_LIBS = @GLIB_LIBS@ +--- configure.in~ ++++ configure.in +@@ -5758,17 +5775,48 @@ dnl ==================================== + dnl = Check alsa availability on Linux if using sydneyaudio + dnl ======================================================== + ++MOZ_ARG_ENABLE_BOOL(alsa, ++[ --enable-alsa Enable Alsa support], ++MOZ_ALSA=1, ++MOZ_ALSA= MOZ_ALSA_FORCE=$enableval) ++ + dnl If using sydneyaudio with Linux, ensure that the alsa library is available +-if test -n "$MOZ_SYDNEYAUDIO"; then ++if test -n "$MOZ_SYDNEYAUDIO" -a "$MOZ_ALSA_FORCE" != "no"; then + case "$target_os" in + linux*) ++ MOZ_ALSA=1 ++ ;; ++ esac ++fi ++ ++if test -n "$MOZ_ALSA"; then + PKG_CHECK_MODULES(MOZ_ALSA, alsa, , + [echo "$MOZ_ALSA_PKG_ERRORS" + AC_MSG_ERROR([Need alsa for Ogg, Wave or WebM decoding on Linux. Disable with --disable-ogg --disable-wave --disable-webm. (On Ubuntu, you might try installing the package libasound2-dev.)])]) +- ;; +- esac + fi + ++AC_SUBST(MOZ_ALSA_CFLAGS) ++AC_SUBST(MOZ_ALSA) ++ ++dnl ======================================================== ++dnl = Enable PulseAudio ++dnl ======================================================== ++ ++MOZ_ARG_ENABLE_BOOL(pulseaudio, ++[ --enable-pulseaudio Enable PulseAudio support], ++MOZ_PULSEAUDIO=1, ++MOZ_PULSEAUDIO=) ++ ++if test -n "$MOZ_PULSEAUDIO"; then ++ PKG_CHECK_MODULES(MOZ_PULSEAUDIO, libpulse, , ++ [echo "$MOZ_PULSEAUDIO_PKG_ERRORS" ++ AC_MSG_ERROR([pulseaudio audio backend requires libpulse package])]) ++fi ++ ++AC_SUBST(MOZ_PULSEAUDIO_CFLAGS) ++AC_SUBST(MOZ_PULSEAUDIO_LIBS) ++AC_SUBST(MOZ_PULSEAUDIO) ++ + dnl ======================================================== + dnl Permissions System + dnl ======================================================== +--- media/libsydneyaudio/src/Makefile.in~ ++++ media/libsydneyaudio/src/Makefile.in +@@ -30,10 +30,6 @@ else ifeq ($(MOZ_WIDGET_TOOLKIT),android) + CSRCS = \ + sydney_audio_android.c \ + $(NULL) +-else ifeq ($(OS_ARCH),Linux) +-CSRCS = \ +- sydney_audio_alsa.c \ +- $(NULL) + endif + + ifeq ($(OS_ARCH),WINNT) +@@ -68,6 +64,18 @@ CSRCS = \ + $(NULL) + endif + ++ifdef MOZ_ALSA ++CSRCS = \ ++ sydney_audio_alsa.c \ ++ $(NULL) ++endif ++ ++ifdef MOZ_PULSEAUDIO ++CSRCS = \ ++ sydney_audio_pulseaudio.c \ ++ $(NULL) ++endif ++ + ifeq ($(OS_ARCH),WINNT) + OS_LIBS += winmm.lib + endif +--- toolkit/library/libxul-config.mk~ ++++ toolkit/library/libxul-config.mk +@@ -348,10 +348,12 @@ ifdef MOZ_NATIVE_LIBVPX + EXTRA_DSO_LDOPTS += $(MOZ_LIBVPX_LIBS) + endif + +-ifdef MOZ_SYDNEYAUDIO +-ifeq ($(OS_ARCH),Linux) ++ifdef MOZ_ALSA + EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS) + endif ++ ++ifdef MOZ_PULSEAUDIO ++EXTRA_DSO_LDOPTS += $(MOZ_PULSEAUDIO_LIBS) + endif + + ifdef HAVE_CLOCK_MONOTONIC Added: branches/experimental/www/firefox-esr/files/patch-bug685258 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox-esr/files/patch-bug685258 Sun Jul 8 12:45:43 2012 (r852) @@ -0,0 +1,17 @@ +# HG changeset patch +# User Oleg Romashin +# Parent a2291c212856ad27622416e83c8311b6a33b52f1 +Bug 685258 - Pulse audio backend does not check provided playback and crashes r=derf + +diff --git a/content/media/nsAudioStream.cpp b/content/media/nsAudioStream.cpp +--- content/media/nsAudioStream.cpp ++++ content/media/nsAudioStream.cpp +@@ -429,7 +429,7 @@ nsresult nsNativeAudioStream::Init(PRInt32 aNumChannels, PRInt32 aRate, SampleFo + mFormat = aFormat; + + if (sa_stream_create_pcm(reinterpret_cast(&mAudioHandle), +- NULL, ++ "Mozilla", + SA_MODE_WRONLY, + SA_PCM_FORMAT_S16_NE, + aRate, Modified: branches/experimental/www/firefox-nightly/Makefile ============================================================================== --- branches/experimental/www/firefox-nightly/Makefile Sun Jul 8 12:45:24 2012 (r851) +++ branches/experimental/www/firefox-nightly/Makefile Sun Jul 8 12:45:43 2012 (r852) @@ -54,10 +54,6 @@ --disable-necko-wifi OPTIONS_DEFAULT=DBUS GSTREAMER OSS - -OPTIONS_SINGLE+= AUDIO -OPTIONS_SINGLE_AUDIO= ALSA OSS PULSEAUDIO - OPTIONS_DEFINE= GSTREAMER PGO .if ${USE_MOZILLA:M-nss} @@ -91,17 +87,6 @@ MOZ_OPTIONS+= --disable-gnomeui .endif -.if ${PORT_OPTIONS:MALSA} -LIB_DEPENDS+= asound.2:${PORTSDIR}/audio/alsa-lib -RUN_DEPENDS+= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins -MOZ_OPTIONS+= --enable-alsa -.endif - -.if ${PORT_OPTIONS:MPULSEAUDIO} -LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio -MOZ_OPTIONS+= --enable-pulseaudio -.endif - .if ${PORT_OPTIONS:MPGO} USE_DISPLAY= yes Modified: branches/experimental/www/firefox-nightly/files/patch-alsapulse ============================================================================== --- branches/experimental/www/firefox-nightly/files/patch-alsapulse Sun Jul 8 12:45:24 2012 (r851) +++ branches/experimental/www/firefox-nightly/files/patch-alsapulse Sun Jul 8 12:45:43 2012 (r852) @@ -17,18 +17,6 @@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GLIB_GMODULE_LIBS = @GLIB_GMODULE_LIBS@ -diff --git config/system-headers config/system-headers -index 84b03b4..5f49f7a 100644 ---- config/system-headers -+++ config/system-headers -@@ -595,6 +595,7 @@ psap.h - Pt.h - pthread.h - pthread_np.h -+pulse/pulseaudio.h - pwd.h - Python.h - QDOffscreen.h diff --git configure.in configure.in index 5980b76..11f5f77 100644 --- configure.in @@ -80,18 +68,6 @@ dnl ======================================================== dnl = Enable GStreamer dnl ======================================================== -diff --git js/src/config/system-headers js/src/config/system-headers -index 84b03b4..5f49f7a 100644 ---- js/src/config/system-headers -+++ js/src/config/system-headers -@@ -595,6 +595,7 @@ psap.h - Pt.h - pthread.h - pthread_np.h -+pulse/pulseaudio.h - pwd.h - Python.h - QDOffscreen.h diff --git media/libcubeb/src/Makefile.in media/libcubeb/src/Makefile.in index 5ab4dd8..c8df26f 100644 --- media/libcubeb/src/Makefile.in Modified: branches/experimental/www/firefox/Makefile ============================================================================== --- branches/experimental/www/firefox/Makefile Sun Jul 8 12:45:24 2012 (r851) +++ branches/experimental/www/firefox/Makefile Sun Jul 8 12:45:43 2012 (r852) @@ -53,7 +53,7 @@ --disable-updater \ --disable-necko-wifi -OPTIONS_DEFAULT=DBUS +OPTIONS_DEFAULT=DBUS OSS OPTIONS_DEFINE= PGO .include Copied and modified: branches/experimental/www/firefox/files/patch-alsapulse (from r851, branches/experimental/www/firefox-nightly/files/patch-alsapulse) ============================================================================== --- branches/experimental/www/firefox-nightly/files/patch-alsapulse Sun Jul 8 12:45:24 2012 (r851, copy source) +++ branches/experimental/www/firefox/files/patch-alsapulse Sun Jul 8 12:45:43 2012 (r852) @@ -1,39 +1,22 @@ -diff --git config/autoconf.mk.in config/autoconf.mk.in -index 44c0b06..748511b 100644 ---- config/autoconf.mk.in +--- config/autoconf.mk.in~ +++ config/autoconf.mk.in -@@ -536,9 +536,14 @@ MOZ_LIBNOTIFY_CFLAGS = @MOZ_LIBNOTIFY_CFLAGS@ +@@ -568,7 +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@ +MOZ_PULSEAUDIO_CFLAGS = @MOZ_PULSEAUDIO_CFLAGS@ -+ + GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ - GLIB_GMODULE_LIBS = @GLIB_GMODULE_LIBS@ -diff --git config/system-headers config/system-headers -index 84b03b4..5f49f7a 100644 ---- config/system-headers -+++ config/system-headers -@@ -595,6 +595,7 @@ psap.h - Pt.h - pthread.h - pthread_np.h -+pulse/pulseaudio.h - pwd.h - Python.h - QDOffscreen.h -diff --git configure.in configure.in -index 5980b76..11f5f77 100644 ---- configure.in +--- configure.in~ +++ configure.in -@@ -5600,13 +5600,45 @@ dnl ======================================================== +@@ -5758,17 +5775,48 @@ dnl ==================================== dnl = Check alsa availability on Linux if using sydneyaudio dnl ======================================================== @@ -43,18 +26,24 @@ +MOZ_ALSA= MOZ_ALSA_FORCE=$enableval) + dnl If using sydneyaudio with Linux, ensure that the alsa library is available --if test -n "$MOZ_SYDNEYAUDIO" -a "$OS_TARGET" = "Linux"; then -+if test -n "$MOZ_SYDNEYAUDIO" -a "$OS_TARGET" = "Linux" -a "$MOZ_ALSA_FORCE" != "no"; then -+ MOZ_ALSA=1 +-if test -n "$MOZ_SYDNEYAUDIO"; then ++if test -n "$MOZ_SYDNEYAUDIO" -a "$MOZ_ALSA_FORCE" != "no"; then + case "$target_os" in + linux*) ++ MOZ_ALSA=1 ++ ;; ++ esac +fi + +if test -n "$MOZ_ALSA"; then - PKG_CHECK_MODULES(MOZ_ALSA, alsa, , + PKG_CHECK_MODULES(MOZ_ALSA, alsa, , [echo "$MOZ_ALSA_PKG_ERRORS" AC_MSG_ERROR([Need alsa for Ogg, Wave or WebM decoding on Linux. Disable with --disable-ogg --disable-wave --disable-webm. (On Ubuntu, you might try installing the package libasound2-dev.)])]) -+ AC_DEFINE(MOZ_CUBEB) +- ;; +- esac fi ++AC_SUBST(MOZ_ALSA_CFLAGS) +AC_SUBST(MOZ_ALSA) + +dnl ======================================================== @@ -70,7 +59,6 @@ + PKG_CHECK_MODULES(MOZ_PULSEAUDIO, libpulse, , + [echo "$MOZ_PULSEAUDIO_PKG_ERRORS" + AC_MSG_ERROR([pulseaudio audio backend requires libpulse package])]) -+ AC_DEFINE(MOZ_CUBEB) +fi + +AC_SUBST(MOZ_PULSEAUDIO_CFLAGS) @@ -78,69 +66,9 @@ +AC_SUBST(MOZ_PULSEAUDIO) + dnl ======================================================== - dnl = Enable GStreamer + dnl Permissions System dnl ======================================================== -diff --git js/src/config/system-headers js/src/config/system-headers -index 84b03b4..5f49f7a 100644 ---- js/src/config/system-headers -+++ js/src/config/system-headers -@@ -595,6 +595,7 @@ psap.h - Pt.h - pthread.h - pthread_np.h -+pulse/pulseaudio.h - pwd.h - Python.h - QDOffscreen.h -diff --git media/libcubeb/src/Makefile.in media/libcubeb/src/Makefile.in -index 5ab4dd8..c8df26f 100644 ---- media/libcubeb/src/Makefile.in -+++ media/libcubeb/src/Makefile.in -@@ -24,10 +24,6 @@ endif - - ifeq ($(OS_TARGET),Android) - # No Android implementation of libcubeb yet. --else ifeq ($(OS_TARGET),Linux) --CSRCS = \ -- cubeb_alsa.c \ -- $(NULL) - endif - - ifeq ($(OS_TARGET),Darwin) -@@ -42,4 +38,16 @@ CSRCS = \ - $(NULL) - endif - -+ifdef MOZ_ALSA -+CSRCS = \ -+ cubeb_alsa.c \ -+ $(NULL) -+endif -+ -+ifdef MOZ_PULSEAUDIO -+CSRCS = \ -+ cubeb_pulse.c \ -+ $(NULL) -+endif -+ - include $(topsrcdir)/config/rules.mk -diff --git media/libcubeb/src/cubeb_alsa.c media/libcubeb/src/cubeb_alsa.c -index 599aea2..41fd5af 100644 ---- media/libcubeb/src/cubeb_alsa.c -+++ media/libcubeb/src/cubeb_alsa.c -@@ -6,7 +6,9 @@ - */ - #undef NDEBUG - #define _BSD_SOURCE -+#ifndef __FreeBSD__ - #define _POSIX_SOURCE -+#endif - #include - #include - #include -diff --git media/libsydneyaudio/src/Makefile.in media/libsydneyaudio/src/Makefile.in -index 8dda8ce..b19641d 100644 ---- media/libsydneyaudio/src/Makefile.in +--- media/libsydneyaudio/src/Makefile.in~ +++ media/libsydneyaudio/src/Makefile.in @@ -30,10 +30,6 @@ else ifeq ($(MOZ_WIDGET_TOOLKIT),android) CSRCS = \ @@ -172,9 +100,7 @@ ifeq ($(OS_ARCH),WINNT) OS_LIBS += winmm.lib endif -diff --git toolkit/library/Makefile.in toolkit/library/Makefile.in -index 43384e9..e46a6e3 100644 ---- toolkit/library/Makefile.in +--- toolkit/library/Makefile.in~ +++ toolkit/library/Makefile.in @@ -375,10 +375,12 @@ endif Added: branches/experimental/www/firefox/files/patch-bug685258 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox/files/patch-bug685258 Sun Jul 8 12:45:43 2012 (r852) @@ -0,0 +1,17 @@ +# HG changeset patch +# User Oleg Romashin +# Parent a2291c212856ad27622416e83c8311b6a33b52f1 +Bug 685258 - Pulse audio backend does not check provided playback and crashes r=derf + +diff --git a/content/media/nsAudioStream.cpp b/content/media/nsAudioStream.cpp +--- content/media/nsAudioStream.cpp ++++ content/media/nsAudioStream.cpp +@@ -429,7 +429,7 @@ nsresult nsNativeAudioStream::Init(PRInt32 aNumChannels, PRInt32 aRate, SampleFo + mFormat = aFormat; + + if (sa_stream_create_pcm(reinterpret_cast(&mAudioHandle), +- NULL, ++ "Mozilla", + SA_MODE_WRONLY, + SA_PCM_FORMAT_S16_NE, + aRate, Modified: branches/experimental/www/firefox36/Makefile ============================================================================== --- branches/experimental/www/firefox36/Makefile Sun Jul 8 12:45:24 2012 (r851) +++ branches/experimental/www/firefox36/Makefile Sun Jul 8 12:45:43 2012 (r852) @@ -49,14 +49,12 @@ --disable-updater \ --disable-necko-wifi -OPTIONS_DEFAULT=DBUS +OPTIONS_DEFAULT=DBUS OSS .include OPTIONS_DEFINE:=${OPTIONS_DEFINE:NLIBPROXY} -EXTRA_PATCHES= ${FILESDIR}/libsydney_oss - .if ${ARCH} == amd64 CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL} .elif ${ARCH} == powerpc64 Deleted: branches/experimental/www/firefox36/files/libsydney_oss ============================================================================== --- branches/experimental/www/firefox36/files/libsydney_oss Sun Jul 8 12:45:43 2012 (r851) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,15 +0,0 @@ ---- media/libsydneyaudio/src/Makefile.in.orig 2009-08-11 16:28:21.000000000 +0200 -+++ media/libsydneyaudio/src/Makefile.in 2009-08-11 16:29:08.000000000 +0200 -@@ -45,6 +45,12 @@ - LIBRARY_NAME = sydneyaudio - FORCE_STATIC_LIB= 1 - -+ifeq ($(OS_ARCH),FreeBSD) -+CSRCS = \ -+ sydney_audio_oss.c \ -+ $(NULL) -+endif -+ - ifeq ($(OS_ARCH),Linux) - CSRCS = \ - sydney_audio_alsa.c \ Added: branches/experimental/www/firefox36/files/patch-alsapulse ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox36/files/patch-alsapulse Sun Jul 8 12:45:43 2012 (r852) @@ -0,0 +1,122 @@ +--- config/autoconf.mk.in~ ++++ config/autoconf.mk.in +@@ -555,6 +555,14 @@ 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_PULSEAUDIO = @MOZ_PULSEAUDIO@ ++MOZ_PULSEAUDIO_LIBS = @MOZ_PULSEAUDIO_LIBS@ ++MOZ_PULSEAUDIO_CFLAGS = @MOZ_PULSEAUDIO_CFLAGS@ ++ + GLIB_CFLAGS = @GLIB_CFLAGS@ + GLIB_LIBS = @GLIB_LIBS@ + GLIB_GMODULE_LIBS = @GLIB_GMODULE_LIBS@ +--- configure.in~ ++++ configure.in +@@ -5660,15 +5660,49 @@ dnl ==================================== + + dnl If using sydneyaudio with Linux, ensure that the alsa library is available + if test "$COMPILE_ENVIRONMENT"; then +-if test -n "$MOZ_SYDNEYAUDIO"; then ++MOZ_ARG_ENABLE_BOOL(alsa, ++[ --enable-alsa Enable Alsa support], ++MOZ_ALSA=1, ++MOZ_ALSA= MOZ_ALSA_FORCE=$enableval) ++ ++if test -n "$MOZ_SYDNEYAUDIO" -a "$MOZ_ALSA_FORCE" != "no"; then + case "$target_os" in + linux*) +- AC_CHECK_LIB(asound, snd_pcm_open,,AC_MSG_ERROR([Ogg support on Linux requires the alsa library])) ++ MOZ_ALSA=1 + ;; + esac + fi ++ ++if test -n "$MOZ_ALSA"; then ++ PKG_CHECK_MODULES(MOZ_ALSA, alsa, , ++ [echo "$MOZ_ALSA_PKG_ERRORS" ++ AC_MSG_ERROR([Need alsa for Ogg, Wave or WebM decoding on Linux. Disable with --disable-ogg --disable-wave --disable-webm. (On Ubuntu, you might try installing the package libasound2-dev.)])]) ++fi + fi + ++AC_SUBST(MOZ_ALSA_CFLAGS) ++AC_SUBST(MOZ_ALSA_LIBS) ++AC_SUBST(MOZ_ALSA) ++ ++dnl ======================================================== ++dnl = Enable PulseAudio ++dnl ======================================================== ++ ++MOZ_ARG_ENABLE_BOOL(pulseaudio, ++[ --enable-pulseaudio Enable PulseAudio support], ++MOZ_PULSEAUDIO=1, ++MOZ_PULSEAUDIO=) ++ ++if test -n "$MOZ_PULSEAUDIO"; then ++ PKG_CHECK_MODULES(MOZ_PULSEAUDIO, libpulse, , ++ [echo "$MOZ_PULSEAUDIO_PKG_ERRORS" ++ AC_MSG_ERROR([pulseaudio audio backend requires libpulse package])]) ++fi ++ ++AC_SUBST(MOZ_PULSEAUDIO_CFLAGS) ++AC_SUBST(MOZ_PULSEAUDIO_LIBS) ++AC_SUBST(MOZ_PULSEAUDIO) ++ + dnl ======================================================== + dnl Splashscreen + dnl ======================================================== +--- media/libsydneyaudio/src/Makefile.in~ ++++ media/libsydneyaudio/src/Makefile.in +@@ -45,12 +45,6 @@ MODULE = sydneyaudio + LIBRARY_NAME = sydneyaudio + FORCE_STATIC_LIB= 1 + +-ifeq ($(OS_ARCH),Linux) +-CSRCS = \ +- sydney_audio_alsa.c \ +- $(NULL) +-endif +- + ifneq (,$(filter WINNT WINCE,$(OS_ARCH))) + CSRCS = \ + sydney_audio_waveapi.c \ +@@ -83,6 +83,18 @@ CSRCS = \ + $(NULL) + endif + ++ifdef MOZ_ALSA ++CSRCS = \ ++ sydney_audio_alsa.c \ ++ $(NULL) ++endif ++ ++ifdef MOZ_PULSEAUDIO ++CSRCS = \ ++ sydney_audio_pulseaudio.c \ ++ $(NULL) ++endif ++ + ifeq ($(OS_ARCH),WINNT) + OS_LIBS += winmm.lib + endif +--- toolkit/library/libxul-config.mk~ ++++ toolkit/library/libxul-config.mk +@@ -90,6 +90,14 @@ endif + LOCAL_INCLUDES += -I$(topsrcdir)/widget/src/os2 + endif + ++ifdef MOZ_ALSA ++EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS) ++endif ++ ++ifdef MOZ_PULSEAUDIO ++EXTRA_DSO_LDOPTS += $(MOZ_PULSEAUDIO_LIBS) ++endif ++ + # dependent libraries + ifdef MOZ_IPC + STATIC_LIBS += \ Added: branches/experimental/www/firefox36/files/patch-bug685258 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox36/files/patch-bug685258 Sun Jul 8 12:45:43 2012 (r852) @@ -0,0 +1,17 @@ +# HG changeset patch +# User Oleg Romashin +# Parent a2291c212856ad27622416e83c8311b6a33b52f1 +Bug 685258 - Pulse audio backend does not check provided playback and crashes r=derf + +diff --git a/content/media/nsAudioStream.cpp b/content/media/nsAudioStream.cpp +--- content/media/nsAudioStream.cpp ++++ content/media/nsAudioStream.cpp +@@ -83,7 +83,7 @@ void nsAudioStream::Init(PRInt32 aNumCha + mChannels = aNumChannels; + mFormat = aFormat; + if (sa_stream_create_pcm(reinterpret_cast(&mAudioHandle), +- NULL, ++ "Mozilla", + SA_MODE_WRONLY, + SA_PCM_FORMAT_S16_NE, + aRate, Copied and modified: branches/experimental/www/firefox36/files/patch-media-libsydneyaudio-src-Makefile.in (from r851, branches/experimental/www/firefox36/files/libsydney_oss) ============================================================================== --- branches/experimental/www/firefox36/files/libsydney_oss Sun Jul 8 12:45:24 2012 (r851, copy source) +++ branches/experimental/www/firefox36/files/patch-media-libsydneyaudio-src-Makefile.in Sun Jul 8 12:45:43 2012 (r852) @@ -10,6 +10,6 @@ + $(NULL) +endif + - ifeq ($(OS_ARCH),Linux) + ifneq (,$(filter WINNT WINCE,$(OS_ARCH))) CSRCS = \ - sydney_audio_alsa.c \ + sydney_audio_waveapi.c \ Modified: branches/experimental/www/kompozer/Makefile ============================================================================== --- branches/experimental/www/kompozer/Makefile Sun Jul 8 12:45:24 2012 (r851) +++ branches/experimental/www/kompozer/Makefile Sun Jul 8 12:45:43 2012 (r852) @@ -45,6 +45,7 @@ .include OPTIONS_DEFINE:=${OPTIONS_DEFINE:NDBUS:NGIO:NLIBPROXY} +OPTIONS_SINGLE:=${OPTIONS_SINGLE:NAUDIO} .if ${ARCH} == amd64 CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL} Modified: branches/experimental/www/libxul/Makefile ============================================================================== --- branches/experimental/www/libxul/Makefile Sun Jul 8 12:45:24 2012 (r851) +++ branches/experimental/www/libxul/Makefile Sun Jul 8 12:45:43 2012 (r852) @@ -45,7 +45,7 @@ --disable-updater \ --disable-necko-wifi MOZ_EXTENSIONS= default,cookie,permissions -OPTIONS_DEFAULT=DBUS +OPTIONS_DEFAULT=DBUS OSS USE_GECKO= gecko MOZILLA_EXEC_NAME=xulrunner USE_MOZILLA= # empty Added: branches/experimental/www/libxul/files/patch-alsapulse ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/libxul/files/patch-alsapulse Sun Jul 8 12:45:43 2012 (r852) @@ -0,0 +1,119 @@ +--- config/autoconf.mk.in~ ++++ config/autoconf.mk.in +@@ -568,7 +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_PULSEAUDIO = @MOZ_PULSEAUDIO@ ++MOZ_PULSEAUDIO_LIBS = @MOZ_PULSEAUDIO_LIBS@ ++MOZ_PULSEAUDIO_CFLAGS = @MOZ_PULSEAUDIO_CFLAGS@ + + GLIB_CFLAGS = @GLIB_CFLAGS@ + GLIB_LIBS = @GLIB_LIBS@ +--- configure.in~ ++++ configure.in +@@ -5758,17 +5775,48 @@ dnl ==================================== + dnl = Check alsa availability on Linux if using sydneyaudio + dnl ======================================================== + ++MOZ_ARG_ENABLE_BOOL(alsa, ++[ --enable-alsa Enable Alsa support], ++MOZ_ALSA=1, ++MOZ_ALSA= MOZ_ALSA_FORCE=$enableval) ++ + dnl If using sydneyaudio with Linux, ensure that the alsa library is available +-if test -n "$MOZ_SYDNEYAUDIO"; then ++if test -n "$MOZ_SYDNEYAUDIO" -a "$MOZ_ALSA_FORCE" != "no"; then + case "$target_os" in + linux*) ++ MOZ_ALSA=1 ++ ;; ++ esac ++fi ++ ++if test -n "$MOZ_ALSA"; then + PKG_CHECK_MODULES(MOZ_ALSA, alsa, , + [echo "$MOZ_ALSA_PKG_ERRORS" + AC_MSG_ERROR([Need alsa for Ogg, Wave or WebM decoding on Linux. Disable with --disable-ogg --disable-wave --disable-webm. (On Ubuntu, you might try installing the package libasound2-dev.)])]) +- ;; +- esac + fi + ++AC_SUBST(MOZ_ALSA_CFLAGS) ++AC_SUBST(MOZ_ALSA) ++ ++dnl ======================================================== ++dnl = Enable PulseAudio ++dnl ======================================================== ++ ++MOZ_ARG_ENABLE_BOOL(pulseaudio, ++[ --enable-pulseaudio Enable PulseAudio support], ++MOZ_PULSEAUDIO=1, ++MOZ_PULSEAUDIO=) ++ ++if test -n "$MOZ_PULSEAUDIO"; then ++ PKG_CHECK_MODULES(MOZ_PULSEAUDIO, libpulse, , ++ [echo "$MOZ_PULSEAUDIO_PKG_ERRORS" ++ AC_MSG_ERROR([pulseaudio audio backend requires libpulse package])]) ++fi ++ ++AC_SUBST(MOZ_PULSEAUDIO_CFLAGS) ++AC_SUBST(MOZ_PULSEAUDIO_LIBS) ++AC_SUBST(MOZ_PULSEAUDIO) ++ + dnl ======================================================== + dnl Permissions System + dnl ======================================================== +--- media/libsydneyaudio/src/Makefile.in~ ++++ media/libsydneyaudio/src/Makefile.in +@@ -30,10 +30,6 @@ else ifeq ($(MOZ_WIDGET_TOOLKIT),android) + CSRCS = \ + sydney_audio_android.c \ + $(NULL) +-else ifeq ($(OS_ARCH),Linux) +-CSRCS = \ +- sydney_audio_alsa.c \ +- $(NULL) + endif + + ifeq ($(OS_ARCH),WINNT) +@@ -68,6 +64,18 @@ CSRCS = \ + $(NULL) + endif + ++ifdef MOZ_ALSA ++CSRCS = \ ++ sydney_audio_alsa.c \ ++ $(NULL) ++endif ++ ++ifdef MOZ_PULSEAUDIO ++CSRCS = \ ++ sydney_audio_pulseaudio.c \ ++ $(NULL) ++endif ++ + ifeq ($(OS_ARCH),WINNT) + OS_LIBS += winmm.lib + endif +--- toolkit/library/libxul-config.mk~ ++++ toolkit/library/libxul-config.mk +@@ -348,10 +348,12 @@ ifdef MOZ_NATIVE_LIBVPX + EXTRA_DSO_LDOPTS += $(MOZ_LIBVPX_LIBS) + endif + +-ifdef MOZ_SYDNEYAUDIO +-ifeq ($(OS_ARCH),Linux) ++ifdef MOZ_ALSA + EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS) + endif ++ ++ifdef MOZ_PULSEAUDIO ++EXTRA_DSO_LDOPTS += $(MOZ_PULSEAUDIO_LIBS) + endif + + ifdef HAVE_CLOCK_MONOTONIC Added: branches/experimental/www/libxul/files/patch-bug685258 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/libxul/files/patch-bug685258 Sun Jul 8 12:45:43 2012 (r852) @@ -0,0 +1,17 @@ +# HG changeset patch +# User Oleg Romashin +# Parent a2291c212856ad27622416e83c8311b6a33b52f1 +Bug 685258 - Pulse audio backend does not check provided playback and crashes r=derf + +diff --git a/content/media/nsAudioStream.cpp b/content/media/nsAudioStream.cpp +--- content/media/nsAudioStream.cpp ++++ content/media/nsAudioStream.cpp +@@ -429,7 +429,7 @@ nsresult nsNativeAudioStream::Init(PRInt32 aNumChannels, PRInt32 aRate, SampleFo + mFormat = aFormat; + + if (sa_stream_create_pcm(reinterpret_cast(&mAudioHandle), +- NULL, ++ "Mozilla", + SA_MODE_WRONLY, + SA_PCM_FORMAT_S16_NE, + aRate, Modified: branches/experimental/www/libxul19/Makefile ============================================================================== --- branches/experimental/www/libxul19/Makefile Sun Jul 8 12:45:24 2012 (r851) +++ branches/experimental/www/libxul19/Makefile Sun Jul 8 12:45:43 2012 (r852) @@ -39,7 +39,7 @@ --disable-updater \ --disable-necko-wifi MOZ_EXTENSIONS= default,cookie,permissions -OPTIONS_DEFAULT=DBUS +OPTIONS_DEFAULT=DBUS OSS USE_GECKO= gecko MOZILLA_EXEC_NAME=xulrunner USE_MOZILLA= -event -ffi -vpx @@ -58,13 +58,6 @@ MOZ_PKGCONFIG_FILES+= mozilla-nss .endif -.if ${OSVERSION} < 700000 -LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio -EXTRA_PATCHES= ${FILESDIR}/releng6_pulseaudio -.else -EXTRA_PATCHES= ${FILESDIR}/libsydney_oss -.endif - .if ${ARCH} == amd64 CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL} .elif ${ARCH} == powerpc64 Deleted: branches/experimental/www/libxul19/files/libsydney_oss ============================================================================== --- branches/experimental/www/libxul19/files/libsydney_oss Sun Jul 8 12:45:43 2012 (r851) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,15 +0,0 @@ ---- media/libsydneyaudio/src/Makefile.in.orig 2009-08-17 14:21:06.000000000 +0200 -+++ media/libsydneyaudio/src/Makefile.in 2009-08-17 14:21:53.000000000 +0200 -@@ -45,6 +45,12 @@ - LIBRARY_NAME = sydneyaudio - FORCE_STATIC_LIB= 1 - -+ifeq ($(OS_ARCH),FreeBSD) -+CSRCS = \ -+ sydney_audio_oss.c \ -+ $(NULL) -+endif -+ - ifeq ($(OS_ARCH),Linux) - CSRCS = \ - sydney_audio_alsa.c \ Added: branches/experimental/www/libxul19/files/patch-alsapulse ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/libxul19/files/patch-alsapulse Sun Jul 8 12:45:43 2012 (r852) @@ -0,0 +1,122 @@ +--- config/autoconf.mk.in~ ++++ config/autoconf.mk.in +@@ -555,6 +555,14 @@ 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_PULSEAUDIO = @MOZ_PULSEAUDIO@ ++MOZ_PULSEAUDIO_LIBS = @MOZ_PULSEAUDIO_LIBS@ ++MOZ_PULSEAUDIO_CFLAGS = @MOZ_PULSEAUDIO_CFLAGS@ ++ + GLIB_CFLAGS = @GLIB_CFLAGS@ + GLIB_LIBS = @GLIB_LIBS@ + GLIB_GMODULE_LIBS = @GLIB_GMODULE_LIBS@ +--- configure.in~ ++++ configure.in +@@ -5660,15 +5660,49 @@ dnl ==================================== + + dnl If using sydneyaudio with Linux, ensure that the alsa library is available + if test "$COMPILE_ENVIRONMENT"; then +-if test -n "$MOZ_SYDNEYAUDIO"; then ++MOZ_ARG_ENABLE_BOOL(alsa, ++[ --enable-alsa Enable Alsa support], ++MOZ_ALSA=1, ++MOZ_ALSA= MOZ_ALSA_FORCE=$enableval) ++ ++if test -n "$MOZ_SYDNEYAUDIO" -a "$MOZ_ALSA_FORCE" != "no"; then + case "$target_os" in + linux*) +- AC_CHECK_LIB(asound, snd_pcm_open,,AC_MSG_ERROR([Ogg support on Linux requires the alsa library])) ++ MOZ_ALSA=1 + ;; + esac + fi ++ ++if test -n "$MOZ_ALSA"; then ++ PKG_CHECK_MODULES(MOZ_ALSA, alsa, , ++ [echo "$MOZ_ALSA_PKG_ERRORS" ++ AC_MSG_ERROR([Need alsa for Ogg, Wave or WebM decoding on Linux. Disable with --disable-ogg --disable-wave --disable-webm. (On Ubuntu, you might try installing the package libasound2-dev.)])]) ++fi + fi + ++AC_SUBST(MOZ_ALSA_CFLAGS) ++AC_SUBST(MOZ_ALSA_LIBS) ++AC_SUBST(MOZ_ALSA) ++ ++dnl ======================================================== ++dnl = Enable PulseAudio ++dnl ======================================================== ++ ++MOZ_ARG_ENABLE_BOOL(pulseaudio, ++[ --enable-pulseaudio Enable PulseAudio support], ++MOZ_PULSEAUDIO=1, ++MOZ_PULSEAUDIO=) ++ ++if test -n "$MOZ_PULSEAUDIO"; then ++ PKG_CHECK_MODULES(MOZ_PULSEAUDIO, libpulse, , ++ [echo "$MOZ_PULSEAUDIO_PKG_ERRORS" ++ AC_MSG_ERROR([pulseaudio audio backend requires libpulse package])]) ++fi ++ ++AC_SUBST(MOZ_PULSEAUDIO_CFLAGS) ++AC_SUBST(MOZ_PULSEAUDIO_LIBS) ++AC_SUBST(MOZ_PULSEAUDIO) ++ + dnl ======================================================== + dnl Splashscreen + dnl ======================================================== +--- media/libsydneyaudio/src/Makefile.in~ ++++ media/libsydneyaudio/src/Makefile.in +@@ -45,12 +45,6 @@ MODULE = sydneyaudio + LIBRARY_NAME = sydneyaudio + FORCE_STATIC_LIB= 1 + +-ifeq ($(OS_ARCH),Linux) +-CSRCS = \ +- sydney_audio_alsa.c \ +- $(NULL) +-endif +- + ifneq (,$(filter WINNT WINCE,$(OS_ARCH))) + CSRCS = \ + sydney_audio_waveapi.c \ +@@ -83,6 +83,18 @@ CSRCS = \ + $(NULL) + endif + ++ifdef MOZ_ALSA ++CSRCS = \ ++ sydney_audio_alsa.c \ ++ $(NULL) ++endif ++ ++ifdef MOZ_PULSEAUDIO ++CSRCS = \ ++ sydney_audio_pulseaudio.c \ ++ $(NULL) ++endif ++ + ifeq ($(OS_ARCH),WINNT) + OS_LIBS += winmm.lib + endif +--- toolkit/library/libxul-config.mk~ ++++ toolkit/library/libxul-config.mk +@@ -90,6 +90,14 @@ endif + LOCAL_INCLUDES += -I$(topsrcdir)/widget/src/os2 + endif + ++ifdef MOZ_ALSA ++EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS) ++endif ++ ++ifdef MOZ_PULSEAUDIO ++EXTRA_DSO_LDOPTS += $(MOZ_PULSEAUDIO_LIBS) ++endif ++ + # dependent libraries + ifdef MOZ_IPC + STATIC_LIBS += \ Added: branches/experimental/www/libxul19/files/patch-bug685258 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/libxul19/files/patch-bug685258 Sun Jul 8 12:45:43 2012 (r852) @@ -0,0 +1,17 @@ +# HG changeset patch +# User Oleg Romashin +# Parent a2291c212856ad27622416e83c8311b6a33b52f1 +Bug 685258 - Pulse audio backend does not check provided playback and crashes r=derf + +diff --git a/content/media/nsAudioStream.cpp b/content/media/nsAudioStream.cpp +--- content/media/nsAudioStream.cpp ++++ content/media/nsAudioStream.cpp +@@ -83,7 +83,7 @@ void nsAudioStream::Init(PRInt32 aNumCha + mChannels = aNumChannels; + mFormat = aFormat; + if (sa_stream_create_pcm(reinterpret_cast(&mAudioHandle), +- NULL, ++ "Mozilla", + SA_MODE_WRONLY, + SA_PCM_FORMAT_S16_NE, + aRate, Copied and modified: branches/experimental/www/libxul19/files/patch-media-libsydneyaudio-src-Makefile.in (from r851, branches/experimental/www/libxul19/files/libsydney_oss) ============================================================================== --- branches/experimental/www/libxul19/files/libsydney_oss Sun Jul 8 12:45:24 2012 (r851, copy source) +++ branches/experimental/www/libxul19/files/patch-media-libsydneyaudio-src-Makefile.in Sun Jul 8 12:45:43 2012 (r852) @@ -10,6 +10,6 @@ + $(NULL) +endif + - ifeq ($(OS_ARCH),Linux) + ifneq (,$(filter WINNT WINCE,$(OS_ARCH))) CSRCS = \ - sydney_audio_alsa.c \ + sydney_audio_waveapi.c \ Deleted: branches/experimental/www/libxul19/files/releng6_pulseaudio ============================================================================== --- branches/experimental/www/libxul19/files/releng6_pulseaudio Sun Jul 8 12:45:43 2012 (r851) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,32 +0,0 @@ ---- media/libsydneyaudio/src/Makefile.in.orig 2009-08-11 17:22:08.000000000 +0200 -+++ media/libsydneyaudio/src/Makefile.in 2009-08-11 17:22:36.000000000 +0200 -@@ -45,6 +45,12 @@ - LIBRARY_NAME = sydneyaudio - FORCE_STATIC_LIB= 1 - -+ifeq ($(OS_ARCH),FreeBSD) -+CSRCS = \ -+ sydney_audio_pulseaudio.c \ -+ $(NULL) -+endif -+ - ifeq ($(OS_ARCH),Linux) - CSRCS = \ - sydney_audio_alsa.c \ ---- toolkit/library/Makefile.in.orig 2009-08-11 17:22:45.000000000 +0200 -+++ toolkit/library/Makefile.in 2009-08-11 17:23:22.000000000 +0200 -@@ -231,12 +231,12 @@ - endif - - ifeq (gtk2,$(MOZ_WIDGET_TOOLKIT)) --EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XEXT_LIBS) $(XCOMPOSITE_LIBS) $(MOZ_PANGO_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) -lgthread-2.0 -+EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XEXT_LIBS) $(XCOMPOSITE_LIBS) $(MOZ_PANGO_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) -lgthread-2.0 -lpulse -lpthread - EXTRA_DSO_LDOPTS += $(FT2_LIBS) - endif - - ifeq (qt,$(MOZ_WIDGET_TOOLKIT)) --EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XT_LIBS) $(MOZ_QT_LIBS) -lgthread-2.0 -+EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XT_LIBS) $(MOZ_QT_LIBS) -lgthread-2.0 -lpulse -lpthread - EXTRA_DSO_LDOPTS += $(FT2_LIBS) - endif - Modified: branches/experimental/www/seamonkey/Makefile ============================================================================== --- branches/experimental/www/seamonkey/Makefile Sun Jul 8 12:45:24 2012 (r851) +++ branches/experimental/www/seamonkey/Makefile Sun Jul 8 12:45:43 2012 (r852) @@ -52,7 +52,7 @@ NOT_FOR_ARCHS= ia64 -OPTIONS_DEFAULT=DBUS MAILNEWS COMPOSER LDAP CHATZILLA +OPTIONS_DEFAULT=DBUS CHATZILLA COMPOSER LDAP MAILNEWS OSS OPTIONS_DEFINE= CHATZILLA COMPOSER LDAP LIGHTNING MAILNEWS CHATZILLA_DESC?=Chatzilla IRC module Added: branches/experimental/www/seamonkey/files/patch-alsapulse ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey/files/patch-alsapulse Sun Jul 8 12:45:43 2012 (r852) @@ -0,0 +1,119 @@ +--- mozilla/config/autoconf.mk.in~ ++++ mozilla/config/autoconf.mk.in +@@ -568,7 +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_PULSEAUDIO = @MOZ_PULSEAUDIO@ ++MOZ_PULSEAUDIO_LIBS = @MOZ_PULSEAUDIO_LIBS@ ++MOZ_PULSEAUDIO_CFLAGS = @MOZ_PULSEAUDIO_CFLAGS@ + + GLIB_CFLAGS = @GLIB_CFLAGS@ + GLIB_LIBS = @GLIB_LIBS@ +--- mozilla/configure.in~ ++++ mozilla/configure.in +@@ -5758,17 +5775,48 @@ dnl ==================================== + dnl = Check alsa availability on Linux if using sydneyaudio + dnl ======================================================== + ++MOZ_ARG_ENABLE_BOOL(alsa, ++[ --enable-alsa Enable Alsa support], ++MOZ_ALSA=1, ++MOZ_ALSA= MOZ_ALSA_FORCE=$enableval) ++ + dnl If using sydneyaudio with Linux, ensure that the alsa library is available +-if test -n "$MOZ_SYDNEYAUDIO"; then ++if test -n "$MOZ_SYDNEYAUDIO" -a "$MOZ_ALSA_FORCE" != "no"; then + case "$target_os" in + linux*) ++ MOZ_ALSA=1 ++ ;; ++ esac ++fi ++ ++if test -n "$MOZ_ALSA"; then + PKG_CHECK_MODULES(MOZ_ALSA, alsa, , + [echo "$MOZ_ALSA_PKG_ERRORS" + AC_MSG_ERROR([Need alsa for Ogg, Wave or WebM decoding on Linux. Disable with --disable-ogg --disable-wave --disable-webm. (On Ubuntu, you might try installing the package libasound2-dev.)])]) +- ;; +- esac + fi + ++AC_SUBST(MOZ_ALSA_CFLAGS) ++AC_SUBST(MOZ_ALSA) ++ ++dnl ======================================================== ++dnl = Enable PulseAudio ++dnl ======================================================== ++ ++MOZ_ARG_ENABLE_BOOL(pulseaudio, ++[ --enable-pulseaudio Enable PulseAudio support], ++MOZ_PULSEAUDIO=1, ++MOZ_PULSEAUDIO=) ++ ++if test -n "$MOZ_PULSEAUDIO"; then ++ PKG_CHECK_MODULES(MOZ_PULSEAUDIO, libpulse, , ++ [echo "$MOZ_PULSEAUDIO_PKG_ERRORS" ++ AC_MSG_ERROR([pulseaudio audio backend requires libpulse package])]) ++fi ++ ++AC_SUBST(MOZ_PULSEAUDIO_CFLAGS) ++AC_SUBST(MOZ_PULSEAUDIO_LIBS) ++AC_SUBST(MOZ_PULSEAUDIO) ++ + dnl ======================================================== + dnl Permissions System + dnl ======================================================== +--- mozilla/media/libsydneyaudio/src/Makefile.in~ ++++ mozilla/media/libsydneyaudio/src/Makefile.in +@@ -30,10 +30,6 @@ else ifeq ($(MOZ_WIDGET_TOOLKIT),android) + CSRCS = \ + sydney_audio_android.c \ + $(NULL) +-else ifeq ($(OS_ARCH),Linux) +-CSRCS = \ +- sydney_audio_alsa.c \ +- $(NULL) + endif + + ifeq ($(OS_ARCH),WINNT) +@@ -68,6 +64,18 @@ CSRCS = \ + $(NULL) + endif + ++ifdef MOZ_ALSA ++CSRCS = \ ++ sydney_audio_alsa.c \ ++ $(NULL) ++endif ++ ++ifdef MOZ_PULSEAUDIO ++CSRCS = \ ++ sydney_audio_pulseaudio.c \ ++ $(NULL) ++endif ++ + ifeq ($(OS_ARCH),WINNT) + OS_LIBS += winmm.lib + endif +--- mozilla/toolkit/library/Makefile.in~ ++++ mozilla/toolkit/library/Makefile.in +@@ -375,10 +375,12 @@ endif + + EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,gkmedias,$(DIST)/lib) + +-ifdef MOZ_SYDNEYAUDIO +-ifeq ($(OS_ARCH),Linux) ++ifdef MOZ_ALSA + EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS) + endif ++ ++ifdef MOZ_PULSEAUDIO ++EXTRA_DSO_LDOPTS += $(MOZ_PULSEAUDIO_LIBS) + endif + + ifdef HAVE_CLOCK_MONOTONIC Added: branches/experimental/www/seamonkey/files/patch-bug685258 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey/files/patch-bug685258 Sun Jul 8 12:45:43 2012 (r852) @@ -0,0 +1,17 @@ +# HG changeset patch +# User Oleg Romashin +# Parent a2291c212856ad27622416e83c8311b6a33b52f1 +Bug 685258 - Pulse audio backend does not check provided playback and crashes r=derf + +diff --git a/content/media/nsAudioStream.cpp b/content/media/nsAudioStream.cpp +--- mozilla/content/media/nsAudioStream.cpp ++++ mozilla/content/media/nsAudioStream.cpp +@@ -429,7 +429,7 @@ nsresult nsNativeAudioStream::Init(PRInt32 aNumChannels, PRInt32 aRate, SampleFo + mFormat = aFormat; + + if (sa_stream_create_pcm(reinterpret_cast(&mAudioHandle), +- NULL, ++ "Mozilla", + SA_MODE_WRONLY, + SA_PCM_FORMAT_S16_NE, + aRate, From owner-freebsd-gecko@FreeBSD.ORG Sun Jul 8 12:45:58 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7DA9A106564A for ; Sun, 8 Jul 2012 12:45:58 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 095008FC17 for ; Sun, 8 Jul 2012 12:45:57 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q68Cjvl5025735 for ; Sun, 8 Jul 2012 12:45:57 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q68Cjq2e025355 for freebsd-gecko@freebsd.org; Sun, 8 Jul 2012 12:45:52 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sun, 8 Jul 2012 12:45:52 GMT Message-Id: <201207081245.q68Cjq2e025355@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r853 - in branches/experimental/www: libxul libxul19 X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Jul 2012 12:45:58 -0000 Author: jbeich Date: Sun Jul 8 12:45:51 2012 New Revision: 853 Log: add missing gnomeui to libxul{,19} Modified: branches/experimental/www/libxul/Makefile branches/experimental/www/libxul19/Makefile Modified: branches/experimental/www/libxul/Makefile ============================================================================== --- branches/experimental/www/libxul/Makefile Sun Jul 8 12:45:43 2012 (r852) +++ branches/experimental/www/libxul/Makefile Sun Jul 8 12:45:51 2012 (r853) @@ -69,6 +69,13 @@ .endif .endif +.if ${HAVE_GNOME:Mlibgnomeui}!="" +USE_GNOME+= libgnomeui +MOZ_OPTIONS+= --enable-gnomeui +.else +MOZ_OPTIONS+= --disable-gnomeui +.endif + .if ${ARCH} == amd64 || ${ARCH} == i386 BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/yasm .endif Modified: branches/experimental/www/libxul19/Makefile ============================================================================== --- branches/experimental/www/libxul19/Makefile Sun Jul 8 12:45:43 2012 (r852) +++ branches/experimental/www/libxul19/Makefile Sun Jul 8 12:45:51 2012 (r853) @@ -69,6 +69,13 @@ .endif .endif +.if ${HAVE_GNOME:Mlibgnomeui}!="" +USE_GNOME+= libgnomeui +MOZ_OPTIONS+= --enable-gnomeui +.else +MOZ_OPTIONS+= --disable-gnomeui +.endif + .if ${PORT_OPTIONS:MJAVA} USE_JAVA= yes JAVA_VERSION+= 1.5+ From owner-freebsd-gecko@FreeBSD.ORG Sun Jul 8 12:46:09 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5DB4D106566C for ; Sun, 8 Jul 2012 12:46:09 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id E93A18FC0A for ; Sun, 8 Jul 2012 12:46:08 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q68Ck7vk028680 for ; Sun, 8 Jul 2012 12:46:07 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q68Ck2GG026500 for freebsd-gecko@freebsd.org; Sun, 8 Jul 2012 12:46:02 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sun, 8 Jul 2012 12:46:02 GMT Message-Id: <201207081246.q68Ck2GG026500@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r854 - in branches/experimental: Mk mail/thunderbird mail/thunderbird-esr mail/thunderbird3 www/firefox www/firefox-esr www/firefox-nightly www/firefox36 www/libxul www/libxul19 www/seamonkey X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Jul 2012 12:46:09 -0000 Author: jbeich Date: Sun Jul 8 12:46:02 2012 New Revision: 854 Log: make GNOMEUI into an option Modified: branches/experimental/Mk/bsd.gecko.mk branches/experimental/mail/thunderbird-esr/Makefile branches/experimental/mail/thunderbird/Makefile branches/experimental/mail/thunderbird3/Makefile branches/experimental/www/firefox-esr/Makefile branches/experimental/www/firefox-nightly/Makefile branches/experimental/www/firefox/Makefile branches/experimental/www/firefox36/Makefile branches/experimental/www/libxul/Makefile branches/experimental/www/libxul19/Makefile branches/experimental/www/seamonkey/Makefile Modified: branches/experimental/Mk/bsd.gecko.mk ============================================================================== --- branches/experimental/Mk/bsd.gecko.mk Sun Jul 8 12:45:51 2012 (r853) +++ branches/experimental/Mk/bsd.gecko.mk Sun Jul 8 12:46:02 2012 (r854) @@ -552,12 +552,13 @@ CFLAGS+= ${PTHREAD_CFLAGS} LIBS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib -liconv -OPTIONS_DEFINE+=DBUS DEBUG GCONF GIO GNOMEVFS2 LIBPROXY LOGGING OPTIMIZED_CFLAGS +OPTIONS_DEFINE+=DBUS DEBUG GCONF GIO GNOMEUI GNOMEVFS2 LIBPROXY LOGGING OPTIMIZED_CFLAGS OPTIONS_SINGLE+= AUDIO OPTIONS_SINGLE_AUDIO= ALSA OSS PULSEAUDIO GIO_DESC?= GIO for file I/O # move to bsd.options.desc.mk +GNOMEUI_DESC?= libgnomeui support module LIGHTNING_DESC?=Calendar extension LOGGING_DESC?= Additional log messages PGO_DESC?= Profile-Guided Optimization # move to bsd.options.desc.mk @@ -707,6 +708,13 @@ MOZ_OPTIONS+= --disable-gio .endif +.if ${PORT_OPTIONS:MGNOMEUI} +USE_GNOME+= libgnomeui +MOZ_OPTIONS+= --enable-gnomeui +.else +MOZ_OPTIONS+= --disable-gnomeui +.endif + .if ${PORT_OPTIONS:MGNOMEVFS2} USE_GNOME+= gnomevfs2 MOZ_OPTIONS+= --enable-gnomevfs Modified: branches/experimental/mail/thunderbird-esr/Makefile ============================================================================== --- branches/experimental/mail/thunderbird-esr/Makefile Sun Jul 8 12:45:51 2012 (r853) +++ branches/experimental/mail/thunderbird-esr/Makefile Sun Jul 8 12:46:02 2012 (r854) @@ -75,13 +75,6 @@ .endif .endif -.if ${HAVE_GNOME:Mlibgnomeui}!="" -USE_GNOME+= libgnomeui -MOZ_OPTIONS+= --enable-gnomeui -.else -MOZ_OPTIONS+= --disable-gnomeui -.endif - .if ${ARCH} == amd64 || ${ARCH} == i386 BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/yasm .endif Modified: branches/experimental/mail/thunderbird/Makefile ============================================================================== --- branches/experimental/mail/thunderbird/Makefile Sun Jul 8 12:45:51 2012 (r853) +++ branches/experimental/mail/thunderbird/Makefile Sun Jul 8 12:46:02 2012 (r854) @@ -75,13 +75,6 @@ .endif .endif -.if ${HAVE_GNOME:Mlibgnomeui}!="" -USE_GNOME+= libgnomeui -MOZ_OPTIONS+= --enable-gnomeui -.else -MOZ_OPTIONS+= --disable-gnomeui -.endif - .if ${ARCH} == amd64 || ${ARCH} == i386 BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/yasm .endif Modified: branches/experimental/mail/thunderbird3/Makefile ============================================================================== --- branches/experimental/mail/thunderbird3/Makefile Sun Jul 8 12:45:51 2012 (r853) +++ branches/experimental/mail/thunderbird3/Makefile Sun Jul 8 12:46:02 2012 (r854) @@ -72,13 +72,6 @@ .endif .endif -.if ${HAVE_GNOME:Mlibgnomeui}!="" -USE_GNOME+= libgnomeui -MOZ_OPTIONS+= --enable-gnomeui -.else -MOZ_OPTIONS+= --disable-gnomeui -.endif - post-extract: ${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|;s|@MOZILLA@|${MOZILLA}|' \ <${FILESDIR}/thunderbird.desktop.in >${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop Modified: branches/experimental/www/firefox-esr/Makefile ============================================================================== --- branches/experimental/www/firefox-esr/Makefile Sun Jul 8 12:45:51 2012 (r853) +++ branches/experimental/www/firefox-esr/Makefile Sun Jul 8 12:46:02 2012 (r854) @@ -71,13 +71,6 @@ .endif .endif -.if ${HAVE_GNOME:Mlibgnomeui}!="" -USE_GNOME+= libgnomeui -MOZ_OPTIONS+= --enable-gnomeui -.else -MOZ_OPTIONS+= --disable-gnomeui -.endif - .if ${PORT_OPTIONS:MPGO} BUILD_DEPENDS+= ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 USE_PYTHON_BUILD= yes Modified: branches/experimental/www/firefox-nightly/Makefile ============================================================================== --- branches/experimental/www/firefox-nightly/Makefile Sun Jul 8 12:45:51 2012 (r853) +++ branches/experimental/www/firefox-nightly/Makefile Sun Jul 8 12:46:02 2012 (r854) @@ -80,13 +80,6 @@ .endif .endif -.if ${HAVE_GNOME:Mlibgnomeui}!="" -USE_GNOME+= libgnomeui -MOZ_OPTIONS+= --enable-gnomeui -.else -MOZ_OPTIONS+= --disable-gnomeui -.endif - .if ${PORT_OPTIONS:MPGO} USE_DISPLAY= yes Modified: branches/experimental/www/firefox/Makefile ============================================================================== --- branches/experimental/www/firefox/Makefile Sun Jul 8 12:45:51 2012 (r853) +++ branches/experimental/www/firefox/Makefile Sun Jul 8 12:46:02 2012 (r854) @@ -71,13 +71,6 @@ .endif .endif -.if ${HAVE_GNOME:Mlibgnomeui}!="" -USE_GNOME+= libgnomeui -MOZ_OPTIONS+= --enable-gnomeui -.else -MOZ_OPTIONS+= --disable-gnomeui -.endif - .if ${PORT_OPTIONS:MPGO} BUILD_DEPENDS+= ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 USE_PYTHON_BUILD= yes Modified: branches/experimental/www/firefox36/Makefile ============================================================================== --- branches/experimental/www/firefox36/Makefile Sun Jul 8 12:45:51 2012 (r853) +++ branches/experimental/www/firefox36/Makefile Sun Jul 8 12:46:02 2012 (r854) @@ -68,13 +68,6 @@ WRKSRC:= ${WRKSRC}-1.9.2 -.if ${HAVE_GNOME:Mlibgnomeui}!="" -USE_GNOME+= libgnomeui -MOZ_OPTIONS+= --enable-gnomeui -.else -MOZ_OPTIONS+= --disable-gnomeui -.endif - post-extract: @${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \ -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \ Modified: branches/experimental/www/libxul/Makefile ============================================================================== --- branches/experimental/www/libxul/Makefile Sun Jul 8 12:45:51 2012 (r853) +++ branches/experimental/www/libxul/Makefile Sun Jul 8 12:46:02 2012 (r854) @@ -69,13 +69,6 @@ .endif .endif -.if ${HAVE_GNOME:Mlibgnomeui}!="" -USE_GNOME+= libgnomeui -MOZ_OPTIONS+= --enable-gnomeui -.else -MOZ_OPTIONS+= --disable-gnomeui -.endif - .if ${ARCH} == amd64 || ${ARCH} == i386 BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/yasm .endif Modified: branches/experimental/www/libxul19/Makefile ============================================================================== --- branches/experimental/www/libxul19/Makefile Sun Jul 8 12:45:51 2012 (r853) +++ branches/experimental/www/libxul19/Makefile Sun Jul 8 12:46:02 2012 (r854) @@ -69,13 +69,6 @@ .endif .endif -.if ${HAVE_GNOME:Mlibgnomeui}!="" -USE_GNOME+= libgnomeui -MOZ_OPTIONS+= --enable-gnomeui -.else -MOZ_OPTIONS+= --disable-gnomeui -.endif - .if ${PORT_OPTIONS:MJAVA} USE_JAVA= yes JAVA_VERSION+= 1.5+ Modified: branches/experimental/www/seamonkey/Makefile ============================================================================== --- branches/experimental/www/seamonkey/Makefile Sun Jul 8 12:45:51 2012 (r853) +++ branches/experimental/www/seamonkey/Makefile Sun Jul 8 12:46:02 2012 (r854) @@ -76,13 +76,6 @@ .endif .endif -.if ${HAVE_GNOME:Mlibgnomeui}!="" -USE_GNOME+= libgnomeui -MOZ_OPTIONS+= --enable-gnomeui -.else -MOZ_OPTIONS+= --disable-gnomeui -.endif - .if ! ${PORT_OPTIONS:MMAILNEWS} EXTRA_PATCHES+= ${FILESDIR}/extra-mailnews-patch-bridge-bridge.mk \ ${FILESDIR}/extra-patch-configure.in From owner-freebsd-gecko@FreeBSD.ORG Sun Jul 8 12:46:17 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 90301106566C for ; Sun, 8 Jul 2012 12:46:17 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 1C7828FC14 for ; Sun, 8 Jul 2012 12:46:16 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q68CkG3K029589 for ; Sun, 8 Jul 2012 12:46:16 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q68CkBbo029191 for freebsd-gecko@freebsd.org; Sun, 8 Jul 2012 12:46:11 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sun, 8 Jul 2012 12:46:11 GMT Message-Id: <201207081246.q68CkBbo029191@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r855 - in branches/experimental: Mk www/kompozer X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Jul 2012 12:46:17 -0000 Author: jbeich Date: Sun Jul 8 12:46:10 2012 New Revision: 855 Log: move gnome options to its group PulseAudio is supposed to be there Modified: branches/experimental/Mk/bsd.gecko.mk branches/experimental/www/kompozer/Makefile Modified: branches/experimental/Mk/bsd.gecko.mk ============================================================================== --- branches/experimental/Mk/bsd.gecko.mk Sun Jul 8 12:46:02 2012 (r854) +++ branches/experimental/Mk/bsd.gecko.mk Sun Jul 8 12:46:10 2012 (r855) @@ -552,11 +552,14 @@ CFLAGS+= ${PTHREAD_CFLAGS} LIBS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib -liconv -OPTIONS_DEFINE+=DBUS DEBUG GCONF GIO GNOMEUI GNOMEVFS2 LIBPROXY LOGGING OPTIMIZED_CFLAGS +OPTIONS_DEFINE+= DBUS DEBUG GNOME LIBPROXY LOGGING OPTIMIZED_CFLAGS OPTIONS_SINGLE+= AUDIO OPTIONS_SINGLE_AUDIO= ALSA OSS PULSEAUDIO +OPTIONS_MULTI+= GNOME +OPTIONS_MULTI_GNOME= GCONF GIO GNOMEUI GNOMEVFS2 + GIO_DESC?= GIO for file I/O # move to bsd.options.desc.mk GNOMEUI_DESC?= libgnomeui support module LIGHTNING_DESC?=Calendar extension Modified: branches/experimental/www/kompozer/Makefile ============================================================================== --- branches/experimental/www/kompozer/Makefile Sun Jul 8 12:46:02 2012 (r854) +++ branches/experimental/www/kompozer/Makefile Sun Jul 8 12:46:10 2012 (r855) @@ -44,8 +44,9 @@ .include -OPTIONS_DEFINE:=${OPTIONS_DEFINE:NDBUS:NGIO:NLIBPROXY} +OPTIONS_DEFINE:=${OPTIONS_DEFINE:NDBUS:NLIBPROXY} OPTIONS_SINGLE:=${OPTIONS_SINGLE:NAUDIO} +OPTIONS_MULTI_GNOME:=${OPTIONS_MULTI_GNOME:NGIO} .if ${ARCH} == amd64 CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL} From owner-freebsd-gecko@FreeBSD.ORG Sun Jul 8 12:46:29 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 04B141065670 for ; Sun, 8 Jul 2012 12:46:29 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 7F23C8FC15 for ; Sun, 8 Jul 2012 12:46:28 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q68CkRqO033268 for ; Sun, 8 Jul 2012 12:46:27 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q68CkM1b030522 for freebsd-gecko@freebsd.org; Sun, 8 Jul 2012 12:46:22 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sun, 8 Jul 2012 12:46:22 GMT Message-Id: <201207081246.q68CkM1b030522@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r856 - in branches/experimental: Mk mail/thunderbird mail/thunderbird-esr mail/thunderbird3 www/firefox www/firefox-esr www/firefox-nightly www/firefox36 www/kompozer www/libxul www/libxul19 www/seamonkey X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Jul 2012 12:46:29 -0000 Author: jbeich Date: Sun Jul 8 12:46:22 2012 New Revision: 856 Log: add QT4 option for cairo-qt toolkit Modified: branches/experimental/Mk/bsd.gecko.mk branches/experimental/mail/thunderbird-esr/Makefile branches/experimental/mail/thunderbird/Makefile branches/experimental/mail/thunderbird3/Makefile branches/experimental/www/firefox-esr/Makefile branches/experimental/www/firefox-nightly/Makefile branches/experimental/www/firefox/Makefile branches/experimental/www/firefox36/Makefile branches/experimental/www/kompozer/Makefile branches/experimental/www/libxul/Makefile branches/experimental/www/libxul19/Makefile branches/experimental/www/seamonkey/Makefile Modified: branches/experimental/Mk/bsd.gecko.mk ============================================================================== --- branches/experimental/Mk/bsd.gecko.mk Sun Jul 8 12:46:10 2012 (r855) +++ branches/experimental/Mk/bsd.gecko.mk Sun Jul 8 12:46:22 2012 (r856) @@ -557,6 +557,9 @@ OPTIONS_SINGLE+= AUDIO OPTIONS_SINGLE_AUDIO= ALSA OSS PULSEAUDIO +OPTIONS_SINGLE+= TOOLKIT +OPTIONS_SINGLE_TOOLKIT= GTK2 QT4 + OPTIONS_MULTI+= GNOME OPTIONS_MULTI_GNOME= GCONF GIO GNOMEUI GNOMEVFS2 @@ -666,6 +669,11 @@ LIBS+= -lcxxrt .endif +.if ${PORT_OPTIONS:MQT4} +MOZ_TOOLKIT= cairo-qt +USE_MOZILLA+= -cairo # ports/169343 +.endif + .if ${MOZ_TOOLKIT:Mcairo-qt} USE_GNOME+= pango USE_QT4+= moc_build gui network opengl Modified: branches/experimental/mail/thunderbird-esr/Makefile ============================================================================== --- branches/experimental/mail/thunderbird-esr/Makefile Sun Jul 8 12:46:10 2012 (r855) +++ branches/experimental/mail/thunderbird-esr/Makefile Sun Jul 8 12:46:22 2012 (r856) @@ -56,7 +56,7 @@ SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}/defaults/pref/${PORTNAME}.js MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome -OPTIONS_DEFAULT=DBUS OSS +OPTIONS_DEFAULT=DBUS GTK2 OSS OPTIONS_DEFINE= LIGHTNING .include Modified: branches/experimental/mail/thunderbird/Makefile ============================================================================== --- branches/experimental/mail/thunderbird/Makefile Sun Jul 8 12:46:10 2012 (r855) +++ branches/experimental/mail/thunderbird/Makefile Sun Jul 8 12:46:22 2012 (r856) @@ -56,7 +56,7 @@ SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}/defaults/pref/${PORTNAME}.js MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome -OPTIONS_DEFAULT=DBUS OSS +OPTIONS_DEFAULT=DBUS GTK2 OSS OPTIONS_DEFINE= LIGHTNING .include Modified: branches/experimental/mail/thunderbird3/Makefile ============================================================================== --- branches/experimental/mail/thunderbird3/Makefile Sun Jul 8 12:46:10 2012 (r855) +++ branches/experimental/mail/thunderbird3/Makefile Sun Jul 8 12:46:22 2012 (r856) @@ -57,6 +57,7 @@ .include OPTIONS_DEFINE:=${OPTIONS_DEFINE:NLIBPROXY} +OPTIONS_SINGLE:=${OPTIONS_SINGLE:NTOOLKIT} WRKSRC= ${WRKDIR}/comm-1.9.2 MOZSRC:= ${WRKSRC}/mozilla Modified: branches/experimental/www/firefox-esr/Makefile ============================================================================== --- branches/experimental/www/firefox-esr/Makefile Sun Jul 8 12:46:10 2012 (r855) +++ branches/experimental/www/firefox-esr/Makefile Sun Jul 8 12:46:22 2012 (r856) @@ -53,7 +53,7 @@ --disable-updater \ --disable-necko-wifi -OPTIONS_DEFAULT=DBUS OSS +OPTIONS_DEFAULT=DBUS GTK2 OSS OPTIONS_DEFINE= PGO .include Modified: branches/experimental/www/firefox-nightly/Makefile ============================================================================== --- branches/experimental/www/firefox-nightly/Makefile Sun Jul 8 12:46:10 2012 (r855) +++ branches/experimental/www/firefox-nightly/Makefile Sun Jul 8 12:46:22 2012 (r856) @@ -53,7 +53,7 @@ --disable-updater \ --disable-necko-wifi -OPTIONS_DEFAULT=DBUS GSTREAMER OSS +OPTIONS_DEFAULT=DBUS GTK2 GSTREAMER OSS OPTIONS_DEFINE= GSTREAMER PGO .if ${USE_MOZILLA:M-nss} Modified: branches/experimental/www/firefox/Makefile ============================================================================== --- branches/experimental/www/firefox/Makefile Sun Jul 8 12:46:10 2012 (r855) +++ branches/experimental/www/firefox/Makefile Sun Jul 8 12:46:22 2012 (r856) @@ -53,7 +53,7 @@ --disable-updater \ --disable-necko-wifi -OPTIONS_DEFAULT=DBUS OSS +OPTIONS_DEFAULT=DBUS GTK2 OSS OPTIONS_DEFINE= PGO .include Modified: branches/experimental/www/firefox36/Makefile ============================================================================== --- branches/experimental/www/firefox36/Makefile Sun Jul 8 12:46:10 2012 (r855) +++ branches/experimental/www/firefox36/Makefile Sun Jul 8 12:46:22 2012 (r856) @@ -54,6 +54,7 @@ .include OPTIONS_DEFINE:=${OPTIONS_DEFINE:NLIBPROXY} +OPTIONS_SINGLE:=${OPTIONS_SINGLE:NTOOLKIT} .if ${ARCH} == amd64 CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL} Modified: branches/experimental/www/kompozer/Makefile ============================================================================== --- branches/experimental/www/kompozer/Makefile Sun Jul 8 12:46:10 2012 (r855) +++ branches/experimental/www/kompozer/Makefile Sun Jul 8 12:46:22 2012 (r856) @@ -44,8 +44,8 @@ .include -OPTIONS_DEFINE:=${OPTIONS_DEFINE:NDBUS:NLIBPROXY} -OPTIONS_SINGLE:=${OPTIONS_SINGLE:NAUDIO} +OPTIONS_DEFINE:=${OPTIONS_DEFINE:NDBUS:NGIO:NLIBPROXY} +OPTIONS_SINGLE:=${OPTIONS_SINGLE:NAUDIO:NTOOLKIT} OPTIONS_MULTI_GNOME:=${OPTIONS_MULTI_GNOME:NGIO} .if ${ARCH} == amd64 Modified: branches/experimental/www/libxul/Makefile ============================================================================== --- branches/experimental/www/libxul/Makefile Sun Jul 8 12:46:10 2012 (r855) +++ branches/experimental/www/libxul/Makefile Sun Jul 8 12:46:22 2012 (r856) @@ -45,7 +45,7 @@ --disable-updater \ --disable-necko-wifi MOZ_EXTENSIONS= default,cookie,permissions -OPTIONS_DEFAULT=DBUS OSS +OPTIONS_DEFAULT=DBUS GTK2 OSS USE_GECKO= gecko MOZILLA_EXEC_NAME=xulrunner USE_MOZILLA= # empty Modified: branches/experimental/www/libxul19/Makefile ============================================================================== --- branches/experimental/www/libxul19/Makefile Sun Jul 8 12:46:10 2012 (r855) +++ branches/experimental/www/libxul19/Makefile Sun Jul 8 12:46:22 2012 (r856) @@ -53,6 +53,7 @@ .include OPTIONS_DEFINE:=${OPTIONS_DEFINE:NLIBPROXY} +OPTIONS_SINGLE:=${OPTIONS_SINGLE:NTOOLKIT} .if ${USE_MOZILLA:M-nss} MOZ_PKGCONFIG_FILES+= mozilla-nss Modified: branches/experimental/www/seamonkey/Makefile ============================================================================== --- branches/experimental/www/seamonkey/Makefile Sun Jul 8 12:46:10 2012 (r855) +++ branches/experimental/www/seamonkey/Makefile Sun Jul 8 12:46:22 2012 (r856) @@ -52,7 +52,7 @@ NOT_FOR_ARCHS= ia64 -OPTIONS_DEFAULT=DBUS CHATZILLA COMPOSER LDAP MAILNEWS OSS +OPTIONS_DEFAULT=DBUS CHATZILLA COMPOSER GTK2 LDAP MAILNEWS OSS OPTIONS_DEFINE= CHATZILLA COMPOSER LDAP LIGHTNING MAILNEWS CHATZILLA_DESC?=Chatzilla IRC module From owner-freebsd-gecko@FreeBSD.ORG Sun Jul 8 12:46:40 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7AE7B1065672 for ; Sun, 8 Jul 2012 12:46:40 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id F0B8B8FC0C for ; Sun, 8 Jul 2012 12:46:39 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q68Ckdvj036560 for ; Sun, 8 Jul 2012 12:46:39 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q68CkXde034114 for freebsd-gecko@freebsd.org; Sun, 8 Jul 2012 12:46:33 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sun, 8 Jul 2012 12:46:33 GMT Message-Id: <201207081246.q68CkXde034114@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r857 - in branches/experimental: mail/thunderbird mail/thunderbird-esr mail/thunderbird3 www/firefox www/firefox-esr www/firefox-nightly www/firefox36 www/kompozer www/libxul www/libxul19 www/seamonkey X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Jul 2012 12:46:40 -0000 Author: jbeich Date: Sun Jul 8 12:46:33 2012 New Revision: 857 Log: enable logging by default (like upstream builds) It should make NSPR_LOG_MODULES output more useful with packages. Modified: branches/experimental/mail/thunderbird-esr/Makefile branches/experimental/mail/thunderbird/Makefile branches/experimental/mail/thunderbird3/Makefile branches/experimental/www/firefox-esr/Makefile branches/experimental/www/firefox-nightly/Makefile branches/experimental/www/firefox/Makefile branches/experimental/www/firefox36/Makefile branches/experimental/www/kompozer/Makefile branches/experimental/www/libxul/Makefile branches/experimental/www/libxul19/Makefile branches/experimental/www/seamonkey/Makefile Modified: branches/experimental/mail/thunderbird-esr/Makefile ============================================================================== --- branches/experimental/mail/thunderbird-esr/Makefile Sun Jul 8 12:46:22 2012 (r856) +++ branches/experimental/mail/thunderbird-esr/Makefile Sun Jul 8 12:46:33 2012 (r857) @@ -56,7 +56,7 @@ SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}/defaults/pref/${PORTNAME}.js MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome -OPTIONS_DEFAULT=DBUS GTK2 OSS +OPTIONS_DEFAULT=DBUS GTK2 LOGGING OSS OPTIONS_DEFINE= LIGHTNING .include Modified: branches/experimental/mail/thunderbird/Makefile ============================================================================== --- branches/experimental/mail/thunderbird/Makefile Sun Jul 8 12:46:22 2012 (r856) +++ branches/experimental/mail/thunderbird/Makefile Sun Jul 8 12:46:33 2012 (r857) @@ -56,7 +56,7 @@ SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}/defaults/pref/${PORTNAME}.js MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome -OPTIONS_DEFAULT=DBUS GTK2 OSS +OPTIONS_DEFAULT=DBUS GTK2 LOGGING OSS OPTIONS_DEFINE= LIGHTNING .include Modified: branches/experimental/mail/thunderbird3/Makefile ============================================================================== --- branches/experimental/mail/thunderbird3/Makefile Sun Jul 8 12:46:22 2012 (r856) +++ branches/experimental/mail/thunderbird3/Makefile Sun Jul 8 12:46:33 2012 (r857) @@ -52,7 +52,7 @@ SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}/defaults/pref/${PORTNAME}.js MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome -OPTIONS_DEFAULT=DBUS OSS +OPTIONS_DEFAULT=DBUS LOGGING OSS .include Modified: branches/experimental/www/firefox-esr/Makefile ============================================================================== --- branches/experimental/www/firefox-esr/Makefile Sun Jul 8 12:46:22 2012 (r856) +++ branches/experimental/www/firefox-esr/Makefile Sun Jul 8 12:46:33 2012 (r857) @@ -53,7 +53,7 @@ --disable-updater \ --disable-necko-wifi -OPTIONS_DEFAULT=DBUS GTK2 OSS +OPTIONS_DEFAULT=DBUS GTK2 LOGGING OSS OPTIONS_DEFINE= PGO .include Modified: branches/experimental/www/firefox-nightly/Makefile ============================================================================== --- branches/experimental/www/firefox-nightly/Makefile Sun Jul 8 12:46:22 2012 (r856) +++ branches/experimental/www/firefox-nightly/Makefile Sun Jul 8 12:46:33 2012 (r857) @@ -53,7 +53,7 @@ --disable-updater \ --disable-necko-wifi -OPTIONS_DEFAULT=DBUS GTK2 GSTREAMER OSS +OPTIONS_DEFAULT=DBUS GTK2 LOGGING GSTREAMER OSS OPTIONS_DEFINE= GSTREAMER PGO .if ${USE_MOZILLA:M-nss} Modified: branches/experimental/www/firefox/Makefile ============================================================================== --- branches/experimental/www/firefox/Makefile Sun Jul 8 12:46:22 2012 (r856) +++ branches/experimental/www/firefox/Makefile Sun Jul 8 12:46:33 2012 (r857) @@ -53,7 +53,7 @@ --disable-updater \ --disable-necko-wifi -OPTIONS_DEFAULT=DBUS GTK2 OSS +OPTIONS_DEFAULT=DBUS GTK2 LOGGING OSS OPTIONS_DEFINE= PGO .include Modified: branches/experimental/www/firefox36/Makefile ============================================================================== --- branches/experimental/www/firefox36/Makefile Sun Jul 8 12:46:22 2012 (r856) +++ branches/experimental/www/firefox36/Makefile Sun Jul 8 12:46:33 2012 (r857) @@ -49,7 +49,7 @@ --disable-updater \ --disable-necko-wifi -OPTIONS_DEFAULT=DBUS OSS +OPTIONS_DEFAULT=DBUS LOGGING OSS .include Modified: branches/experimental/www/kompozer/Makefile ============================================================================== --- branches/experimental/www/kompozer/Makefile Sun Jul 8 12:46:22 2012 (r856) +++ branches/experimental/www/kompozer/Makefile Sun Jul 8 12:46:33 2012 (r857) @@ -42,6 +42,8 @@ NOT_FOR_ARCHS= ia64 NOT_FOR_ARCHS_REASON_ia64= does not build +OPTIONS_DEFAULT=LOGGING + .include OPTIONS_DEFINE:=${OPTIONS_DEFINE:NDBUS:NGIO:NLIBPROXY} Modified: branches/experimental/www/libxul/Makefile ============================================================================== --- branches/experimental/www/libxul/Makefile Sun Jul 8 12:46:22 2012 (r856) +++ branches/experimental/www/libxul/Makefile Sun Jul 8 12:46:33 2012 (r857) @@ -45,7 +45,7 @@ --disable-updater \ --disable-necko-wifi MOZ_EXTENSIONS= default,cookie,permissions -OPTIONS_DEFAULT=DBUS GTK2 OSS +OPTIONS_DEFAULT=DBUS GTK2 LOGGING OSS USE_GECKO= gecko MOZILLA_EXEC_NAME=xulrunner USE_MOZILLA= # empty Modified: branches/experimental/www/libxul19/Makefile ============================================================================== --- branches/experimental/www/libxul19/Makefile Sun Jul 8 12:46:22 2012 (r856) +++ branches/experimental/www/libxul19/Makefile Sun Jul 8 12:46:33 2012 (r857) @@ -39,7 +39,7 @@ --disable-updater \ --disable-necko-wifi MOZ_EXTENSIONS= default,cookie,permissions -OPTIONS_DEFAULT=DBUS OSS +OPTIONS_DEFAULT=DBUS LOGGING OSS USE_GECKO= gecko MOZILLA_EXEC_NAME=xulrunner USE_MOZILLA= -event -ffi -vpx Modified: branches/experimental/www/seamonkey/Makefile ============================================================================== --- branches/experimental/www/seamonkey/Makefile Sun Jul 8 12:46:22 2012 (r856) +++ branches/experimental/www/seamonkey/Makefile Sun Jul 8 12:46:33 2012 (r857) @@ -52,7 +52,7 @@ NOT_FOR_ARCHS= ia64 -OPTIONS_DEFAULT=DBUS CHATZILLA COMPOSER GTK2 LDAP MAILNEWS OSS +OPTIONS_DEFAULT=DBUS CHATZILLA COMPOSER GTK2 LDAP LOGGING MAILNEWS OSS OPTIONS_DEFINE= CHATZILLA COMPOSER LDAP LIGHTNING MAILNEWS CHATZILLA_DESC?=Chatzilla IRC module From owner-freebsd-gecko@FreeBSD.ORG Sun Jul 8 12:46:52 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8F9BB106566B for ; Sun, 8 Jul 2012 12:46:52 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id C71238FC16 for ; Sun, 8 Jul 2012 12:46:51 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q68Cko1c042210 for ; Sun, 8 Jul 2012 12:46:50 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q68Ckj69037450 for freebsd-gecko@freebsd.org; Sun, 8 Jul 2012 12:46:45 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sun, 8 Jul 2012 12:46:45 GMT Message-Id: <201207081246.q68Ckj69037450@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r858 - in branches/experimental: mail/thunderbird mail/thunderbird/files www/firefox www/firefox/files www/seamonkey www/seamonkey/files X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Jul 2012 12:46:52 -0000 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 -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 -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 -- #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 +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(~GST_PLAY_FLAG_AUDIO), static_cast(~GST_PLAY_FLAG_VIDEO)}; + guint default_flags, current_flags; + g_object_get(mPlayBin, "flags", &default_flags, NULL); + +commit 667daed +Author: Stephen Moehle +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 - #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 +#endif - #include - #include - #include -@@ -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 -+#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 // for valloc on *BSD #endif //if defined(XP_UNIX) @@ -8,14 +8,14 @@ +# include // 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 -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 -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 -- #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 +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(~GST_PLAY_FLAG_AUDIO), static_cast(~GST_PLAY_FLAG_VIDEO)}; + guint default_flags, current_flags; + g_object_get(mPlayBin, "flags", &default_flags, NULL); + +commit 667daed +Author: Stephen Moehle +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 +#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 // for valloc on *BSD #endif //if defined(XP_UNIX) @@ -8,14 +8,14 @@ +# include // 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 -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 -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 -- #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 +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(~GST_PLAY_FLAG_AUDIO), static_cast(~GST_PLAY_FLAG_VIDEO)}; + guint default_flags, current_flags; + g_object_get(mPlayBin, "flags", &default_flags, NULL); + +commit 667daed +Author: Stephen Moehle +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 // for valloc on *BSD #endif //if defined(XP_UNIX) @@ -8,14 +8,14 @@ +# include // 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. From owner-freebsd-gecko@FreeBSD.ORG Sun Jul 8 12:47:06 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 277851065786 for ; Sun, 8 Jul 2012 12:47:06 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id B2D8B8FC08 for ; Sun, 8 Jul 2012 12:47:05 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q68Cl4NM047316 for ; Sun, 8 Jul 2012 12:47:04 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q68CkxEc043250 for freebsd-gecko@freebsd.org; Sun, 8 Jul 2012 12:46:59 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sun, 8 Jul 2012 12:46:59 GMT Message-Id: <201207081246.q68CkxEc043250@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r859 - in branches/experimental: mail/thunderbird-esr/files mail/thunderbird/files mail/thunderbird3/files www/firefox-esr/files www/firefox/files www/firefox36/files www/libxul/files www/libxul19/files www/seamonkey/files X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Jul 2012 12:47:06 -0000 Author: jbeich Date: Sun Jul 8 12:46:59 2012 New Revision: 859 Log: rename manifest patch and partially revert r731, apply only where it's actually needed Added: branches/experimental/www/firefox/files/patch-bug752895 Deleted: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-browser-installer-package-manifest.in branches/experimental/mail/thunderbird/files/patch-mozilla-browser-installer-package-manifest.in branches/experimental/mail/thunderbird3/files/patch-configure.in branches/experimental/mail/thunderbird3/files/patch-mozilla-browser-installer-package-manifest.in branches/experimental/www/firefox-esr/files/patch-browser-installer-package-manifest.in branches/experimental/www/firefox/files/patch-browser-installer-package-manifest.in branches/experimental/www/firefox36/files/patch-browser-installer-package-manifest.in branches/experimental/www/firefox36/files/patch-configure.in branches/experimental/www/libxul/files/patch-browser-installer-package-manifest.in branches/experimental/www/libxul19/files/patch-browser-installer-package-manifest.in branches/experimental/www/libxul19/files/patch-configure.in branches/experimental/www/seamonkey/files/patch-mozilla-browser-installer-package-manifest.in Modified: branches/experimental/mail/thunderbird-esr/files/patch-configure.in branches/experimental/mail/thunderbird/files/patch-configure.in branches/experimental/www/firefox-esr/files/patch-configure.in branches/experimental/www/firefox/files/patch-configure.in branches/experimental/www/libxul/files/patch-configure.in branches/experimental/www/seamonkey/files/patch-configure.in Modified: branches/experimental/mail/thunderbird-esr/files/patch-configure.in ============================================================================== --- branches/experimental/mail/thunderbird-esr/files/patch-configure.in Sun Jul 8 12:46:45 2012 (r858) +++ branches/experimental/mail/thunderbird-esr/files/patch-configure.in Sun Jul 8 12:46:59 2012 (r859) @@ -1,15 +1,5 @@ --- configure.in.orig 2011-12-19 14:48:06.000000000 +0100 +++ configure.in 2011-12-19 15:51:19.000000000 +0100 -@@ -4218,6 +4218,9 @@ else - NSPR_LIBS='`$(LIBXUL_DIST)/sdk/bin/nspr-config --prefix='${LIBXUL_DIST}' --libdir='${LIBXUL_DIST}'/lib --libs`' - fi - fi -+if test -n "$MOZ_NATIVE_NSPR"; then -+ AC_DEFINE(MOZ_NATIVE_NSPR) -+fi - - dnl system libevent Support - dnl ======================================================== @@ -4383,7 +4386,7 @@ LDFLAGS=$_SAVE_LDFLAGS LIBS=$_SAVE_LIBS Deleted: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-browser-installer-package-manifest.in ============================================================================== --- branches/experimental/mail/thunderbird-esr/files/patch-mozilla-browser-installer-package-manifest.in Sun Jul 8 12:46:59 2012 (r858) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,26 +0,0 @@ ---- mozilla/browser/installer/package-manifest.in~ -+++ mozilla/browser/installer/package-manifest.in -@@ -40,10 +40,12 @@ - #ifndef MOZ_STATIC_JS - @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@ - #endif -+#ifndef MOZ_NATIVE_NSPR - @BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@ - @BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@ --@BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@ - @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@ -+#endif -+@BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@ - @BINPATH@/@DLL_PREFIX@mozalloc@DLL_SUFFIX@ - @BINPATH@/@DLL_PREFIX@mozutils@DLL_SUFFIX@ - #ifdef XP_MACOSX -@@ -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 Modified: branches/experimental/mail/thunderbird/files/patch-configure.in ============================================================================== --- branches/experimental/mail/thunderbird/files/patch-configure.in Sun Jul 8 12:46:45 2012 (r858) +++ branches/experimental/mail/thunderbird/files/patch-configure.in Sun Jul 8 12:46:59 2012 (r859) @@ -1,15 +1,5 @@ --- configure.in.orig 2011-12-19 14:48:06.000000000 +0100 +++ configure.in 2011-12-19 15:51:19.000000000 +0100 -@@ -4218,6 +4218,9 @@ else - NSPR_LIBS='`$(LIBXUL_DIST)/sdk/bin/nspr-config --prefix='${LIBXUL_DIST}' --libdir='${LIBXUL_DIST}'/lib --libs`' - fi - fi -+if test -n "$MOZ_NATIVE_NSPR"; then -+ AC_DEFINE(MOZ_NATIVE_NSPR) -+fi - - dnl system libevent Support - dnl ======================================================== @@ -4383,7 +4386,7 @@ LDFLAGS=$_SAVE_LDFLAGS LIBS=$_SAVE_LIBS Deleted: branches/experimental/mail/thunderbird/files/patch-mozilla-browser-installer-package-manifest.in ============================================================================== --- branches/experimental/mail/thunderbird/files/patch-mozilla-browser-installer-package-manifest.in Sun Jul 8 12:46:59 2012 (r858) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,24 +0,0 @@ ---- mozilla/browser/installer/package-manifest.in~ -+++ mozilla/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 Deleted: branches/experimental/mail/thunderbird3/files/patch-configure.in ============================================================================== --- branches/experimental/mail/thunderbird3/files/patch-configure.in Sun Jul 8 12:46:59 2012 (r858) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,12 +0,0 @@ ---- configure.in.orig 2009-08-14 11:24:58.206076928 +0200 -+++ configure.in 2009-08-14 11:25:29.601293359 +0200 -@@ -4304,6 +4304,9 @@ else - NSPR_LIBS='`$(LIBXUL_DIST)/bin/nspr-config --prefix='${LIBXUL_DIST}' --libdir='${LIBXUL_DIST}'/lib --libs`' - fi - fi -+if test -n "$MOZ_NATIVE_NSPR"; then -+ AC_DEFINE(MOZ_NATIVE_NSPR) -+fi - - dnl ======================================================== - dnl = If NSS was not detected in the system, Deleted: branches/experimental/mail/thunderbird3/files/patch-mozilla-browser-installer-package-manifest.in ============================================================================== --- branches/experimental/mail/thunderbird3/files/patch-mozilla-browser-installer-package-manifest.in Sun Jul 8 12:46:59 2012 (r858) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,16 +0,0 @@ ---- mozilla/browser/installer/package-manifest.in~ -+++ mozilla/browser/installer/package-manifest.in -@@ -46,10 +46,12 @@ - #else - @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@ - #endif -+#ifndef MOZ_NATIVE_NSPR - @BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@ - @BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@ --@BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@ - @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@ -+#endif -+@BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@ - #ifdef XP_MACOSX - @BINPATH@/XUL - #else Deleted: branches/experimental/www/firefox-esr/files/patch-browser-installer-package-manifest.in ============================================================================== --- branches/experimental/www/firefox-esr/files/patch-browser-installer-package-manifest.in Sun Jul 8 12:46:59 2012 (r858) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,26 +0,0 @@ ---- browser/installer/package-manifest.in~ -+++ browser/installer/package-manifest.in -@@ -40,10 +40,12 @@ - #ifndef MOZ_STATIC_JS - @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@ - #endif -+#ifndef MOZ_NATIVE_NSPR - @BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@ - @BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@ --@BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@ - @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@ -+#endif -+@BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@ - @BINPATH@/@DLL_PREFIX@mozalloc@DLL_SUFFIX@ - @BINPATH@/@DLL_PREFIX@mozutils@DLL_SUFFIX@ - #ifdef XP_MACOSX -@@ -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 Modified: branches/experimental/www/firefox-esr/files/patch-configure.in ============================================================================== --- branches/experimental/www/firefox-esr/files/patch-configure.in Sun Jul 8 12:46:45 2012 (r858) +++ branches/experimental/www/firefox-esr/files/patch-configure.in Sun Jul 8 12:46:59 2012 (r859) @@ -27,16 +27,6 @@ AC_DEFINE(HAVE_CLOCK_MONOTONIC) AC_SUBST(HAVE_CLOCK_MONOTONIC) AC_SUBST(REALTIME_LIBS) -@@ -4218,6 +4218,9 @@ else - NSPR_LIBS='`$(LIBXUL_DIST)/sdk/bin/nspr-config --prefix='${LIBXUL_DIST}' --libdir='${LIBXUL_DIST}'/lib --libs`' - fi - fi -+if test -n "$MOZ_NATIVE_NSPR"; then -+ AC_DEFINE(MOZ_NATIVE_NSPR) -+fi - - dnl system libevent Support - dnl ======================================================== @@ -4230,6 +4233,9 @@ if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then MOZ_NATIVE_LIBEVENT= Deleted: branches/experimental/www/firefox/files/patch-browser-installer-package-manifest.in ============================================================================== --- branches/experimental/www/firefox/files/patch-browser-installer-package-manifest.in Sun Jul 8 12:46:59 2012 (r858) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,24 +0,0 @@ ---- 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 Added: branches/experimental/www/firefox/files/patch-bug752895 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox/files/patch-bug752895 Sun Jul 8 12:46:59 2012 (r859) @@ -0,0 +1,71 @@ +commit de14ddd +Author: Andrew Benton +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: branches/experimental/www/firefox/files/patch-configure.in ============================================================================== --- branches/experimental/www/firefox/files/patch-configure.in Sun Jul 8 12:46:45 2012 (r858) +++ branches/experimental/www/firefox/files/patch-configure.in Sun Jul 8 12:46:59 2012 (r859) @@ -1,15 +1,5 @@ --- configure.in.orig 2012-05-23 20:56:34.000000000 +0200 +++ configure.in 2012-05-27 18:18:25.000000000 +0200 -@@ -4218,6 +4218,9 @@ else - NSPR_LIBS='`$(LIBXUL_DIST)/sdk/bin/nspr-config --prefix='${LIBXUL_DIST}' --libdir='${LIBXUL_DIST}'/lib --libs`' - fi - fi -+if test -n "$MOZ_NATIVE_NSPR"; then -+ AC_DEFINE(MOZ_NATIVE_NSPR) -+fi - - dnl system libevent Support - dnl ======================================================== @@ -4230,6 +4233,9 @@ if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then MOZ_NATIVE_LIBEVENT= Deleted: branches/experimental/www/firefox36/files/patch-browser-installer-package-manifest.in ============================================================================== --- branches/experimental/www/firefox36/files/patch-browser-installer-package-manifest.in Sun Jul 8 12:46:59 2012 (r858) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,16 +0,0 @@ ---- browser/installer/package-manifest.in~ -+++ browser/installer/package-manifest.in -@@ -46,10 +46,12 @@ - #else - @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@ - #endif -+#ifndef MOZ_NATIVE_NSPR - @BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@ - @BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@ --@BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@ - @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@ -+#endif -+@BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@ - #ifdef XP_MACOSX - @BINPATH@/XUL - #else Deleted: branches/experimental/www/firefox36/files/patch-configure.in ============================================================================== --- branches/experimental/www/firefox36/files/patch-configure.in Sun Jul 8 12:46:59 2012 (r858) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,12 +0,0 @@ ---- configure.in.orig 2009-10-03 20:24:11.000000000 +0200 -+++ configure.in 2009-10-03 20:24:43.000000000 +0200 -@@ -4252,6 +4252,9 @@ else - NSPR_LIBS='`$(LIBXUL_DIST)/bin/nspr-config --prefix='${LIBXUL_DIST}' --libdir='${LIBXUL_DIST}'/lib --libs`' - fi - fi -+if test -n "$MOZ_NATIVE_NSPR"; then -+ AC_DEFINE(MOZ_NATIVE_NSPR) -+fi - - dnl system libevent Support - dnl ======================================================== Deleted: branches/experimental/www/libxul/files/patch-browser-installer-package-manifest.in ============================================================================== --- branches/experimental/www/libxul/files/patch-browser-installer-package-manifest.in Sun Jul 8 12:46:59 2012 (r858) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,26 +0,0 @@ ---- browser/installer/package-manifest.in~ -+++ browser/installer/package-manifest.in -@@ -40,10 +40,12 @@ - #ifndef MOZ_STATIC_JS - @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@ - #endif -+#ifndef MOZ_NATIVE_NSPR - @BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@ - @BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@ --@BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@ - @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@ -+#endif -+@BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@ - @BINPATH@/@DLL_PREFIX@mozalloc@DLL_SUFFIX@ - @BINPATH@/@DLL_PREFIX@mozutils@DLL_SUFFIX@ - #ifdef XP_MACOSX -@@ -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 Modified: branches/experimental/www/libxul/files/patch-configure.in ============================================================================== --- branches/experimental/www/libxul/files/patch-configure.in Sun Jul 8 12:46:45 2012 (r858) +++ branches/experimental/www/libxul/files/patch-configure.in Sun Jul 8 12:46:59 2012 (r859) @@ -27,16 +27,6 @@ AC_DEFINE(HAVE_CLOCK_MONOTONIC) AC_SUBST(HAVE_CLOCK_MONOTONIC) AC_SUBST(REALTIME_LIBS) -@@ -4218,6 +4218,9 @@ else - NSPR_LIBS='`$(LIBXUL_DIST)/sdk/bin/nspr-config --prefix='${LIBXUL_DIST}' --libdir='${LIBXUL_DIST}'/lib --libs`' - fi - fi -+if test -n "$MOZ_NATIVE_NSPR"; then -+ AC_DEFINE(MOZ_NATIVE_NSPR) -+fi - - dnl system libevent Support - dnl ======================================================== @@ -4230,6 +4233,9 @@ if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then MOZ_NATIVE_LIBEVENT= Deleted: branches/experimental/www/libxul19/files/patch-browser-installer-package-manifest.in ============================================================================== --- branches/experimental/www/libxul19/files/patch-browser-installer-package-manifest.in Sun Jul 8 12:46:59 2012 (r858) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,16 +0,0 @@ ---- browser/installer/package-manifest.in~ -+++ browser/installer/package-manifest.in -@@ -46,10 +46,12 @@ - #else - @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@ - #endif -+#ifndef MOZ_NATIVE_NSPR - @BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@ - @BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@ --@BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@ - @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@ -+#endif -+@BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@ - #ifdef XP_MACOSX - @BINPATH@/XUL - #else Deleted: branches/experimental/www/libxul19/files/patch-configure.in ============================================================================== --- branches/experimental/www/libxul19/files/patch-configure.in Sun Jul 8 12:46:59 2012 (r858) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,12 +0,0 @@ ---- configure.in.orig 2009-10-29 23:11:31.000000000 +0100 -+++ configure.in 2009-11-16 19:51:19.000000000 +0100 -@@ -4252,6 +4252,9 @@ else - NSPR_LIBS='`$(LIBXUL_DIST)/bin/nspr-config --prefix='${LIBXUL_DIST}' --libdir='${LIBXUL_DIST}'/lib --libs`' - fi - fi -+if test -n "$MOZ_NATIVE_NSPR"; then -+ AC_DEFINE(MOZ_NATIVE_NSPR) -+fi - - dnl system libevent Support - dnl ======================================================== Modified: branches/experimental/www/seamonkey/files/patch-configure.in ============================================================================== --- branches/experimental/www/seamonkey/files/patch-configure.in Sun Jul 8 12:46:45 2012 (r858) +++ branches/experimental/www/seamonkey/files/patch-configure.in Sun Jul 8 12:46:59 2012 (r859) @@ -1,15 +1,5 @@ --- configure.in.orig 2011-12-17 18:35:47.000000000 +0100 +++ configure.in 2011-12-19 15:57:09.000000000 +0100 -@@ -4218,6 +4218,9 @@ else - NSPR_LIBS='`$(LIBXUL_DIST)/sdk/bin/nspr-config --prefix='${LIBXUL_DIST}' --libdir='${LIBXUL_DIST}'/lib --libs`' - fi - fi -+if test -n "$MOZ_NATIVE_NSPR"; then -+ AC_DEFINE(MOZ_NATIVE_NSPR) -+fi - - dnl system libevent Support - dnl ======================================================== @@ -4383,7 +4386,7 @@ LDFLAGS=$_SAVE_LDFLAGS LIBS=$_SAVE_LIBS Deleted: branches/experimental/www/seamonkey/files/patch-mozilla-browser-installer-package-manifest.in ============================================================================== --- branches/experimental/www/seamonkey/files/patch-mozilla-browser-installer-package-manifest.in Sun Jul 8 12:46:59 2012 (r858) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,24 +0,0 @@ ---- mozilla/browser/installer/package-manifest.in~ -+++ mozilla/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 From owner-freebsd-gecko@FreeBSD.ORG Sun Jul 8 12:47:13 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9DD01106567B for ; Sun, 8 Jul 2012 12:47:13 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 233658FC15 for ; Sun, 8 Jul 2012 12:47:12 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q68ClChQ048777 for ; Sun, 8 Jul 2012 12:47:12 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q68Cl7OT048579 for freebsd-gecko@freebsd.org; Sun, 8 Jul 2012 12:47:07 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sun, 8 Jul 2012 12:47:07 GMT Message-Id: <201207081247.q68Cl7OT048579@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r860 - branches/experimental/www/seamonkey/files X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Jul 2012 12:47:13 -0000 Author: jbeich Date: Sun Jul 8 12:47:06 2012 New Revision: 860 Log: consistently disable floating-point exceptions Added: branches/experimental/www/seamonkey/files/patch-mozilla-js-src-jsnum.cpp Added: branches/experimental/www/seamonkey/files/patch-mozilla-js-src-jsnum.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey/files/patch-mozilla-js-src-jsnum.cpp Sun Jul 8 12:47:06 2012 (r860) @@ -0,0 +1,31 @@ +--- 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 ++#endif + #ifdef XP_OS2 + #define _PC_53 PC_53 + #define _MCW_EM MCW_EM +@@ -691,8 +694,18 @@ + + #else + ++#if defined(__FreeBSD__) ++#if __BSD_VISIBLE == 0 ++#error __BSD_VISIBLE is zero, so fedisableexcept is not defined ++#endif ++#include ++#define FIX_FPU() ((void)fedisableexcept(FE_ALL_EXCEPT)) ++#else ++ + #define FIX_FPU() ((void)0) + ++#endif /* defined(__FreeBSD__) && __FreeBSD_version >= 503000 */ ++ + #endif + + JSBool From owner-freebsd-gecko@FreeBSD.ORG Mon Jul 9 08:00:51 2012 Return-Path: Delivered-To: gecko@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 04BCB106567E; Mon, 9 Jul 2012 08:00:51 +0000 (UTC) (envelope-from edwin@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id CC9818FC14; Mon, 9 Jul 2012 08:00:50 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q6980oOI045605; Mon, 9 Jul 2012 08:00:50 GMT (envelope-from edwin@freefall.freebsd.org) Received: (from edwin@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q6980oqw045601; Mon, 9 Jul 2012 08:00:50 GMT (envelope-from edwin) Date: Mon, 9 Jul 2012 08:00:50 GMT Message-Id: <201207090800.q6980oqw045601@freefall.freebsd.org> To: edwin@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org, gecko@FreeBSD.org From: edwin@FreeBSD.org Cc: Subject: Re: ports/169729: www/firefox-esr "make package" produces package with zero dependencies X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Jul 2012 08:00:51 -0000 Synopsis: www/firefox-esr "make package" produces package with zero dependencies Responsible-Changed-From-To: freebsd-ports-bugs->gecko Responsible-Changed-By: edwin Responsible-Changed-When: Mon Jul 9 08:00:49 UTC 2012 Responsible-Changed-Why: Over to maintainer (via the GNATS Auto Assign Tool) http://www.freebsd.org/cgi/query-pr.cgi?pr=169729 From owner-freebsd-gecko@FreeBSD.ORG Mon Jul 9 11:07:32 2012 Return-Path: Delivered-To: gecko@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4C5C210656D0 for ; Mon, 9 Jul 2012 11:07:32 +0000 (UTC) (envelope-from owner-bugmaster@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 1D8E08FC1B for ; Mon, 9 Jul 2012 11:07:32 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q69B7Wg6075725 for ; Mon, 9 Jul 2012 11:07:32 GMT (envelope-from owner-bugmaster@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q69B7Vrj075720 for gecko@FreeBSD.org; Mon, 9 Jul 2012 11:07:31 GMT (envelope-from owner-bugmaster@FreeBSD.org) Date: Mon, 9 Jul 2012 11:07:31 GMT Message-Id: <201207091107.q69B7Vrj075720@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: gnats set sender to owner-bugmaster@FreeBSD.org using -f From: FreeBSD bugmaster To: gecko@FreeBSD.org Cc: Subject: Current problem reports assigned to gecko@FreeBSD.org X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Jul 2012 11:07:32 -0000 Note: to view an individual PR, use: http://www.freebsd.org/cgi/query-pr.cgi?pr=(number). The following is a listing of current problems submitted by FreeBSD users. These represent problem reports covering all versions including experimental development code and obsolete releases. S Tracker Resp. Description -------------------------------------------------------------------------------- o ports/169729 gecko www/firefox-esr "make package" produces package with z o ports/169479 gecko www/firefox always adds -O0 to CFLAGS o ports/169389 gecko Firefox/Thunderbird fail to build with system GCC o ports/169241 gecko www/firefox Right mouse buttom click freeze screen o ports/169231 gecko [patch] Fix build for www/firefox using CLANG o ports/168978 gecko mail/thunderbird: /base/nsStackWalk.cpp:1196:29: error o ports/168898 gecko mail/thunderbird: nsDirPrefs.cpp:378:9: error: case va o ports/168793 gecko www/firefox: /usr/ports/www/firefox/work/mozilla-relea o ports/168718 gecko www/firefox: core dumping or refuse to compile o ports/168637 gecko www/libxul: nsStackWalk.cpp: In function 'nsresult NS_ o ports/168465 gecko www/firefox: HTML5 audio and video doesn't work in FF1 o ports/168369 gecko [PATCH] cannot build www/libxul 1.9.2.28 o ports/168091 gecko Mk/bsd.gecko.mk error: USE_FIREFOX doesn't work correc o ports/167397 gecko mail/thunderbird-i18n Version 12.0 and freebsd 9.0: ca o ports/167298 gecko mail/thunderbird-i18n and www/firefox-i18n fail to fet f ports/165263 gecko mail/thunderbird: core dumping most time when users ar o ports/164919 gecko www/seamonkey fails to build on pre-SSE2 processor o ports/164905 gecko www/seamonkey fails to build with clang [patch] o ports/164239 gecko [PATCH] mail/thunderbird: crash with nss_ldap o ports/164013 gecko www/firefox: Firefox-9 Icons & xpi-addons from ports o ports/163454 gecko [patch] www/firefox-beta: unbreak with libc++ o ports/162939 gecko www/firefox crashes with Zotero add-on o ports/162075 gecko www/firefox >= 7.0.1_2 bug with respect to pentadactyl o ports/161421 gecko [patch] www/firefox: use libevent2 o ports/160933 gecko Bad port interactions between Mozilla projects o ports/160387 gecko security/ca_root_nss: Allow user to trust extra local o ports/160351 gecko www/libxul installs incorrect mozilla-nss.pc o ports/159831 gecko www/firefox is broken o ports/156335 gecko www/firefox: Repeatable firefox-4.0_1,1 crash f ports/155949 gecko www/firefox: firefox 4, WITH_PGO, better Text against o ports/150631 gecko www/firefox 3.6.9 does not build if you have previousl o ports/146231 gecko [feature request] [patch] www/firefox: use port libs o ports/144044 gecko [PATCH] www/firefox: Makefile.webplugins target order 33 problems total. From owner-freebsd-gecko@FreeBSD.ORG Mon Jul 9 11:35:42 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 586461065677 for ; Mon, 9 Jul 2012 11:35:42 +0000 (UTC) (envelope-from flo@smeets.im) Received: from mail.solomo.de (mail.solomo.de [IPv6:2a01:238:42c7:9a00::2]) by mx1.freebsd.org (Postfix) with ESMTP id D9FB78FC14 for ; Mon, 9 Jul 2012 11:35:41 +0000 (UTC) Received: from mail.solomo.de (localhost [127.0.0.1]) by mail.solomo.de (Postfix) with ESMTP id 14537C381D for ; Mon, 9 Jul 2012 13:35:40 +0200 (CEST) X-Virus-Scanned: amavisd-new at solomo.de Received: from mail.solomo.de ([127.0.0.1]) by mail.solomo.de (mail.solomo.de [127.0.0.1]) (amavisd-new, port 10024) with LMTP id Wm6B8LSjgheK for ; Mon, 9 Jul 2012 13:35:38 +0200 (CEST) Received: from bender.solomo.local (bsdruler.solomo.de [213.172.127.26]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mail.solomo.de (Postfix) with ESMTPSA id 94F93C381A for ; Mon, 9 Jul 2012 13:35:38 +0200 (CEST) Message-ID: <4FFAC20A.8070509@smeets.im> Date: Mon, 09 Jul 2012 13:35:38 +0200 From: Florian Smeets User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:13.0) Gecko/20120612 Thunderbird/13.0 MIME-Version: 1.0 To: freebsd-gecko@freebsd.org References: <201206231314.q5NDEOLt050876@trillian.chruetertee.ch> In-Reply-To: <201206231314.q5NDEOLt050876@trillian.chruetertee.ch> X-Enigmail-Version: 1.4.2 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Subject: Re: [SVN-Commit] r792 - in branches/experimental: Mk mail/thunderbird mail/thunderbird/files www/firefox www/firefox-nightly www/firefox/files www/seamonkey www/seamonkey/files X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Jul 2012 11:35:42 -0000 On 06/23/2012 15:14, svn-freebsd-gecko@chruetertee.ch wrote: > Author: jbeich > Date: Sat Jun 23 13:14:24 2012 > New Revision: 792 > > Log: > use objdir build > Does the following patch look correct to fix lightning installation with thunderbird? It fixes the installation for me. The same needs to be done for seamonkey. Index: Makefile =================================================================== --- Makefile (revision 860) +++ Makefile (working copy) @@ -87,7 +87,7 @@ MOZ_OPTIONS+= --enable-calendar MOZ_MK_OPTIONS+= MOZ_CO_PROJECT=calendar LIGHTNING_DIR= share/lightning -XPI_FILE= ${MOZSRC}/dist/xpi-stage/lightning.xpi +XPI_FILE= ${MOZ_OBJDIR}/mozilla/dist/xpi-stage/lightning.xpi XPI_LIBDIR= ${PREFIX}/lib/xpi XPI_ORIG_ID= {e2fda1a4-762b-4020-b5ad-a41df1933103} XPI_ID= lightning@thunderbird.mozilla.org Florian From owner-freebsd-gecko@FreeBSD.ORG Mon Jul 9 14:05:19 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 908A1106566B for ; Mon, 9 Jul 2012 14:05:19 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 19F918FC14 for ; Mon, 9 Jul 2012 14:05:18 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q69E5CqA007335 for ; Mon, 9 Jul 2012 14:05:12 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q69E55f2007254 for freebsd-gecko@freebsd.org; Mon, 9 Jul 2012 14:05:05 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Mon, 9 Jul 2012 14:05:05 GMT Message-Id: <201207091405.q69E55f2007254@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r861 - branches/experimental/www/seamonkey X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Jul 2012 14:05:19 -0000 Author: jbeich Date: Mon Jul 9 14:05:05 2012 New Revision: 861 Log: remove LD_LIBRARY_PATH lost in time Modified: branches/experimental/www/seamonkey/Makefile Modified: branches/experimental/www/seamonkey/Makefile ============================================================================== --- branches/experimental/www/seamonkey/Makefile Sun Jul 8 12:47:06 2012 (r860) +++ branches/experimental/www/seamonkey/Makefile Mon Jul 9 14:05:05 2012 (r861) @@ -36,8 +36,6 @@ USE_GL= gl MAKE_JOBS_SAFE= yes MOZ_PIS_SCRIPTS= moz_pis_S50cleanhome -MOZ_EXPORT= LD_LIBRARY_PATH="${WRKSRC}/dist/bin" - MOZ_EXTENSIONS= default MOZ_OPTIONS+= --program-transform-name='s/seamonkey/${MOZILLA}/' \ From owner-freebsd-gecko@FreeBSD.ORG Mon Jul 9 14:05:24 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E4FE0106564A for ; Mon, 9 Jul 2012 14:05:24 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 57E468FC16 for ; Mon, 9 Jul 2012 14:05:24 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q69E5NoL009063 for ; Mon, 9 Jul 2012 14:05:23 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q69E5Igg007910 for freebsd-gecko@freebsd.org; Mon, 9 Jul 2012 14:05:18 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Mon, 9 Jul 2012 14:05:18 GMT Message-Id: <201207091405.q69E5Igg007910@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r862 - in branches/experimental: Mk mail/thunderbird mail/thunderbird-esr www/seamonkey X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Jul 2012 14:05:25 -0000 Author: jbeich Date: Mon Jul 9 14:05:18 2012 New Revision: 862 Log: make LIGHTNING objdir safe Submitted by: flo Modified: branches/experimental/Mk/bsd.gecko.mk branches/experimental/mail/thunderbird-esr/Makefile branches/experimental/mail/thunderbird/Makefile branches/experimental/www/seamonkey/Makefile Modified: branches/experimental/Mk/bsd.gecko.mk ============================================================================== --- branches/experimental/Mk/bsd.gecko.mk Mon Jul 9 14:05:05 2012 (r861) +++ branches/experimental/Mk/bsd.gecko.mk Mon Jul 9 14:05:18 2012 (r862) @@ -802,6 +802,8 @@ CONFIGURE_WRKSRC=${MOZ_OBJDIR} BUILD_WRKSRC= ${MOZ_OBJDIR} INSTALL_WRKSRC= ${MOZ_OBJDIR} +.else +MOZ_OBJDIR= ${WRKSRC} .endif .else # bsd.port.post.mk Modified: branches/experimental/mail/thunderbird-esr/Makefile ============================================================================== --- branches/experimental/mail/thunderbird-esr/Makefile Mon Jul 9 14:05:05 2012 (r861) +++ branches/experimental/mail/thunderbird-esr/Makefile Mon Jul 9 14:05:18 2012 (r862) @@ -87,7 +87,7 @@ MOZ_OPTIONS+= --enable-calendar MOZ_MK_OPTIONS+= MOZ_CO_PROJECT=calendar LIGHTNING_DIR= share/lightning -XPI_FILE= ${MOZSRC}/dist/xpi-stage/lightning.xpi +XPI_FILE= ${MOZ_OBJDIR}/mozilla/dist/xpi-stage/lightning.xpi XPI_LIBDIR= ${PREFIX}/lib/xpi XPI_ORIG_ID= {e2fda1a4-762b-4020-b5ad-a41df1933103} XPI_ID= lightning@thunderbird.mozilla.org Modified: branches/experimental/mail/thunderbird/Makefile ============================================================================== --- branches/experimental/mail/thunderbird/Makefile Mon Jul 9 14:05:05 2012 (r861) +++ branches/experimental/mail/thunderbird/Makefile Mon Jul 9 14:05:18 2012 (r862) @@ -87,7 +87,7 @@ MOZ_OPTIONS+= --enable-calendar MOZ_MK_OPTIONS+= MOZ_CO_PROJECT=calendar LIGHTNING_DIR= share/lightning -XPI_FILE= ${MOZSRC}/dist/xpi-stage/lightning.xpi +XPI_FILE= ${MOZ_OBJDIR}/mozilla/dist/xpi-stage/lightning.xpi XPI_LIBDIR= ${PREFIX}/lib/xpi XPI_ORIG_ID= {e2fda1a4-762b-4020-b5ad-a41df1933103} XPI_ID= lightning@thunderbird.mozilla.org Modified: branches/experimental/www/seamonkey/Makefile ============================================================================== --- branches/experimental/www/seamonkey/Makefile Mon Jul 9 14:05:05 2012 (r861) +++ branches/experimental/www/seamonkey/Makefile Mon Jul 9 14:05:18 2012 (r862) @@ -107,7 +107,7 @@ MOZ_OPTIONS+= --enable-calendar MOZ_MK_OPTIONS+= MOZ_CO_PROJECT=calendar LIGHTNING_DIR= share/lightning -XPI_FILE= ${MOZSRC}/dist/xpi-stage/lightning.xpi +XPI_FILE= ${MOZ_OBJDIR}/mozilla/dist/xpi-stage/lightning.xpi XPI_LIBDIR= ${PREFIX}/lib/xpi XPI_ORIG_ID= {e2fda1a4-762b-4020-b5ad-a41df1933103} XPI_ID= lightning@seamonkey.mozilla.org From owner-freebsd-gecko@FreeBSD.ORG Mon Jul 9 16:42:44 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1D59E10656A8 for ; Mon, 9 Jul 2012 16:42:44 +0000 (UTC) (envelope-from andy@neu.net) Received: from mail.neu.net (unknown [IPv6:2607:fc50:0:d300:216:3eff:fe54:f1c6]) by mx1.freebsd.org (Postfix) with ESMTP id 8053E8FC19 for ; Mon, 9 Jul 2012 16:42:43 +0000 (UTC) Received: from neu.net (neu.net [199.48.129.194]) by mail.neu.net (8.14.5/8.14.5) with ESMTP id q69GgZoP076388 for ; Mon, 9 Jul 2012 12:42:41 -0400 (EDT) (envelope-from andy@neu.net) Date: Mon, 9 Jul 2012 12:42:35 -0400 (EDT) From: AN To: freebsd-gecko@freebsd.org In-Reply-To: <201207091405.q69E55f2007254@trillian.chruetertee.ch> Message-ID: References: <201207091405.q69E55f2007254@trillian.chruetertee.ch> User-Agent: Alpine 2.00 (BSF 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; format=flowed; charset=US-ASCII X-Spam-Status: No, score=-0.0 required=5.0 tests=T_RP_MATCHES_RCVD autolearn=unavailable version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on mail.neu.net Subject: nightly build fails as of r862 X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Jul 2012 16:42:44 -0000 # svn up Updating '.': At revision 862. FreeBSD FBSD10 10.0-CURRENT FreeBSD 10.0-CURRENT #23 r237852: Sat Jun 30 18:45:27 EDT 2012 root@FBSD10:/usr/obj/usr/src/sys/MYKERNEL amd64 rm -f libiLBC.a /home/root/ff_nightly/work/mozilla-central-78e058c75a38/_virtualenv/bin/python ../../../../../..//config/pythonpath.py -I../../../../../../config ../../../../../..//config/expandlibs_gen.py --depend .deps/libiLBC.a.desc.pp -o libiLBC.a.desc audio_coding/codecs/ilbc/abs_quant.o audio_coding/codecs/ilbc/abs_quant_loop.o audio_coding/codecs/ilbc/augmented_cb_corr.o audio_coding/codecs/ilbc/bw_expand.o audio_coding/codecs/ilbc/cb_construct.o audio_coding/codecs/ilbc/cb_mem_energy.o audio_coding/codecs/ilbc/cb_mem_energy_augmentation.o audio_coding/codecs/ilbc/cb_mem_energy_calc.o audio_coding/codecs/ilbc/cb_search.o audio_coding/codecs/ilbc/cb_search_core.o audio_coding/codecs/ilbc/cb_update_best_index.o audio_coding/codecs/ilbc/chebyshev.o audio_coding/codecs/ilbc/comp_corr.o audio_coding/codecs/ilbc/constants.o audio_coding/codecs/ilbc/create_augmented_vec.o audio_coding/codecs/ilbc/decode.o audio_coding/codecs/ilbc/decode_residual.o audio_coding/codecs/ilbc/decoder_interpolate_lsf.o audio_coding/codecs/ilbc/do_plc.o audio_coding/codecs/ilbc/encode.o audio_coding/codecs/ilbc/energy_inverse.o audio_coding/codecs/ilbc/enh_upsample.o audio_coding/codecs/ilbc/enhancer.o audio_coding/codecs/ilbc/enhancer_interface.o audio_coding/codecs/ilbc/filtered_cb_vecs.o audio_coding/codecs/ilbc/frame_classify.o audio_coding/codecs/ilbc/gain_dequant.o audio_coding/codecs/ilbc/gain_quant.o audio_coding/codecs/ilbc/get_cd_vec.o audio_coding/codecs/ilbc/get_lsp_poly.o audio_coding/codecs/ilbc/get_sync_seq.o audio_coding/codecs/ilbc/hp_input.o audio_coding/codecs/ilbc/hp_output.o audio_coding/codecs/ilbc/ilbc.o audio_coding/codecs/ilbc/index_conv_dec.o audio_coding/codecs/ilbc/index_conv_enc.o audio_coding/codecs/ilbc/init_decode.o audio_coding/codecs/ilbc/init_encode.o audio_coding/codecs/ilbc/interpolate.o audio_coding/codecs/ilbc/interpolate_samples.o audio_coding/codecs/ilbc/lpc_encode.o audio_coding/codecs/ilbc/lsf_check.o audio_coding/codecs/ilbc/lsf_interpolate_to_poly_dec.o audio_coding/codecs/ilbc/lsf_interpolate_to_poly_enc.o audio_coding/codecs/ilbc/lsf_to_lsp.o audio_coding/codecs/ilbc/lsf_to_poly.o audio_coding/codecs/ilbc/lsp_to_lsf.o audio_coding/codecs/ilbc/my_corr.o audio_coding/codecs/ilbc/nearest_neighbor.o audio_coding/codecs/ilbc/pack_bits.o audio_coding/codecs/ilbc/poly_to_lsf.o audio_coding/codecs/ilbc/poly_to_lsp.o audio_coding/codecs/ilbc/refiner.o audio_coding/codecs/ilbc/simple_interpolate_lsf.o audio_coding/codecs/ilbc/simple_lpc_analysis.o audio_coding/codecs/ilbc/simple_lsf_dequant.o audio_coding/codecs/ilbc/simple_lsf_quant.o audio_coding/codecs/ilbc/smooth.o audio_coding/codecs/ilbc/smooth_out_data.o audio_coding/codecs/ilbc/sort_sq.o audio_coding/codecs/ilbc/split_vq.o audio_coding/codecs/ilbc/state_construct.o audio_coding/codecs/ilbc/state_search.o audio_coding/codecs/ilbc/swap_bytes.o audio_coding/codecs/ilbc/unpack_bits.o audio_coding/codecs/ilbc/vq3.o audio_coding/codecs/ilbc/vq4.o audio_coding/codecs/ilbc/window32_w32.o audio_coding/codecs/ilbc/xcorr_coef.o gmake[5]: Leaving directory `/home/root/ff_nightly/work/mozilla-central-78e058c75a38/media/webrtc/trunk/src/modules/modules_iLBC' gmake[4]: Leaving directory `/home/root/ff_nightly/work/mozilla-central-78e058c75a38/media/webrtc/trunk' gmake[3]: *** [libs] Error 2 gmake[3]: Leaving directory `/home/root/ff_nightly/work/mozilla-central-78e058c75a38/media/webrtc' gmake[2]: *** [libs_tier_platform] Error 2 gmake[2]: Leaving directory `/home/root/ff_nightly/work/mozilla-central-78e058c75a38' gmake[1]: *** [tier_platform] Error 2 gmake[1]: Leaving directory `/home/root/ff_nightly/work/mozilla-central-78e058c75a38' gmake: *** [default] Error 2 *** [do-build] Error code 1 Stop in /home/root/ff_nightly. *** [/home/root/ff_nightly/work/.build_done.firefox._usr_local] Error code 1 Stop in /home/root/ff_nightly. *** [build] Error code 1 Seems maybe new sound options are a problem? Build log posted at: http://sebsauvage.net/paste/?c9a2204624f61722#DeEQEDpehP4D6HgxNcbmgQmTSXlWe6ZIStTyjkBXi60= From owner-freebsd-gecko@FreeBSD.ORG Mon Jul 9 17:46:26 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B7CF9106566C for ; Mon, 9 Jul 2012 17:46:26 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 2886B8FC0A for ; Mon, 9 Jul 2012 17:46:25 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q69HkNJR054954 for ; Mon, 9 Jul 2012 17:46:23 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q69HkGgD054627 for freebsd-gecko@freebsd.org; Mon, 9 Jul 2012 17:46:16 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Mon, 9 Jul 2012 17:46:16 GMT Message-Id: <201207091746.q69HkGgD054627@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r863 - branches/experimental/www/firefox-nightly X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Jul 2012 17:46:26 -0000 Author: jbeich Date: Mon Jul 9 17:46:16 2012 New Revision: 863 Log: update Nightly Modified: branches/experimental/www/firefox-nightly/Makefile branches/experimental/www/firefox-nightly/Makefile.hgrev branches/experimental/www/firefox-nightly/distinfo Modified: branches/experimental/www/firefox-nightly/Makefile ============================================================================== --- branches/experimental/www/firefox-nightly/Makefile Mon Jul 9 14:05:18 2012 (r862) +++ branches/experimental/www/firefox-nightly/Makefile Mon Jul 9 17:46:16 2012 (r863) @@ -49,6 +49,7 @@ FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png MOZ_OPTIONS= --program-transform-name='s/firefox/${MOZILLA}/' \ --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \ + --disable-webrtc \ --enable-application=browser \ --disable-updater \ --disable-necko-wifi Modified: branches/experimental/www/firefox-nightly/Makefile.hgrev ============================================================================== --- branches/experimental/www/firefox-nightly/Makefile.hgrev Mon Jul 9 14:05:18 2012 (r862) +++ branches/experimental/www/firefox-nightly/Makefile.hgrev Mon Jul 9 17:46:16 2012 (r863) @@ -1 +1 @@ -HGREV= 97387:93439ef24979 +HGREV= 98677:78e058c75a38 Modified: branches/experimental/www/firefox-nightly/distinfo ============================================================================== --- branches/experimental/www/firefox-nightly/distinfo Mon Jul 9 14:05:18 2012 (r862) +++ branches/experimental/www/firefox-nightly/distinfo Mon Jul 9 17:46:16 2012 (r863) @@ -1,2 +1,2 @@ -SHA256 (firefox-nightly/93439ef24979.tar.bz2) = 15bf9dc23ce68ea681b43ed0885328f4ef6c6f9d69cd9626fdd5c17327ac3fcc -SIZE (firefox-nightly/93439ef24979.tar.bz2) = 86930297 +SHA256 (firefox-nightly/78e058c75a38.tar.bz2) = 5e233f9bd3122b04662ea2b7cf7d6e4ebdf8b6d1e3b16318dc4015877dc91fe4 +SIZE (firefox-nightly/78e058c75a38.tar.bz2) = 87353921 From owner-freebsd-gecko@FreeBSD.ORG Mon Jul 9 17:46:31 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6969B106566C for ; Mon, 9 Jul 2012 17:46:31 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id E94F38FC0C for ; Mon, 9 Jul 2012 17:46:30 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q69HkTcS056487 for ; Mon, 9 Jul 2012 17:46:29 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q69HkOYH055955 for freebsd-gecko@freebsd.org; Mon, 9 Jul 2012 17:46:24 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Mon, 9 Jul 2012 17:46:24 GMT Message-Id: <201207091746.q69HkOYH055955@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r864 - branches/experimental/Mk X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Jul 2012 17:46:31 -0000 Author: jbeich Date: Mon Jul 9 17:46:24 2012 New Revision: 864 Log: stop USE_MOZILLA from clashing with bsd.gstreamer.mk Reported by: flo Modified: branches/experimental/Mk/bsd.gecko.mk Modified: branches/experimental/Mk/bsd.gecko.mk ============================================================================== --- branches/experimental/Mk/bsd.gecko.mk Mon Jul 9 17:46:16 2012 (r863) +++ branches/experimental/Mk/bsd.gecko.mk Mon Jul 9 17:46:24 2012 (r864) @@ -614,7 +614,8 @@ vpx_MOZ_OPTIONS= --with-system-libvpx #vpx_EXTRACT_AFTER_ARGS= --exclude mozilla*/media/libvpx -zip_DEPENDS= zip:${PORTSDIR}/archivers/zip +zip_BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip +zip_RUN_DEPENDS= ${zip_BUILD_DEPENDS} .for use in ${USE_MOZILLA} ${use:S/-/_WITHOUT_/}= ${TRUE} @@ -622,9 +623,9 @@ .for dep in ${_ALL_DEPENDS} .if !defined(_WITHOUT_${dep}) -BUILD_DEPENDS+= ${${dep}_DEPENDS} +BUILD_DEPENDS+= ${${dep}_BUILD_DEPENDS} LIB_DEPENDS+= ${${dep}_LIB_DEPENDS} -RUN_DEPENDS+= ${${dep}_DEPENDS} +RUN_DEPENDS+= ${${dep}_RUN_DEPENDS} MOZ_OPTIONS+= ${${dep}_MOZ_OPTIONS} EXTRACT_AFTER_ARGS+= ${${dep}_EXTRACT_AFTER_ARGS} CPPFLAGS+= ${${dep}_CPPFLAGS} From owner-freebsd-gecko@FreeBSD.ORG Mon Jul 9 17:46:42 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id AA4A8106566B for ; Mon, 9 Jul 2012 17:46:42 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 41D7C8FC08 for ; Mon, 9 Jul 2012 17:46:42 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q69HkfLo059421 for ; Mon, 9 Jul 2012 17:46:41 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q69Hkag7057229 for freebsd-gecko@freebsd.org; Mon, 9 Jul 2012 17:46:36 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Mon, 9 Jul 2012 17:46:36 GMT Message-Id: <201207091746.q69Hkag7057229@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r865 - in branches/experimental: Mk mail/thunderbird mail/thunderbird-esr mail/thunderbird3 www/firefox www/firefox-esr www/firefox-nightly www/firefox36 www/kompozer www/libxul www/libxul19 www/seamonkey X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Jul 2012 17:46:42 -0000 Author: jbeich Date: Mon Jul 9 17:46:35 2012 New Revision: 865 Log: move a few common options to bsd.gecko.mk Modified: branches/experimental/Mk/bsd.gecko.mk branches/experimental/mail/thunderbird-esr/Makefile branches/experimental/mail/thunderbird/Makefile branches/experimental/mail/thunderbird3/Makefile branches/experimental/www/firefox-esr/Makefile branches/experimental/www/firefox-nightly/Makefile branches/experimental/www/firefox/Makefile branches/experimental/www/firefox36/Makefile branches/experimental/www/kompozer/Makefile branches/experimental/www/libxul/Makefile branches/experimental/www/libxul19/Makefile branches/experimental/www/seamonkey/Makefile Modified: branches/experimental/Mk/bsd.gecko.mk ============================================================================== --- branches/experimental/Mk/bsd.gecko.mk Mon Jul 9 17:46:24 2012 (r864) +++ branches/experimental/Mk/bsd.gecko.mk Mon Jul 9 17:46:35 2012 (r865) @@ -633,12 +633,13 @@ .endif .endfor -# Standard options from README +# Standard options MOZ_CHROME?= omni MOZ_TOOLKIT?= cairo-gtk2 MOZ_OPTIONS+= --disable-tests \ --enable-chrome-format=${MOZ_CHROME} \ --enable-default-toolkit=${MOZ_TOOLKIT} \ + --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \ --with-pthreads # Configure options for install MOZ_OPTIONS+= --x-includes=${LOCALBASE}/include \ @@ -662,6 +663,8 @@ --disable-freetypetest \ --disable-installer \ --disable-md \ + --disable-necko-wifi \ + --disable-updater \ --disable-pedantic MOZ_MK_OPTIONS+= XP_UNIX=1 \ PERL=${PERL} Modified: branches/experimental/mail/thunderbird-esr/Makefile ============================================================================== --- branches/experimental/mail/thunderbird-esr/Makefile Mon Jul 9 17:46:24 2012 (r864) +++ branches/experimental/mail/thunderbird-esr/Makefile Mon Jul 9 17:46:35 2012 (r865) @@ -42,10 +42,8 @@ MOZ_PROTOCOLS= http,ftp,file,viewsource,res,data,wyciwyg,websocket MOZ_OPTIONS= --program-transform-name='s/thunderbird/${MOZILLA}/' \ - --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \ --enable-single-profile --disable-profilesharing \ - --enable-application=mail --enable-official-branding \ - --disable-updater --disable-necko-wifi + --enable-application=mail --enable-official-branding MOZ_MK_OPTIONS= MOZ_MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1 MOZ_EXPORT= MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1 MOZ_PKGCONFIG_FILES= Modified: branches/experimental/mail/thunderbird/Makefile ============================================================================== --- branches/experimental/mail/thunderbird/Makefile Mon Jul 9 17:46:24 2012 (r864) +++ branches/experimental/mail/thunderbird/Makefile Mon Jul 9 17:46:35 2012 (r865) @@ -42,10 +42,8 @@ MOZ_PROTOCOLS= http,ftp,file,viewsource,res,data,wyciwyg,websocket MOZ_OPTIONS= --program-transform-name='s/thunderbird/${MOZILLA}/' \ - --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \ --enable-single-profile --disable-profilesharing \ - --enable-application=mail --enable-official-branding \ - --disable-updater --disable-necko-wifi + --enable-application=mail --enable-official-branding MOZ_MK_OPTIONS= MOZ_MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1 MOZ_EXPORT= MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1 MOZ_PKGCONFIG_FILES= Modified: branches/experimental/mail/thunderbird3/Makefile ============================================================================== --- branches/experimental/mail/thunderbird3/Makefile Mon Jul 9 17:46:24 2012 (r864) +++ branches/experimental/mail/thunderbird3/Makefile Mon Jul 9 17:46:35 2012 (r865) @@ -36,11 +36,9 @@ MOZILLA_SUFX= 3 MOZILLA= ${PORTNAME}${MOZILLA_SUFX} MOZ_OPTIONS= --program-transform-name='s/thunderbird/${MOZILLA}/' \ - --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \ --enable-single-profile --disable-profilesharing \ --enable-application=mail --enable-official-branding \ - --enable-image-decoders=default,-xbm \ - --disable-updater --disable-necko-wifi + --enable-image-decoders=default,-xbm MOZ_MK_OPTIONS= MOZ_MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1 MOZ_EXPORT= MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1 MOZILLA_PLIST_DIRS= bin lib Modified: branches/experimental/www/firefox-esr/Makefile ============================================================================== --- branches/experimental/www/firefox-esr/Makefile Mon Jul 9 17:46:24 2012 (r864) +++ branches/experimental/www/firefox-esr/Makefile Mon Jul 9 17:46:35 2012 (r865) @@ -47,11 +47,8 @@ FIREFOX_ICON= ${MOZILLA}.png FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png MOZ_OPTIONS= --program-transform-name='s/firefox/${MOZILLA}/' \ - --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \ --enable-application=browser \ - --enable-official-branding \ - --disable-updater \ - --disable-necko-wifi + --enable-official-branding OPTIONS_DEFAULT=DBUS GTK2 LOGGING OSS OPTIONS_DEFINE= PGO Modified: branches/experimental/www/firefox-nightly/Makefile ============================================================================== --- branches/experimental/www/firefox-nightly/Makefile Mon Jul 9 17:46:24 2012 (r864) +++ branches/experimental/www/firefox-nightly/Makefile Mon Jul 9 17:46:35 2012 (r865) @@ -48,11 +48,8 @@ FIREFOX_ICON= ${MOZILLA}.png FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png MOZ_OPTIONS= --program-transform-name='s/firefox/${MOZILLA}/' \ - --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \ --disable-webrtc \ - --enable-application=browser \ - --disable-updater \ - --disable-necko-wifi + --enable-application=browser OPTIONS_DEFAULT=DBUS GTK2 LOGGING GSTREAMER OSS OPTIONS_DEFINE= GSTREAMER PGO Modified: branches/experimental/www/firefox/Makefile ============================================================================== --- branches/experimental/www/firefox/Makefile Mon Jul 9 17:46:24 2012 (r864) +++ branches/experimental/www/firefox/Makefile Mon Jul 9 17:46:35 2012 (r865) @@ -47,11 +47,8 @@ FIREFOX_ICON= ${MOZILLA}.png FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png MOZ_OPTIONS= --program-transform-name='s/firefox/${MOZILLA}/' \ - --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \ --enable-application=browser \ - --enable-official-branding \ - --disable-updater \ - --disable-necko-wifi + --enable-official-branding OPTIONS_DEFAULT=DBUS GTK2 LOGGING OSS OPTIONS_DEFINE= GSTREAMER PGO Modified: branches/experimental/www/firefox36/Makefile ============================================================================== --- branches/experimental/www/firefox36/Makefile Mon Jul 9 17:46:24 2012 (r864) +++ branches/experimental/www/firefox36/Makefile Mon Jul 9 17:46:35 2012 (r865) @@ -41,13 +41,10 @@ FIREFOX_ICON= ${MOZILLA}.png FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png MOZ_OPTIONS= --program-transform-name='s/firefox/${MOZILLA}/' \ - --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \ --enable-application=browser \ --enable-official-branding \ --enable-libxul \ - --disable-ipc \ - --disable-updater \ - --disable-necko-wifi + --disable-ipc OPTIONS_DEFAULT=DBUS LOGGING OSS Modified: branches/experimental/www/kompozer/Makefile ============================================================================== --- branches/experimental/www/kompozer/Makefile Mon Jul 9 17:46:24 2012 (r864) +++ branches/experimental/www/kompozer/Makefile Mon Jul 9 17:46:35 2012 (r865) @@ -28,8 +28,7 @@ MOZ_CHROME= jar MOZ_TOOLKIT= gtk2 MOZ_EXTENSIONS= wallet,xml-rpc,xmlextras,pref,universalchardet,spellcheck -MOZ_OPTIONS= --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \ - ${CONFIGURE_TARGET} \ +MOZ_OPTIONS= ${CONFIGURE_TARGET} \ --enable-xinerama \ --disable-xprint \ --enable-application=composer Modified: branches/experimental/www/libxul/Makefile ============================================================================== --- branches/experimental/www/libxul/Makefile Mon Jul 9 17:46:24 2012 (r864) +++ branches/experimental/www/libxul/Makefile Mon Jul 9 17:46:35 2012 (r865) @@ -41,9 +41,6 @@ USE_LDCONFIG= ${PREFIX}/lib/${MOZILLA} PORT_MOZCONFIG= ${WRKSRC}/xulrunner/config/mozconfig -MOZ_OPTIONS?= --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \ - --disable-updater \ - --disable-necko-wifi MOZ_EXTENSIONS= default,cookie,permissions OPTIONS_DEFAULT=DBUS GTK2 LOGGING OSS USE_GECKO= gecko Modified: branches/experimental/www/libxul19/Makefile ============================================================================== --- branches/experimental/www/libxul19/Makefile Mon Jul 9 17:46:24 2012 (r864) +++ branches/experimental/www/libxul19/Makefile Mon Jul 9 17:46:35 2012 (r865) @@ -34,10 +34,7 @@ USE_LDCONFIG= ${PREFIX}/lib/${MOZILLA} PORT_MOZCONFIG= ${WRKSRC}/xulrunner/config/mozconfig -MOZ_OPTIONS?= --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \ - --disable-ipc \ - --disable-updater \ - --disable-necko-wifi +MOZ_OPTIONS?= --disable-ipc MOZ_EXTENSIONS= default,cookie,permissions OPTIONS_DEFAULT=DBUS LOGGING OSS USE_GECKO= gecko Modified: branches/experimental/www/seamonkey/Makefile ============================================================================== --- branches/experimental/www/seamonkey/Makefile Mon Jul 9 17:46:24 2012 (r864) +++ branches/experimental/www/seamonkey/Makefile Mon Jul 9 17:46:35 2012 (r865) @@ -39,10 +39,7 @@ MOZ_EXTENSIONS= default MOZ_OPTIONS+= --program-transform-name='s/seamonkey/${MOZILLA}/' \ - --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \ - --enable-application=suite \ - --disable-updater \ - --disable-necko-wifi + --enable-application=suite USE_MOZILLA= # empty MOZILLA_PLIST_DIRS= bin lib From owner-freebsd-gecko@FreeBSD.ORG Mon Jul 9 17:48:37 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6278E106566B for ; Mon, 9 Jul 2012 17:48:37 +0000 (UTC) (envelope-from jbeich@tormail.org) Received: from server2.allsitecontrol.com (server2.allsitecontrol.com [63.143.36.210]) by mx1.freebsd.org (Postfix) with ESMTP id 326618FC0C for ; Mon, 9 Jul 2012 17:48:36 +0000 (UTC) Received: from [93.182.129.84] (port=42015 helo=internal.tormail.org) by server2.allsitecontrol.com with esmtpsa (TLSv1:RC4-SHA:128) (Exim 4.77) (envelope-from ) id 1SoI3p-0011WE-HW; Mon, 09 Jul 2012 13:47:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tormail.org; s=tm; h=Message-Id:X-TorMail-User:Content-Type:MIME-Version:References:Date:In-Reply-To:Subject:Cc:To:From; bh=MMYUjPgs0vtkX/f+z7SneNYL2eGS4HvwdqT1QsjQSDU=; b=H8OreNpNVGk8zslsNSgPqWhO3uAc68vGC92LwD9hdeLEFJD5Xrmmsq4tih5kH/5avGxkqmMl3sfFd75TPbBkFgwrFMl+gL5Or5kR5D1vnKDGbG2Ri6MsfT/oHlEhsaYlQPzqdcJlxKCilRyiF4a/eGAKSmxt9I4F/CurkPk4L4w=; Received: from jbeich by internal.tormail.org with local (Exim 4.63) (envelope-from ) id 1SoI2X-0004wQ-A0; Mon, 09 Jul 2012 17:46:30 +0000 From: Jan Beich To: AN In-Reply-To: (AN's message of "Mon, 9 Jul 2012 12:42:35 -0400 (EDT)") Date: Mon, 09 Jul 2012 22:35:50 +0500 References: <201207091405.q69E55f2007254@trillian.chruetertee.ch> MIME-Version: 1.0 Content-Type: text/plain X-TorMail-User: jbeich Message-Id: <1SoI2X-0004wQ-A0@internal.tormail.org> X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - server2.allsitecontrol.com X-AntiAbuse: Original Domain - freebsd.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tormail.org X-Source: X-Source-Args: X-Source-Dir: Cc: freebsd-gecko@freebsd.org Subject: Re: nightly build fails as of r862 X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Jul 2012 17:48:37 -0000 AN writes: > In file included from ../../../../../../media/webrtc/trunk/src/modules/audio_device/main/source/linux/audio_mixer_manager_alsa_linux.h:19:0, > from ../../../../../../media/webrtc/trunk/src/modules/audio_device/main/source/linux/audio_device_alsa_linux.h:16, > from /home/root/ff_nightly/work/mozilla-central-78e058c75a38/media/webrtc/trunk/src/modules/audio_device/main/source/audio_device_impl.cc:35: > ../../../../../../dist/system_wrappers/alsa/asoundlib.h:3:33: fatal error: alsa/asoundlib.h: No such file or directory WebRTC does not yet build on BSDs, see www/chromium. ALSA is not the only thing it needs. > Seems maybe new sound options are a problem? No, upstream flipped the option (bug#771248). From owner-freebsd-gecko@FreeBSD.ORG Mon Jul 9 18:14:46 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E00D41065673 for ; Mon, 9 Jul 2012 18:14:46 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 4C5148FC16 for ; Mon, 9 Jul 2012 18:14:46 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q69IEjsx042939 for ; Mon, 9 Jul 2012 18:14:45 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q69IEe3S042374 for freebsd-gecko@freebsd.org; Mon, 9 Jul 2012 18:14:40 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Mon, 9 Jul 2012 18:14:40 GMT Message-Id: <201207091814.q69IEe3S042374@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r866 - branches/experimental/mail/thunderbird/files X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Jul 2012 18:14:47 -0000 Author: jbeich Date: Mon Jul 9 18:14:40 2012 New Revision: 866 Log: unbreak QT4 build on Thunderbird Added: branches/experimental/mail/thunderbird/files/patch-mail-components-Makefile.in branches/experimental/mail/thunderbird/files/patch-mail-components-build-Makefile.in Added: branches/experimental/mail/thunderbird/files/patch-mail-components-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird/files/patch-mail-components-Makefile.in Mon Jul 9 18:14:40 2012 (r866) @@ -0,0 +1,11 @@ +--- mail/components/Makefile.in~ ++++ mail/components/Makefile.in +@@ -46,7 +46,7 @@ include $(DEPTH)/config/autoconf.mk + # least one module from search/ on all platforms + DIRS = compose cloudfile preferences addrbook migration activity search about-support wintaskbar newmailaccount im + +-ifneq (,$(filter windows gtk2 cocoa, $(MOZ_WIDGET_TOOLKIT))) ++ifneq (,$(filter windows gtk2 cocoa qt, $(MOZ_WIDGET_TOOLKIT))) + DIRS += shell + endif + Added: branches/experimental/mail/thunderbird/files/patch-mail-components-build-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird/files/patch-mail-components-build-Makefile.in Mon Jul 9 18:14:40 2012 (r866) @@ -0,0 +1,11 @@ +--- mail/components/build/Makefile.in~ ++++ mail/components/build/Makefile.in +@@ -78,7 +78,7 @@ SHARED_LIBRARY_LIBS = \ + ../migration/src/$(LIB_PREFIX)profilemigration_s.$(LIB_SUFFIX) \ + $(NULL) + +-ifneq (,$(filter windows cocoa gtk2, $(MOZ_WIDGET_TOOLKIT))) ++ifneq (,$(filter windows cocoa gtk2 qt, $(MOZ_WIDGET_TOOLKIT))) + SHARED_LIBRARY_LIBS += ../shell/$(LIB_PREFIX)shellservice_s.$(LIB_SUFFIX) + endif + From owner-freebsd-gecko@FreeBSD.ORG Mon Jul 9 19:22:45 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0051D10656D1 for ; Mon, 9 Jul 2012 19:22:44 +0000 (UTC) (envelope-from andy@neu.net) Received: from mail.neu.net (unknown [IPv6:2607:fc50:0:d300:216:3eff:fe54:f1c6]) by mx1.freebsd.org (Postfix) with ESMTP id B41448FC15 for ; Mon, 9 Jul 2012 19:22:44 +0000 (UTC) Received: from neu.net (neu.net [199.48.129.194]) by mail.neu.net (8.14.5/8.14.5) with ESMTP id q69JMcvW076766; Mon, 9 Jul 2012 15:22:43 -0400 (EDT) (envelope-from andy@neu.net) Date: Mon, 9 Jul 2012 15:22:38 -0400 (EDT) From: AN To: Jan Beich In-Reply-To: <1SoI2X-0004wQ-A0@internal.tormail.org> Message-ID: References: <201207091405.q69E55f2007254@trillian.chruetertee.ch> <1SoI2X-0004wQ-A0@internal.tormail.org> User-Agent: Alpine 2.00 (BSF 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed X-Spam-Status: No, score=-0.0 required=5.0 tests=T_RP_MATCHES_RCVD autolearn=unavailable version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on mail.neu.net Cc: freebsd-gecko@freebsd.org Subject: Re: nightly build fails as of r862 X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Jul 2012 19:22:45 -0000 On Mon, 9 Jul 2012, Jan Beich wrote: > AN writes: > >> In file included from ../../../../../../media/webrtc/trunk/src/modules/audio_device/main/source/linux/audio_mixer_manager_alsa_linux.h:19:0, >> from ../../../../../../media/webrtc/trunk/src/modules/audio_device/main/source/linux/audio_device_alsa_linux.h:16, >> from /home/root/ff_nightly/work/mozilla-central-78e058c75a38/media/webrtc/trunk/src/modules/audio_device/main/source/audio_device_impl.cc:35: >> ../../../../../../dist/system_wrappers/alsa/asoundlib.h:3:33: fatal error: alsa/asoundlib.h: No such file or directory > > WebRTC does not yet build on BSDs, see www/chromium. > ALSA is not the only thing it needs. > >> Seems maybe new sound options are a problem? > > No, upstream flipped the option (bug#771248). > Working again. ===> Registering installation for firefox-nightly-16.0.98678,1 At revision 866. From owner-freebsd-gecko@FreeBSD.ORG Mon Jul 9 22:55:06 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9F7F71065670 for ; Mon, 9 Jul 2012 22:55:06 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 3A93B8FC21 for ; Mon, 9 Jul 2012 22:55:06 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q69Mt4wO057699 for ; Mon, 9 Jul 2012 22:55:04 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q69MsxX8054595 for freebsd-gecko@freebsd.org; Mon, 9 Jul 2012 22:54:59 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Mon, 9 Jul 2012 22:54:59 GMT Message-Id: <201207092254.q69MsxX8054595@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r867 - in branches/experimental: mail/thunderbird-esr mail/thunderbird/files www/firefox-esr/files www/firefox-nightly/files www/firefox/files www/libxul/files www/seamonkey/files X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Jul 2012 22:55:06 -0000 Author: jbeich Date: Mon Jul 9 22:54:59 2012 New Revision: 867 Log: unbreak qt with libc++ Added: branches/experimental/mail/thunderbird-esr/patch-mozilla-widget-src-qt-nsSound.cpp branches/experimental/mail/thunderbird-esr/patch-mozilla-widget-src-qt-nsWindow.cpp branches/experimental/mail/thunderbird/files/patch-mozilla-widget-qt-nsSound.cpp branches/experimental/mail/thunderbird/files/patch-mozilla-widget-qt-nsWindow.cpp branches/experimental/www/firefox-esr/files/patch-widget-src-qt-nsSound.cpp branches/experimental/www/firefox-esr/files/patch-widget-src-qt-nsWindow.cpp branches/experimental/www/firefox-nightly/files/patch-widget-qt-nsSound.cpp branches/experimental/www/firefox-nightly/files/patch-widget-qt-nsWindow.cpp branches/experimental/www/firefox/files/patch-widget-qt-nsSound.cpp branches/experimental/www/firefox/files/patch-widget-qt-nsWindow.cpp branches/experimental/www/libxul/files/patch-widget-src-qt-nsSound.cpp branches/experimental/www/libxul/files/patch-widget-src-qt-nsWindow.cpp branches/experimental/www/seamonkey/files/patch-mozilla-widget-qt-nsSound.cpp branches/experimental/www/seamonkey/files/patch-mozilla-widget-qt-nsWindow.cpp Modified: branches/experimental/www/firefox-nightly/files/patch-bug753046 Added: branches/experimental/mail/thunderbird-esr/patch-mozilla-widget-src-qt-nsSound.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird-esr/patch-mozilla-widget-src-qt-nsSound.cpp Mon Jul 9 22:54:59 2012 (r867) @@ -0,0 +1,10 @@ +--- mozilla/widget/src/qt/nsSound.cpp~ ++++ mozilla/widget/src/qt/nsSound.cpp +@@ -40,6 +40,7 @@ + #include + + #include ++#include + + #include "nscore.h" + #include "plstr.h" Added: branches/experimental/mail/thunderbird-esr/patch-mozilla-widget-src-qt-nsWindow.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird-esr/patch-mozilla-widget-src-qt-nsWindow.cpp Mon Jul 9 22:54:59 2012 (r867) @@ -0,0 +1,10 @@ +--- mozilla/widget/src/qt/nsWindow.cpp~ ++++ mozilla/widget/src/qt/nsWindow.cpp +@@ -43,6 +43,7 @@ using namespace QtMobility; + + #ifdef MOZ_X11 + #include ++#include "mozilla/X11Util.h" + #endif //MOZ_X11 + + #include "nsXULAppAPI.h" Added: branches/experimental/mail/thunderbird/files/patch-mozilla-widget-qt-nsSound.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird/files/patch-mozilla-widget-qt-nsSound.cpp Mon Jul 9 22:54:59 2012 (r867) @@ -0,0 +1,10 @@ +--- mozilla/widget/qt/nsSound.cpp~ ++++ mozilla/widget/qt/nsSound.cpp +@@ -40,6 +40,7 @@ + #include + + #include ++#include + + #include "nscore.h" + #include "plstr.h" Added: branches/experimental/mail/thunderbird/files/patch-mozilla-widget-qt-nsWindow.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird/files/patch-mozilla-widget-qt-nsWindow.cpp Mon Jul 9 22:54:59 2012 (r867) @@ -0,0 +1,10 @@ +--- mozilla/widget/qt/nsWindow.cpp~ ++++ mozilla/widget/qt/nsWindow.cpp +@@ -43,6 +43,7 @@ using namespace QtMobility; + + #ifdef MOZ_X11 + #include ++#include "mozilla/X11Util.h" + #endif //MOZ_X11 + + #include "nsXULAppAPI.h" Added: branches/experimental/www/firefox-esr/files/patch-widget-src-qt-nsSound.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox-esr/files/patch-widget-src-qt-nsSound.cpp Mon Jul 9 22:54:59 2012 (r867) @@ -0,0 +1,10 @@ +--- widget/src/qt/nsSound.cpp~ ++++ widget/src/qt/nsSound.cpp +@@ -40,6 +40,7 @@ + #include + + #include ++#include + + #include "nscore.h" + #include "plstr.h" Added: branches/experimental/www/firefox-esr/files/patch-widget-src-qt-nsWindow.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox-esr/files/patch-widget-src-qt-nsWindow.cpp Mon Jul 9 22:54:59 2012 (r867) @@ -0,0 +1,10 @@ +--- widget/src/qt/nsWindow.cpp~ ++++ widget/src/qt/nsWindow.cpp +@@ -43,6 +43,7 @@ using namespace QtMobility; + + #ifdef MOZ_X11 + #include ++#include "mozilla/X11Util.h" + #endif //MOZ_X11 + + #include "nsXULAppAPI.h" Modified: branches/experimental/www/firefox-nightly/files/patch-bug753046 ============================================================================== --- branches/experimental/www/firefox-nightly/files/patch-bug753046 Mon Jul 9 18:14:40 2012 (r866) +++ branches/experimental/www/firefox-nightly/files/patch-bug753046 Mon Jul 9 22:54:59 2012 (r867) @@ -4,6 +4,15 @@ --- dom/plugins/ipc/PluginModuleChild.cpp.orig 2011-12-20 23:28:14.000000000 +0000 +++ dom/plugins/ipc/PluginModuleChild.cpp +@@ -33,6 +33,8 @@ + #include "nsPluginsDir.h" + #include "nsXULAppAPI.h" + ++#include ++ + #ifdef MOZ_X11 + # include "mozilla/X11Util.h" + #endif @@ -228,7 +228,7 @@ PluginModuleChild::Init(const std::strin // TODO: use PluginPRLibrary here Added: branches/experimental/www/firefox-nightly/files/patch-widget-qt-nsSound.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox-nightly/files/patch-widget-qt-nsSound.cpp Mon Jul 9 22:54:59 2012 (r867) @@ -0,0 +1,10 @@ +--- widget/qt/nsSound.cpp~ ++++ widget/qt/nsSound.cpp +@@ -40,6 +40,7 @@ + #include + + #include ++#include + + #include "nscore.h" + #include "plstr.h" Added: branches/experimental/www/firefox-nightly/files/patch-widget-qt-nsWindow.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox-nightly/files/patch-widget-qt-nsWindow.cpp Mon Jul 9 22:54:59 2012 (r867) @@ -0,0 +1,10 @@ +--- widget/qt/nsWindow.cpp~ ++++ widget/qt/nsWindow.cpp +@@ -43,6 +43,7 @@ using namespace QtMobility; + + #ifdef MOZ_X11 + #include ++#include "mozilla/X11Util.h" + #endif //MOZ_X11 + + #include "nsXULAppAPI.h" Added: branches/experimental/www/firefox/files/patch-widget-qt-nsSound.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox/files/patch-widget-qt-nsSound.cpp Mon Jul 9 22:54:59 2012 (r867) @@ -0,0 +1,10 @@ +--- widget/qt/nsSound.cpp~ ++++ widget/qt/nsSound.cpp +@@ -40,6 +40,7 @@ + #include + + #include ++#include + + #include "nscore.h" + #include "plstr.h" Added: branches/experimental/www/firefox/files/patch-widget-qt-nsWindow.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox/files/patch-widget-qt-nsWindow.cpp Mon Jul 9 22:54:59 2012 (r867) @@ -0,0 +1,10 @@ +--- widget/qt/nsWindow.cpp~ ++++ widget/qt/nsWindow.cpp +@@ -43,6 +43,7 @@ using namespace QtMobility; + + #ifdef MOZ_X11 + #include ++#include "mozilla/X11Util.h" + #endif //MOZ_X11 + + #include "nsXULAppAPI.h" Added: branches/experimental/www/libxul/files/patch-widget-src-qt-nsSound.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/libxul/files/patch-widget-src-qt-nsSound.cpp Mon Jul 9 22:54:59 2012 (r867) @@ -0,0 +1,10 @@ +--- widget/src/qt/nsSound.cpp~ ++++ widget/src/qt/nsSound.cpp +@@ -40,6 +40,7 @@ + #include + + #include ++#include + + #include "nscore.h" + #include "plstr.h" Added: branches/experimental/www/libxul/files/patch-widget-src-qt-nsWindow.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/libxul/files/patch-widget-src-qt-nsWindow.cpp Mon Jul 9 22:54:59 2012 (r867) @@ -0,0 +1,10 @@ +--- widget/src/qt/nsWindow.cpp~ ++++ widget/src/qt/nsWindow.cpp +@@ -43,6 +43,7 @@ using namespace QtMobility; + + #ifdef MOZ_X11 + #include ++#include "mozilla/X11Util.h" + #endif //MOZ_X11 + + #include "nsXULAppAPI.h" Added: branches/experimental/www/seamonkey/files/patch-mozilla-widget-qt-nsSound.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey/files/patch-mozilla-widget-qt-nsSound.cpp Mon Jul 9 22:54:59 2012 (r867) @@ -0,0 +1,10 @@ +--- mozilla/widget/qt/nsSound.cpp~ ++++ mozilla/widget/qt/nsSound.cpp +@@ -40,6 +40,7 @@ + #include + + #include ++#include + + #include "nscore.h" + #include "plstr.h" Added: branches/experimental/www/seamonkey/files/patch-mozilla-widget-qt-nsWindow.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey/files/patch-mozilla-widget-qt-nsWindow.cpp Mon Jul 9 22:54:59 2012 (r867) @@ -0,0 +1,10 @@ +--- mozilla/widget/qt/nsWindow.cpp~ ++++ mozilla/widget/qt/nsWindow.cpp +@@ -43,6 +43,7 @@ using namespace QtMobility; + + #ifdef MOZ_X11 + #include ++#include "mozilla/X11Util.h" + #endif //MOZ_X11 + + #include "nsXULAppAPI.h" From owner-freebsd-gecko@FreeBSD.ORG Tue Jul 10 16:38:28 2012 Return-Path: Delivered-To: gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6BC951065672 for ; Tue, 10 Jul 2012 16:38:28 +0000 (UTC) (envelope-from dmk@ncf.ca) Received: from mail.ncf.ca (mail.ncf.ca [134.117.136.45]) by mx1.freebsd.org (Postfix) with ESMTP id 3E9A18FC08 for ; Tue, 10 Jul 2012 16:38:28 +0000 (UTC) Received: from mail.ncf.ca (localhost [127.0.0.1]) by mail.ncf.ca (Postfix) with ESMTP id AB02C9F19F for ; Tue, 10 Jul 2012 12:38:20 -0400 (EDT) Received: from adminpc5.internal.iinfraxu.ca (CPE0014bfb32f8a-CM0014e887dd48.cpe.net.cable.rogers.com [174.114.186.180]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: du880) by mail.ncf.ca (Postfix) with ESMTPSA id 9332B9F15F for ; Tue, 10 Jul 2012 12:38:20 -0400 (EDT) From: Dwayne MacKinnon To: gecko@freebsd.org Date: Tue, 10 Jul 2012 12:38:14 -0400 Message-ID: <2280290.V686BoCgQ0@adminpc5.internal.iinfraxu.ca> User-Agent: KMail/4.8.4 (FreeBSD/9.0-RELEASE; KDE/4.8.4; i386; ; ) MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-NCF-Filtered: By ProxSMTP on pallando Tue Jul 10 12:38:20 2012 -0400 (EDT) Cc: Subject: firefox-13.0.1,1, clang & Hotmail X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Jul 2012 16:38:28 -0000 Hi all, I have access to two FreeBSD 9.0-RELEASE i386 boxes. Both have up-to- date ports. I ran into an unusual problem. On one box, I could not read my Hotmail e-mails in firefox. On the other box, I could. (On both boxes I could see my Hotmail inbox. however, when clicking on an e-mail one box would have the upper and lower headers (reply, forward, etc.) immediately following one another and the other would display the actual message.) I did some digging, and after a while, I found the difference. On one box I had built firefox using clang. On the other box I used gcc. The gcc-built firefox works properly with Hotmail. The clang one does not. I was able to confirm this by uninstalling the working firefox and rebuilding with clang. The problem was perfectly reproduced. Reinstalling the gcc-built firefox (I had made a backup package) fixed the problem. I have no idea how to get more detailed information for you, but if someone can give me some directions I'd be happy to help further. Cheers, DMK From owner-freebsd-gecko@FreeBSD.ORG Tue Jul 10 18:03:17 2012 Return-Path: Delivered-To: freebsd-gecko@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0EBBB1065673 for ; Tue, 10 Jul 2012 18:03:17 +0000 (UTC) (envelope-from jbeich@tormail.org) Received: from server2.allsitecontrol.com (server2.allsitecontrol.com [63.143.36.210]) by mx1.freebsd.org (Postfix) with ESMTP id D4FFD8FC17 for ; Tue, 10 Jul 2012 18:03:16 +0000 (UTC) Received: from politkovskaja.torservers.net ([77.247.181.165]:58607 helo=internal.tormail.org) by server2.allsitecontrol.com with esmtpsa (TLSv1:RC4-SHA:128) (Exim 4.77) (envelope-from ) id 1SoemA-0003x8-L6; Tue, 10 Jul 2012 14:03:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tormail.org; s=tm; h=Message-Id:X-TorMail-User:Content-Type:MIME-Version:References:Date:Subject:Cc:To:From; bh=JBAgoSrv9x+tC4WrvRNDXm0J1P2BMjIxX2KK0nOXCjA=; b=n6AqrcTqeDcX3o6rJFus67EzB435ZITwHwD54Edd0SzfuHVFkHgNgi4KcN1dLe/9Y39L5iGBN3X3lWgXfJUU16WJp6XRLpRz112mm9EMdTG3YIihpZ187p0CmFXF7Uboau5IzxCYIQGt+RA0hYUEA0G7dtutatv/P0aGDkfyPlc=; Received: from jbeich by internal.tormail.org with local (Exim 4.63) (envelope-from ) id 1Soekl-000NYK-Lt; Tue, 10 Jul 2012 18:01:41 +0000 From: Jan Beich To: AN Date: Wed, 11 Jul 2012 04:01:20 +1000 References: <86d35ikpkd.fsf@tormail.org> <864npvz1le.fsf@tormail.org> MIME-Version: 1.0 Content-Type: text/plain X-TorMail-User: jbeich Message-Id: <1Soekl-000NYK-Lt@internal.tormail.org> X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - server2.allsitecontrol.com X-AntiAbuse: Original Domain - freebsd.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tormail.org X-Source: X-Source-Args: X-Source-Dir: Cc: freebsd-gecko@FreeBSD.org Subject: Re: issue with VP8 and Ogg video X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Jul 2012 18:03:17 -0000 Jan Beich writes: > alsa->oss + sydney = fast-forward video Tracking the bug in ports/169767. Otherwise, ALSA is more responsive to pause/resume than native OSS when using libsydneyaudio. From owner-freebsd-gecko@FreeBSD.ORG Wed Jul 11 19:44:05 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1E0EB106566B for ; Wed, 11 Jul 2012 19:44:05 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 982B88FC14 for ; Wed, 11 Jul 2012 19:44:04 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q6BJhvK2048977 for ; Wed, 11 Jul 2012 19:43:57 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q6BJhpDM048353 for freebsd-gecko@freebsd.org; Wed, 11 Jul 2012 19:43:51 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Wed, 11 Jul 2012 19:43:51 GMT Message-Id: <201207111943.q6BJhpDM048353@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r868 - branches/experimental/Mk X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Jul 2012 19:44:05 -0000 Author: jbeich Date: Wed Jul 11 19:43:51 2012 New Revision: 868 Log: remove dup substitution in pkg-config files - location obsolete since 2007/08/03 (bug#389673) - is useless outside of xulrunner ports - www/xulrunner needed it but was removed in 2009/12/02 - already present in www/libxul since 2009/04/10 The command always succeeded as part of Mk/bsd.gecko.mk and couldn't cause a build failure. `|| ${TRUE}' was added in 2008/06/30 as part of consolidating www/mozilla/Makefile.common + www/mozilla/bsd.gecko.mk -> Mk/bsd.gecko.mk probably to make migration from www/xulrunner to www/libxul easier. Modified: branches/experimental/Mk/bsd.gecko.mk Modified: branches/experimental/Mk/bsd.gecko.mk ============================================================================== --- branches/experimental/Mk/bsd.gecko.mk Mon Jul 9 22:54:59 2012 (r867) +++ branches/experimental/Mk/bsd.gecko.mk Wed Jul 11 19:43:51 2012 (r868) @@ -911,12 +911,6 @@ gecko-post-configure: @${ECHO_CMD} "#define JNIIMPORT" >> ${MOZSRC}/mozilla-config.h -post-build: gecko-post-build - -gecko-post-build: - @${REINPLACE_CMD} -e "s|\(Libs:.*\)\($$\)|\1 -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH}\2|" \ - ${MOZSRC}/build/unix/*.pc || ${TRUE} - pre-install: gecko-moz-pis-pre-install gecko-pre-install port-pre-install gecko-create-plist .if !target(port-pre-install) From owner-freebsd-gecko@FreeBSD.ORG Wed Jul 11 19:44:17 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E79721065670 for ; Wed, 11 Jul 2012 19:44:17 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 7340D8FC12 for ; Wed, 11 Jul 2012 19:44:17 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q6BJiGf9064519 for ; Wed, 11 Jul 2012 19:44:16 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q6BJiBAY064176 for freebsd-gecko@freebsd.org; Wed, 11 Jul 2012 19:44:11 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Wed, 11 Jul 2012 19:44:11 GMT Message-Id: <201207111944.q6BJiBAY064176@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r869 - branches/experimental/www/firefox-nightly/files X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Jul 2012 19:44:18 -0000 Author: jbeich Date: Wed Jul 11 19:44:11 2012 New Revision: 869 Log: fix pkgsrc patch header Modified: branches/experimental/www/firefox-nightly/files/patch-bug753046 Modified: branches/experimental/www/firefox-nightly/files/patch-bug753046 ============================================================================== --- branches/experimental/www/firefox-nightly/files/patch-bug753046 Wed Jul 11 19:43:51 2012 (r868) +++ branches/experimental/www/firefox-nightly/files/patch-bug753046 Wed Jul 11 19:44:11 2012 (r869) @@ -255,9 +255,6 @@ return being_debugged; } -$NetBSD: patch-ipc_chromium_src_base_file__util.h,v 1.2 2012/03/06 12:34:09 ryoon Exp $ - ---- ipc/chromium/src/base/file_util.h.orig 2011-12-20 23:28:19.000000000 +0000 diff --git ipc/chromium/src/base/dir_reader_bsd.h ipc/chromium/src/base/dir_reader_bsd.h new file mode 100644 index 0000000..3fc1a87 @@ -389,9 +386,9 @@ #else typedef DirReaderFallback DirReaderPosix; #endif -diff --git ipc/chromium/src/base/file_util.h ipc/chromium/src/base/file_util.h -index 71124ed..a10fcc2 100644 ---- ipc/chromium/src/base/file_util.h +$NetBSD: patch-ipc_chromium_src_base_file__util.h,v 1.2 2012/03/06 12:34:09 ryoon Exp $ + +--- ipc/chromium/src/base/file_util.h.orig 2011-12-20 23:28:19.000000000 +0000 +++ ipc/chromium/src/base/file_util.h @@ -16,8 +16,8 @@ #include From owner-freebsd-gecko@FreeBSD.ORG Wed Jul 11 20:34:51 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ABFAC10656FC for ; Wed, 11 Jul 2012 20:34:51 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 1DF528FC15 for ; Wed, 11 Jul 2012 20:34:50 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q6BKYoUU085080 for ; Wed, 11 Jul 2012 20:34:50 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q6BKYjqw084337 for freebsd-gecko@freebsd.org; Wed, 11 Jul 2012 20:34:45 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Wed, 11 Jul 2012 20:34:45 GMT Message-Id: <201207112034.q6BKYjqw084337@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r870 - branches/experimental/www/firefox-nightly X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Jul 2012 20:34:51 -0000 Author: jbeich Date: Wed Jul 11 20:34:44 2012 New Revision: 870 Log: - update Nightly - switch back to system sqlite Modified: branches/experimental/www/firefox-nightly/Makefile branches/experimental/www/firefox-nightly/Makefile.hgrev branches/experimental/www/firefox-nightly/distinfo Modified: branches/experimental/www/firefox-nightly/Makefile ============================================================================== --- branches/experimental/www/firefox-nightly/Makefile Wed Jul 11 19:44:11 2012 (r869) +++ branches/experimental/www/firefox-nightly/Makefile Wed Jul 11 20:34:44 2012 (r870) @@ -18,6 +18,7 @@ COMMENT= Web browser based on the browser portion of Mozilla BUILD_DEPENDS= nss>=3.13.2:${PORTSDIR}/security/nss \ + sqlite3>=3.7.13:${PORTSDIR}/databases/sqlite3 \ ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \ unzip:${PORTSDIR}/archivers/unzip @@ -28,7 +29,7 @@ USE_PYTHON_BUILD=yes USE_GECKO= gecko MOZ_PKGCONFIG_FILES= # empty -USE_MOZILLA= -nspr -sqlite +USE_MOZILLA= -nspr MOZILLA_NAME= Nightly MOZILLA_SUFX= -nightly MOZILLA= ${PORTNAME}${MOZILLA_SUFX} @@ -48,7 +49,6 @@ FIREFOX_ICON= ${MOZILLA}.png FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png MOZ_OPTIONS= --program-transform-name='s/firefox/${MOZILLA}/' \ - --disable-webrtc \ --enable-application=browser OPTIONS_DEFAULT=DBUS GTK2 LOGGING GSTREAMER OSS Modified: branches/experimental/www/firefox-nightly/Makefile.hgrev ============================================================================== --- branches/experimental/www/firefox-nightly/Makefile.hgrev Wed Jul 11 19:44:11 2012 (r869) +++ branches/experimental/www/firefox-nightly/Makefile.hgrev Wed Jul 11 20:34:44 2012 (r870) @@ -1 +1 @@ -HGREV= 98677:78e058c75a38 +HGREV= 98950:e4857e5dfb51 Modified: branches/experimental/www/firefox-nightly/distinfo ============================================================================== --- branches/experimental/www/firefox-nightly/distinfo Wed Jul 11 19:44:11 2012 (r869) +++ branches/experimental/www/firefox-nightly/distinfo Wed Jul 11 20:34:44 2012 (r870) @@ -1,2 +1,2 @@ -SHA256 (firefox-nightly/78e058c75a38.tar.bz2) = 5e233f9bd3122b04662ea2b7cf7d6e4ebdf8b6d1e3b16318dc4015877dc91fe4 -SIZE (firefox-nightly/78e058c75a38.tar.bz2) = 87353921 +SHA256 (firefox-nightly/e4857e5dfb51.tar.bz2) = 70debda79b1f841bafefef2705538c0635bd462968ae8eb063cd2bba2507664a +SIZE (firefox-nightly/e4857e5dfb51.tar.bz2) = 87173237 From owner-freebsd-gecko@FreeBSD.ORG Wed Jul 11 20:39:24 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1E8761065670 for ; Wed, 11 Jul 2012 20:39:24 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 9E8978FC16 for ; Wed, 11 Jul 2012 20:39:23 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q6BKdMi7090497 for ; Wed, 11 Jul 2012 20:39:22 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q6BKdHOX089966 for freebsd-gecko@freebsd.org; Wed, 11 Jul 2012 20:39:17 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Wed, 11 Jul 2012 20:39:17 GMT Message-Id: <201207112039.q6BKdHOX089966@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r871 - branches/experimental/www/firefox X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Jul 2012 20:39:24 -0000 Author: jbeich Date: Wed Jul 11 20:39:17 2012 New Revision: 871 Log: update Firefox Modified: branches/experimental/www/firefox/Makefile branches/experimental/www/firefox/distinfo Modified: branches/experimental/www/firefox/Makefile ============================================================================== --- branches/experimental/www/firefox/Makefile Wed Jul 11 20:34:44 2012 (r870) +++ branches/experimental/www/firefox/Makefile Wed Jul 11 20:39:17 2012 (r871) @@ -6,7 +6,7 @@ # PORTNAME= firefox -DISTVERSION= 14.0b11 +DISTVERSION= 14.0b12 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} Modified: branches/experimental/www/firefox/distinfo ============================================================================== --- branches/experimental/www/firefox/distinfo Wed Jul 11 20:34:44 2012 (r870) +++ branches/experimental/www/firefox/distinfo Wed Jul 11 20:39:17 2012 (r871) @@ -1,2 +1,2 @@ -SHA256 (firefox-14.0b11.source.tar.bz2) = ca8de2d2c87d54369bd1e35a75f4a5dc755edec8a382c2c6dc1baa7696917994 -SIZE (firefox-14.0b11.source.tar.bz2) = 82257494 +SHA256 (firefox-14.0b12.source.tar.bz2) = 0372fc7aa6b940ddf5458162239a38da567fe6cff4b2de4540cfc4ee2eb243d7 +SIZE (firefox-14.0b12.source.tar.bz2) = 82301917 From owner-freebsd-gecko@FreeBSD.ORG Wed Jul 11 22:59:48 2012 Return-Path: Delivered-To: gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C9228106564A for ; Wed, 11 Jul 2012 22:59:48 +0000 (UTC) (envelope-from mi+thun@aldan.algebra.com) Received: from smtp02.lnh.mail.rcn.net (smtp02.lnh.mail.rcn.net [207.172.157.102]) by mx1.freebsd.org (Postfix) with ESMTP id 9E3BD8FC12 for ; Wed, 11 Jul 2012 22:59:47 +0000 (UTC) Received: from mr17.lnh.mail.rcn.net ([207.172.157.37]) by smtp02.lnh.mail.rcn.net with ESMTP; 11 Jul 2012 18:59:46 -0400 Received: from smtp04.lnh.mail.rcn.net (smtp04.lnh.mail.rcn.net [207.172.157.104]) by mr17.lnh.mail.rcn.net (MOS 4.3.4-GA) with ESMTP id BOU10177; Wed, 11 Jul 2012 18:59:46 -0400 X-Auth-ID: anat Received: from 209-6-63-29.c3-0.sbo-ubr1.sbo.ma.cable.rcn.com (HELO utka.zajac) ([209.6.63.29]) by smtp04.lnh.mail.rcn.net with ESMTP; 11 Jul 2012 18:59:47 -0400 Message-ID: <4FFE0561.9050109@aldan.algebra.com> Date: Wed, 11 Jul 2012 18:59:45 -0400 From: "Mikhail T." User-Agent: Mozilla/5.0 (X11; FreeBSD i386; rv:13.0) Gecko/20120711 Thunderbird/13.0.1 MIME-Version: 1.0 To: gecko@freebsd.org Content-Type: multipart/mixed; boundary="------------030406090900000003050309" X-Content-Filtered-By: Mailman/MimeDel 2.1.5 Cc: Subject: USE_MOZILLA=yes for firefox and thunderbird X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Jul 2012 22:59:48 -0000 This is a multi-part message in MIME format. --------------030406090900000003050309 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Hello! Attached is a fairly small patch, that changes the two ports to use ports of all of the components currently supported by bsd.gecko.mk. Please, consider committing soon so the work on bringing-in other components (such as hunspell, sqlite3, or xulrunner) can begin. Thank you! Yours, -mi --------------030406090900000003050309 Content-Type: text/plain; charset=KOI8-U; name="mozilla-update.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="mozilla-update.patch" Index: www/firefox/Makefile =================================================================== RCS file: /home/pcvs/ports/www/firefox/Makefile,v retrieving revision 1.273 diff -U 2 -r1.273 Makefile --- www/firefox/Makefile 19 Jun 2012 18:23:11 -0000 1.273 +++ www/firefox/Makefile 11 Jul 2012 22:53:23 -0000 @@ -19,4 +19,5 @@ BUILD_DEPENDS= nspr>=4.9:${PORTSDIR}/devel/nspr \ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \ + nss>=3.13:${PORTSDIR}/security/nss \ unzip:${PORTSDIR}/archivers/unzip LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo \ @@ -29,5 +30,5 @@ CONFLICTS= firefox-10.* MOZ_PKGCONFIG_FILES= # empty -USE_MOZILLA= -png -nss -dbm -jpeg -xft +USE_MOZILLA= yes MOZILLA_NAME= Firefox MOZ_TOOLKIT= cairo-gtk2 @@ -37,5 +38,4 @@ ALL_TARGET= default CONFIGURE_ENV= LOCALBASE=${LOCALBASE} -EXTRA_CFLAGS= -O0 HAS_CONFIGURE= yes USE_BZIP2= yes Index: mail/thunderbird/Makefile =================================================================== RCS file: /home/pcvs/ports/mail/thunderbird/Makefile,v retrieving revision 1.153 diff -U 2 -r1.153 Makefile --- mail/thunderbird/Makefile 19 Jun 2012 18:27:11 -0000 1.153 +++ mail/thunderbird/Makefile 11 Jul 2012 22:53:23 -0000 @@ -27,5 +27,5 @@ USE_GECKO= gecko CONFLICTS= thunderbird-10.* -USE_MOZILLA= -png -nss -dbm -jpeg -xft +USE_MOZILLA= yes MOZ_TOOLKIT= cairo-gtk2 @@ -35,5 +35,4 @@ CONFIGURE_ENV= LOCALBASE=${LOCALBASE} MAKE_ENV= PTHREAD_LDFLAGS="${PTHREAD_LIBS}" -EXTRA_CFLAGS= -O0 HAS_CONFIGURE= yes USE_BZIP2= yes Index: mail/thunderbird/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in =================================================================== RCS file: mail/thunderbird/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in diff -N mail/thunderbird/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ mail/thunderbird/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in 11 Jul 2012 22:53:25 -0000 @@ -0,0 +1,14 @@ +--- ldap/sdks/c-sdk/ldap/libraries/libssldap/Makefile.in 2012-06-14 19:26:06.000000000 -0400 ++++ ldap/sdks/c-sdk/ldap/libraries/libssldap/Makefile.in 2012-07-11 15:40:42.000000000 -0400 +@@ -176,6 +176,11 @@ + CUSTOM_LIBS=1 + endif + ++ifeq ($(OS_ARCH), FreeBSD) ++EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lpthread ++CUSTOM_LIBS=1 ++endif ++ + ifeq ($(OS_ARCH), HP-UX) + CUSTOM_LIBS=1 + endif Index: mail/thunderbird/files/patch-mozilla-security_nss_lib_freebl_mpi_mpcpucache.c =================================================================== RCS file: mail/thunderbird/files/patch-mozilla-security_nss_lib_freebl_mpi_mpcpucache.c diff -N mail/thunderbird/files/patch-mozilla-security_nss_lib_freebl_mpi_mpcpucache.c --- mail/thunderbird/files/patch-mozilla-security_nss_lib_freebl_mpi_mpcpucache.c 1 Mar 2011 22:27:20 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,43 +0,0 @@ ---- mozilla/security/nss/lib/freebl/mpi/mpcpucache.c.orig 2011-02-26 23:13:08.000000000 +0100 -+++ mozilla/security/nss/lib/freebl/mpi/mpcpucache.c 2011-02-26 23:18:46.000000000 +0100 -@@ -733,6 +733,32 @@ - #endif - - #if defined(__ppc64__) -+#if defined(__FreeBSD__) -+#include -+#include -+ -+#include -+#include -+ -+unsigned long -+s_mpi_getProcessorLineSize() -+{ -+ static int cacheline_size = 0; -+ static int cachemib[] = { CTL_MACHDEP, CPU_CACHELINE }; -+ int clen; -+ -+ if (cacheline_size > 0) -+ return cacheline_size; -+ -+ clen = sizeof(cacheline_size); -+ if (sysctl(cachemib, sizeof(cachemib) / sizeof(cachemib[0]), -+ &cacheline_size, &clen, NULL, 0) < 0 || !cacheline_size) -+ return 128; /* guess */ -+ -+ return cacheline_size; -+} -+#else /* __FreeBSD__ */ -+ - /* - * Sigh, The PPC has some really nice features to help us determine cache - * size, since it had lots of direct control functions to do so. The POWER -@@ -786,6 +812,7 @@ - return 0; - } - -+#endif /* __FreeBSD__ */ - #define MPI_GET_PROCESSOR_LINE_SIZE_DEFINED 1 - #endif - --------------030406090900000003050309-- From owner-freebsd-gecko@FreeBSD.ORG Thu Jul 12 02:52:55 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8824D106566B for ; Thu, 12 Jul 2012 02:52:55 +0000 (UTC) (envelope-from jbeich@tormail.org) Received: from server2.allsitecontrol.com (server2.allsitecontrol.com [63.143.36.210]) by mx1.freebsd.org (Postfix) with ESMTP id 56AEA8FC1B for ; Thu, 12 Jul 2012 02:52:55 +0000 (UTC) Received: from politkovskaja.torservers.net ([77.247.181.165]:4144 helo=internal.tormail.org) by server2.allsitecontrol.com with esmtpsa (TLSv1:RC4-SHA:128) (Exim 4.77) (envelope-from ) id 1Sp9WJ-001RXm-4R; Wed, 11 Jul 2012 22:52:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tormail.org; s=tm; h=Message-Id:X-TorMail-User:Content-Type:MIME-Version:References:Date:Subject:Cc:To:From; bh=ASiM/YuIczBZZud+w6ZNBo1U4rgRzEEBiekp+ysuhu4=; b=o/y0YIcay0Xx/fPOkpDzb5NOZpmVzTRmXKWlcpjFIUdKepvST+p+g2RYQdNEgT5QvI9531D25KEU2XtynOVOmF/1im53St4Mve3PbYVKmaeIHeUL0vPCOp9FpDDE7q82R+6se5kEjVcHiaHht7TpigxtUljoTj6bQLWcG43C2g4=; Received: from jbeich by internal.tormail.org with local (Exim 4.63) (envelope-from ) id 1Sp9VJ-0009Ur-9e; Thu, 12 Jul 2012 02:51:46 +0000 From: Jan Beich To: Toomas Aas Date: Thu, 12 Jul 2012 07:50:00 +0500 References: <20120703204245.18341mxlqo3s258g__34909.188692882$1341338060$gmane$org@webmail.raad.tartu.ee> MIME-Version: 1.0 Content-Type: text/plain X-TorMail-User: jbeich Message-Id: <1Sp9VJ-0009Ur-9e@internal.tormail.org> X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - server2.allsitecontrol.com X-AntiAbuse: Original Domain - freebsd.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tormail.org X-Source: X-Source-Args: X-Source-Dir: Cc: freebsd-gecko@freebsd.org Subject: Re: Building www/libxul fails - 'No such file or directory' X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Jul 2012 02:52:55 -0000 Toomas Aas writes: > Hello! > > It seems I can't build www/libxul from a freshly updated ports tree on > my 9.0-STABLE amd64 system. No matter how I try, the build ends with > > sed: /usr/ports/www/libxul/work/mozilla-1.9.2/build/unix/*.pc: No such > file or directory. I've seen other people confused by this harmless warning. It's now removed in experimental branch and likely to be merged with other changes sometime after 17th July (firefox-14 release). http://lists.freebsd.org/pipermail/freebsd-gecko/2012-July/002490.html From owner-freebsd-gecko@FreeBSD.ORG Thu Jul 12 02:54:38 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E30D7106564A for ; Thu, 12 Jul 2012 02:54:38 +0000 (UTC) (envelope-from jbeich@tormail.org) Received: from server2.allsitecontrol.com (server2.allsitecontrol.com [63.143.36.210]) by mx1.freebsd.org (Postfix) with ESMTP id B52BF8FC14 for ; Thu, 12 Jul 2012 02:54:38 +0000 (UTC) Received: from politkovskaja.torservers.net ([77.247.181.165]:54926 helo=internal.tormail.org) by server2.allsitecontrol.com with esmtpsa (TLSv1:RC4-SHA:128) (Exim 4.77) (envelope-from ) id 1Sp9XH-001SBR-It; Wed, 11 Jul 2012 22:53:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tormail.org; s=tm; h=Message-Id:X-TorMail-User:Content-Type:MIME-Version:References:Date:Subject:Cc:To:From; bh=DqpjmC+Bb6Fgxj2SSsHb5I8FwbulUmh5YmEvajH/O5o=; b=fc/9+Megfz/yTEmuGbPwukpKijD64IhafL8pUnSU2JBMPqD2aa3CJFzE4lp/mRVlINvhAXwRoJVZ3a3tSxtRNUbQ0BNdaOGJ9DtR/V3JOUds2umHsRNFLLoy5yjDEo5FyEs3UQtCTXDqsMvde00RlLWcpVc65ATDVje+XHQTHwM=; Received: from jbeich by internal.tormail.org with local (Exim 4.63) (envelope-from ) id 1Sp9VY-0009Vv-JW; Thu, 12 Jul 2012 02:52:01 +0000 From: Jan Beich To: "Mikhail T." Date: Wed, 11 Jul 2012 21:51:14 -0500 References: <4FFE0561.9050109@aldan.algebra.com> MIME-Version: 1.0 Content-Type: text/plain X-TorMail-User: jbeich Message-Id: <1Sp9VY-0009Vv-JW@internal.tormail.org> X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - server2.allsitecontrol.com X-AntiAbuse: Original Domain - freebsd.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tormail.org X-Source: X-Source-Args: X-Source-Dir: Cc: freebsd-gecko@freebsd.org Subject: Re: USE_MOZILLA=yes for firefox and thunderbird X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Jul 2012 02:54:39 -0000 "Mikhail T." writes: > Hello! > > Attached is a fairly small patch, that changes the two ports to use > ports of all of the components currently supported by bsd.gecko.mk. I'm afraid this is already fixed in the experimental branch for *all* gecko ports. http://wiki.freebsd.org/Gecko > Please, consider committing soon so the work on bringing-in other > components (such as hunspell, sqlite3, or xulrunner) can begin. Thank ^^^^^^^^^ There are currently 4 copies of libxul (in CVS): - mail/thunderbird, www/firefox (gecko-13) - mail/thunderbird-esr, www/firefox-esr (gecko-10) - www/kompozer (gecko-1.8) - www/libxul (gecko-1.9) Assuming the last two are gonna be deprecated installing two versions of xulrunner currently causes a conflict with the following files: bin/xulrunner libdata/pkgconfig/libxul-embedding.pc libdata/pkgconfig/libxul.pc libdata/pkgconfig/mozilla-js.pc libdata/pkgconfig/mozilla-plugin.pc Forcing xulrunner to install the files under different names is trivial, fixing dependent ports is less so. It'd also benefit libxul19 -> libxul migration. And running on different engine version is not guaranteed to work, e.g. # application.ini for firefox-esr [Gecko] MinVersion=10.0.2 MaxVersion=10.0.2 The rest is simplifying gecko-app ports (firefox/thunderbird/seamonkey) by throwing away most patches, shrinking Makefile size and fixing issues like $ firefox Could not read application.ini Exit 1 which can be worked around with $ /usr/local/lib/libxul/xulrunner-stub -app /usr/local/lib/firefox/application.ini From owner-freebsd-gecko@FreeBSD.ORG Thu Jul 12 03:05:07 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D6867106564A for ; Thu, 12 Jul 2012 03:05:07 +0000 (UTC) (envelope-from mi+thun@aldan.algebra.com) Received: from smtp02.lnh.mail.rcn.net (smtp02.lnh.mail.rcn.net [207.172.157.102]) by mx1.freebsd.org (Postfix) with ESMTP id 7D48F8FC08 for ; Thu, 12 Jul 2012 03:05:06 +0000 (UTC) Received: from mr16.lnh.mail.rcn.net ([207.172.157.36]) by smtp02.lnh.mail.rcn.net with ESMTP; 11 Jul 2012 23:05:06 -0400 Received: from smtp01.lnh.mail.rcn.net (smtp01.lnh.mail.rcn.net [207.172.4.11]) by mr16.lnh.mail.rcn.net (MOS 4.3.4-GA) with ESMTP id BVW91043; Wed, 11 Jul 2012 23:05:05 -0400 X-Auth-ID: anat Received: from pool-173-63-112-200.nwrknj.fios.verizon.net (HELO [192.168.1.8]) ([173.63.112.200]) by smtp01.lnh.mail.rcn.net with ESMTP; 11 Jul 2012 23:05:06 -0400 Message-ID: <4FFE3EE0.3010104@aldan.algebra.com> Date: Wed, 11 Jul 2012 23:05:04 -0400 From: "Mikhail T." User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:13.0) Gecko/20120707 Thunderbird/13.0.1 MIME-Version: 1.0 To: Jan Beich References: <4FFE0561.9050109@aldan.algebra.com> <1Sp9VY-0009Vv-JW@internal.tormail.org> In-Reply-To: <1Sp9VY-0009Vv-JW@internal.tormail.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Content-Filtered-By: Mailman/MimeDel 2.1.5 Cc: freebsd-gecko@freebsd.org Subject: Re: USE_MOZILLA=yes for firefox and thunderbird X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Jul 2012 03:05:07 -0000 On 11.07.2012 22:51, Jan Beich wrote: > "Mikhail T." writes: > >> Hello! >> >> Attached is a fairly small patch, that changes the two ports to use >> ports of all of the components currently supported by bsd.gecko.mk. > I'm afraid this is already fixed in the experimental branch > for *all* gecko ports. > > http://wiki.freebsd.org/Gecko This is awesome -- what's to be "afraid" of? But when is this hitting the ports-tree? > >> Please, consider committing soon so the work on bringing-in other >> components (such as hunspell, sqlite3, or xulrunner) can begin. Thank > ^^^^^^^^^ > There are currently 4 copies of libxul (in CVS): > > - mail/thunderbird, www/firefox (gecko-13) > - mail/thunderbird-esr, www/firefox-esr (gecko-10) > - www/kompozer (gecko-1.8) > - www/libxul (gecko-1.9) There is xulrunner-13.0.2 available from Mozilla, BTW... > Assuming the last two are gonna be deprecated installing two versions of > xulrunner currently causes a conflict with the following files: > > bin/xulrunner > libdata/pkgconfig/libxul-embedding.pc > libdata/pkgconfig/libxul.pc > libdata/pkgconfig/mozilla-js.pc > libdata/pkgconfig/mozilla-plugin.pc > > Forcing xulrunner to install the files under different names is trivial, > fixing dependent ports is less so. It'd also benefit libxul19 -> libxul > migration. And running on different engine version is not guaranteed to > work, e.g. > > # application.ini for firefox-esr > [Gecko] > MinVersion=10.0.2 > MaxVersion=10.0.2 > > The rest is simplifying gecko-app ports (firefox/thunderbird/seamonkey) > by throwing away most patches, shrinking Makefile size and fixing issues like > > $ firefox > Could not read application.ini > Exit 1 > > which can be worked around with > > $ /usr/local/lib/libxul/xulrunner-stub -app /usr/local/lib/firefox/application.ini Yes! Terrific! When is this happening?.. I, for one, am rather tired of seeing mozilla-ports recompiling the same files -- and installing the same libraries -- over and over... And, worse, some pieces are installed /twice by each port/... Right now on my system, for example: /opt/lib/libxul/libxul.so /opt/lib/libxul/sdk/lib/libxul.so /opt/lib/firefox/libxul.so /opt/lib/firefox/sdk/lib/libxul.so /opt/lib/thunderbird/libxul.so /opt/lib/thunderbird/sdk/lib/libxul.so Yours, -mi From owner-freebsd-gecko@FreeBSD.ORG Thu Jul 12 04:24:25 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 360AD106566C; Thu, 12 Jul 2012 04:24:25 +0000 (UTC) (envelope-from toomas.aas@raad.tartu.ee) Received: from kuller.raad.tartu.ee (kuller.raad.tartu.ee [213.184.43.8]) by mx1.freebsd.org (Postfix) with ESMTP id D383D8FC16; Thu, 12 Jul 2012 04:24:24 +0000 (UTC) Received: from kuller.raad.tartu.ee (localhost [127.0.0.1]) by kuller.raad.tartu.ee (Postfix) with ESMTP id BB02D39826; Thu, 12 Jul 2012 07:24:22 +0300 (EEST) X-Virus-Scanned: amavisd-new at post.raad.tartu.ee Received: from kuller.raad.tartu.ee ([127.0.0.1]) by kuller.raad.tartu.ee (kuller.raad.tartu.ee [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 27o-hvB0Wkrk; Thu, 12 Jul 2012 07:24:21 +0300 (EEST) Received: by kuller.raad.tartu.ee (Postfix, from userid 80) id AFE6A3983A; Thu, 12 Jul 2012 07:24:20 +0300 (EEST) Received: from 76.20.190.90.dyn.estpak.ee (76.20.190.90.dyn.estpak.ee [90.190.20.76]) by webmail.raad.tartu.ee (Horde Framework) with HTTP; Thu, 12 Jul 2012 07:24:20 +0300 Message-ID: <20120712072420.12744mmaroy8sps0@webmail.raad.tartu.ee> Date: Thu, 12 Jul 2012 07:24:20 +0300 From: Toomas Aas To: Jan Beich References: <20120703204245.18341mxlqo3s258g__34909.188692882$1341338060$gmane$org@webmail.raad.tartu.ee> <1Sp9VJ-0009Ur-9e@internal.tormail.org> In-Reply-To: <1Sp9VJ-0009Ur-9e@internal.tormail.org> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; DelSp="Yes"; format="flowed" Content-Disposition: inline Content-Transfer-Encoding: 7bit User-Agent: Internet Messaging Program (IMP) H3 (4.3.7) X-Originating-IP: 90.190.20.76 Cc: freebsd-gecko@freebsd.org, freebsd-questions@freebsd.org Subject: Re: Building www/libxul fails - 'No such file or directory' X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Jul 2012 04:24:25 -0000 Thu, 12 Jul 2012 kirjutas Jan Beich : > > I've seen other people confused by this harmless warning. OMG. All this time the build was actually successful and all I should have done was 'make install', which I did just now and of course it worked. I just assumed that if the last line in build output is error, it must have been failed. -- Toomas Aas From owner-freebsd-gecko@FreeBSD.ORG Thu Jul 12 17:55:12 2012 Return-Path: Delivered-To: freebsd-gecko@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 69FB11065676; Thu, 12 Jul 2012 17:55:12 +0000 (UTC) (envelope-from andy@neu.net) Received: from mail.neu.net (unknown [IPv6:2607:fc50:0:d300:216:3eff:fe54:f1c6]) by mx1.freebsd.org (Postfix) with ESMTP id 21BA88FC1C; Thu, 12 Jul 2012 17:55:11 +0000 (UTC) Received: from neu.net (neu.net [199.48.129.194]) by mail.neu.net (8.14.5/8.14.5) with ESMTP id q6CHt4ki092357; Thu, 12 Jul 2012 13:55:10 -0400 (EDT) (envelope-from andy@neu.net) Date: Thu, 12 Jul 2012 13:55:04 -0400 (EDT) From: AN To: gecko@FreeBSD.org, freebsd-gecko@FreeBSD.org Message-ID: User-Agent: Alpine 2.00 (BSF 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; format=flowed; charset=US-ASCII X-Spam-Status: No, score=-0.0 required=5.0 tests=T_RP_MATCHES_RCVD autolearn=unavailable version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on mail.neu.net Cc: Subject: nightly crashes when viewing HTML5 video X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Jul 2012 17:55:12 -0000 FreeBSD FBSD10 10.0-CURRENT FreeBSD 10.0-CURRENT #23 r237852: Sat Jun 30 18:45:27 EDT 2012 root@FBSD10:/usr/obj/usr/src/sys/MYKERNEL amd64 # svn up Updating '.': At revision 871. I have been using FF nightly for several weeks and it had been working well with HTML5 video. I started having a problem today watching HTML5 videos, it causes the broswer to crash immediately. I loaded sem.ko but the crash still occurs: ]# kldstat Id Refs Address Size Name 1 22 0xffffffff80200000 d0d840 kernel 2 1 0xffffffff80f0e000 10ae520 nvidia.ko 3 3 0xffffffff81fbd000 48450 linux.ko 4 1 0xffffffff82006000 4ef30 vboxdrv.ko 5 1 0xffffffff82212000 3df6 linprocfs.ko 6 1 0xffffffff82383000 a9f3 fuse.ko 7 1 0xffffffff8238e000 23d4 sem.ko Also, another problem appeared after the crashes started, tabs are on top with no way to move them to original position. Under the menu item "view" -> "toolbars" the Tabs on Top option is missing. I have verified both of these are working fine in FF 13. Is anyone else seeing these problems? What data can I try to collect to help troubleshoot the problems? Thanks in advance. From owner-freebsd-gecko@FreeBSD.ORG Thu Jul 12 17:55:12 2012 Return-Path: Delivered-To: gecko@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 69FB11065676; Thu, 12 Jul 2012 17:55:12 +0000 (UTC) (envelope-from andy@neu.net) Received: from mail.neu.net (unknown [IPv6:2607:fc50:0:d300:216:3eff:fe54:f1c6]) by mx1.freebsd.org (Postfix) with ESMTP id 21BA88FC1C; Thu, 12 Jul 2012 17:55:11 +0000 (UTC) Received: from neu.net (neu.net [199.48.129.194]) by mail.neu.net (8.14.5/8.14.5) with ESMTP id q6CHt4ki092357; Thu, 12 Jul 2012 13:55:10 -0400 (EDT) (envelope-from andy@neu.net) Date: Thu, 12 Jul 2012 13:55:04 -0400 (EDT) From: AN To: gecko@FreeBSD.org, freebsd-gecko@FreeBSD.org Message-ID: User-Agent: Alpine 2.00 (BSF 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; format=flowed; charset=US-ASCII X-Spam-Status: No, score=-0.0 required=5.0 tests=T_RP_MATCHES_RCVD autolearn=unavailable version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on mail.neu.net Cc: Subject: nightly crashes when viewing HTML5 video X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Jul 2012 17:55:12 -0000 FreeBSD FBSD10 10.0-CURRENT FreeBSD 10.0-CURRENT #23 r237852: Sat Jun 30 18:45:27 EDT 2012 root@FBSD10:/usr/obj/usr/src/sys/MYKERNEL amd64 # svn up Updating '.': At revision 871. I have been using FF nightly for several weeks and it had been working well with HTML5 video. I started having a problem today watching HTML5 videos, it causes the broswer to crash immediately. I loaded sem.ko but the crash still occurs: ]# kldstat Id Refs Address Size Name 1 22 0xffffffff80200000 d0d840 kernel 2 1 0xffffffff80f0e000 10ae520 nvidia.ko 3 3 0xffffffff81fbd000 48450 linux.ko 4 1 0xffffffff82006000 4ef30 vboxdrv.ko 5 1 0xffffffff82212000 3df6 linprocfs.ko 6 1 0xffffffff82383000 a9f3 fuse.ko 7 1 0xffffffff8238e000 23d4 sem.ko Also, another problem appeared after the crashes started, tabs are on top with no way to move them to original position. Under the menu item "view" -> "toolbars" the Tabs on Top option is missing. I have verified both of these are working fine in FF 13. Is anyone else seeing these problems? What data can I try to collect to help troubleshoot the problems? Thanks in advance. From owner-freebsd-gecko@FreeBSD.ORG Thu Jul 12 21:57:15 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E47FC106564A for ; Thu, 12 Jul 2012 21:57:14 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 81A8A8FC0A for ; Thu, 12 Jul 2012 21:57:14 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q6CLvDAE002662 for ; Thu, 12 Jul 2012 21:57:13 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q6CLv8W9000314 for freebsd-gecko@freebsd.org; Thu, 12 Jul 2012 21:57:08 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Thu, 12 Jul 2012 21:57:08 GMT Message-Id: <201207122157.q6CLv8W9000314@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r873 - in branches/experimental: Mk mail/thunderbird-esr/files mail/thunderbird/files www/firefox-esr/files www/firefox-nightly/files www/firefox/files www/libxul/files www/seamonkey/files X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Jul 2012 21:57:15 -0000 Author: jbeich Date: Thu Jul 12 21:57:07 2012 New Revision: 873 Log: get rid of zlib patch Deleted: branches/experimental/mail/thunderbird-esr/files/patch-configure.in branches/experimental/mail/thunderbird/files/patch-configure.in branches/experimental/www/seamonkey/files/patch-configure.in Modified: branches/experimental/Mk/bsd.gecko.mk branches/experimental/mail/thunderbird-esr/files/patch-mozilla-configure.in branches/experimental/mail/thunderbird/files/patch-mozilla-configure.in branches/experimental/www/firefox-esr/files/patch-configure.in branches/experimental/www/firefox-nightly/files/patch-configure.in branches/experimental/www/firefox/files/patch-configure.in branches/experimental/www/libxul/files/patch-configure.in branches/experimental/www/seamonkey/files/patch-mozilla-configure.in Modified: branches/experimental/Mk/bsd.gecko.mk ============================================================================== --- branches/experimental/Mk/bsd.gecko.mk Thu Jul 12 21:56:56 2012 (r872) +++ branches/experimental/Mk/bsd.gecko.mk Thu Jul 12 21:57:07 2012 (r873) @@ -655,7 +655,7 @@ MOZ_OPTIONS+= --enable-necko-protocols=${MOZ_PROTOCOLS} .endif # others -MOZ_OPTIONS+= --with-system-zlib=/usr \ +MOZ_OPTIONS+= --with-system-zlib \ --disable-auto-deps \ --disable-debug-symbols \ --disable-glibtest \ Deleted: branches/experimental/mail/thunderbird-esr/files/patch-configure.in ============================================================================== --- branches/experimental/mail/thunderbird-esr/files/patch-configure.in Thu Jul 12 21:57:07 2012 (r872) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- configure.in.orig 2011-12-19 14:48:06.000000000 +0100 -+++ configure.in 2011-12-19 15:51:19.000000000 +0100 -@@ -4383,7 +4386,7 @@ - LDFLAGS=$_SAVE_LDFLAGS - LIBS=$_SAVE_LIBS - --if test "${ZLIB_DIR}" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then -+if test "${ZLIB_DIR}" -a "${ZLIB_DIR}" != "/usr" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then - ZLIB_CFLAGS="-I${ZLIB_DIR}/include" - ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}" - fi Modified: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-configure.in ============================================================================== --- branches/experimental/mail/thunderbird-esr/files/patch-mozilla-configure.in Thu Jul 12 21:56:56 2012 (r872) +++ branches/experimental/mail/thunderbird-esr/files/patch-mozilla-configure.in Thu Jul 12 21:57:07 2012 (r873) @@ -50,15 +50,6 @@ CFLAGS=$_SAVE_CFLAGS LDFLAGS=$_SAVE_LDFLAGS LIBS=$_SAVE_LIBS -@@ -4808,7 +4810,7 @@ CFLAGS=$_SAVE_CFLAGS - LDFLAGS=$_SAVE_LDFLAGS - LIBS=$_SAVE_LIBS - --if test "${ZLIB_DIR}" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then -+if test "${ZLIB_DIR}" -a "${ZLIB_DIR}" != "/usr" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then - ZLIB_CFLAGS="-I${ZLIB_DIR}/include" - ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}" - fi @@ -6022,6 +6024,14 @@ VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC" VPX_X86_ASM=1 Deleted: branches/experimental/mail/thunderbird/files/patch-configure.in ============================================================================== --- branches/experimental/mail/thunderbird/files/patch-configure.in Thu Jul 12 21:57:07 2012 (r872) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- configure.in.orig 2011-12-19 14:48:06.000000000 +0100 -+++ configure.in 2011-12-19 15:51:19.000000000 +0100 -@@ -4383,7 +4386,7 @@ - LDFLAGS=$_SAVE_LDFLAGS - LIBS=$_SAVE_LIBS - --if test "${ZLIB_DIR}" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then -+if test "${ZLIB_DIR}" -a "${ZLIB_DIR}" != "/usr" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then - ZLIB_CFLAGS="-I${ZLIB_DIR}/include" - ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}" - fi Modified: branches/experimental/mail/thunderbird/files/patch-mozilla-configure.in ============================================================================== --- branches/experimental/mail/thunderbird/files/patch-mozilla-configure.in Thu Jul 12 21:56:56 2012 (r872) +++ branches/experimental/mail/thunderbird/files/patch-mozilla-configure.in Thu Jul 12 21:57:07 2012 (r873) @@ -23,15 +23,6 @@ CFLAGS=$_SAVE_CFLAGS LDFLAGS=$_SAVE_LDFLAGS LIBS=$_SAVE_LIBS -@@ -4580,7 +4580,7 @@ - LDFLAGS=$_SAVE_LDFLAGS - LIBS=$_SAVE_LIBS - --if test "${ZLIB_DIR}" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then -+if test "${ZLIB_DIR}" -a "${ZLIB_DIR}" != "/usr" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then - ZLIB_CFLAGS="-I${ZLIB_DIR}/include" - ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}" - fi @@ -5903,6 +5903,14 @@ VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC" VPX_X86_ASM=1 Modified: branches/experimental/www/firefox-esr/files/patch-configure.in ============================================================================== --- branches/experimental/www/firefox-esr/files/patch-configure.in Thu Jul 12 21:56:56 2012 (r872) +++ branches/experimental/www/firefox-esr/files/patch-configure.in Thu Jul 12 21:57:07 2012 (r873) @@ -50,15 +50,6 @@ CFLAGS=$_SAVE_CFLAGS LDFLAGS=$_SAVE_LDFLAGS LIBS=$_SAVE_LIBS -@@ -4808,7 +4810,7 @@ CFLAGS=$_SAVE_CFLAGS - LDFLAGS=$_SAVE_LDFLAGS - LIBS=$_SAVE_LIBS - --if test "${ZLIB_DIR}" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then -+if test "${ZLIB_DIR}" -a "${ZLIB_DIR}" != "/usr" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then - ZLIB_CFLAGS="-I${ZLIB_DIR}/include" - ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}" - fi @@ -6022,6 +6024,14 @@ VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC" VPX_X86_ASM=1 Modified: branches/experimental/www/firefox-nightly/files/patch-configure.in ============================================================================== --- branches/experimental/www/firefox-nightly/files/patch-configure.in Thu Jul 12 21:56:56 2012 (r872) +++ branches/experimental/www/firefox-nightly/files/patch-configure.in Thu Jul 12 21:57:07 2012 (r873) @@ -23,15 +23,6 @@ CFLAGS=$_SAVE_CFLAGS LDFLAGS=$_SAVE_LDFLAGS LIBS=$_SAVE_LIBS -@@ -4101,7 +4105,7 @@ CFLAGS=$_SAVE_CFLAGS - LDFLAGS=$_SAVE_LDFLAGS - LIBS=$_SAVE_LIBS - --if test "${ZLIB_DIR}" -a -d "${ZLIB_DIR}" -a "$MOZ_NATIVE_ZLIB" = 1; then -+if test "${ZLIB_DIR}" -a "${ZLIB_DIR}" != "/usr" -a -d "${ZLIB_DIR}" -a "$MOZ_NATIVE_ZLIB" = 1; then - MOZ_ZLIB_CFLAGS="-I${ZLIB_DIR}/include" - MOZ_ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}" - fi @@ -6022,6 +6024,14 @@ VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC" VPX_X86_ASM=1 Modified: branches/experimental/www/firefox/files/patch-configure.in ============================================================================== --- branches/experimental/www/firefox/files/patch-configure.in Thu Jul 12 21:56:56 2012 (r872) +++ branches/experimental/www/firefox/files/patch-configure.in Thu Jul 12 21:57:07 2012 (r873) @@ -23,15 +23,6 @@ CFLAGS=$_SAVE_CFLAGS LDFLAGS=$_SAVE_LDFLAGS LIBS=$_SAVE_LIBS -@@ -4808,7 +4810,7 @@ - LDFLAGS=$_SAVE_LDFLAGS - LIBS=$_SAVE_LIBS - --if test "${ZLIB_DIR}" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then -+if test "${ZLIB_DIR}" -a "${ZLIB_DIR}" != "/usr" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then - ZLIB_CFLAGS="-I${ZLIB_DIR}/include" - ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}" - fi @@ -5903,6 +5903,14 @@ VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC" VPX_X86_ASM=1 Modified: branches/experimental/www/libxul/files/patch-configure.in ============================================================================== --- branches/experimental/www/libxul/files/patch-configure.in Thu Jul 12 21:56:56 2012 (r872) +++ branches/experimental/www/libxul/files/patch-configure.in Thu Jul 12 21:57:07 2012 (r873) @@ -50,15 +50,6 @@ CFLAGS=$_SAVE_CFLAGS LDFLAGS=$_SAVE_LDFLAGS LIBS=$_SAVE_LIBS -@@ -4808,7 +4810,7 @@ CFLAGS=$_SAVE_CFLAGS - LDFLAGS=$_SAVE_LDFLAGS - LIBS=$_SAVE_LIBS - --if test "${ZLIB_DIR}" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then -+if test "${ZLIB_DIR}" -a "${ZLIB_DIR}" != "/usr" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then - ZLIB_CFLAGS="-I${ZLIB_DIR}/include" - ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}" - fi @@ -6022,6 +6024,14 @@ VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC" VPX_X86_ASM=1 Deleted: branches/experimental/www/seamonkey/files/patch-configure.in ============================================================================== --- branches/experimental/www/seamonkey/files/patch-configure.in Thu Jul 12 21:57:07 2012 (r872) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- configure.in.orig 2011-12-17 18:35:47.000000000 +0100 -+++ configure.in 2011-12-19 15:57:09.000000000 +0100 -@@ -4383,7 +4386,7 @@ - LDFLAGS=$_SAVE_LDFLAGS - LIBS=$_SAVE_LIBS - --if test "${ZLIB_DIR}" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then -+if test "${ZLIB_DIR}" -a "${ZLIB_DIR}" != "/usr" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then - ZLIB_CFLAGS="-I${ZLIB_DIR}/include" - ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}" - fi Modified: branches/experimental/www/seamonkey/files/patch-mozilla-configure.in ============================================================================== --- branches/experimental/www/seamonkey/files/patch-mozilla-configure.in Thu Jul 12 21:56:56 2012 (r872) +++ branches/experimental/www/seamonkey/files/patch-mozilla-configure.in Thu Jul 12 21:57:07 2012 (r873) @@ -23,15 +23,6 @@ CFLAGS=$_SAVE_CFLAGS LDFLAGS=$_SAVE_LDFLAGS LIBS=$_SAVE_LIBS -@@ -4808,7 +4810,7 @@ CFLAGS=$_SAVE_CFLAGS - LDFLAGS=$_SAVE_LDFLAGS - LIBS=$_SAVE_LIBS - --if test "${ZLIB_DIR}" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then -+if test "${ZLIB_DIR}" -a "${ZLIB_DIR}" != "/usr" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then - ZLIB_CFLAGS="-I${ZLIB_DIR}/include" - ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}" - fi @@ -5903,6 +5903,14 @@ VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC" VPX_X86_ASM=1 From owner-freebsd-gecko@FreeBSD.ORG Thu Jul 12 21:57:21 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B72141065672 for ; Thu, 12 Jul 2012 21:57:21 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 415D98FC17 for ; Thu, 12 Jul 2012 21:57:21 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q6CLvKsO004298 for ; Thu, 12 Jul 2012 21:57:20 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q6CLvFvG003779 for freebsd-gecko@freebsd.org; Thu, 12 Jul 2012 21:57:15 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Thu, 12 Jul 2012 21:57:15 GMT Message-Id: <201207122157.q6CLvFvG003779@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r874 - branches/experimental/Mk X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Jul 2012 21:57:21 -0000 Author: jbeich Date: Thu Jul 12 21:57:15 2012 New Revision: 874 Log: - explicitly enable pixman with cairo - enable system bz2, used only by updater which is disabled Modified: branches/experimental/Mk/bsd.gecko.mk Modified: branches/experimental/Mk/bsd.gecko.mk ============================================================================== --- branches/experimental/Mk/bsd.gecko.mk Thu Jul 12 21:57:07 2012 (r873) +++ branches/experimental/Mk/bsd.gecko.mk Thu Jul 12 21:57:15 2012 (r874) @@ -574,7 +574,7 @@ _ALL_DEPENDS= cairo dbm event ffi hunspell jpeg nspr nss png sqlite vpx zip cairo_LIB_DEPENDS= cairo:${PORTSDIR}/graphics/cairo -cairo_MOZ_OPTIONS= --enable-system-cairo +cairo_MOZ_OPTIONS= --enable-system-cairo --enable-system-pixman cairo_EXTRACT_AFTER_ARGS= --exclude mozilla*/gfx/cairo dbm_EXTRACT_AFTER_ARGS= --exclude mozilla*/dbm @@ -656,6 +656,7 @@ .endif # others MOZ_OPTIONS+= --with-system-zlib \ + --with-system-bz2 \ --disable-auto-deps \ --disable-debug-symbols \ --disable-glibtest \ From owner-freebsd-gecko@FreeBSD.ORG Thu Jul 12 22:07:16 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 72982106564A for ; Thu, 12 Jul 2012 22:07:16 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 9F2A68FC18 for ; Thu, 12 Jul 2012 22:07:15 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q6CLv1o9099436 for ; Thu, 12 Jul 2012 21:57:01 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q6CLuu3X098518 for freebsd-gecko@freebsd.org; Thu, 12 Jul 2012 21:56:56 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Thu, 12 Jul 2012 21:56:56 GMT Message-Id: <201207122156.q6CLuu3X098518@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r872 - in branches/experimental/www: firefox firefox-esr firefox-nightly firefox36 X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Jul 2012 22:07:16 -0000 Author: jbeich Date: Thu Jul 12 21:56:56 2012 New Revision: 872 Log: sem.ko is unused since 9.0R http://svn.freebsd.org/changeset/base/201546 Modified: branches/experimental/www/firefox-esr/pkg-message branches/experimental/www/firefox-nightly/pkg-message branches/experimental/www/firefox/pkg-message branches/experimental/www/firefox36/pkg-message Modified: branches/experimental/www/firefox-esr/pkg-message ============================================================================== --- branches/experimental/www/firefox-esr/pkg-message Wed Jul 11 20:39:17 2012 (r871) +++ branches/experimental/www/firefox-esr/pkg-message Thu Jul 12 21:56:56 2012 (r872) @@ -16,7 +16,8 @@ Firefox and HTML5 -Certain functions used to display HTML5 elements need the sem module. +Certain functions used to display HTML5 elements need the sem module +on 7.x and 8.x releases. If your Firefox crashes with the following message while viewing a HTML5 page: Modified: branches/experimental/www/firefox-nightly/pkg-message ============================================================================== --- branches/experimental/www/firefox-nightly/pkg-message Wed Jul 11 20:39:17 2012 (r871) +++ branches/experimental/www/firefox-nightly/pkg-message Thu Jul 12 21:56:56 2012 (r872) @@ -16,7 +16,8 @@ Firefox and HTML5 -Certain functions used to display HTML5 elements need the sem module. +Certain functions used to display HTML5 elements need the sem module +on 7.x and 8.x releases. If your Firefox crashes with the following message while viewing a HTML5 page: Modified: branches/experimental/www/firefox/pkg-message ============================================================================== --- branches/experimental/www/firefox/pkg-message Wed Jul 11 20:39:17 2012 (r871) +++ branches/experimental/www/firefox/pkg-message Thu Jul 12 21:56:56 2012 (r872) @@ -16,7 +16,8 @@ Firefox and HTML5 -Certain functions used to display HTML5 elements need the sem module. +Certain functions used to display HTML5 elements need the sem module +on 7.x and 8.x releases. If your Firefox crashes with the following message while viewing a HTML5 page: Modified: branches/experimental/www/firefox36/pkg-message ============================================================================== --- branches/experimental/www/firefox36/pkg-message Wed Jul 11 20:39:17 2012 (r871) +++ branches/experimental/www/firefox36/pkg-message Thu Jul 12 21:56:56 2012 (r872) @@ -16,7 +16,8 @@ Firefox 3.6 and HTML5 -Certain functions used to display HTML5 elements need the sem module. +Certain functions used to display HTML5 elements need the sem module +on 7.x and 8.x releases. If your Firefox crashes with the following message while viewing a HTML5 page: From owner-freebsd-gecko@FreeBSD.ORG Sat Jul 14 01:12:32 2012 Return-Path: Delivered-To: freebsd-gecko@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A468A106566B for ; Sat, 14 Jul 2012 01:12:32 +0000 (UTC) (envelope-from jbeich@tormail.org) Received: from server2.allsitecontrol.com (server2.allsitecontrol.com [63.143.36.210]) by mx1.freebsd.org (Postfix) with ESMTP id 6A2D68FC0C for ; Sat, 14 Jul 2012 01:12:31 +0000 (UTC) Received: from tor20.anonymizer.ccc.de ([31.172.30.3]:45328 helo=internal.tormail.org) by server2.allsitecontrol.com with esmtpsa (TLSv1:RC4-SHA:128) (Exim 4.77) (envelope-from ) id 1SpquF-000Zia-5p; Fri, 13 Jul 2012 21:12:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tormail.org; s=tm; h=Message-Id:X-TorMail-User:Content-Type:MIME-Version:References:Date:Subject:Cc:To:From; bh=iqXeM6LvtZhEF5Rp6mxxu9PknGulMXquq3qWi+bxQqI=; b=i/SfS3hfJLgtoaOJFcTxbmup8kbijxX8eW26yPhXY0StkVm+drIBpGmMhkKodpGMRFQ5X6gQwiFsOyoh4W6V3S6ZEDFB8x6WiaUx49lQoKmgSk8gmT7jGJznuhxFbBYlHJN+uG8zrlTAuQ/BWQJ/HLs5Fxu2J2570eefG29RFQg=; Received: from jbeich by internal.tormail.org with local (Exim 4.63) (envelope-from ) id 1SplEf-000G5z-6Y; Fri, 13 Jul 2012 19:09:09 +0000 From: Jan Beich To: AN Date: Fri, 13 Jul 2012 00:59:32 -0500 References: MIME-Version: 1.0 Content-Type: text/plain X-TorMail-User: jbeich Message-Id: <1SplEf-000G5z-6Y@internal.tormail.org> X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - server2.allsitecontrol.com X-AntiAbuse: Original Domain - freebsd.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tormail.org X-Source: X-Source-Args: X-Source-Dir: Cc: freebsd-gecko@FreeBSD.org Subject: Re: nightly crashes when viewing HTML5 video X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Jul 2012 01:12:32 -0000 AN writes: > FreeBSD FBSD10 10.0-CURRENT FreeBSD 10.0-CURRENT #23 r237852: Sat Jun > 30 18:45:27 EDT 2012 root@FBSD10:/usr/obj/usr/src/sys/MYKERNEL > amd64 > > # svn up > Updating '.': > At revision 871. > > I have been using FF nightly for several weeks and it had been working > well with HTML5 video. I started having a problem today watching > HTML5 videos, it causes the broswer to crash immediately. > > I loaded sem.ko but the crash still occurs: > > ]# kldstat > Id Refs Address Size Name > 1 22 0xffffffff80200000 d0d840 kernel > 2 1 0xffffffff80f0e000 10ae520 nvidia.ko > 3 3 0xffffffff81fbd000 48450 linux.ko > 4 1 0xffffffff82006000 4ef30 vboxdrv.ko > 5 1 0xffffffff82212000 3df6 linprocfs.ko > 6 1 0xffffffff82383000 a9f3 fuse.ko > 7 1 0xffffffff8238e000 23d4 sem.ko It's more likely that the crash is due to some changes in your environment since the time Nightly last worked/built for you. Try to see if the following items in the list make a difference: - updating -CURRENT - previous versions of www/firefox-nightly and not using make update - GENERIC kernel - not loading vboxdrv.ko and fuse.ko after boot - layers.acceleration.force-enabled=true and/or gfx.xrender.enabled=false - x11 vesa driver instead of nvidia.ko - bundled cairo/pixman, add -cairo to USE_MOZILLA - bundled vpx, add -vpx to USE_MOZILLA - GSTREAMER option, don't forget to install codecs > Also, another problem appeared after the crashes started, tabs are on > top with no way to move them to original position. Under the menu > item "view" -> "toolbars" the Tabs on Top option is missing. An upstream issue(?). It's easy to confirm with linux Nightly. > I have verified both of these are working fine in FF 13. Have you tested FF 13 on experimental branch? Actually, it's FF14 there but still important to rule out my changes (except jemalloc) as the cause, e.g. sydney_audio_oss.c patch comes to mind. To get FF13 just roll back: $ svn up -r857 > Is anyone else seeing these problems? What data can I try to collect > to help troubleshoot the problems? Can you get a fingerprint of the crash, e.g. $ make WITH_DEBUG= $ cd $(make -V WRKSRC)/dist/bin $ gdb --args ./firefox -ProfileManager -no-remote (gdb) where