forked from kiss-community/repo
testing: remove firefox-esr
This commit is contained in:
Dylan Araps
parent
884e59fe35
commit
4bc72ea2a8
@ -1,96 +0,0 @@
|
||||
#!/bin/sh -e
|
||||
|
||||
for patch in *.patch; do
|
||||
patch -p1 < "$patch"
|
||||
done
|
||||
|
||||
# Build autoconf 2.13 for Firefox's sole use.
|
||||
# See: https://bugzilla.mozilla.org/show_bug.cgi?id=104642
|
||||
(
|
||||
cd autoconf2.13
|
||||
|
||||
./configure \
|
||||
--prefix="$PWD/../junk" \
|
||||
--program-suffix=-2.13
|
||||
|
||||
make
|
||||
make install
|
||||
)
|
||||
|
||||
# Build yasm for Firefox's sole use.
|
||||
# Firefox is the only package which needs it
|
||||
# and upstream is kinda dead.
|
||||
(
|
||||
cd yasm
|
||||
|
||||
./configure \
|
||||
--prefix="$PWD/../junk"
|
||||
|
||||
make
|
||||
make install
|
||||
)
|
||||
export PATH="$PWD/junk/bin:$PATH"
|
||||
|
||||
mkdir -p build
|
||||
cd build
|
||||
|
||||
# Bypass 'ccache' as it's totally useless when building
|
||||
# Firefox and only slows things down.
|
||||
export CC="${CC:-/usr/bin/cc}"
|
||||
export CXX="${CXX:-/usr/bin/c++}"
|
||||
|
||||
export LDFLAGS="$LDFLAGS -Wl,-rpath=/usr/lib/firefox"
|
||||
export RUSTFLAGS="$RUSTFLAGS -Cdebuginfo=0"
|
||||
export MOZ_DEBUG_FLAGS=-g0
|
||||
export MOZ_NOSPAM=1
|
||||
|
||||
../configure \
|
||||
--prefix=/usr \
|
||||
--libdir=/usr/lib \
|
||||
--enable-official-branding \
|
||||
--enable-optimize="$CFLAGS -w" \
|
||||
--enable-install-strip \
|
||||
--enable-strip \
|
||||
--enable-rust-simd \
|
||||
--enable-application=browser \
|
||||
--enable-release \
|
||||
--enable-alsa \
|
||||
--without-system-nspr \
|
||||
--without-system-nss \
|
||||
--with-system-jpeg \
|
||||
--with-system-zlib \
|
||||
--with-system-png \
|
||||
--without-system-libvpx \
|
||||
--with-system-pixman \
|
||||
--with-system-ffi \
|
||||
--disable-profiling \
|
||||
--disable-accessibility \
|
||||
--disable-tests \
|
||||
--disable-system-extension-dirs \
|
||||
--disable-parental-controls \
|
||||
--disable-debug-symbols \
|
||||
--disable-callgrind \
|
||||
--disable-vtune \
|
||||
--disable-elf-hack \
|
||||
--disable-gold \
|
||||
--disable-jemalloc \
|
||||
--disable-pulseaudio \
|
||||
--disable-crashreporter \
|
||||
--disable-updater \
|
||||
--disable-dbus \
|
||||
--disable-eme \
|
||||
--disable-necko-wifi
|
||||
|
||||
make
|
||||
make DESTDIR="$1" install
|
||||
|
||||
# Remove a lot of uneeded "stuff".
|
||||
rm -rf "$1/usr/include"
|
||||
rm -rf "$1/usr/lib/firefox-devel"
|
||||
rm -rf "$1/usr/share/idl"
|
||||
rm -rf "$1/usr/lib/firefox/gtk2" # Drop GTK+2 runtime dependency.
|
||||
rm -f "$1/usr/lib/firefox/browser/features/fxmonitor@mozilla.org.xpi"
|
||||
rm -f "$1/usr/lib/firefox/browser/features/screenshots@mozilla.org.xpi"
|
||||
rm -f "$1/usr/lib/firefox/browser/features/webcompat-reporter@mozilla.org.xpi"
|
||||
rm -f "$1/usr/lib/firefox/browser/features/webcompat@mozilla.org.xpi"
|
||||
rm -f "$1/usr/lib/firefox/browser/features/doh-rollout@mozilla.org.xpi"
|
||||
@ -1,7 +0,0 @@
|
||||
85273e22d6c31ccd000d72af47530cea3dc52f63f06e53701d9c6c82f68f7bf7
|
||||
f0611136bee505811e9ca11ca7ac188ef5323a8e2ef19cffd3edb3cf08fd791e
|
||||
3dce6601b495f5b3d45b59f7d2492a340ee7e84b5beca17e48f862502bd5603f
|
||||
9b4c5c6bd57198abc4c846a1000603007f17e85577d861fd67ee11762a7c1c1b
|
||||
e2e423de86a6ee5fe559090dc48a5a411940ec310f5ee03d7c7266a0028d6177
|
||||
8d0ed41cc3b84cebd2946f80a493fb681df38ac83a2a3bb4d3e021ea363fc8bc
|
||||
644c15b00c0be72b5d7122fcf1c292653ff74c843e55c3ef9e57266a11d485c0
|
||||
@ -1,51 +0,0 @@
|
||||
alsa-lib
|
||||
atk
|
||||
bzip2
|
||||
cairo
|
||||
cbindgen make
|
||||
clang make
|
||||
expat
|
||||
ffmpeg
|
||||
fontconfig
|
||||
freetype-harfbuzz
|
||||
fribidi
|
||||
gdk-pixbuf
|
||||
glib
|
||||
gtk+2 make
|
||||
gtk+3
|
||||
libICE
|
||||
libSM
|
||||
libX11
|
||||
libXau
|
||||
libXcomposite
|
||||
libXcursor
|
||||
libXdamage
|
||||
libXext
|
||||
libXfixes
|
||||
libXi
|
||||
libXinerama
|
||||
libXrandr
|
||||
libXrender
|
||||
libXt
|
||||
libXxf86vm
|
||||
libdrm
|
||||
libepoxy
|
||||
libffi
|
||||
libjpeg-turbo
|
||||
libpng
|
||||
libvpx
|
||||
libxcb
|
||||
libxshmfence
|
||||
llvm make
|
||||
m4 make
|
||||
mesa
|
||||
nasm make
|
||||
nodejs make
|
||||
pango
|
||||
perl make
|
||||
pixman
|
||||
pkgconf make
|
||||
python make
|
||||
rust make
|
||||
zip make
|
||||
zlib
|
||||
@ -1,39 +0,0 @@
|
||||
From 63678ae69e03325d65255d29f1af4a6ea3dd354a Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Deutschmann <whissi@gentoo.org>
|
||||
Date: Sat, 10 Oct 2020 16:07:49 +0200
|
||||
Subject: [PATCH 36/38] bmo#1643201: Cherry-pick some servo changes to
|
||||
derive_common
|
||||
|
||||
Link: https://bugzilla.mozilla.org/show_bug.cgi?id=1663715#c7
|
||||
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
|
||||
---
|
||||
servo/components/derive_common/cg.rs | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/servo/components/derive_common/cg.rs b/servo/components/derive_common/cg.rs
|
||||
index 55a75398c7..c51c0d7750 100644
|
||||
--- a/servo/components/derive_common/cg.rs
|
||||
+++ b/servo/components/derive_common/cg.rs
|
||||
@@ -7,7 +7,7 @@ use proc_macro2::{Span, TokenStream};
|
||||
use quote::TokenStreamExt;
|
||||
use syn::{self, AngleBracketedGenericArguments, Binding, DeriveInput, Field};
|
||||
use syn::{GenericArgument, GenericParam, Ident, Path};
|
||||
-use syn::{PathArguments, PathSegment, QSelf, Type, TypeArray};
|
||||
+use syn::{PathArguments, PathSegment, QSelf, Type, TypeArray, TypeGroup};
|
||||
use syn::{TypeParam, TypeParen, TypePath, TypeSlice, TypeTuple};
|
||||
use syn::{Variant, WherePredicate};
|
||||
use synstructure::{self, BindStyle, BindingInfo, VariantAst, VariantInfo};
|
||||
@@ -208,6 +208,10 @@ where
|
||||
elem: Box::new(map_type_params(&inner.elem, params, f)),
|
||||
..inner.clone()
|
||||
}),
|
||||
+ Type::Group(ref inner) => Type::from(TypeGroup {
|
||||
+ elem: Box::new(map_type_params(&inner.elem, params, f)),
|
||||
+ ..inner.clone()
|
||||
+ }),
|
||||
ref ty => panic!("type {:?} cannot be mapped yet", ty),
|
||||
}
|
||||
}
|
||||
--
|
||||
2.28.0
|
||||
|
||||
@ -1,143 +0,0 @@
|
||||
From 23f22e9de6cc2236d58cc03997a1040e62c532e1 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Deutschmann <whissi@gentoo.org>
|
||||
Date: Sat, 10 Oct 2020 16:09:04 +0200
|
||||
Subject: [PATCH 37/38] bmo#1653339: Teach style_derive's map_type_params about
|
||||
mapping self correctly
|
||||
|
||||
Link: https://bugzilla.mozilla.org/show_bug.cgi?id=1663715#c7
|
||||
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
|
||||
---
|
||||
servo/components/derive_common/cg.rs | 30 +++++++++++--------
|
||||
.../style_derive/to_computed_value.rs | 4 ++-
|
||||
2 files changed, 21 insertions(+), 13 deletions(-)
|
||||
|
||||
diff --git a/servo/components/derive_common/cg.rs b/servo/components/derive_common/cg.rs
|
||||
index c51c0d7750..8abfd87149 100644
|
||||
--- a/servo/components/derive_common/cg.rs
|
||||
+++ b/servo/components/derive_common/cg.rs
|
||||
@@ -154,19 +154,19 @@ pub fn fmap_trait_output(input: &DeriveInput, trait_path: &Path, trait_output: &
|
||||
segment.into()
|
||||
}
|
||||
|
||||
-pub fn map_type_params<F>(ty: &Type, params: &[&TypeParam], f: &mut F) -> Type
|
||||
+pub fn map_type_params<F>(ty: &Type, params: &[&TypeParam], self_type: &Path, f: &mut F) -> Type
|
||||
where
|
||||
F: FnMut(&Ident) -> Type,
|
||||
{
|
||||
match *ty {
|
||||
Type::Slice(ref inner) => Type::from(TypeSlice {
|
||||
- elem: Box::new(map_type_params(&inner.elem, params, f)),
|
||||
+ elem: Box::new(map_type_params(&inner.elem, params, self_type, f)),
|
||||
..inner.clone()
|
||||
}),
|
||||
Type::Array(ref inner) => {
|
||||
//ref ty, ref expr) => {
|
||||
Type::from(TypeArray {
|
||||
- elem: Box::new(map_type_params(&inner.elem, params, f)),
|
||||
+ elem: Box::new(map_type_params(&inner.elem, params, self_type, f)),
|
||||
..inner.clone()
|
||||
})
|
||||
},
|
||||
@@ -175,7 +175,7 @@ where
|
||||
elems: inner
|
||||
.elems
|
||||
.iter()
|
||||
- .map(|ty| map_type_params(&ty, params, f))
|
||||
+ .map(|ty| map_type_params(&ty, params, self_type, f))
|
||||
.collect(),
|
||||
..inner.clone()
|
||||
}),
|
||||
@@ -187,10 +187,16 @@ where
|
||||
if params.iter().any(|ref param| ¶m.ident == ident) {
|
||||
return f(ident);
|
||||
}
|
||||
+ if ident == "Self" {
|
||||
+ return Type::from(TypePath {
|
||||
+ qself: None,
|
||||
+ path: self_type.clone(),
|
||||
+ });
|
||||
+ }
|
||||
}
|
||||
Type::from(TypePath {
|
||||
qself: None,
|
||||
- path: map_type_params_in_path(path, params, f),
|
||||
+ path: map_type_params_in_path(path, params, self_type, f),
|
||||
})
|
||||
},
|
||||
Type::Path(TypePath {
|
||||
@@ -198,25 +204,25 @@ where
|
||||
ref path,
|
||||
}) => Type::from(TypePath {
|
||||
qself: qself.as_ref().map(|qself| QSelf {
|
||||
- ty: Box::new(map_type_params(&qself.ty, params, f)),
|
||||
+ ty: Box::new(map_type_params(&qself.ty, params, self_type, f)),
|
||||
position: qself.position,
|
||||
..qself.clone()
|
||||
}),
|
||||
- path: map_type_params_in_path(path, params, f),
|
||||
+ path: map_type_params_in_path(path, params, self_type, f),
|
||||
}),
|
||||
Type::Paren(ref inner) => Type::from(TypeParen {
|
||||
- elem: Box::new(map_type_params(&inner.elem, params, f)),
|
||||
+ elem: Box::new(map_type_params(&inner.elem, params, self_type, f)),
|
||||
..inner.clone()
|
||||
}),
|
||||
Type::Group(ref inner) => Type::from(TypeGroup {
|
||||
- elem: Box::new(map_type_params(&inner.elem, params, f)),
|
||||
+ elem: Box::new(map_type_params(&inner.elem, params, self_type, f)),
|
||||
..inner.clone()
|
||||
}),
|
||||
ref ty => panic!("type {:?} cannot be mapped yet", ty),
|
||||
}
|
||||
}
|
||||
|
||||
-fn map_type_params_in_path<F>(path: &Path, params: &[&TypeParam], f: &mut F) -> Path
|
||||
+fn map_type_params_in_path<F>(path: &Path, params: &[&TypeParam], self_type: &Path, f: &mut F) -> Path
|
||||
where
|
||||
F: FnMut(&Ident) -> Type,
|
||||
{
|
||||
@@ -236,11 +242,11 @@ where
|
||||
.map(|arg| match arg {
|
||||
ty @ &GenericArgument::Lifetime(_) => ty.clone(),
|
||||
&GenericArgument::Type(ref data) => {
|
||||
- GenericArgument::Type(map_type_params(data, params, f))
|
||||
+ GenericArgument::Type(map_type_params(data, params, self_type, f))
|
||||
},
|
||||
&GenericArgument::Binding(ref data) => {
|
||||
GenericArgument::Binding(Binding {
|
||||
- ty: map_type_params(&data.ty, params, f),
|
||||
+ ty: map_type_params(&data.ty, params, self_type, f),
|
||||
..data.clone()
|
||||
})
|
||||
},
|
||||
diff --git a/servo/components/style_derive/to_computed_value.rs b/servo/components/style_derive/to_computed_value.rs
|
||||
index fe6bddb7ed..1dc422e2dd 100644
|
||||
--- a/servo/components/style_derive/to_computed_value.rs
|
||||
+++ b/servo/components/style_derive/to_computed_value.rs
|
||||
@@ -47,12 +47,15 @@ pub fn derive_to_value(
|
||||
cg::add_predicate(&mut where_clause, parse_quote!(#param: #trait_path));
|
||||
}
|
||||
|
||||
+ let computed_value_type = cg::fmap_trait_output(&input, &trait_path, &output_type_name);
|
||||
+
|
||||
let mut add_field_bound = |binding: &BindingInfo| {
|
||||
let ty = &binding.ast().ty;
|
||||
|
||||
let output_type = cg::map_type_params(
|
||||
ty,
|
||||
¶ms,
|
||||
+ &computed_value_type,
|
||||
&mut |ident| parse_quote!(<#ident as #trait_path>::#output_type_name),
|
||||
);
|
||||
|
||||
@@ -142,7 +145,6 @@ pub fn derive_to_value(
|
||||
|
||||
input.generics.where_clause = where_clause;
|
||||
let (impl_generics, ty_generics, where_clause) = input.generics.split_for_impl();
|
||||
- let computed_value_type = cg::fmap_trait_output(&input, &trait_path, &output_type_name);
|
||||
|
||||
let impl_ = trait_impl(from_body, to_body);
|
||||
|
||||
--
|
||||
2.28.0
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -1,359 +0,0 @@
|
||||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index b1fca7cbca..888dd6d3fd 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -111,25 +111,11 @@ dependencies = [
|
||||
"bitflags",
|
||||
]
|
||||
|
||||
-[[package]]
|
||||
-name = "audio_thread_priority"
|
||||
-version = "0.22.1"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "f8fba1500e466a39dd3faa5aed20a50dfe0aa1b905264a453bbe9f49508994cc"
|
||||
-dependencies = [
|
||||
- "cfg-if",
|
||||
- "dbus",
|
||||
- "libc",
|
||||
- "log",
|
||||
- "mach",
|
||||
- "winapi 0.3.7",
|
||||
-]
|
||||
|
||||
[[package]]
|
||||
name = "audioipc"
|
||||
version = "0.2.5"
|
||||
dependencies = [
|
||||
- "audio_thread_priority",
|
||||
"bincode",
|
||||
"bytes 0.4.9",
|
||||
"cc",
|
||||
@@ -156,7 +142,6 @@ dependencies = [
|
||||
name = "audioipc-client"
|
||||
version = "0.4.0"
|
||||
dependencies = [
|
||||
- "audio_thread_priority",
|
||||
"audioipc",
|
||||
"cubeb-backend",
|
||||
"futures 0.1.29",
|
||||
@@ -169,7 +154,6 @@ dependencies = [
|
||||
name = "audioipc-server"
|
||||
version = "0.2.3"
|
||||
dependencies = [
|
||||
- "audio_thread_priority",
|
||||
"audioipc",
|
||||
"cubeb-core",
|
||||
"error-chain",
|
||||
@@ -1890,7 +1874,6 @@ dependencies = [
|
||||
name = "gkrust-shared"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
- "audio_thread_priority",
|
||||
"audioipc-client",
|
||||
"audioipc-server",
|
||||
"authenticator",
|
||||
diff --git a/dom/ipc/ContentChild.cpp b/dom/ipc/ContentChild.cpp
|
||||
index 2fe91affcd..ae835b2c34 100644
|
||||
--- a/dom/ipc/ContentChild.cpp
|
||||
+++ b/dom/ipc/ContentChild.cpp
|
||||
@@ -111,9 +111,7 @@
|
||||
#include "GMPServiceChild.h"
|
||||
#include "nsIStringBundle.h"
|
||||
#include "Geolocation.h"
|
||||
-#include "audio_thread_priority.h"
|
||||
#include "nsIConsoleService.h"
|
||||
-#include "audio_thread_priority.h"
|
||||
#include "nsIURIMutator.h"
|
||||
#include "nsIInputStreamChannel.h"
|
||||
#include "nsFocusManager.h"
|
||||
@@ -1624,9 +1622,7 @@ mozilla::ipc::IPCResult ContentChild::RecvSetProcessSandbox(
|
||||
} else {
|
||||
// Pre-start audio before sandboxing; see bug 1443612.
|
||||
if (StaticPrefs::media_cubeb_sandbox()) {
|
||||
- if (atp_set_real_time_limit(0, 48000)) {
|
||||
NS_WARNING("could not set real-time limit at process startup");
|
||||
- }
|
||||
InstallSoftRealTimeLimitHandler();
|
||||
} else {
|
||||
Unused << CubebUtils::GetCubebContext();
|
||||
diff --git a/dom/media/GraphRunner.cpp b/dom/media/GraphRunner.cpp
|
||||
index 6ea8f2e9ca..51dba21d71 100644
|
||||
--- a/dom/media/GraphRunner.cpp
|
||||
+++ b/dom/media/GraphRunner.cpp
|
||||
@@ -13,7 +13,6 @@
|
||||
#include "nsISupportsPriority.h"
|
||||
#include "prthread.h"
|
||||
#include "Tracing.h"
|
||||
-#include "audio_thread_priority.h"
|
||||
|
||||
namespace mozilla {
|
||||
|
||||
@@ -95,8 +94,6 @@ auto GraphRunner::OneIteration(GraphTime aStateEnd, GraphTime aIterationEnd,
|
||||
}
|
||||
|
||||
NS_IMETHODIMP GraphRunner::Run() {
|
||||
- atp_handle* handle =
|
||||
- atp_promote_current_thread_to_real_time(0, mGraph->GraphRate());
|
||||
|
||||
nsCOMPtr<nsIThreadInternal> threadInternal = do_QueryInterface(mThread);
|
||||
threadInternal->SetObserver(mGraph);
|
||||
@@ -119,9 +116,6 @@ NS_IMETHODIMP GraphRunner::Run() {
|
||||
mMonitor.Notify();
|
||||
}
|
||||
|
||||
- if (handle) {
|
||||
- atp_demote_current_thread_from_real_time(handle);
|
||||
- }
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
diff --git a/dom/media/UnderrunHandlerLinux.cpp b/dom/media/UnderrunHandlerLinux.cpp
|
||||
index af5c84538e..9fecb5ebd2 100644
|
||||
--- a/dom/media/UnderrunHandlerLinux.cpp
|
||||
+++ b/dom/media/UnderrunHandlerLinux.cpp
|
||||
@@ -9,7 +9,6 @@
|
||||
|
||||
#include <mozilla/Sprintf.h>
|
||||
#include <mozilla/Atomics.h>
|
||||
-#include "audio_thread_priority.h"
|
||||
|
||||
namespace mozilla {
|
||||
|
||||
@@ -57,21 +56,8 @@ void InstallSoftRealTimeLimitHandler() {
|
||||
}
|
||||
|
||||
void DemoteThreadFromRealTime() {
|
||||
- atp_thread_info* info = atp_get_current_thread_info();
|
||||
- if (!info) {
|
||||
NS_WARNING("Could not get current thread info when demoting thread.");
|
||||
return;
|
||||
- }
|
||||
- int rv = atp_demote_thread_from_real_time(info);
|
||||
- if (rv) {
|
||||
- NS_WARNING("Could not demote thread from real-time.");
|
||||
- return;
|
||||
- }
|
||||
- rv = atp_free_thread_info(info);
|
||||
- if (rv) {
|
||||
- NS_WARNING("Could not free atp_thread_info struct");
|
||||
- }
|
||||
- gRealtimeLimitReached = false;
|
||||
}
|
||||
|
||||
} // namespace mozilla
|
||||
diff --git a/dom/media/moz.build b/dom/media/moz.build
|
||||
index c8dc9fe2d1..ae43f16fa3 100644
|
||||
--- a/dom/media/moz.build
|
||||
+++ b/dom/media/moz.build
|
||||
@@ -100,7 +100,6 @@ XPIDL_SOURCES += [
|
||||
XPIDL_MODULE = 'dom_media'
|
||||
|
||||
EXPORTS += [
|
||||
- '../../third_party/rust/audio_thread_priority/audio_thread_priority.h',
|
||||
'ADTSDecoder.h',
|
||||
'ADTSDemuxer.h',
|
||||
'AsyncLogger.h',
|
||||
diff --git a/media/audioipc/audioipc/Cargo.toml b/media/audioipc/audioipc/Cargo.toml
|
||||
index dfffa97f24..d9d2cf7d95 100644
|
||||
--- a/media/audioipc/audioipc/Cargo.toml
|
||||
+++ b/media/audioipc/audioipc/Cargo.toml
|
||||
@@ -19,7 +19,6 @@ serde = "1"
|
||||
serde_derive = "1"
|
||||
tokio = "0.1"
|
||||
tokio-io = "0.1"
|
||||
-audio_thread_priority = "0.22"
|
||||
|
||||
[target.'cfg(unix)'.dependencies]
|
||||
iovec = "0.1"
|
||||
diff --git a/media/audioipc/audioipc/src/messages.rs b/media/audioipc/audioipc/src/messages.rs
|
||||
index 9cda962e0e..37e6119b74 100644
|
||||
--- a/media/audioipc/audioipc/src/messages.rs
|
||||
+++ b/media/audioipc/audioipc/src/messages.rs
|
||||
@@ -5,8 +5,6 @@
|
||||
|
||||
use crate::PlatformHandle;
|
||||
use crate::PlatformHandleType;
|
||||
-#[cfg(target_os = "linux")]
|
||||
-use audio_thread_priority::RtPriorityThreadInfo;
|
||||
use cubeb::{self, ffi};
|
||||
use std::ffi::{CStr, CString};
|
||||
use std::os::raw::{c_char, c_int, c_uint};
|
||||
@@ -211,8 +209,6 @@ pub enum ServerMessage {
|
||||
StreamGetCurrentDevice(usize),
|
||||
StreamRegisterDeviceChangeCallback(usize, bool),
|
||||
|
||||
- #[cfg(target_os = "linux")]
|
||||
- PromoteThreadToRealTime([u8; std::mem::size_of::<RtPriorityThreadInfo>()]),
|
||||
}
|
||||
|
||||
// Server -> Client messages.
|
||||
@@ -243,8 +239,6 @@ pub enum ClientMessage {
|
||||
StreamCurrentDevice(Device),
|
||||
StreamRegisterDeviceChangeCallback,
|
||||
|
||||
- #[cfg(target_os = "linux")]
|
||||
- ThreadPromoted,
|
||||
|
||||
Error(c_int),
|
||||
}
|
||||
diff --git a/media/audioipc/client/Cargo.toml b/media/audioipc/client/Cargo.toml
|
||||
index 4a55c0162e..2fbccc05df 100644
|
||||
--- a/media/audioipc/client/Cargo.toml
|
||||
+++ b/media/audioipc/client/Cargo.toml
|
||||
@@ -9,7 +9,6 @@ description = "Cubeb Backend for talking to remote cubeb server."
|
||||
edition = "2018"
|
||||
|
||||
[dependencies]
|
||||
-audio_thread_priority = "0.22"
|
||||
audioipc = { path="../audioipc" }
|
||||
cubeb-backend = "0.7"
|
||||
futures = { version="0.1.18", default-features=false, features=["use_std"] }
|
||||
diff --git a/media/audioipc/client/src/context.rs b/media/audioipc/client/src/context.rs
|
||||
index 6b13900c54..87323508b8 100644
|
||||
--- a/media/audioipc/client/src/context.rs
|
||||
+++ b/media/audioipc/client/src/context.rs
|
||||
@@ -6,10 +6,6 @@
|
||||
use crate::stream;
|
||||
use crate::{assert_not_in_callback, run_in_callback};
|
||||
use crate::{ClientStream, AUDIOIPC_INIT_PARAMS};
|
||||
-#[cfg(target_os = "linux")]
|
||||
-use audio_thread_priority::get_current_thread_info;
|
||||
-#[cfg(not(target_os = "linux"))]
|
||||
-use audio_thread_priority::promote_current_thread_to_real_time;
|
||||
use audioipc::codec::LengthDelimitedCodec;
|
||||
use audioipc::frame::{framed, Framed};
|
||||
use audioipc::platformhandle_passing::{framed_with_platformhandles, FramedWithPlatformHandles};
|
||||
@@ -72,31 +68,6 @@ impl ClientContext {
|
||||
}
|
||||
}
|
||||
|
||||
-#[cfg(target_os = "linux")]
|
||||
-fn promote_thread(rpc: &rpc::ClientProxy<ServerMessage, ClientMessage>) {
|
||||
- match get_current_thread_info() {
|
||||
- Ok(info) => {
|
||||
- let bytes = info.serialize();
|
||||
- // Don't wait for the response, this is on the callback thread, which must not block.
|
||||
- rpc.call(ServerMessage::PromoteThreadToRealTime(bytes));
|
||||
- }
|
||||
- Err(_) => {
|
||||
- warn!("Could not remotely promote thread to RT.");
|
||||
- }
|
||||
- }
|
||||
-}
|
||||
-
|
||||
-#[cfg(not(target_os = "linux"))]
|
||||
-fn promote_thread(_rpc: &rpc::ClientProxy<ServerMessage, ClientMessage>) {
|
||||
- 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.");
|
||||
- }
|
||||
- }
|
||||
-}
|
||||
|
||||
fn register_thread(callback: Option<extern "C" fn(*const ::std::os::raw::c_char)>) {
|
||||
if let Some(func) = callback {
|
||||
@@ -116,7 +87,6 @@ fn promote_and_register_thread(
|
||||
rpc: &rpc::ClientProxy<ServerMessage, ClientMessage>,
|
||||
callback: Option<extern "C" fn(*const ::std::os::raw::c_char)>,
|
||||
) {
|
||||
- promote_thread(rpc);
|
||||
register_thread(callback);
|
||||
}
|
||||
|
||||
diff --git a/media/audioipc/server/Cargo.toml b/media/audioipc/server/Cargo.toml
|
||||
index 99afe54939..99a3440d33 100644
|
||||
--- a/media/audioipc/server/Cargo.toml
|
||||
+++ b/media/audioipc/server/Cargo.toml
|
||||
@@ -9,7 +9,6 @@ description = "Remote cubeb server"
|
||||
edition = "2018"
|
||||
|
||||
[dependencies]
|
||||
-audio_thread_priority = "0.22"
|
||||
audioipc = { path = "../audioipc" }
|
||||
cubeb-core = "0.7.0"
|
||||
futures = "0.1.29"
|
||||
diff --git a/media/audioipc/server/src/lib.rs b/media/audioipc/server/src/lib.rs
|
||||
index 4d49c8fc08..3c44ee3def 100644
|
||||
--- a/media/audioipc/server/src/lib.rs
|
||||
+++ b/media/audioipc/server/src/lib.rs
|
||||
@@ -9,7 +9,6 @@ extern crate error_chain;
|
||||
#[macro_use]
|
||||
extern crate log;
|
||||
|
||||
-use audio_thread_priority::promote_current_thread_to_real_time;
|
||||
use audioipc::core;
|
||||
use audioipc::platformhandle_passing::framed_with_platformhandles;
|
||||
use audioipc::rpc;
|
||||
@@ -64,12 +63,6 @@ fn run() -> Result<ServerWrapper> {
|
||||
let callback_thread = 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(())
|
||||
},
|
||||
diff --git a/media/audioipc/server/src/server.rs b/media/audioipc/server/src/server.rs
|
||||
index f07432f71f..b90e9d9be7 100644
|
||||
--- a/media/audioipc/server/src/server.rs
|
||||
+++ b/media/audioipc/server/src/server.rs
|
||||
@@ -3,8 +3,6 @@
|
||||
// This program is made available under an ISC-style license. See the
|
||||
// accompanying file LICENSE for details
|
||||
|
||||
-#[cfg(target_os = "linux")]
|
||||
-use audio_thread_priority::{promote_thread_to_real_time, RtPriorityThreadInfo};
|
||||
use audioipc;
|
||||
use audioipc::codec::LengthDelimitedCodec;
|
||||
use audioipc::frame::{framed, Framed};
|
||||
@@ -636,19 +634,6 @@ impl CubebServer {
|
||||
)
|
||||
.unwrap_or_else(error),
|
||||
|
||||
- #[cfg(target_os = "linux")]
|
||||
- ServerMessage::PromoteThreadToRealTime(thread_info) => {
|
||||
- let info = RtPriorityThreadInfo::deserialize(thread_info);
|
||||
- match promote_thread_to_real_time(info, 0, 48000) {
|
||||
- Ok(_) => {
|
||||
- info!("Promotion of content process thread to real-time OK");
|
||||
- }
|
||||
- Err(_) => {
|
||||
- warn!("Promotion of content process thread to real-time error");
|
||||
- }
|
||||
- }
|
||||
- ClientMessage::ThreadPromoted
|
||||
- }
|
||||
};
|
||||
|
||||
trace!("process_msg: req={:?}, resp={:?}", msg, resp);
|
||||
diff --git a/toolkit/library/rust/shared/Cargo.toml b/toolkit/library/rust/shared/Cargo.toml
|
||||
index 5fdb0eb2c0..d9bc0346cb 100644
|
||||
--- a/toolkit/library/rust/shared/Cargo.toml
|
||||
+++ b/toolkit/library/rust/shared/Cargo.toml
|
||||
@@ -41,7 +41,6 @@ storage = { path = "../../../../storage/rust" }
|
||||
bookmark_sync = { path = "../../../components/places/bookmark_sync", optional = true }
|
||||
shift_or_euc_c = "0.1.0"
|
||||
chardetng_c = "0.1.1"
|
||||
-audio_thread_priority = "0.22.1"
|
||||
mdns_service = { path="../../../../media/mtransport/mdns_service", optional = true }
|
||||
neqo_glue = { path = "../../../../netwerk/socket/neqo_glue" }
|
||||
rlbox_lucet_sandbox = { version = "0.1.0", optional = true }
|
||||
diff --git a/toolkit/library/rust/shared/lib.rs b/toolkit/library/rust/shared/lib.rs
|
||||
index 3285383a11..d228bc9bad 100644
|
||||
--- a/toolkit/library/rust/shared/lib.rs
|
||||
+++ b/toolkit/library/rust/shared/lib.rs
|
||||
@@ -51,7 +51,6 @@ extern crate xpcom;
|
||||
#[cfg(feature = "new_xulstore")]
|
||||
extern crate xulstore;
|
||||
|
||||
-extern crate audio_thread_priority;
|
||||
|
||||
#[cfg(not(target_os = "android"))]
|
||||
extern crate webext_storage_bridge;
|
||||
@ -1,7 +0,0 @@
|
||||
https://ftp.mozilla.org/pub/firefox/releases/78.3.0esr/source/firefox-78.3.0esr.source.tar.xz
|
||||
https://ftp.gnu.org/gnu/autoconf/autoconf-2.13.tar.gz autoconf2.13/
|
||||
https://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz yasm/
|
||||
patches/no-dbus.patch
|
||||
patches/0036-bmo-1643201-Cherry-pick-some-servo-changes-to-derive.patch
|
||||
patches/0037-bmo-1653339-Teach-style_derive-s-map_type_params-abo.patch
|
||||
patches/0038-bmo-1663715-Update-syn-and-proc-macro2-so-that-Firef.patch
|
||||
@ -1 +0,0 @@
|
||||
78.3.0esr 1
|
||||
Loading…
Reference in New Issue
Block a user