[SVN-Commit] r1217 - in trunk: . www/firefox www/firefox-nightly www/firefox-nightly/files
svn-freebsd-gecko at chruetertee.ch
svn-freebsd-gecko at chruetertee.ch
Wed Mar 20 17:04:09 UTC 2013
Author: jbeich
Date: Wed Mar 20 17:03:55 2013
New Revision: 1217
Log:
update
Deleted:
trunk/www/firefox-nightly/files/patch-bug685258
trunk/www/firefox-nightly/files/patch-bug780432
trunk/www/firefox-nightly/files/patch-media-libsydneyaudio-src-sydney_audio_oss.c
Modified:
trunk/Gecko_TODO
trunk/www/firefox-nightly/Makefile
trunk/www/firefox-nightly/Makefile.hgrev
trunk/www/firefox-nightly/distinfo
trunk/www/firefox-nightly/files/patch-bug807492
trunk/www/firefox-nightly/files/patch-bug826985
trunk/www/firefox-nightly/files/patch-bug851880
trunk/www/firefox/Makefile
trunk/www/firefox/distinfo
Modified: trunk/Gecko_TODO
==============================================================================
--- trunk/Gecko_TODO Tue Mar 19 21:48:38 2013 (r1216)
+++ trunk/Gecko_TODO Wed Mar 20 17:03:55 2013 (r1217)
@@ -9,7 +9,6 @@
- pmc(3) for js/src/perf
https://developer.mozilla.org/en-US/docs/Performance/JS::PerfMeasurement
- mozboot (ex.: bug 790750)
-- fix pause latency issue with OSS in libsydneyaudio (deprecated)
- push patch-js-src-methodjit-MethodJIT.cpp (needs a test case)
- push patch-sysdb
Modified: trunk/www/firefox-nightly/Makefile
==============================================================================
--- trunk/www/firefox-nightly/Makefile Tue Mar 19 21:48:38 2013 (r1216)
+++ trunk/www/firefox-nightly/Makefile Wed Mar 20 17:03:55 2013 (r1217)
@@ -53,7 +53,9 @@
.include "${.CURDIR}/../../www/firefox/Makefile.options"
+# OSS is gone after bug 852401
OPTIONS_DEFAULT:=${OPTIONS_DEFAULT:S/OSS/ALSA/}
+OPTIONS_SINGLE_AUDIO:=${OPTIONS_SINGLE_AUDIO:S/OSS//}
.include <bsd.port.pre.mk>
Modified: trunk/www/firefox-nightly/Makefile.hgrev
==============================================================================
--- trunk/www/firefox-nightly/Makefile.hgrev Tue Mar 19 21:48:38 2013 (r1216)
+++ trunk/www/firefox-nightly/Makefile.hgrev Wed Mar 20 17:03:55 2013 (r1217)
@@ -1 +1 @@
-HGREV= 125380:f4394e306dad
+HGREV= 125575:1d6fe70c79c5
Modified: trunk/www/firefox-nightly/distinfo
==============================================================================
--- trunk/www/firefox-nightly/distinfo Tue Mar 19 21:48:38 2013 (r1216)
+++ trunk/www/firefox-nightly/distinfo Wed Mar 20 17:03:55 2013 (r1217)
@@ -1,2 +1,2 @@
-SHA256 (firefox-nightly/f4394e306dad.tar.bz2) = b5540a98c7f9b5036314c5a634091b889336de6ce5e69e1258215735dfb24b83
-SIZE (firefox-nightly/f4394e306dad.tar.bz2) = 109212098
+SHA256 (firefox-nightly/1d6fe70c79c5.tar.bz2) = 10d7e9a15bb811cdc429c889aeb19a144d429df088912ca8b8cbd5d885cc3996
+SIZE (firefox-nightly/1d6fe70c79c5.tar.bz2) = 109019090
Deleted: trunk/www/firefox-nightly/files/patch-bug685258
==============================================================================
--- trunk/www/firefox-nightly/files/patch-bug685258 Wed Mar 20 17:03:55 2013 (r1216)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,17 +0,0 @@
-# HG changeset patch
-# User Oleg Romashin <romaxa at gmail.com>
-# Parent a2291c212856ad27622416e83c8311b6a33b52f1
-Bug 685258 - Pulse audio backend does not check provided playback and crashes r=derf
-
-diff --git a/content/media/AudioStream.cpp b/content/media/AudioStream.cpp
---- content/media/AudioStream.cpp
-+++ content/media/AudioStream.cpp
-@@ -429,7 +429,7 @@ nsresult nsNativeAudioStream::Init(PRInt32 aNumChannels, PRInt32 aRate, SampleFo
- mFormat = aFormat;
-
- if (sa_stream_create_pcm(reinterpret_cast<sa_stream_t**>(&mAudioHandle),
-- NULL,
-+ "Mozilla",
- SA_MODE_WRONLY,
- SA_PCM_FORMAT_S16_NE,
- aRate,
Deleted: trunk/www/firefox-nightly/files/patch-bug780432
==============================================================================
--- trunk/www/firefox-nightly/files/patch-bug780432 Wed Mar 20 17:03:55 2013 (r1216)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,17 +0,0 @@
-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
-@@ -68,6 +68,12 @@ ifdef MOZ_ALSA
- $(NULL)
- endif
-
-+ifdef MOZ_PULSEAUDIO
-+CSRCS = \
-+ sydney_audio_pulseaudio.c \
-+ $(NULL)
-+endif
-+
- ifeq ($(OS_ARCH),WINNT)
- OS_LIBS += winmm.lib
- endif
Modified: trunk/www/firefox-nightly/files/patch-bug807492
==============================================================================
--- trunk/www/firefox-nightly/files/patch-bug807492 Tue Mar 19 21:48:38 2013 (r1216)
+++ trunk/www/firefox-nightly/files/patch-bug807492 Wed Mar 20 17:03:55 2013 (r1217)
@@ -17,14 +17,14 @@
index c167461..8346c11 100644
--- configure.in
+++ configure.in
-@@ -5243,17 +5243,17 @@ dnl Turn off webrtc for OS's we don't handle yet, but allow
- dnl --enable-webrtc to override. Can disable for everything in
- dnl the master list above.
- if test -n "$MOZ_WEBRTC"; then
- case "$target" in
+@@ -5258,17 +5258,17 @@ if test -n "$MOZ_WEBRTC"; then
*-android*|*-linuxandroid*)
- dnl Make sure doesn't get matched by *-linux*
- MOZ_WEBRTC=
+ if test -n "$MOZ_B2G"; then
+ MOZ_WEBRTC=1
+ else
+ dnl Make sure doesn't get matched by *-linux*
+ MOZ_WEBRTC=
+ fi
;;
- *-linux*|*-mingw*|*-darwin*)
+ *-linux*|*-mingw*|*-darwin*|*-dragonfly*|*-freebsd*|*-netbsd*|*-openbsd*)
@@ -1528,7 +1528,7 @@
WEBRTC_TRACE(kTraceStateInfo, kTraceUtility, -1,
"Available number of cores:%d", number_of_cores_);
- #elif defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID)
+ #elif defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) && !defined(WEBRTC_GONK)
number_of_cores_ = get_nprocs();
WEBRTC_TRACE(kTraceStateInfo, kTraceUtility, -1,
"Available number of cores:%d", number_of_cores_);
@@ -1602,7 +1602,7 @@
}
uint32_t ThreadWrapper::GetThreadId() {
- #if defined(WEBRTC_ANDROID) || defined(WEBRTC_LINUX)
+ #if defined(WEBRTC_ANDROID) || defined(WEBRTC_LINUX) || defined(WEBRTC_GONK)
return static_cast<uint32_t>(syscall(__NR_gettid));
#elif defined(WEBRTC_MAC) || defined(WEBRTC_IOS)
return pthread_mach_thread_np(pthread_self());
@@ -1627,7 +1627,7 @@
int ThreadPosix::Construct() {
int result = 0;
- #if !defined(WEBRTC_ANDROID)
+ #if !defined(WEBRTC_ANDROID) && !defined(WEBRTC_GONK)
@@ -167,17 +192,17 @@ int ThreadPosix::Construct() {
}
@@ -1647,7 +1647,7 @@
}
int result = pthread_attr_setdetachstate(&attr_, PTHREAD_CREATE_DETACHED);
// Set the stack stack size to 1M.
-@@ -232,31 +257,39 @@ bool ThreadPosix::Start(unsigned int& thread_id)
+@@ -232,31 +257,40 @@ bool ThreadPosix::Start(unsigned int& thread_id)
WEBRTC_TRACE(kTraceError, kTraceUtility, -1,
"unable to set thread priority");
}
@@ -1656,8 +1656,9 @@
// CPU_ZERO and CPU_SET are not available in NDK r7, so disable
// SetAffinity on Android for now.
--#if (defined(WEBRTC_LINUX) && (!defined(WEBRTC_ANDROID)))
-+#if defined(__FreeBSD__) || (defined(WEBRTC_LINUX) && (!defined(WEBRTC_ANDROID)))
+-#if (defined(WEBRTC_LINUX) && (!defined(WEBRTC_ANDROID)) && (!defined(WEBRTC_GONK)))
++#if defined(__FreeBSD__) || (defined(WEBRTC_LINUX) && \
++ (!defined(WEBRTC_ANDROID)) && (!defined(WEBRTC_GONK)))
bool ThreadPosix::SetAffinity(const int* processor_numbers,
const unsigned int amount_of_processors) {
if (!processor_numbers || (amount_of_processors == 0)) {
@@ -1675,12 +1676,12 @@
++processor) {
CPU_SET(processor_numbers[processor], &mask);
}
--#if defined(WEBRTC_ANDROID)
+-#if defined(WEBRTC_ANDROID) || defined(WEBRTC_GONK)
+#if defined(__FreeBSD__)
+ const int result = pthread_setaffinity_np(thread_,
+ sizeof(mask),
+ &mask);
-+#elif defined(WEBRTC_ANDROID)
++#elif defined(WEBRTC_ANDROID) || defined(WEBRTC_GONK)
// Android.
const int result = syscall(__NR_sched_setaffinity,
pid_,
Modified: trunk/www/firefox-nightly/files/patch-bug826985
==============================================================================
--- trunk/www/firefox-nightly/files/patch-bug826985 Tue Mar 19 21:48:38 2013 (r1216)
+++ trunk/www/firefox-nightly/files/patch-bug826985 Wed Mar 20 17:03:55 2013 (r1217)
@@ -16,16 +16,16 @@
index 55e4cd1..76567b3 100644
--- configure.in
+++ configure.in
-@@ -5238,6 +5238,9 @@ if test -n "$MOZ_WEBRTC"; then
+@@ -5294,6 +5294,9 @@ if test -n "$MOZ_WEBRTC"; then
MOZ_VP8_ENCODER=1
MOZ_VP8_ERROR_CONCEALMENT=1
+ dnl with libv4l2 we can support more cameras
+ PKG_CHECK_MODULES(MOZ_LIBV4L2, libv4l2)
+
- dnl OpenSLES is only available in Android 2.3 and later; we'll change this
- dnl hard dependency to a dynamic load with graceful runtime failure before
- dnl we make --enable-webrtc on by default in Android (bug 815905)
+ if test "$MOZ_WIDGET_TOOLKIT" != "gonk"; then
+ dnl OpenSLES is only available in Android 2.3 and later; we'll change this
+ dnl hard dependency to a dynamic load with graceful runtime failure before
@@ -8981,6 +8984,10 @@ elif test "${OS_TARGET}" = "Android"; then
fi
fi
Modified: trunk/www/firefox-nightly/files/patch-bug851880
==============================================================================
--- trunk/www/firefox-nightly/files/patch-bug851880 Tue Mar 19 21:48:38 2013 (r1216)
+++ trunk/www/firefox-nightly/files/patch-bug851880 Wed Mar 20 17:03:55 2013 (r1217)
@@ -66,7 +66,7 @@
+# if defined(__linux__)
+# define XMM_sig(p,i) ((p)->uc_mcontext.fpregs->_xmm[i])
+# else
-+# define XMM_sig(p,i) ((p)->uc_mcontext.fpregs->xmm[i])
++# define XMM_sig(p,i) ((p)->uc_mcontext.fpregs.fp_reg_set.fpchip_state.xmm[i])
+# endif
+# define EIP_sig(p) ((p)->uc_mcontext.gregs[REG_EIP])
+# define RIP_sig(p) ((p)->uc_mcontext.gregs[REG_RIP])
@@ -157,7 +157,7 @@
// Prevent races trying to install the signal handlers.
#ifdef JS_THREADSAFE
# include "jslock.h"
-@@ -142,66 +274,90 @@ LookupHeapAccess(const AsmJSModule &module, uint8_t *pc)
+@@ -142,66 +274,88 @@ LookupHeapAccess(const AsmJSModule &module, uint8_t *pc)
# if defined(XP_WIN)
# include "jswin.h"
@@ -173,14 +173,12 @@
+# if defined(JS_CPU_X64)
+# if defined(__DragonFly__)
+# include <machine/npx.h> // for union savefpu
-+# elif defined(__FreeBSD__)
-+# include <machine/fpu.h> // for struct savefpu
++# elif defined(__FreeBSD__) || defined(__OpenBSD__)
++# include <machine/fpu.h> // for struct savefpu/fxsave64
+# endif
+# endif
+
-+# if defined(__OpenBSD__)
-+# define CONTEXT sigcontext_t
-+# elif !defined(XP_WIN)
++# if !defined(XP_WIN)
+# define CONTEXT ucontext_t
+# endif
Deleted: trunk/www/firefox-nightly/files/patch-media-libsydneyaudio-src-sydney_audio_oss.c
==============================================================================
--- trunk/www/firefox-nightly/files/patch-media-libsydneyaudio-src-sydney_audio_oss.c Wed Mar 20 17:03:55 2013 (r1216)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,13 +0,0 @@
---- media/libsydneyaudio/src/sydney_audio_oss.c~
-+++ media/libsydneyaudio/src/sydney_audio_oss.c
-@@ -446,6 +446,10 @@ static void audio_callback(void* data)
- printf("!"); /* not enough audio data */
- #endif
- bytes = bytes-bytes_to_copy;
-+ struct timespec ts = {0, 1000000};
-+ pthread_mutex_unlock(&s->mutex);
-+ nanosleep(&ts, NULL);
-+ pthread_mutex_lock(&s->mutex);
- break;
- }
- free(s->bl_head);
Modified: trunk/www/firefox/Makefile
==============================================================================
--- trunk/www/firefox/Makefile Tue Mar 19 21:48:38 2013 (r1216)
+++ trunk/www/firefox/Makefile Wed Mar 20 17:03:55 2013 (r1217)
@@ -2,7 +2,7 @@
# $FreeBSD: head/www/firefox/Makefile 310227 2013-01-11 10:22:40Z ehaupt $
PORTNAME= firefox
-DISTVERSION= 20.0b5
+DISTVERSION= 20.0b6
PORTEPOCH= 1
CATEGORIES= www ipv6
MASTER_SITES= ${MASTER_SITE_MOZILLA}
Modified: trunk/www/firefox/distinfo
==============================================================================
--- trunk/www/firefox/distinfo Tue Mar 19 21:48:38 2013 (r1216)
+++ trunk/www/firefox/distinfo Wed Mar 20 17:03:55 2013 (r1217)
@@ -1,2 +1,2 @@
-SHA256 (firefox-20.0b5.source.tar.bz2) = fcc417dc7cfe1429495c494f8d29e3518fc8ec5afb748701c1f28a8284c53673
-SIZE (firefox-20.0b5.source.tar.bz2) = 100157800
+SHA256 (firefox-20.0b6.source.tar.bz2) = 4e5bfe78a9969358c8714a7914e124aade5664d7a5964d3ee3606e12b0845e36
+SIZE (firefox-20.0b6.source.tar.bz2) = 99841370
More information about the freebsd-gecko
mailing list