forked from kiss-community/repo
firefox: bump to 69.0.2
This commit is contained in:
Dylan Araps
parent
3afe4aa694
commit
a7e7f001cd
@ -1,4 +1,4 @@
|
||||
f5f2f592b8296812d43244d6a50c0c57ad11a5324db8e4e79749545482b79033 firefox-69.0.1.source.tar.xz
|
||||
2904ef954626d2a7f320670ccb7cb5d9060610f091c94190a6cbee14aa2cd82e firefox-69.0.2.source.tar.xz
|
||||
f0611136bee505811e9ca11ca7ac188ef5323a8e2ef19cffd3edb3cf08fd791e autoconf-2.13.tar.gz
|
||||
32a91ec1f74c99bc5e1ae369b6a1045390ee86bc73498c149dac1dc1eca3d937 user.js
|
||||
143c5f3348713eaa0850c9ba5b0233603a85764feda9fa5b267f9f4424d03f4c mozconfig
|
||||
@ -10,4 +10,4 @@ b19aaae7fc45db643f8d2540d96919c745ea341e36d9aea2df40e3e90eb951f0 fix-toolkit.pa
|
||||
e24f71a6a0d8d4637b2081780c66b01be4eeb4dd496031270d0ae0b898be94d2 fix-tools.patch
|
||||
5e0fcfde375837074baad21a8ab26aa442a7940617ebd074a6b238a48f2ceb63 fix-webrtc-glibcisms.patch
|
||||
1d4a8f110d34da478f5597727eda9acacebd443dd86cce5bb64f898c01feabce mallinfo.patch
|
||||
5b0c8ca11cf2d461433f0fc96773ea99a2efea22892f970b1247ee17d230f4be firefox-69-no-dbus.patch
|
||||
143171921ef5d12c5258aa49f9500e6e260890b160ee822beb3933f099262def firefox-69.0.2-no-dbus.patch
|
||||
|
||||
@ -135,35 +135,8 @@ index 90fa464f2a..60039f3117 100644
|
||||
-audio_thread_priority = "0.15.0"
|
||||
lazy_static = "1.2.0"
|
||||
cfg-if = "0.1.0"
|
||||
diff --git a/media/audioipc/client/src/context.rs b/media/audioipc/client/src/context.rs
|
||||
index 6c959d4fac..e04a28e890 100644
|
||||
--- a/media/audioipc/client/src/context.rs
|
||||
+++ b/media/audioipc/client/src/context.rs
|
||||
@@ -4,7 +4,6 @@
|
||||
// accompanying file LICENSE for details
|
||||
|
||||
use assert_not_in_callback;
|
||||
-use audio_thread_priority::promote_current_thread_to_real_time;
|
||||
use audioipc::codec::LengthDelimitedCodec;
|
||||
use audioipc::platformhandle_passing::{framed_with_platformhandles, FramedWithPlatformHandles};
|
||||
use audioipc::{core, rpc};
|
||||
@@ -86,14 +85,6 @@ fn open_server_stream() -> Result<audioipc::MessageStream> {
|
||||
}
|
||||
|
||||
fn register_thread(callback: Option<extern "C" fn(*const ::std::os::raw::c_char)>) {
|
||||
- match promote_current_thread_to_real_time(0, 48000) {
|
||||
- Ok(_) => {
|
||||
- info!("Audio thread promoted to real-time.");
|
||||
- }
|
||||
- Err(_) => {
|
||||
- warn!("Could not promote thread to real-time.");
|
||||
- }
|
||||
- }
|
||||
if let Some(func) = callback {
|
||||
let thr = thread::current();
|
||||
let name = CString::new(thr.name().unwrap()).unwrap();
|
||||
diff --git a/media/audioipc/client/src/lib.rs b/media/audioipc/client/src/lib.rs
|
||||
index 302ca87a91..9b30a2643e 100644
|
||||
index 848559607b..9b30a2643e 100644
|
||||
--- a/media/audioipc/client/src/lib.rs
|
||||
+++ b/media/audioipc/client/src/lib.rs
|
||||
@@ -14,7 +14,6 @@ extern crate libc;
|
||||
@ -174,7 +147,7 @@ index 302ca87a91..9b30a2643e 100644
|
||||
#[macro_use]
|
||||
extern crate lazy_static;
|
||||
#[macro_use]
|
||||
@@ -32,13 +31,11 @@ use std::os::raw::{c_char, c_int};
|
||||
@@ -32,7 +31,6 @@ use std::os::raw::{c_char, c_int};
|
||||
use stream::ClientStream;
|
||||
use std::sync::{Mutex};
|
||||
use futures_cpupool::CpuPool;
|
||||
@ -182,13 +155,7 @@ index 302ca87a91..9b30a2643e 100644
|
||||
cfg_if! {
|
||||
if #[cfg(target_os = "linux")] {
|
||||
use std::sync::{Arc, Condvar};
|
||||
use std::ffi::CString;
|
||||
use std::thread;
|
||||
- use audio_thread_priority::promote_current_thread_to_real_time;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -46,7 +43,6 @@ type InitParamsTls = std::cell::RefCell<Option<CpuPoolInitParams>>;
|
||||
@@ -45,7 +43,6 @@ type InitParamsTls = std::cell::RefCell<Option<CpuPoolInitParams>>;
|
||||
|
||||
thread_local!(static IN_CALLBACK: std::cell::RefCell<bool> = std::cell::RefCell::new(false));
|
||||
thread_local!(static CPUPOOL_INIT_PARAMS: InitParamsTls = std::cell::RefCell::new(None));
|
||||
@ -196,23 +163,6 @@ index 302ca87a91..9b30a2643e 100644
|
||||
|
||||
lazy_static! {
|
||||
static ref G_THREAD_POOL: Mutex<Option<CpuPool>> = Mutex::new(None);
|
||||
@@ -119,16 +115,6 @@ cfg_if! {
|
||||
|
||||
let register_thread = move || {
|
||||
if let Some(func) = thread_create_callback {
|
||||
- match promote_current_thread_to_real_time(0, 48000) {
|
||||
- Ok(handle) => {
|
||||
- G_PRIORITY_HANDLES.with(|handles| {
|
||||
- (handles.borrow_mut()).push(handle);
|
||||
- });
|
||||
- }
|
||||
- Err(_) => {
|
||||
- warn!("Could not promote audio threads to real-time during initialization.");
|
||||
- }
|
||||
- }
|
||||
let thr = thread::current();
|
||||
let name = CString::new(thr.name().unwrap()).unwrap();
|
||||
func(name.as_ptr());
|
||||
diff --git a/media/audioipc/server/Cargo.toml b/media/audioipc/server/Cargo.toml
|
||||
index 8daa952823..62b6d838ea 100644
|
||||
--- a/media/audioipc/server/Cargo.toml
|
||||
@ -226,7 +176,7 @@ index 8daa952823..62b6d838ea 100644
|
||||
[dependencies.error-chain]
|
||||
version = "0.11.0"
|
||||
diff --git a/media/audioipc/server/src/lib.rs b/media/audioipc/server/src/lib.rs
|
||||
index eff54e6bb6..df1a6a3396 100644
|
||||
index 776c6e5000..df1a6a3396 100644
|
||||
--- a/media/audioipc/server/src/lib.rs
|
||||
+++ b/media/audioipc/server/src/lib.rs
|
||||
@@ -18,7 +18,6 @@ extern crate libc;
|
||||
@ -237,27 +187,6 @@ index eff54e6bb6..df1a6a3396 100644
|
||||
|
||||
use audioipc::core;
|
||||
use audioipc::platformhandle_passing::framed_with_platformhandles;
|
||||
@@ -29,7 +28,6 @@ use futures::Future;
|
||||
use std::error::Error;
|
||||
use std::os::raw::c_void;
|
||||
use std::ptr;
|
||||
-use audio_thread_priority::promote_current_thread_to_real_time;
|
||||
|
||||
mod server;
|
||||
|
||||
@@ -59,12 +57,6 @@ fn run() -> Result<ServerWrapper> {
|
||||
|
||||
let callback_thread = try!(
|
||||
core::spawn_thread("AudioIPC Callback RPC", || {
|
||||
- match promote_current_thread_to_real_time(0, 48000) {
|
||||
- Ok(_) => { }
|
||||
- Err(_) => {
|
||||
- debug!("Failed to promote audio callback thread to real-time.");
|
||||
- }
|
||||
- }
|
||||
trace!("Starting up cubeb audio callback event loop thread...");
|
||||
Ok(())
|
||||
}).or_else(|e| {
|
||||
diff --git a/toolkit/library/rust/shared/Cargo.toml b/toolkit/library/rust/shared/Cargo.toml
|
||||
index c659552cdc..71b9d64942 100644
|
||||
--- a/toolkit/library/rust/shared/Cargo.toml
|
||||
@ -1,4 +1,4 @@
|
||||
https://archive.mozilla.org/pub/firefox/candidates/69.0.1-candidates/build1/source/firefox-69.0.1.source.tar.xz firefox/
|
||||
https://archive.mozilla.org/pub/firefox/candidates/69.0.2-candidates/build1/source/firefox-69.0.2.source.tar.xz firefox/
|
||||
https://ftp.gnu.org/gnu/autoconf/autoconf-2.13.tar.gz autoconf2.13/
|
||||
https://raw.githubusercontent.com/ghacksuserjs/ghacks-user.js/335299a0cfc083e86e1b88e849999b5daffd5a58/user.js firefox/
|
||||
files/mozconfig firefox/
|
||||
@ -10,4 +10,4 @@ patches/fix-toolkit.patch firefox/
|
||||
patches/fix-tools.patch firefox/
|
||||
patches/fix-webrtc-glibcisms.patch firefox/
|
||||
patches/mallinfo.patch firefox/
|
||||
patches/firefox-69-no-dbus.patch firefox/
|
||||
patches/firefox-69.0.2-no-dbus.patch firefox/
|
||||
|
||||
@ -1 +1 @@
|
||||
69.0.1 1
|
||||
69.0.2 1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user