bonsai/repo
4
0
Fork 0
forked from kiss-community/repo
Code Issues 28 Pull Requests 2 Projects Releases Activity

various: move

Browse Source 
- remove firefox-esr for now
- move pixman to extra
- move libxkbcommon to extra
This commit is contained in:
Dylan Araps 2021-07-01 12:39:23 +00:00
parent 5e4c797a07
commit a81b073a03
No known key found for this signature in database
GPG Key ID: 13295DAC2CF13B5C
16 changed files with 0 additions and 2077 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

142
extra/firefox-esr/build
View File

@ -1,142 +0,0 @@
#!/bin/sh -e
for patch in *.patch; do
patch -p1 < "$patch"
done
# Update some crates which cause build failure with the latest
# Rust version (1.47.0). Fixes not backported to this ESR.
# This avoids patching 100 or so files which is just unreasonable.
# See: https://github.com/rust-lang/rust/issues/76482
# https://github.com/rust-lang/rust/issues/76480
# https://phabricator.services.mozilla.com/D89473
# https://hg.mozilla.org/mozilla-central/rev/281a323cde5f
# https://hg.mozilla.org/mozilla-central/rev/da77d5528a08
# https://bugzilla.mozilla.org/show_bug.cgi?id=1663715
# https://bugzilla.mozilla.org/show_bug.cgi?id=1670579
(
cd third_party/rust
for crate in *.crate; do
crate_name=${crate%-*}
crate_ver=${crate##*-}
crate_ver=${crate_ver%%.crate}
# Remove the pre-existing crate's files.
rm -rf "$crate_name"
# Add the updated crate's files.
tar xf "$crate"
# Rename <crate_name>-<crate_ver> to <crate_name>
mv -f "${crate%%.crate}" "$crate_name"
# Generate checksums.
sha256=$(sha256sum "$crate")
sha256=${sha256%% *}
# Create .cargo-checksum.json to appease tooling.
printf '{"package":"%s","files":{}}\n' "$sha256" \
> "$crate_name/.cargo-checksum.json"
# Update root Cargo.lock to reflect changes.
sed -i "/name = \"$crate_name\"/ {
N
s/version = \".*\"/version = \"$crate_ver\"/
N
N
s/checksum = \".*\"/checksum = \"$sha256\"/
}" ../../Cargo.lock
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"

7
extra/firefox-esr/checksums
View File

@ -1,7 +0,0 @@
51f54ff608aa09de07b304307581ae89112781597322b8999b3099cfabf48290
f0611136bee505811e9ca11ca7ac188ef5323a8e2ef19cffd3edb3cf08fd791e
3dce6601b495f5b3d45b59f7d2492a340ee7e84b5beca17e48f862502bd5603f
9b4c5c6bd57198abc4c846a1000603007f17e85577d861fd67ee11762a7c1c1b
5506dc04d46b55e0ce91ae663c9ed13b89e20bfcb53c84989dccf9ff551e8de3
963f7d3cc59b59b9325165add223142bbf1df27655d07789f109896d353d8350
175c513d55719db99da20232b06cda8bab6b83ec2d04e3283edf0213c37c1a29

50
extra/firefox-esr/depends
View File

@ -1,50 +0,0 @@
alsa-lib
atk
bzip2
cairo
cbindgen make
clang make
expat
ffmpeg
fontconfig
freetype-harfbuzz
fribidi
gdk-pixbuf
glib
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

359
extra/firefox-esr/patches/no-dbus.patch
View File

@ -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;

1508
extra/firefox-esr/patches/no-gtk2.patch
View File

File diff suppressed because it is too large Load Diff

10
extra/firefox-esr/sources
View File

@ -1,10 +0,0 @@
https://ftp.mozilla.org/pub/firefox/releases/78.5.0esr/source/firefox-78.5.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/no-gtk2.patch
# Temporary crate updates to fix issues with Rust 1.47.0.
# See the build file for more information.
https://static.crates.io/crates/syn/syn-1.0.40.crate third_party/rust
https://static.crates.io/crates/proc-macro2/proc-macro2-1.0.20.crate third_party/rust

1
extra/firefox-esr/version
View File

@ -1 +0,0 @@
78.5.0esr 1

0
xorg/libxkbcommon/build → extra/libxkbcommon/build
View File

0
xorg/libxkbcommon/checksums → extra/libxkbcommon/checksums
View File

0
xorg/libxkbcommon/depends → extra/libxkbcommon/depends
View File

0
xorg/libxkbcommon/sources → extra/libxkbcommon/sources
View File

0
xorg/libxkbcommon/version → extra/libxkbcommon/version
View File

0
xorg/pixman/build → extra/pixman/build
View File

0
xorg/pixman/checksums → extra/pixman/checksums
View File

0
xorg/pixman/sources → extra/pixman/sources
View File

0
xorg/pixman/version → extra/pixman/version
View File