import firefox-91.4.0-1.el8
This commit is contained in:
CentOS Sources
Stepan Oksanichenko
parent
8090f9328b
commit
dd3f0d7a06
@ -1,11 +1,5 @@
|
|||||||
18a8f30a0356c751b8d0ea6f76e764cab13ee046 SOURCES/Python-2.7.13.tar.xz
|
c822547dbc12e2baebdfdfb38b665e23f0c2513a SOURCES/cbindgen-vendor.tar.xz
|
||||||
a9effcc06cf80eaa22f12c1f7d6aa4266a1c4966 SOURCES/cbindgen-vendor-0.14.3.tar.xz
|
322e0ffb8b442f599b0f5dd695e6f83050b3dc82 SOURCES/firefox-91.4.0esr.processed-source.tar.xz
|
||||||
0da70b30de24716246dd090cf4b3245c91c5931c SOURCES/firefox-78.13.0esr.source.tar.xz
|
74a1b8c9a5f4a96f80af2d3fe542495e3af2423a SOURCES/firefox-langpacks-91.4.0esr-20211201.tar.xz
|
||||||
140765234e3d4340710e09632d9af4a88ea10ba7 SOURCES/firefox-langpacks-78.13.0esr-20210805.tar.xz
|
b5fd1332d8e0d37339ae170c7bebcb63a40b22e0 SOURCES/nspr-4.32.0-1.el8_1.src.rpm
|
||||||
0de63f863b158454b9429234b52ed28a397ec45c SOURCES/gtk3-private-3.22.26-1.el6.src.rpm
|
8fff814901e03c2518ede2f8992d898f5ba61ed9 SOURCES/nss-3.67.0-7.el8_1.src.rpm
|
||||||
e188ab1a444697bc649e223c28389d82ca94c472 SOURCES/libffi-3.0.13-18.el7_3.src.rpm
|
|
||||||
5715f987bc0024ce5d72993cb101b8268350033b SOURCES/nodejs-10.21.0-5.fc32.src.rpm
|
|
||||||
07d67c90367c3ec0d6cebc1a5793c21076d34b78 SOURCES/nspr-4.25.0-1.el8_0.src.rpm
|
|
||||||
223c02166b1cb9863b9f453ef687d7805a93e7af SOURCES/nss-3.53.1-3.fc32.src.rpm
|
|
||||||
a379070abf5000cde61411c97af7e733b267a4d3 SOURCES/openssl-1.0.2k-19.6.bundle.el7_7.src.rpm
|
|
||||||
77fd30f7ebc12a629a31c1e252cec06af55a71fe SOURCES/yasm-1.2.0-3.el5.src.rpm
|
|
||||||
|
|||||||
16
.gitignore
vendored
16
.gitignore
vendored
@ -1,11 +1,5 @@
|
|||||||
SOURCES/Python-2.7.13.tar.xz
|
SOURCES/cbindgen-vendor.tar.xz
|
||||||
SOURCES/cbindgen-vendor-0.14.3.tar.xz
|
SOURCES/firefox-91.4.0esr.processed-source.tar.xz
|
||||||
SOURCES/firefox-78.13.0esr.source.tar.xz
|
SOURCES/firefox-langpacks-91.4.0esr-20211201.tar.xz
|
||||||
SOURCES/firefox-langpacks-78.13.0esr-20210805.tar.xz
|
SOURCES/nspr-4.32.0-1.el8_1.src.rpm
|
||||||
SOURCES/gtk3-private-3.22.26-1.el6.src.rpm
|
SOURCES/nss-3.67.0-7.el8_1.src.rpm
|
||||||
SOURCES/libffi-3.0.13-18.el7_3.src.rpm
|
|
||||||
SOURCES/nodejs-10.21.0-5.fc32.src.rpm
|
|
||||||
SOURCES/nspr-4.25.0-1.el8_0.src.rpm
|
|
||||||
SOURCES/nss-3.53.1-3.fc32.src.rpm
|
|
||||||
SOURCES/openssl-1.0.2k-19.6.bundle.el7_7.src.rpm
|
|
||||||
SOURCES/yasm-1.2.0-3.el5.src.rpm
|
|
||||||
|
|||||||
@ -1,24 +1,24 @@
|
|||||||
diff -up firefox-78.9.0/widget/gtk/nsWindow.cpp.D110204-fscreen firefox-78.9.0/widget/gtk/nsWindow.cpp
|
diff -up firefox-91.0/widget/gtk/nsWindow.cpp.D110204-fscreen.diff firefox-91.0/widget/gtk/nsWindow.cpp
|
||||||
--- firefox-78.9.0/widget/gtk/nsWindow.cpp.D110204-fscreen 2021-03-30 13:28:56.212009697 +0200
|
--- firefox-91.0/widget/gtk/nsWindow.cpp.D110204-fscreen.diff 2021-07-27 23:31:38.000000000 +0200
|
||||||
+++ firefox-78.9.0/widget/gtk/nsWindow.cpp 2021-03-30 13:37:41.925850585 +0200
|
+++ firefox-91.0/widget/gtk/nsWindow.cpp 2021-07-30 15:47:22.031795569 +0200
|
||||||
@@ -139,6 +139,7 @@ using namespace mozilla::widget;
|
@@ -91,6 +91,7 @@
|
||||||
|
#include "SystemTimeConverter.h"
|
||||||
#include <dlfcn.h>
|
#include "WidgetUtilsGtk.h"
|
||||||
#include "nsPresContext.h"
|
#include "mozilla/X11Util.h"
|
||||||
+#include "nsIBrowserHandler.h"
|
+#include "nsIBrowserHandler.h"
|
||||||
|
|
||||||
using namespace mozilla;
|
#ifdef ACCESSIBILITY
|
||||||
using namespace mozilla::gfx;
|
# include "mozilla/a11y/LocalAccessible.h"
|
||||||
@@ -416,6 +417,7 @@ nsWindow::nsWindow() {
|
@@ -441,6 +442,7 @@ nsWindow::nsWindow()
|
||||||
mRetryPointerGrab = false;
|
mHasMappedToplevel(false),
|
||||||
mWindowType = eWindowType_child;
|
mRetryPointerGrab(false),
|
||||||
mSizeState = nsSizeMode_Normal;
|
mSizeState(nsSizeMode_Normal),
|
||||||
+ mPendingFullscreen = false;
|
+ mPendingFullscreen(false),
|
||||||
mBoundsAreValid = true;
|
mAspectRatio(0.0f),
|
||||||
mAspectRatio = 0.0f;
|
mAspectRatioSaved(0.0f),
|
||||||
mAspectRatioSaved = 0.0f;
|
mLastScrollEventTime(GDK_CURRENT_TIME),
|
||||||
@@ -3887,6 +3889,19 @@ void nsWindow::OnWindowStateEvent(GtkWid
|
@@ -4626,6 +4628,19 @@ void nsWindow::OnWindowStateEvent(GtkWid
|
||||||
}
|
ClearTransparencyBitmap();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+
|
+
|
||||||
@ -36,8 +36,8 @@ diff -up firefox-78.9.0/widget/gtk/nsWindow.cpp.D110204-fscreen firefox-78.9.0/w
|
|||||||
+ }
|
+ }
|
||||||
}
|
}
|
||||||
|
|
||||||
void nsWindow::ThemeChanged() {
|
void nsWindow::OnDPIChanged() {
|
||||||
@@ -6010,6 +6025,19 @@ nsresult nsWindow::MakeFullScreen(bool a
|
@@ -6880,6 +6895,19 @@ nsresult nsWindow::MakeFullScreen(bool a
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -57,14 +57,14 @@ diff -up firefox-78.9.0/widget/gtk/nsWindow.cpp.D110204-fscreen firefox-78.9.0/w
|
|||||||
gtk_window_fullscreen(GTK_WINDOW(mShell));
|
gtk_window_fullscreen(GTK_WINDOW(mShell));
|
||||||
} else {
|
} else {
|
||||||
mSizeMode = mLastSizeMode;
|
mSizeMode = mLastSizeMode;
|
||||||
diff -up firefox-78.9.0/widget/gtk/nsWindow.h.D110204-fscreen firefox-78.9.0/widget/gtk/nsWindow.h
|
diff -up firefox-91.0/widget/gtk/nsWindow.h.D110204-fscreen.diff firefox-91.0/widget/gtk/nsWindow.h
|
||||||
--- firefox-78.9.0/widget/gtk/nsWindow.h.D110204-fscreen 2021-03-15 16:52:42.000000000 +0100
|
--- firefox-91.0/widget/gtk/nsWindow.h.D110204-fscreen.diff 2021-07-27 23:31:38.000000000 +0200
|
||||||
+++ firefox-78.9.0/widget/gtk/nsWindow.h 2021-03-30 13:28:56.237009784 +0200
|
+++ firefox-91.0/widget/gtk/nsWindow.h 2021-07-29 18:35:41.000639386 +0200
|
||||||
@@ -703,6 +703,7 @@ class nsWindow final : public nsBaseWidg
|
@@ -763,6 +763,7 @@ class nsWindow final : public nsBaseWidg
|
||||||
nsRect mPreferredPopupRect;
|
* move-to-rect callback we store it to mNewSizeAfterMoveToRect.
|
||||||
bool mPreferredPopupRectFlushed;
|
*/
|
||||||
bool mWaitingForMoveToRectCB;
|
bool mWaitingForMoveToRectCallback;
|
||||||
+ bool mPendingFullscreen;
|
+ bool mPendingFullscreen;
|
||||||
LayoutDeviceIntRect mPendingSizeRect;
|
LayoutDeviceIntRect mNewSizeAfterMoveToRect;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -1,681 +0,0 @@
|
|||||||
--- firefox-78.9.0/Cargo.lock.D87019-thin-vec-big-endian.diff 2021-03-18 15:53:29.520861862 +0100
|
|
||||||
+++ firefox-78.9.0/Cargo.lock 2021-03-18 15:56:14.193397228 +0100
|
|
||||||
@@ -4792,9 +4792,9 @@ checksum = "8eaa81235c7058867fa8c0e7314f
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "thin-vec"
|
|
||||||
-version = "0.1.2"
|
|
||||||
+version = "0.2.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
-checksum = "3a93c9ade36a827a69257925808463db46ffcf193442fad01eb9bdc1d31aed81"
|
|
||||||
+checksum = "dcc760ada4a9f56fc6d0e81bd143984ebc7bb1b875a6891aa2fa613ca7394fc0"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "thiserror"
|
|
||||||
--- firefox-78.9.0/gfx/webrender_bindings/Cargo.toml.D87019-thin-vec-big-endian.diff 2021-03-15 16:52:33.000000000 +0100
|
|
||||||
+++ firefox-78.9.0/gfx/webrender_bindings/Cargo.toml 2021-03-18 15:53:29.522861856 +0100
|
|
||||||
@@ -20,7 +20,7 @@ nsstring = { path = "../../xpcom/rust/ns
|
|
||||||
bincode = "1.0"
|
|
||||||
uuid = { version = "0.8", features = ["v4"] }
|
|
||||||
fxhash = "0.2.1"
|
|
||||||
-thin-vec = { version = "0.1.0", features = ["gecko-ffi"] }
|
|
||||||
+thin-vec = { version = "0.2.1", features = ["gecko-ffi"] }
|
|
||||||
swgl = { path = "../wr/swgl" }
|
|
||||||
|
|
||||||
[dependencies.webrender]
|
|
||||||
--- firefox-78.9.0/intl/l10n/rust/fluent-ffi/Cargo.toml.D87019-thin-vec-big-endian.diff 2021-03-15 16:52:33.000000000 +0100
|
|
||||||
+++ firefox-78.9.0/intl/l10n/rust/fluent-ffi/Cargo.toml 2021-03-18 15:53:29.524861850 +0100
|
|
||||||
@@ -10,4 +10,4 @@ fluent-pseudo = "0.2"
|
|
||||||
intl-memoizer = "0.4"
|
|
||||||
unic-langid = "0.8"
|
|
||||||
nsstring = { path = "../../../../xpcom/rust/nsstring" }
|
|
||||||
-thin-vec = { version = "0.1.0", features = ["gecko-ffi"] }
|
|
||||||
+thin-vec = { version = "0.2.1", features = ["gecko-ffi"] }
|
|
||||||
--- firefox-78.9.0/intl/locale/rust/fluent-langneg-ffi/Cargo.toml.D87019-thin-vec-big-endian.diff 2021-03-15 16:52:33.000000000 +0100
|
|
||||||
+++ firefox-78.9.0/intl/locale/rust/fluent-langneg-ffi/Cargo.toml 2021-03-18 15:53:29.525861847 +0100
|
|
||||||
@@ -9,7 +9,7 @@ edition = "2018"
|
|
||||||
nserror = { path = "../../../../xpcom/rust/nserror" }
|
|
||||||
nsstring = { path = "../../../../xpcom/rust/nsstring" }
|
|
||||||
xpcom = { path = "../../../../xpcom/rust/xpcom" }
|
|
||||||
-thin-vec = { version = "0.1.0", features = ["gecko-ffi"] }
|
|
||||||
+thin-vec = { version = "0.2.1", features = ["gecko-ffi"] }
|
|
||||||
fluent-langneg = { version = "0.12.1", features = ["cldr"] }
|
|
||||||
unic-langid = "0.8"
|
|
||||||
unic-langid-ffi = { path = "../unic-langid-ffi" }
|
|
||||||
--- firefox-78.9.0/intl/locale/rust/unic-langid-ffi/Cargo.toml.D87019-thin-vec-big-endian.diff 2021-03-15 16:52:33.000000000 +0100
|
|
||||||
+++ firefox-78.9.0/intl/locale/rust/unic-langid-ffi/Cargo.toml 2021-03-18 15:53:29.526861844 +0100
|
|
||||||
@@ -9,5 +9,5 @@ edition = "2018"
|
|
||||||
nserror = { path = "../../../../xpcom/rust/nserror" }
|
|
||||||
nsstring = { path = "../../../../xpcom/rust/nsstring" }
|
|
||||||
xpcom = { path = "../../../../xpcom/rust/xpcom" }
|
|
||||||
-thin-vec = { version = "0.1.0", features = ["gecko-ffi"] }
|
|
||||||
+thin-vec = { version = "0.2.1", features = ["gecko-ffi"] }
|
|
||||||
unic-langid = { version = "0.8", features = ["likelysubtags"] }
|
|
||||||
--- firefox-78.9.0/netwerk/socket/neqo_glue/Cargo.toml.D87019-thin-vec-big-endian.diff 2021-03-15 16:52:37.000000000 +0100
|
|
||||||
+++ firefox-78.9.0/netwerk/socket/neqo_glue/Cargo.toml 2021-03-18 15:53:29.527861842 +0100
|
|
||||||
@@ -14,7 +14,7 @@ neqo-common = { tag = "v0.2.4", git = "h
|
|
||||||
nserror = { path = "../../../xpcom/rust/nserror" }
|
|
||||||
nsstring = { path = "../../../xpcom/rust/nsstring" }
|
|
||||||
xpcom = { path = "../../../xpcom/rust/xpcom" }
|
|
||||||
-thin-vec = { version = "0.1.0", features = ["gecko-ffi"] }
|
|
||||||
+thin-vec = { version = "0.2.1", features = ["gecko-ffi"] }
|
|
||||||
|
|
||||||
[dependencies.neqo-crypto]
|
|
||||||
tag = "v0.2.4"
|
|
||||||
--- firefox-78.9.0/security/manager/ssl/cert_storage/Cargo.toml.D87019-thin-vec-big-endian.diff 2021-03-15 16:52:37.000000000 +0100
|
|
||||||
+++ firefox-78.9.0/security/manager/ssl/cert_storage/Cargo.toml 2021-03-18 15:53:29.528861839 +0100
|
|
||||||
@@ -18,6 +18,6 @@ rust_cascade = "0.6.0"
|
|
||||||
sha2 = "^0.8"
|
|
||||||
storage_variant = { path = "../../../../storage/variant" }
|
|
||||||
tempfile = "3"
|
|
||||||
-thin-vec = { version = "0.1.0", features = ["gecko-ffi"] }
|
|
||||||
+thin-vec = { version = "0.2.1", features = ["gecko-ffi"] }
|
|
||||||
time = "0.1"
|
|
||||||
xpcom = { path = "../../../../xpcom/rust/xpcom" }
|
|
||||||
--- firefox-78.9.0/services/fxaccounts/rust-bridge/firefox-accounts-bridge/Cargo.toml.D87019-thin-vec-big-endian.diff 2021-03-15 16:52:38.000000000 +0100
|
|
||||||
+++ firefox-78.9.0/services/fxaccounts/rust-bridge/firefox-accounts-bridge/Cargo.toml 2021-03-18 15:53:29.528861839 +0100
|
|
||||||
@@ -20,5 +20,5 @@ nserror = { path = "../../../../xpcom/ru
|
|
||||||
nsstring = { path = "../../../../xpcom/rust/nsstring" }
|
|
||||||
xpcom = { path = "../../../../xpcom/rust/xpcom" }
|
|
||||||
storage_variant = { path = "../../../../storage/variant" }
|
|
||||||
-thin-vec = { version = "0.1", features = ["gecko-ffi"] }
|
|
||||||
+thin-vec = { version = "0.2.1", features = ["gecko-ffi"] }
|
|
||||||
fxa-client = { git = "https://github.com/mozilla/application-services", rev = "61dcc364ac0d6d0816ab88a494bbf20d824b009b", features = ["gecko"] }
|
|
||||||
--- firefox-78.9.0/services/sync/golden_gate/Cargo.toml.D87019-thin-vec-big-endian.diff 2021-03-15 16:52:38.000000000 +0100
|
|
||||||
+++ firefox-78.9.0/services/sync/golden_gate/Cargo.toml 2021-03-18 15:53:29.529861836 +0100
|
|
||||||
@@ -19,5 +19,5 @@ sync15-traits = { git = "https://github.
|
|
||||||
xpcom = { path = "../../../xpcom/rust/xpcom" }
|
|
||||||
|
|
||||||
[dependencies.thin-vec]
|
|
||||||
-version = "0.1.0"
|
|
||||||
+version = "0.2.1"
|
|
||||||
features = ["gecko-ffi"]
|
|
||||||
--- firefox-78.9.0/third_party/rust/thin-vec/.cargo-checksum.json.D87019-thin-vec-big-endian.diff 2021-03-18 15:53:29.529861836 +0100
|
|
||||||
+++ firefox-78.9.0/third_party/rust/thin-vec/.cargo-checksum.json 2021-03-18 15:57:43.631168890 +0100
|
|
||||||
@@ -1 +1 @@
|
|
||||||
-{"files":{"Cargo.toml":"7b164cc8a702a204a4732cb4da2940711b8e3be915c258e2a972d4874d767b4c","README.md":"c26d7101e3031e7dd8890ce938e50cad7a1e6adf7fc2f2b0d3c36b03afe68c0b","src/lib.rs":"9f2a087cabfe0b6f83818323bb9004b45fe7548c51376816fd8d4572256bd0e8","src/range.rs":"bac59bcb6230367a39c7e28ac15263e4526f966cd8c72015873017f17c115aaa"},"package":"3a93c9ade36a827a69257925808463db46ffcf193442fad01eb9bdc1d31aed81"}
|
|
||||||
\ No newline at end of file
|
|
||||||
+{"files":{"Cargo.toml":"754c05523d17eb7591c3ea2c9294e47c05fbb257fed04b78546fb2ec7cafa8b4","README.md":"c26d7101e3031e7dd8890ce938e50cad7a1e6adf7fc2f2b0d3c36b03afe68c0b","src/lib.rs":"627c6094c3f0286dba25bc73f5672c06c5061c25b01c513d213cbdda100673a2"},"package":"dcc760ada4a9f56fc6d0e81bd143984ebc7bb1b875a6891aa2fa613ca7394fc0"}
|
|
||||||
--- firefox-78.9.0/third_party/rust/thin-vec/Cargo.toml.D87019-thin-vec-big-endian.diff 2021-03-15 16:52:42.000000000 +0100
|
|
||||||
+++ firefox-78.9.0/third_party/rust/thin-vec/Cargo.toml 2021-03-18 15:59:34.162886751 +0100
|
|
||||||
@@ -11,8 +11,9 @@
|
|
||||||
# will likely look very different (and much more reasonable)
|
|
||||||
|
|
||||||
[package]
|
|
||||||
+edition = "2018"
|
|
||||||
name = "thin-vec"
|
|
||||||
-version = "0.1.2"
|
|
||||||
+version = "0.2.1"
|
|
||||||
authors = ["Alexis Beingessner <a.beingessner@gmail.com>"]
|
|
||||||
description = "a vec that takes up less space on the stack"
|
|
||||||
homepage = "https://github.com/gankro/thin-vec"
|
|
||||||
--- firefox-78.9.0/third_party/rust/thin-vec/src/lib.rs.D87019-thin-vec-big-endian.diff 2021-03-15 16:52:42.000000000 +0100
|
|
||||||
+++ firefox-78.9.0/third_party/rust/thin-vec/src/lib.rs 2021-03-18 16:08:47.212871917 +0100
|
|
||||||
@@ -1,47 +1,252 @@
|
|
||||||
-mod range;
|
|
||||||
+//! ThinVec is exactly the same as Vec, except that it stores its `len` and `capacity` in the buffer
|
|
||||||
+//! it allocates.
|
|
||||||
+//!
|
|
||||||
+//! This makes the memory footprint of ThinVecs lower; notably in cases where space is reserved for
|
|
||||||
+//! a non-existence ThinVec<T>. So `Vec<ThinVec<T>>` and `Option<ThinVec<T>>::None` will waste less
|
|
||||||
+//! space. Being pointer-sized also means it can be passed/stored in registers.
|
|
||||||
+//!
|
|
||||||
+//! Of course, any actually constructed ThinVec will theoretically have a bigger allocation, but
|
|
||||||
+//! the fuzzy nature of allocators means that might not actually be the case.
|
|
||||||
+//!
|
|
||||||
+//! Properties of Vec that are preserved:
|
|
||||||
+//! * `ThinVec::new()` doesn't allocate (it points to a statically allocated singleton)
|
|
||||||
+//! * reallocation can be done in place
|
|
||||||
+//! * `size_of::<ThinVec<T>>()` == `size_of::<Option<ThinVec<T>>>()`
|
|
||||||
+//!
|
|
||||||
+//! Properties of Vec that aren't preserved:
|
|
||||||
+//! * `ThinVec<T>` can't ever be zero-cost roundtripped to a `Box<[T]>`, `String`, or `*mut T`
|
|
||||||
+//! * `from_raw_parts` doesn't exist
|
|
||||||
+//! * ThinVec currently doesn't bother to not-allocate for Zero Sized Types (e.g. `ThinVec<()>`),
|
|
||||||
+//! but it could be done if someone cared enough to implement it.
|
|
||||||
+//!
|
|
||||||
+//!
|
|
||||||
+//!
|
|
||||||
+//! # Gecko FFI
|
|
||||||
+//!
|
|
||||||
+//! If you enable the gecko-ffi feature, ThinVec will verbatim bridge with the nsTArray type in
|
|
||||||
+//! Gecko (Firefox). That is, ThinVec and nsTArray have identical layouts *but not ABIs*,
|
|
||||||
+//! so nsTArrays/ThinVecs an be natively manipulated by C++ and Rust, and ownership can be
|
|
||||||
+//! transferred across the FFI boundary (**IF YOU ARE CAREFUL, SEE BELOW!!**).
|
|
||||||
+//!
|
|
||||||
+//! While this feature is handy, it is also inherently dangerous to use because Rust and C++ do not
|
|
||||||
+//! know about eachother. Specifically, this can be an issue with non-POD types (types which
|
|
||||||
+//! have destructors, move constructors, or are `!Copy`).
|
|
||||||
+//!
|
|
||||||
+//! ## Do Not Pass By Value
|
|
||||||
+//!
|
|
||||||
+//! The biggest thing to keep in mind is that **FFI functions cannot pass ThinVec/nsTArray
|
|
||||||
+//! by-value**. That is, these are busted APIs:
|
|
||||||
+//!
|
|
||||||
+//! ```rust,ignore
|
|
||||||
+//! // BAD WRONG
|
|
||||||
+//! extern fn process_data(data: ThinVec<u32>) { ... }
|
|
||||||
+//! // BAD WRONG
|
|
||||||
+//! extern fn get_data() -> ThinVec<u32> { ... }
|
|
||||||
+//! ```
|
|
||||||
+//!
|
|
||||||
+//! You must instead pass by-reference:
|
|
||||||
+//!
|
|
||||||
+//! ```rust
|
|
||||||
+//! # use thin_vec::*;
|
|
||||||
+//! # use std::mem;
|
|
||||||
+//!
|
|
||||||
+//! // Read-only access, ok!
|
|
||||||
+//! extern fn process_data(data: &ThinVec<u32>) {
|
|
||||||
+//! for val in data {
|
|
||||||
+//! println!("{}", val);
|
|
||||||
+//! }
|
|
||||||
+//! }
|
|
||||||
+//!
|
|
||||||
+//! // Replace with empty instance to take ownership, ok!
|
|
||||||
+//! extern fn consume_data(data: &mut ThinVec<u32>) {
|
|
||||||
+//! let owned = mem::replace(data, ThinVec::new());
|
|
||||||
+//! mem::drop(owned);
|
|
||||||
+//! }
|
|
||||||
+//!
|
|
||||||
+//! // Mutate input, ok!
|
|
||||||
+//! extern fn add_data(dataset: &mut ThinVec<u32>) {
|
|
||||||
+//! dataset.push(37);
|
|
||||||
+//! dataset.push(12);
|
|
||||||
+//! }
|
|
||||||
+//!
|
|
||||||
+//! // Return via out-param, usually ok!
|
|
||||||
+//! //
|
|
||||||
+//! // WARNING: output must be initialized! (Empty nsTArrays are free, so just do it!)
|
|
||||||
+//! extern fn get_data(output: &mut ThinVec<u32>) {
|
|
||||||
+//! *output = thin_vec![1, 2, 3, 4, 5];
|
|
||||||
+//! }
|
|
||||||
+//! ```
|
|
||||||
+//!
|
|
||||||
+//! Ignorable Explanation For Those Who Really Want To Know Why:
|
|
||||||
+//!
|
|
||||||
+//! > The fundamental issue is that Rust and C++ can't currently communicate about destructors, and
|
|
||||||
+//! > the semantics of C++ require destructors of function arguments to be run when the function
|
|
||||||
+//! > returns. Whether the callee or caller is responsible for this is also platform-specific, so
|
|
||||||
+//! > trying to hack around it manually would be messy.
|
|
||||||
+//! >
|
|
||||||
+//! > Also a type having a destructor changes its C++ ABI, because that type must actually exist
|
|
||||||
+//! > in memory (unlike a trivial struct, which is often passed in registers). We don't currently
|
|
||||||
+//! > have a way to communicate to Rust that this is happening, so even if we worked out the
|
|
||||||
+//! > destructor issue with say, MaybeUninit, it would still be a non-starter without some RFCs
|
|
||||||
+//! > to add explicit rustc support.
|
|
||||||
+//! >
|
|
||||||
+//! > Realistically, the best answer here is to have a "heavier" bindgen that can secretly
|
|
||||||
+//! > generate FFI glue so we can pass things "by value" and have it generate by-reference code
|
|
||||||
+//! > behind our back (like the cxx crate does). This would muddy up debugging/searchfox though.
|
|
||||||
+//!
|
|
||||||
+//! ## Types Should Be Trivially Relocatable
|
|
||||||
+//!
|
|
||||||
+//! Types in Rust are always trivially relocatable (unless suitably borrowed/[pinned][]/hidden).
|
|
||||||
+//! This means all Rust types are legal to relocate with a bitwise copy, you cannot provide
|
|
||||||
+//! copy or move constructors to execute when this happens, and the old location won't have its
|
|
||||||
+//! destructor run. This will cause problems for types which have a significant location
|
|
||||||
+//! (types that intrusively point into themselves or have their location registered with a service).
|
|
||||||
+//!
|
|
||||||
+//! While relocations are generally predictable if you're very careful, **you should avoid using
|
|
||||||
+//! types with significant locations with Rust FFI**.
|
|
||||||
+//!
|
|
||||||
+//! Specifically, ThinVec will trivially relocate its contents whenever it needs to reallocate its
|
|
||||||
+//! buffer to change its capacity. This is the default reallocation strategy for nsTArray, and is
|
|
||||||
+//! suitable for the vast majority of types. Just be aware of this limitation!
|
|
||||||
+//!
|
|
||||||
+//! ## Auto Arrays Are Dangerous
|
|
||||||
+//!
|
|
||||||
+//! ThinVec has *some* support for handling auto arrays which store their buffer on the stack,
|
|
||||||
+//! but this isn't well tested.
|
|
||||||
+//!
|
|
||||||
+//! Regardless of how much support we provide, Rust won't be aware of the buffer's limited lifetime,
|
|
||||||
+//! so standard auto array safety caveats apply about returning/storing them! ThinVec won't ever
|
|
||||||
+//! produce an auto array on its own, so this is only an issue for transferring an nsTArray into
|
|
||||||
+//! Rust.
|
|
||||||
+//!
|
|
||||||
+//! ## Other Issues
|
|
||||||
+//!
|
|
||||||
+//! Standard FFI caveats also apply:
|
|
||||||
+//!
|
|
||||||
+//! * Rust is more strict about POD types being initialized (use MaybeUninit if you must)
|
|
||||||
+//! * `ThinVec<T>` has no idea if the C++ version of `T` has move/copy/assign/delete overloads
|
|
||||||
+//! * `nsTArray<T>` has no idea if the Rust version of `T` has a Drop/Clone impl
|
|
||||||
+//! * C++ can do all sorts of unsound things that Rust can't catch
|
|
||||||
+//! * C++ and Rust don't agree on how zero-sized/empty types should be handled
|
|
||||||
+//!
|
|
||||||
+//! The gecko-ffi feature will not work if you aren't linking with code that has nsTArray
|
|
||||||
+//! defined. Specifically, we must share the symbol for nsTArray's empty singleton. You will get
|
|
||||||
+//! linking errors if that isn't defined.
|
|
||||||
+//!
|
|
||||||
+//! The gecko-ffi feature also limits ThinVec to the legacy behaviors of nsTArray. Most notably,
|
|
||||||
+//! nsTArray has a maximum capacity of i32::MAX (~2.1 billion items). Probably not an issue.
|
|
||||||
+//! Probably.
|
|
||||||
+//!
|
|
||||||
+//! [pinned]: https://doc.rust-lang.org/std/pin/index.html
|
|
||||||
|
|
||||||
use std::{fmt, io, ptr, mem, slice};
|
|
||||||
use std::collections::Bound;
|
|
||||||
use std::iter::FromIterator;
|
|
||||||
use std::slice::IterMut;
|
|
||||||
-use std::ops::{Deref, DerefMut};
|
|
||||||
+use std::ops::{Deref, DerefMut, RangeBounds};
|
|
||||||
use std::marker::PhantomData;
|
|
||||||
use std::alloc::*;
|
|
||||||
use std::cmp::*;
|
|
||||||
use std::hash::*;
|
|
||||||
use std::borrow::*;
|
|
||||||
-use range::RangeArgument;
|
|
||||||
use std::ptr::NonNull;
|
|
||||||
|
|
||||||
-#[cfg(not(feature = "gecko-ffi"))]
|
|
||||||
-type SizeType = usize;
|
|
||||||
-#[cfg(feature = "gecko-ffi")]
|
|
||||||
-type SizeType = u32;
|
|
||||||
+use impl_details::*;
|
|
||||||
|
|
||||||
-#[cfg(feature = "gecko-ffi")]
|
|
||||||
-const AUTO_MASK: u32 = 1 << 31;
|
|
||||||
-#[cfg(feature = "gecko-ffi")]
|
|
||||||
-const CAP_MASK: u32 = !AUTO_MASK;
|
|
||||||
+// modules: a simple way to cfg a whole bunch of impl details at once
|
|
||||||
|
|
||||||
#[cfg(not(feature = "gecko-ffi"))]
|
|
||||||
-const MAX_CAP: usize = !0;
|
|
||||||
-#[cfg(feature = "gecko-ffi")]
|
|
||||||
-const MAX_CAP: usize = i32::max_value() as usize;
|
|
||||||
+mod impl_details {
|
|
||||||
+ pub type SizeType = usize;
|
|
||||||
+ pub const MAX_CAP: usize = !0;
|
|
||||||
|
|
||||||
-#[cfg(not(feature = "gecko-ffi"))]
|
|
||||||
-#[inline(always)]
|
|
||||||
-fn assert_size(x: usize) -> SizeType { x }
|
|
||||||
+ #[inline(always)]
|
|
||||||
+ pub fn assert_size(x: usize) -> SizeType { x }
|
|
||||||
+}
|
|
||||||
|
|
||||||
#[cfg(feature = "gecko-ffi")]
|
|
||||||
-#[inline]
|
|
||||||
-fn assert_size(x: usize) -> SizeType {
|
|
||||||
- if x > MAX_CAP as usize {
|
|
||||||
- panic!("nsTArray size may not exceed the capacity of a 32-bit sized int");
|
|
||||||
+mod impl_details {
|
|
||||||
+ // Support for briding a gecko nsTArray verbatim into a ThinVec.
|
|
||||||
+ //
|
|
||||||
+ // ThinVec can't see copy/move/delete implementations
|
|
||||||
+ // from C++
|
|
||||||
+ //
|
|
||||||
+ // The actual layout of an nsTArray is:
|
|
||||||
+ //
|
|
||||||
+ // ```cpp
|
|
||||||
+ // struct {
|
|
||||||
+ // uint32_t mLength;
|
|
||||||
+ // uint32_t mCapacity: 31;
|
|
||||||
+ // uint32_t mIsAutoArray: 1;
|
|
||||||
+ // }
|
|
||||||
+ // ```
|
|
||||||
+ //
|
|
||||||
+ // Rust doesn't natively support bit-fields, so we manually mask
|
|
||||||
+ // and shift the bit. When the "auto" bit is set, the header and buffer
|
|
||||||
+ // are actually on the stack, meaning the ThinVec pointer-to-header
|
|
||||||
+ // is essentially an "owned borrow", and therefore dangerous to handle.
|
|
||||||
+ // There are no safety guards for this situation.
|
|
||||||
+ //
|
|
||||||
+ // On little-endian platforms, the auto bit will be the high-bit of
|
|
||||||
+ // our capacity u32. On big-endian platforms, it will be the low bit.
|
|
||||||
+ // Hence we need some platform-specific CFGs for the necessary masking/shifting.
|
|
||||||
+ //
|
|
||||||
+ // ThinVec won't ever construct an auto array. They only happen when
|
|
||||||
+ // bridging from C++. This means we don't need to ever set/preserve the bit.
|
|
||||||
+ // We just need to be able to read and handle it if it happens to be there.
|
|
||||||
+ //
|
|
||||||
+ // Handling the auto bit mostly just means not freeing/reallocating the buffer.
|
|
||||||
+
|
|
||||||
+ pub type SizeType = u32;
|
|
||||||
+
|
|
||||||
+ pub const MAX_CAP: usize = i32::max_value() as usize;
|
|
||||||
+
|
|
||||||
+ // Little endian: the auto bit is the high bit, and the capacity is
|
|
||||||
+ // verbatim. So we just need to mask off the high bit. Note that
|
|
||||||
+ // this masking is unnecessary when packing, because assert_size
|
|
||||||
+ // guards against the high bit being set.
|
|
||||||
+ #[cfg(target_endian = "little")]
|
|
||||||
+ pub fn pack_capacity(cap: SizeType) -> SizeType {
|
|
||||||
+ cap as SizeType
|
|
||||||
+ }
|
|
||||||
+ #[cfg(target_endian = "little")]
|
|
||||||
+ pub fn unpack_capacity(cap: SizeType) -> usize {
|
|
||||||
+ (cap as usize) & !(1 << 31)
|
|
||||||
+ }
|
|
||||||
+ #[cfg(target_endian = "little")]
|
|
||||||
+ pub fn is_auto(cap: SizeType) -> bool {
|
|
||||||
+ (cap & (1 << 31)) != 0
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ // Big endian: the auto bit is the low bit, and the capacity is
|
|
||||||
+ // shifted up one bit. Masking out the auto bit is unnecessary,
|
|
||||||
+ // as rust shifts always shift in 0's for unsigned integers.
|
|
||||||
+ #[cfg(target_endian = "big")]
|
|
||||||
+ pub fn pack_capacity(cap: SizeType) -> SizeType {
|
|
||||||
+ (cap as SizeType) << 1
|
|
||||||
+ }
|
|
||||||
+ #[cfg(target_endian = "big")]
|
|
||||||
+ pub fn unpack_capacity(cap: SizeType) -> usize {
|
|
||||||
+ (cap >> 1) as usize
|
|
||||||
+ }
|
|
||||||
+ #[cfg(target_endian = "big")]
|
|
||||||
+ pub fn is_auto(cap: SizeType) -> bool {
|
|
||||||
+ (cap & 1) != 0
|
|
||||||
}
|
|
||||||
- x as SizeType
|
|
||||||
+
|
|
||||||
+ #[inline]
|
|
||||||
+ pub fn assert_size(x: usize) -> SizeType {
|
|
||||||
+ if x > MAX_CAP as usize {
|
|
||||||
+ panic!("nsTArray size may not exceed the capacity of a 32-bit sized int");
|
|
||||||
+ }
|
|
||||||
+ x as SizeType
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
}
|
|
||||||
|
|
||||||
-/// The header of a ThinVec
|
|
||||||
+/// The header of a ThinVec.
|
|
||||||
+///
|
|
||||||
+/// The _cap can be a bitfield, so use accessors to avoid trouble.
|
|
||||||
#[repr(C)]
|
|
||||||
struct Header {
|
|
||||||
_len: SizeType,
|
|
||||||
@@ -53,38 +258,10 @@ impl Header {
|
|
||||||
self._len as usize
|
|
||||||
}
|
|
||||||
|
|
||||||
- #[cfg(feature = "gecko-ffi")]
|
|
||||||
- fn cap(&self) -> usize {
|
|
||||||
- (self._cap & CAP_MASK) as usize
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- #[cfg(not(feature = "gecko-ffi"))]
|
|
||||||
- fn cap(&self) -> usize {
|
|
||||||
- self._cap as usize
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
fn set_len(&mut self, len: usize) {
|
|
||||||
self._len = assert_size(len);
|
|
||||||
}
|
|
||||||
|
|
||||||
- #[cfg(feature = "gecko-ffi")]
|
|
||||||
- fn set_cap(&mut self, cap: usize) {
|
|
||||||
- debug_assert!(cap & (CAP_MASK as usize) == cap);
|
|
||||||
- // FIXME: this is busted because it reads uninit memory
|
|
||||||
- // debug_assert!(!self.uses_stack_allocated_buffer());
|
|
||||||
- self._cap = assert_size(cap) & CAP_MASK;
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- #[cfg(feature = "gecko-ffi")]
|
|
||||||
- fn uses_stack_allocated_buffer(&self) -> bool {
|
|
||||||
- self._cap & AUTO_MASK != 0
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- #[cfg(not(feature = "gecko-ffi"))]
|
|
||||||
- fn set_cap(&mut self, cap: usize) {
|
|
||||||
- self._cap = assert_size(cap);
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
fn data<T>(&self) -> *mut T {
|
|
||||||
let header_size = mem::size_of::<Header>();
|
|
||||||
let padding = padding::<T>();
|
|
||||||
@@ -102,6 +279,41 @@ impl Header {
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
+
|
|
||||||
+#[cfg(feature = "gecko-ffi")]
|
|
||||||
+impl Header {
|
|
||||||
+ fn cap(&self) -> usize {
|
|
||||||
+ unpack_capacity(self._cap)
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ fn set_cap(&mut self, cap: usize) {
|
|
||||||
+ // debug check that our packing is working
|
|
||||||
+ debug_assert_eq!(unpack_capacity(pack_capacity(cap as SizeType)), cap);
|
|
||||||
+ // FIXME: this assert is busted because it reads uninit memory
|
|
||||||
+ // debug_assert!(!self.uses_stack_allocated_buffer());
|
|
||||||
+
|
|
||||||
+ // NOTE: this always stores a cleared auto bit, because set_cap
|
|
||||||
+ // is only invoked by Rust, and Rust doesn't create auto arrays.
|
|
||||||
+ self._cap = pack_capacity(assert_size(cap));
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ fn uses_stack_allocated_buffer(&self) -> bool {
|
|
||||||
+ is_auto(self._cap)
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+#[cfg(not(feature = "gecko-ffi"))]
|
|
||||||
+impl Header {
|
|
||||||
+ fn cap(&self) -> usize {
|
|
||||||
+ self._cap as usize
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ fn set_cap(&mut self, cap: usize) {
|
|
||||||
+ self._cap = assert_size(cap);
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+
|
|
||||||
/// Singleton that all empty collections share.
|
|
||||||
/// Note: can't store non-zero ZSTs, we allocate in that case. We could
|
|
||||||
/// optimize everything to not do that (basically, make ptr == len and branch
|
|
||||||
@@ -118,9 +330,7 @@ extern {
|
|
||||||
|
|
||||||
// TODO: overflow checks everywhere
|
|
||||||
|
|
||||||
-// Utils
|
|
||||||
-
|
|
||||||
-fn oom() -> ! { std::process::abort() }
|
|
||||||
+// Utils for computing layouts of allocations
|
|
||||||
|
|
||||||
fn alloc_size<T>(cap: usize) -> usize {
|
|
||||||
// Compute "real" header size with pointer math
|
|
||||||
@@ -165,9 +375,10 @@ fn layout<T>(cap: usize) -> Layout {
|
|
||||||
fn header_with_capacity<T>(cap: usize) -> NonNull<Header> {
|
|
||||||
debug_assert!(cap > 0);
|
|
||||||
unsafe {
|
|
||||||
- let header = alloc(layout::<T>(cap)) as *mut Header;
|
|
||||||
+ let layout = layout::<T>(cap);
|
|
||||||
+ let header = alloc(layout) as *mut Header;
|
|
||||||
|
|
||||||
- if header.is_null() { oom() }
|
|
||||||
+ if header.is_null() { handle_alloc_error(layout) }
|
|
||||||
|
|
||||||
// "Infinite" capacity for zero-sized types:
|
|
||||||
(*header).set_cap(if mem::size_of::<T>() == 0 { MAX_CAP } else { cap });
|
|
||||||
@@ -179,28 +390,8 @@ fn header_with_capacity<T>(cap: usize) -
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
-/// ThinVec is exactly the same as Vec, except that it stores its `len` and `capacity` in the buffer
|
|
||||||
-/// it allocates.
|
|
||||||
-///
|
|
||||||
-/// This makes the memory footprint of ThinVecs lower; notably in cases where space is reserved for
|
|
||||||
-/// a non-existence ThinVec<T>. So `Vec<ThinVec<T>>` and `Option<ThinVec<T>>::None` will waste less
|
|
||||||
-/// space. Being pointer-sized also means it can be passed/stored in registers.
|
|
||||||
-///
|
|
||||||
-/// Of course, any actually constructed ThinVec will theoretically have a bigger allocation, but
|
|
||||||
-/// the fuzzy nature of allocators means that might not actually be the case.
|
|
||||||
-///
|
|
||||||
-/// Properties of Vec that are preserved:
|
|
||||||
-/// * `ThinVec::new()` doesn't allocate (it points to a statically allocated singleton)
|
|
||||||
-/// * reallocation can be done in place
|
|
||||||
-/// * `size_of::<ThinVec<T>>()` == `size_of::<Option<ThinVec<T>>>()`
|
|
||||||
-/// * NOTE: This is only possible when the `unstable` feature is used.
|
|
||||||
-///
|
|
||||||
-/// Properties of Vec that aren't preserved:
|
|
||||||
-/// * `ThinVec<T>` can't ever be zero-cost roundtripped to a `Box<[T]>`, `String`, or `*mut T`
|
|
||||||
-/// * `from_raw_parts` doesn't exist
|
|
||||||
-/// * ThinVec currently doesn't bother to not-allocate for Zero Sized Types (e.g. `ThinVec<()>`),
|
|
||||||
-/// but it could be done if someone cared enough to implement it.
|
|
||||||
-#[cfg_attr(feature = "gecko-ffi", repr(C))]
|
|
||||||
+/// See the crate's top level documentation for a description of this type.
|
|
||||||
+#[repr(C)]
|
|
||||||
pub struct ThinVec<T> {
|
|
||||||
ptr: NonNull<Header>,
|
|
||||||
boo: PhantomData<T>,
|
|
||||||
@@ -630,15 +821,15 @@ impl<T> ThinVec<T> {
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn drain<R>(&mut self, range: R) -> Drain<T>
|
|
||||||
- where R: RangeArgument<usize>
|
|
||||||
+ where R: RangeBounds<usize>
|
|
||||||
{
|
|
||||||
let len = self.len();
|
|
||||||
- let start = match range.start() {
|
|
||||||
+ let start = match range.start_bound() {
|
|
||||||
Bound::Included(&n) => n,
|
|
||||||
Bound::Excluded(&n) => n + 1,
|
|
||||||
Bound::Unbounded => 0,
|
|
||||||
};
|
|
||||||
- let end = match range.end() {
|
|
||||||
+ let end = match range.end_bound() {
|
|
||||||
Bound::Included(&n) => n + 1,
|
|
||||||
Bound::Excluded(&n) => n,
|
|
||||||
Bound::Unbounded => len,
|
|
||||||
@@ -688,11 +879,30 @@ impl<T> ThinVec<T> {
|
|
||||||
alloc_size::<T>(new_cap),
|
|
||||||
) as *mut Header;
|
|
||||||
|
|
||||||
- if ptr.is_null() { oom() }
|
|
||||||
+ if ptr.is_null() { handle_alloc_error(layout::<T>(new_cap)) }
|
|
||||||
(*ptr).set_cap(new_cap);
|
|
||||||
self.ptr = NonNull::new_unchecked(ptr);
|
|
||||||
} else {
|
|
||||||
- self.ptr = header_with_capacity::<T>(new_cap);
|
|
||||||
+ let mut new_header = header_with_capacity::<T>(new_cap);
|
|
||||||
+
|
|
||||||
+ // If we get here and have a non-zero len, then we must be handling
|
|
||||||
+ // a gecko auto array, and we have items in a stack buffer. We shouldn't
|
|
||||||
+ // free it, but we should memcopy the contents out of it and mark it as empty.
|
|
||||||
+ //
|
|
||||||
+ // T is assumed to be trivially relocatable, as this is ~required
|
|
||||||
+ // for Rust compatibility anyway. Furthermore, we assume C++ won't try
|
|
||||||
+ // to unconditionally destroy the contents of the stack allocated buffer
|
|
||||||
+ // (i.e. it's obfuscated behind a union).
|
|
||||||
+ //
|
|
||||||
+ // In effect, we are partially reimplementing the auto array move constructor
|
|
||||||
+ // by leaving behind a valid empty instance.
|
|
||||||
+ let len = self.len();
|
|
||||||
+ if cfg!(feature = "gecko-ffi") && len > 0 {
|
|
||||||
+ new_header.as_mut().data::<T>().copy_from_nonoverlapping(self.data_raw(), len);
|
|
||||||
+ self.set_len(0);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ self.ptr = new_header;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1093,10 +1303,7 @@ mod tests {
|
|
||||||
use std::mem::size_of;
|
|
||||||
assert_eq!(size_of::<ThinVec<u8>>(), size_of::<&u8>());
|
|
||||||
|
|
||||||
- // We don't perform the null-pointer optimization on stable rust.
|
|
||||||
- if cfg!(feature = "unstable") {
|
|
||||||
- assert_eq!(size_of::<Option<ThinVec<u8>>>(), size_of::<&u8>());
|
|
||||||
- }
|
|
||||||
+ assert_eq!(size_of::<Option<ThinVec<u8>>>(), size_of::<&u8>());
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
@@ -1731,7 +1938,6 @@ mod std_tests {
|
|
||||||
assert_eq!(v, &[(), ()]);
|
|
||||||
}
|
|
||||||
|
|
||||||
-/* TODO: support inclusive ranges
|
|
||||||
#[test]
|
|
||||||
fn test_drain_inclusive_range() {
|
|
||||||
let mut v = thin_vec!['a', 'b', 'c', 'd', 'e'];
|
|
||||||
@@ -1761,6 +1967,7 @@ mod std_tests {
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
+ #[cfg(not(feature = "gecko-ffi"))]
|
|
||||||
fn test_drain_max_vec_size() {
|
|
||||||
let mut v = ThinVec::<()>::with_capacity(usize::max_value());
|
|
||||||
unsafe { v.set_len(usize::max_value()); }
|
|
||||||
@@ -1781,7 +1988,6 @@ mod std_tests {
|
|
||||||
let mut v = thin_vec![1, 2, 3, 4, 5];
|
|
||||||
v.drain(5..=5);
|
|
||||||
}
|
|
||||||
-*/
|
|
||||||
|
|
||||||
/* TODO: implement splice?
|
|
||||||
#[test]
|
|
||||||
@@ -2187,7 +2393,7 @@ mod std_tests {
|
|
||||||
assert!(v.capacity() >= 33)
|
|
||||||
}
|
|
||||||
|
|
||||||
-/* TODO: implement try_reserve
|
|
||||||
+/* TODO: implement try_reserve
|
|
||||||
#[test]
|
|
||||||
fn test_try_reserve() {
|
|
||||||
|
|
||||||
--- firefox-78.9.0/toolkit/components/cascade_bloom_filter/Cargo.toml.D87019-thin-vec-big-endian.diff 2021-03-15 16:52:42.000000000 +0100
|
|
||||||
+++ firefox-78.9.0/toolkit/components/cascade_bloom_filter/Cargo.toml 2021-03-18 15:54:35.137670977 +0100
|
|
||||||
@@ -8,5 +8,5 @@ nserror = { path = "../../../xpcom/rust/
|
|
||||||
nsstring = { path = "../../../xpcom/rust/nsstring" }
|
|
||||||
rental = "0.5.5"
|
|
||||||
rust_cascade = "0.6.0"
|
|
||||||
-thin-vec = { version = "0.1.0", features = ["gecko-ffi"] }
|
|
||||||
+thin-vec = { version = "0.2.1", features = ["gecko-ffi"] }
|
|
||||||
xpcom = { path = "../../../xpcom/rust/xpcom" }
|
|
||||||
--- firefox-78.9.0/toolkit/components/extensions/storage/webext_storage_bridge/Cargo.toml.D87019-thin-vec-big-endian.diff 2021-03-15 16:52:42.000000000 +0100
|
|
||||||
+++ firefox-78.9.0/toolkit/components/extensions/storage/webext_storage_bridge/Cargo.toml 2021-03-18 15:54:35.139670971 +0100
|
|
||||||
@@ -13,7 +13,7 @@ moz_task = { path = "../../../../../xpco
|
|
||||||
nserror = { path = "../../../../../xpcom/rust/nserror" }
|
|
||||||
nsstring = { path = "../../../../../xpcom/rust/nsstring" }
|
|
||||||
once_cell = "1"
|
|
||||||
-thin-vec = { version = "0.1.0", features = ["gecko-ffi"] }
|
|
||||||
+thin-vec = { version = "0.2.1", features = ["gecko-ffi"] }
|
|
||||||
xpcom = { path = "../../../../../xpcom/rust/xpcom" }
|
|
||||||
serde = "1"
|
|
||||||
serde_json = "1"
|
|
||||||
--- firefox-78.9.0/toolkit/components/kvstore/Cargo.toml.D87019-thin-vec-big-endian.diff 2021-03-15 16:52:42.000000000 +0100
|
|
||||||
+++ firefox-78.9.0/toolkit/components/kvstore/Cargo.toml 2021-03-18 15:54:35.141670966 +0100
|
|
||||||
@@ -18,7 +18,7 @@ rkv = "0.10.2"
|
|
||||||
storage_variant = { path = "../../../storage/variant" }
|
|
||||||
xpcom = { path = "../../../xpcom/rust/xpcom" }
|
|
||||||
tempfile = "3"
|
|
||||||
-thin-vec = { version = "0.1.0", features = ["gecko-ffi"] }
|
|
||||||
+thin-vec = { version = "0.2.1", features = ["gecko-ffi"] }
|
|
||||||
|
|
||||||
# Get rid of failure's dependency on backtrace. Eventually
|
|
||||||
# backtrace will move into Rust core, but we don't need it here.
|
|
||||||
--- firefox-78.9.0/toolkit/components/places/bookmark_sync/Cargo.toml.D87019-thin-vec-big-endian.diff 2021-03-15 16:52:42.000000000 +0100
|
|
||||||
+++ firefox-78.9.0/toolkit/components/places/bookmark_sync/Cargo.toml 2021-03-18 15:54:35.142670963 +0100
|
|
||||||
@@ -19,5 +19,5 @@ url = "2.0"
|
|
||||||
xpcom = { path = "../../../../xpcom/rust/xpcom" }
|
|
||||||
|
|
||||||
[dependencies.thin-vec]
|
|
||||||
-version = "0.1.0"
|
|
||||||
+version = "0.2.1"
|
|
||||||
features = ["gecko-ffi"]
|
|
||||||
--- firefox-78.9.0/tools/profiler/rust-helper/Cargo.toml.D87019-thin-vec-big-endian.diff 2021-03-15 16:52:42.000000000 +0100
|
|
||||||
+++ firefox-78.9.0/tools/profiler/rust-helper/Cargo.toml 2021-03-18 15:54:35.143670960 +0100
|
|
||||||
@@ -23,7 +23,7 @@ features = ["endian_fd", "elf32", "elf64
|
|
||||||
default-features = false
|
|
||||||
|
|
||||||
[dependencies.thin-vec]
|
|
||||||
-version = "0.1.0"
|
|
||||||
+version = "0.2.1"
|
|
||||||
features = ["gecko-ffi"]
|
|
||||||
|
|
||||||
[features]
|
|
||||||
--- firefox-78.9.0/xpcom/rust/xpcom/Cargo.toml.D87019-thin-vec-big-endian.diff 2021-03-15 16:52:43.000000000 +0100
|
|
||||||
+++ firefox-78.9.0/xpcom/rust/xpcom/Cargo.toml 2021-03-18 15:54:35.149670942 +0100
|
|
||||||
@@ -9,4 +9,4 @@ nsstring = { path = "../nsstring" }
|
|
||||||
nserror = { path = "../nserror" }
|
|
||||||
threadbound = "0.1"
|
|
||||||
xpcom_macros = { path = "xpcom_macros" }
|
|
||||||
-thin-vec = { version = "0.1.0", features = ["gecko-ffi"] }
|
|
||||||
+thin-vec = { version = "0.2.1", features = ["gecko-ffi"] }
|
|
||||||
24
SOURCES/build-debuginfo-fix.patch
Normal file
24
SOURCES/build-debuginfo-fix.patch
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
diff -up firefox-91.0.1/third_party/libwebrtc/webrtc/modules/audio_processing/utility/ooura_fft.cc.debuginfo-fix firefox-91.0.1/third_party/libwebrtc/webrtc/modules/audio_processing/utility/ooura_fft.cc
|
||||||
|
--- firefox-91.0.1/third_party/libwebrtc/webrtc/modules/audio_processing/utility/ooura_fft.cc.debuginfo-fix 2021-09-01 11:11:46.738285751 +0200
|
||||||
|
+++ firefox-91.0.1/third_party/libwebrtc/webrtc/modules/audio_processing/utility/ooura_fft.cc 2021-09-01 11:11:56.127319530 +0200
|
||||||
|
@@ -21,7 +21,7 @@
|
||||||
|
* be found in the AUTHORS file in the root of the source tree.
|
||||||
|
*/
|
||||||
|
|
||||||
|
-#include "modules/audio_processing//utility/ooura_fft.h"
|
||||||
|
+#include "modules/audio_processing/utility/ooura_fft.h"
|
||||||
|
|
||||||
|
#include <math.h>
|
||||||
|
|
||||||
|
diff -up firefox-91.0.1/third_party/libwebrtc/webrtc/modules/audio_processing/utility/ooura_fft_sse2.cc.debuginfo-fix firefox-91.0.1/third_party/libwebrtc/webrtc/modules/audio_processing/utility/ooura_fft_sse2.cc
|
||||||
|
--- firefox-91.0.1/third_party/libwebrtc/webrtc/modules/audio_processing/utility/ooura_fft_sse2.cc.debuginfo-fix 2021-09-01 11:12:26.513428847 +0200
|
||||||
|
+++ firefox-91.0.1/third_party/libwebrtc/webrtc/modules/audio_processing/utility/ooura_fft_sse2.cc 2021-09-01 11:12:32.117449009 +0200
|
||||||
|
@@ -8,7 +8,7 @@
|
||||||
|
* be found in the AUTHORS file in the root of the source tree.
|
||||||
|
*/
|
||||||
|
|
||||||
|
-#include "modules/audio_processing//utility/ooura_fft.h"
|
||||||
|
+#include "modules/audio_processing/utility/ooura_fft.h"
|
||||||
|
|
||||||
|
#include <emmintrin.h>
|
||||||
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
diff -up firefox-68.8.0/intl/icu_sources_data.py.icu-makefile firefox-68.8.0/intl/icu_sources_data.py
|
|
||||||
--- firefox-68.8.0/intl/icu_sources_data.py.icu-makefile 2020-05-11 17:00:03.642605718 +0200
|
|
||||||
+++ firefox-68.8.0/intl/icu_sources_data.py 2020-05-11 17:00:37.774642749 +0200
|
|
||||||
@@ -246,8 +246,7 @@ def update_data_file(topsrcdir):
|
|
||||||
if not try_run(
|
|
||||||
'icu-make',
|
|
||||||
['make',
|
|
||||||
- '--jobs=%d' % multiprocessing.cpu_count(),
|
|
||||||
- '--output-sync'],
|
|
||||||
+ '--jobs=1'],
|
|
||||||
cwd=objdir):
|
|
||||||
return False
|
|
||||||
print('Copying ICU data file...')
|
|
||||||
@ -1,12 +1,24 @@
|
|||||||
diff -up firefox-68.3.0/old-configure.in.nss-version firefox-68.3.0/old-configure.in
|
diff -up firefox-91.0.1/build/moz.configure/nspr.configure.nss-nspr-downgrade firefox-91.0.1/build/moz.configure/nspr.configure
|
||||||
--- firefox-68.3.0/old-configure.in.nss-version 2019-11-27 19:48:01.045677621 +0100
|
--- firefox-91.0.1/build/moz.configure/nspr.configure.nss-nspr-downgrade 2021-08-25 13:17:26.265307060 +0200
|
||||||
+++ firefox-68.3.0/old-configure.in 2019-11-27 19:59:52.856894047 +0100
|
+++ firefox-91.0.1/build/moz.configure/nspr.configure 2021-08-25 13:17:28.161313632 +0200
|
||||||
@@ -1537,7 +1537,7 @@ MOZ_ARG_WITH_BOOL(system-nss,
|
@@ -50,7 +50,7 @@ set_define("JS_WITHOUT_NSPR", True, when
|
||||||
_USE_SYSTEM_NSS=1 )
|
def nspr_minver(js_standalone):
|
||||||
|
if js_standalone:
|
||||||
|
return "nspr >= 4.10"
|
||||||
|
- return "nspr >= 4.32"
|
||||||
|
+ return "nspr >= 4.31"
|
||||||
|
|
||||||
if test -n "$_USE_SYSTEM_NSS"; then
|
|
||||||
- AM_PATH_NSS(3.44.4, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
|
|
||||||
+ AM_PATH_NSS(3.44.0, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
|
|
||||||
fi
|
|
||||||
|
|
||||||
NSS_CFLAGS="$NSS_CFLAGS -I${DIST}/include/nss"
|
nspr_pkg = pkg_check_modules("NSPR", nspr_minver, when="--with-system-nspr")
|
||||||
|
diff -up firefox-91.0.1/build/moz.configure/nss.configure.nss-nspr-downgrade firefox-91.0.1/build/moz.configure/nss.configure
|
||||||
|
--- firefox-91.0.1/build/moz.configure/nss.configure.nss-nspr-downgrade 2021-08-25 13:17:45.049372175 +0200
|
||||||
|
+++ firefox-91.0.1/build/moz.configure/nss.configure 2021-08-25 13:17:37.763346918 +0200
|
||||||
|
@@ -9,7 +9,7 @@ option("--with-system-nss", help="Use sy
|
||||||
|
imply_option("--with-system-nspr", True, when="--with-system-nss")
|
||||||
|
|
||||||
|
nss_pkg = pkg_check_modules(
|
||||||
|
- "NSS", "nss >= 3.68", when="--with-system-nss", config=False
|
||||||
|
+ "NSS", "nss >= 3.67", when="--with-system-nss", config=False
|
||||||
|
)
|
||||||
|
|
||||||
|
set_config("MOZ_SYSTEM_NSS", True, when="--with-system-nss")
|
||||||
|
|||||||
12
SOURCES/build-rhel7-nasm-dwarf.patch
Normal file
12
SOURCES/build-rhel7-nasm-dwarf.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
diff -up firefox-91.0.1/python/mozbuild/mozbuild/frontend/context.py.rhel7-nasm firefox-91.0.1/python/mozbuild/mozbuild/frontend/context.py
|
||||||
|
--- firefox-91.0.1/python/mozbuild/mozbuild/frontend/context.py.rhel7-nasm 2021-08-31 08:02:10.814740774 +0200
|
||||||
|
+++ firefox-91.0.1/python/mozbuild/mozbuild/frontend/context.py 2021-08-31 08:04:03.967146994 +0200
|
||||||
|
@@ -420,7 +420,7 @@ class AsmFlags(BaseCompileFlags):
|
||||||
|
if self._context.config.substs.get("OS_ARCH") == "WINNT":
|
||||||
|
debug_flags += ["-F", "cv8"]
|
||||||
|
elif self._context.config.substs.get("OS_ARCH") != "Darwin":
|
||||||
|
- debug_flags += ["-F", "dwarf"]
|
||||||
|
+ debug_flags += ["-f", "elf32"]
|
||||||
|
elif (
|
||||||
|
self._context.config.substs.get("OS_ARCH") == "WINNT"
|
||||||
|
and self._context.config.substs.get("CPU_ARCH") == "aarch64"
|
||||||
@ -1,50 +0,0 @@
|
|||||||
diff -up firefox-68.0/media/libyuv/libyuv/tools_libyuv/autoroller/unittests/testdata/DEPS.chromium.old firefox-68.0/media/libyuv/libyuv/tools_libyuv/autoroller/unittests/testdata/DEPS.chromium
|
|
||||||
diff -up firefox-68.0/media/webrtc/trunk/Makefile.old firefox-68.0/media/webrtc/trunk/Makefile
|
|
||||||
diff -up firefox-68.0/media/webrtc/trunk/webrtc/modules/audio_processing/utility/ooura_fft.cc.old firefox-68.0/media/webrtc/trunk/webrtc/modules/audio_processing/utility/ooura_fft.cc
|
|
||||||
--- firefox-68.0/media/webrtc/trunk/webrtc/modules/audio_processing/utility/ooura_fft.cc.old 2019-06-12 08:17:02.673268442 +0200
|
|
||||||
+++ firefox-68.0/media/webrtc/trunk/webrtc/modules/audio_processing/utility/ooura_fft.cc 2019-06-12 08:17:13.582328073 +0200
|
|
||||||
@@ -21,7 +21,7 @@
|
|
||||||
* be found in the AUTHORS file in the root of the source tree.
|
|
||||||
*/
|
|
||||||
|
|
||||||
-#include "modules/audio_processing//utility/ooura_fft.h"
|
|
||||||
+#include "modules/audio_processing/utility/ooura_fft.h"
|
|
||||||
|
|
||||||
#include <math.h>
|
|
||||||
|
|
||||||
diff -up firefox-68.0/media/webrtc/trunk/webrtc/modules/audio_processing/utility/ooura_fft_sse2.cc.old firefox-68.0/media/webrtc/trunk/webrtc/modules/audio_processing/utility/ooura_fft_sse2.cc
|
|
||||||
--- firefox-68.0/media/webrtc/trunk/webrtc/modules/audio_processing/utility/ooura_fft_sse2.cc.old 2019-06-12 08:17:36.671454285 +0200
|
|
||||||
+++ firefox-68.0/media/webrtc/trunk/webrtc/modules/audio_processing/utility/ooura_fft_sse2.cc 2019-06-12 08:17:46.989510679 +0200
|
|
||||||
@@ -8,7 +8,7 @@
|
|
||||||
* be found in the AUTHORS file in the root of the source tree.
|
|
||||||
*/
|
|
||||||
|
|
||||||
-#include "modules/audio_processing//utility/ooura_fft.h"
|
|
||||||
+#include "modules/audio_processing/utility/ooura_fft.h"
|
|
||||||
|
|
||||||
#include <emmintrin.h>
|
|
||||||
|
|
||||||
diff -up firefox-68.0/third_party/aom/aom_dsp/x86/masked_sad_intrin_avx2.c.old firefox-68.0/third_party/aom/aom_dsp/x86/masked_sad_intrin_avx2.c
|
|
||||||
--- firefox-68.0/third_party/aom/aom_dsp/x86/masked_sad_intrin_avx2.c.old 2019-06-12 08:16:15.673011534 +0200
|
|
||||||
+++ firefox-68.0/third_party/aom/aom_dsp/x86/masked_sad_intrin_avx2.c 2019-06-12 08:16:22.602049410 +0200
|
|
||||||
@@ -17,7 +17,7 @@
|
|
||||||
#include "aom_dsp/blend.h"
|
|
||||||
#include "aom/aom_integer.h"
|
|
||||||
#include "aom_dsp/x86/synonyms.h"
|
|
||||||
-#include "aom_dsp/x86//masked_sad_intrin_ssse3.h"
|
|
||||||
+#include "aom_dsp/x86/masked_sad_intrin_ssse3.h"
|
|
||||||
|
|
||||||
static INLINE unsigned int masked_sad32xh_avx2(
|
|
||||||
const uint8_t *src_ptr, int src_stride, const uint8_t *a_ptr, int a_stride,
|
|
||||||
diff -up firefox-68.0/third_party/aom/aom_dsp/x86/masked_sad_intrin_ssse3.c.old firefox-68.0/third_party/aom/aom_dsp/x86/masked_sad_intrin_ssse3.c
|
|
||||||
--- firefox-68.0/third_party/aom/aom_dsp/x86/masked_sad_intrin_ssse3.c.old 2019-06-12 08:16:35.404119384 +0200
|
|
||||||
+++ firefox-68.0/third_party/aom/aom_dsp/x86/masked_sad_intrin_ssse3.c 2019-06-12 08:16:43.415163174 +0200
|
|
||||||
@@ -19,7 +19,7 @@
|
|
||||||
#include "aom/aom_integer.h"
|
|
||||||
#include "aom_dsp/x86/synonyms.h"
|
|
||||||
|
|
||||||
-#include "aom_dsp/x86//masked_sad_intrin_ssse3.h"
|
|
||||||
+#include "aom_dsp/x86/masked_sad_intrin_ssse3.h"
|
|
||||||
|
|
||||||
// For width a multiple of 16
|
|
||||||
static INLINE unsigned int masked_sad_ssse3(const uint8_t *src_ptr,
|
|
||||||
@ -1,7 +1,5 @@
|
|||||||
. $topsrcdir/browser/config/mozconfig
|
. $topsrcdir/browser/config/mozconfig
|
||||||
|
|
||||||
ac_add_options --enable-default-toolkit=cairo-gtk3
|
|
||||||
|
|
||||||
ac_add_options --prefix="$PREFIX"
|
ac_add_options --prefix="$PREFIX"
|
||||||
ac_add_options --libdir="$LIBDIR"
|
ac_add_options --libdir="$LIBDIR"
|
||||||
ac_add_options --with-system-zlib
|
ac_add_options --with-system-zlib
|
||||||
@ -12,12 +10,18 @@ ac_add_options --enable-necko-wifi
|
|||||||
ac_add_options --disable-updater
|
ac_add_options --disable-updater
|
||||||
ac_add_options --enable-chrome-format=omni
|
ac_add_options --enable-chrome-format=omni
|
||||||
ac_add_options --enable-pulseaudio
|
ac_add_options --enable-pulseaudio
|
||||||
ac_add_options --with-system-icu
|
ac_add_options --without-system-icu
|
||||||
|
ac_add_options --enable-release
|
||||||
|
ac_add_options --update-channel=release
|
||||||
|
ac_add_options --allow-addon-sideload
|
||||||
|
ac_add_options --with-system-jpeg
|
||||||
|
ac_add_options --enable-js-shell
|
||||||
|
ac_add_options --with-unsigned-addon-scopes=app,system
|
||||||
|
|
||||||
ac_add_options --with-mozilla-api-keyfile=../mozilla-api-key
|
ac_add_options --with-mozilla-api-keyfile=../mozilla-api-key
|
||||||
ac_add_options --with-google-location-service-api-keyfile=../google-api-key
|
ac_add_options --with-google-location-service-api-keyfile=../google-api-key
|
||||||
ac_add_options --with-google-safebrowsing-api-keyfile=../google-api-key
|
ac_add_options --with-google-safebrowsing-api-keyfile=../google-api-key
|
||||||
ac_add_options --disable-av1
|
ac_add_options --disable-crashreporter
|
||||||
ac_add_options --allow-addon-sideload
|
|
||||||
|
|
||||||
export BUILD_OFFICIAL=1
|
export BUILD_OFFICIAL=1
|
||||||
export MOZILLA_OFFICIAL=1
|
export MOZILLA_OFFICIAL=1
|
||||||
|
|||||||
@ -1,846 +0,0 @@
|
|||||||
diff --git a/config/system-headers.mozbuild b/config/system-headers.mozbuild
|
|
||||||
index 2081d0c683a4..641133bf1ea4 100644
|
|
||||||
--- a/config/system-headers.mozbuild
|
|
||||||
+++ b/config/system-headers.mozbuild
|
|
||||||
@@ -314,6 +314,7 @@ system_headers = [
|
|
||||||
'Gestalt.h',
|
|
||||||
'getopt.h',
|
|
||||||
'gio/gio.h',
|
|
||||||
+ 'gio/gunixfdlist.h',
|
|
||||||
'glibconfig.h',
|
|
||||||
'glib.h',
|
|
||||||
'glib-object.h',
|
|
||||||
@@ -607,6 +608,7 @@ system_headers = [
|
|
||||||
'Pgenerr.h',
|
|
||||||
'PGenErr.h',
|
|
||||||
'Ph.h',
|
|
||||||
+ 'pipewire/pipewire.h',
|
|
||||||
'pixman.h',
|
|
||||||
'pk11func.h',
|
|
||||||
'pk11pqg.h',
|
|
||||||
diff --git a/media/webrtc/trunk/webrtc/modules/desktop_capture/BUILD.gn b/media/webrtc/trunk/webrtc/modules/desktop_capture/BUILD.gn
|
|
||||||
index ba885217b3ba..201d3b755221 100644
|
|
||||||
--- a/media/webrtc/trunk/webrtc/modules/desktop_capture/BUILD.gn
|
|
||||||
+++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/BUILD.gn
|
|
||||||
@@ -158,7 +158,7 @@ if (rtc_include_tests) {
|
|
||||||
if (is_linux) {
|
|
||||||
if (rtc_use_pipewire) {
|
|
||||||
pkg_config("pipewire") {
|
|
||||||
- packages = [ "libpipewire-0.2" ]
|
|
||||||
+ packages = [ "libpipewire-0.3" ]
|
|
||||||
|
|
||||||
defines = [ "WEBRTC_USE_PIPEWIRE" ]
|
|
||||||
}
|
|
||||||
diff --git a/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build b/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build
|
|
||||||
index 90b40431c7e4..d844aa79d591 100644
|
|
||||||
--- a/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build
|
|
||||||
+++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build
|
|
||||||
@@ -194,6 +194,30 @@ if CONFIG["OS_TARGET"] == "Linux":
|
|
||||||
"/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_linux.cc"
|
|
||||||
]
|
|
||||||
|
|
||||||
+# PipeWire specific files
|
|
||||||
+if CONFIG["OS_TARGET"] == "Linux":
|
|
||||||
+
|
|
||||||
+ DEFINES["WEBRTC_USE_PIPEWIRE"] = "1"
|
|
||||||
+
|
|
||||||
+ OS_LIBS += [
|
|
||||||
+ "rt",
|
|
||||||
+ "pipewire-0.3",
|
|
||||||
+ "glib-2.0",
|
|
||||||
+ "gio-2.0",
|
|
||||||
+ "gobject-2.0"
|
|
||||||
+ ]
|
|
||||||
+
|
|
||||||
+ CXXFLAGS += CONFIG['TK_CFLAGS']
|
|
||||||
+ CXXFLAGS += [ "-I/usr/include/pipewire-0.3" ]
|
|
||||||
+ CXXFLAGS += [ "-I/usr/include/spa-0.2" ]
|
|
||||||
+
|
|
||||||
+ UNIFIED_SOURCES += [
|
|
||||||
+ "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc",
|
|
||||||
+ "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc",
|
|
||||||
+ "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc"
|
|
||||||
+ ]
|
|
||||||
+
|
|
||||||
+
|
|
||||||
if CONFIG["OS_TARGET"] == "NetBSD":
|
|
||||||
|
|
||||||
DEFINES["USE_X11"] = "1"
|
|
||||||
diff --git a/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h b/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h
|
|
||||||
index 1eb8ead26efa..316468eed1fc 100644
|
|
||||||
--- a/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h
|
|
||||||
+++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h
|
|
||||||
@@ -141,7 +141,7 @@ class DesktopCaptureOptions {
|
|
||||||
bool disable_effects_ = true;
|
|
||||||
bool detect_updated_region_ = false;
|
|
||||||
#if defined(WEBRTC_USE_PIPEWIRE)
|
|
||||||
- bool allow_pipewire_ = false;
|
|
||||||
+ bool allow_pipewire_ = true;
|
|
||||||
#endif
|
|
||||||
};
|
|
||||||
|
|
||||||
diff --git a/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc b/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc
|
|
||||||
index 379341c833de..76349f1fbd4d 100644
|
|
||||||
--- a/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc
|
|
||||||
+++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc
|
|
||||||
@@ -15,8 +15,11 @@
|
|
||||||
|
|
||||||
#include <spa/param/format-utils.h>
|
|
||||||
#include <spa/param/props.h>
|
|
||||||
-#include <spa/param/video/raw-utils.h>
|
|
||||||
-#include <spa/support/type-map.h>
|
|
||||||
+
|
|
||||||
+#include <linux/dma-buf.h>
|
|
||||||
+#include <sys/mman.h>
|
|
||||||
+#include <sys/ioctl.h>
|
|
||||||
+#include <sys/syscall.h>
|
|
||||||
|
|
||||||
#include <memory>
|
|
||||||
#include <utility>
|
|
||||||
@@ -36,31 +39,36 @@ const char kSessionInterfaceName[] = "org.freedesktop.portal.Session";
|
|
||||||
const char kRequestInterfaceName[] = "org.freedesktop.portal.Request";
|
|
||||||
const char kScreenCastInterfaceName[] = "org.freedesktop.portal.ScreenCast";
|
|
||||||
|
|
||||||
-// static
|
|
||||||
-void BaseCapturerPipeWire::OnStateChanged(void* data,
|
|
||||||
- pw_remote_state old_state,
|
|
||||||
- pw_remote_state state,
|
|
||||||
- const char* error_message) {
|
|
||||||
- BaseCapturerPipeWire* that = static_cast<BaseCapturerPipeWire*>(data);
|
|
||||||
- RTC_DCHECK(that);
|
|
||||||
|
|
||||||
- switch (state) {
|
|
||||||
- case PW_REMOTE_STATE_ERROR:
|
|
||||||
- RTC_LOG(LS_ERROR) << "PipeWire remote state error: " << error_message;
|
|
||||||
- break;
|
|
||||||
- case PW_REMOTE_STATE_CONNECTED:
|
|
||||||
- RTC_LOG(LS_INFO) << "PipeWire remote state: connected.";
|
|
||||||
- that->CreateReceivingStream();
|
|
||||||
- break;
|
|
||||||
- case PW_REMOTE_STATE_CONNECTING:
|
|
||||||
- RTC_LOG(LS_INFO) << "PipeWire remote state: connecting.";
|
|
||||||
+// static
|
|
||||||
+void BaseCapturerPipeWire::SyncDmaBuf(int fd, uint64_t start_or_end) {
|
|
||||||
+ struct dma_buf_sync sync = { 0 };
|
|
||||||
+
|
|
||||||
+ sync.flags = start_or_end | DMA_BUF_SYNC_READ;
|
|
||||||
+
|
|
||||||
+ while(true) {
|
|
||||||
+ int ret;
|
|
||||||
+ ret = ioctl (fd, DMA_BUF_IOCTL_SYNC, &sync);
|
|
||||||
+ if (ret == -1 && errno == EINTR) {
|
|
||||||
+ continue;
|
|
||||||
+ } else if (ret == -1) {
|
|
||||||
+ RTC_LOG(LS_ERROR) << "Failed to synchronize DMA buffer: " << g_strerror(errno);
|
|
||||||
break;
|
|
||||||
- case PW_REMOTE_STATE_UNCONNECTED:
|
|
||||||
- RTC_LOG(LS_INFO) << "PipeWire remote state: unconnected.";
|
|
||||||
+ } else {
|
|
||||||
break;
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
+// static
|
|
||||||
+void BaseCapturerPipeWire::OnCoreError(void *data,
|
|
||||||
+ uint32_t id,
|
|
||||||
+ int seq,
|
|
||||||
+ int res,
|
|
||||||
+ const char *message) {
|
|
||||||
+ RTC_LOG(LS_ERROR) << "core error: " << message;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
// static
|
|
||||||
void BaseCapturerPipeWire::OnStreamStateChanged(void* data,
|
|
||||||
pw_stream_state old_state,
|
|
||||||
@@ -73,76 +81,54 @@ void BaseCapturerPipeWire::OnStreamStateChanged(void* data,
|
|
||||||
case PW_STREAM_STATE_ERROR:
|
|
||||||
RTC_LOG(LS_ERROR) << "PipeWire stream state error: " << error_message;
|
|
||||||
break;
|
|
||||||
- case PW_STREAM_STATE_CONFIGURE:
|
|
||||||
- pw_stream_set_active(that->pw_stream_, true);
|
|
||||||
- break;
|
|
||||||
- case PW_STREAM_STATE_UNCONNECTED:
|
|
||||||
- case PW_STREAM_STATE_CONNECTING:
|
|
||||||
- case PW_STREAM_STATE_READY:
|
|
||||||
case PW_STREAM_STATE_PAUSED:
|
|
||||||
case PW_STREAM_STATE_STREAMING:
|
|
||||||
+ case PW_STREAM_STATE_UNCONNECTED:
|
|
||||||
+ case PW_STREAM_STATE_CONNECTING:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// static
|
|
||||||
-void BaseCapturerPipeWire::OnStreamFormatChanged(void* data,
|
|
||||||
- const struct spa_pod* format) {
|
|
||||||
+void BaseCapturerPipeWire::OnStreamParamChanged(void *data, uint32_t id,
|
|
||||||
+ const struct spa_pod *format) {
|
|
||||||
BaseCapturerPipeWire* that = static_cast<BaseCapturerPipeWire*>(data);
|
|
||||||
RTC_DCHECK(that);
|
|
||||||
|
|
||||||
- RTC_LOG(LS_INFO) << "PipeWire stream format changed.";
|
|
||||||
+ RTC_LOG(LS_INFO) << "PipeWire stream param changed.";
|
|
||||||
|
|
||||||
- if (!format) {
|
|
||||||
- pw_stream_finish_format(that->pw_stream_, /*res=*/0, /*params=*/nullptr,
|
|
||||||
- /*n_params=*/0);
|
|
||||||
+ if (!format || id != SPA_PARAM_Format) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
- that->spa_video_format_ = new spa_video_info_raw();
|
|
||||||
- spa_format_video_raw_parse(format, that->spa_video_format_,
|
|
||||||
- &that->pw_type_->format_video);
|
|
||||||
+ spa_format_video_raw_parse(format, &that->spa_video_format_);
|
|
||||||
|
|
||||||
- auto width = that->spa_video_format_->size.width;
|
|
||||||
- auto height = that->spa_video_format_->size.height;
|
|
||||||
+ auto width = that->spa_video_format_.size.width;
|
|
||||||
+ auto height = that->spa_video_format_.size.height;
|
|
||||||
auto stride = SPA_ROUND_UP_N(width * kBytesPerPixel, 4);
|
|
||||||
auto size = height * stride;
|
|
||||||
|
|
||||||
+ that->desktop_size_ = DesktopSize(width, height);
|
|
||||||
+
|
|
||||||
uint8_t buffer[1024] = {};
|
|
||||||
auto builder = spa_pod_builder{buffer, sizeof(buffer)};
|
|
||||||
|
|
||||||
// Setup buffers and meta header for new format.
|
|
||||||
- const struct spa_pod* params[2];
|
|
||||||
- params[0] = reinterpret_cast<spa_pod*>(spa_pod_builder_object(
|
|
||||||
- &builder,
|
|
||||||
- // id to enumerate buffer requirements
|
|
||||||
- that->pw_core_type_->param.idBuffers,
|
|
||||||
- that->pw_core_type_->param_buffers.Buffers,
|
|
||||||
- // Size: specified as integer (i) and set to specified size
|
|
||||||
- ":", that->pw_core_type_->param_buffers.size, "i", size,
|
|
||||||
- // Stride: specified as integer (i) and set to specified stride
|
|
||||||
- ":", that->pw_core_type_->param_buffers.stride, "i", stride,
|
|
||||||
- // Buffers: specifies how many buffers we want to deal with, set as
|
|
||||||
- // integer (i) where preferred number is 8, then allowed number is defined
|
|
||||||
- // as range (r) from min and max values and it is undecided (u) to allow
|
|
||||||
- // negotiation
|
|
||||||
- ":", that->pw_core_type_->param_buffers.buffers, "iru", 8,
|
|
||||||
- SPA_POD_PROP_MIN_MAX(1, 32),
|
|
||||||
- // Align: memory alignment of the buffer, set as integer (i) to specified
|
|
||||||
- // value
|
|
||||||
- ":", that->pw_core_type_->param_buffers.align, "i", 16));
|
|
||||||
- params[1] = reinterpret_cast<spa_pod*>(spa_pod_builder_object(
|
|
||||||
- &builder,
|
|
||||||
- // id to enumerate supported metadata
|
|
||||||
- that->pw_core_type_->param.idMeta, that->pw_core_type_->param_meta.Meta,
|
|
||||||
- // Type: specified as id or enum (I)
|
|
||||||
- ":", that->pw_core_type_->param_meta.type, "I",
|
|
||||||
- that->pw_core_type_->meta.Header,
|
|
||||||
- // Size: size of the metadata, specified as integer (i)
|
|
||||||
- ":", that->pw_core_type_->param_meta.size, "i",
|
|
||||||
- sizeof(struct spa_meta_header)));
|
|
||||||
-
|
|
||||||
- pw_stream_finish_format(that->pw_stream_, /*res=*/0, params, /*n_params=*/2);
|
|
||||||
+ const struct spa_pod* params[3];
|
|
||||||
+ params[0] = reinterpret_cast<spa_pod *>(spa_pod_builder_add_object(&builder,
|
|
||||||
+ SPA_TYPE_OBJECT_ParamBuffers, SPA_PARAM_Buffers,
|
|
||||||
+ SPA_PARAM_BUFFERS_size, SPA_POD_Int(size),
|
|
||||||
+ SPA_PARAM_BUFFERS_stride, SPA_POD_Int(stride),
|
|
||||||
+ SPA_PARAM_BUFFERS_buffers, SPA_POD_CHOICE_RANGE_Int(8, 1, 32)));
|
|
||||||
+ params[1] = reinterpret_cast<spa_pod *>(spa_pod_builder_add_object(&builder,
|
|
||||||
+ SPA_TYPE_OBJECT_ParamMeta, SPA_PARAM_Meta,
|
|
||||||
+ SPA_PARAM_META_type, SPA_POD_Id(SPA_META_Header),
|
|
||||||
+ SPA_PARAM_META_size, SPA_POD_Int(sizeof(struct spa_meta_header))));
|
|
||||||
+ params[2] = reinterpret_cast<spa_pod *>(spa_pod_builder_add_object(&builder,
|
|
||||||
+ SPA_TYPE_OBJECT_ParamMeta, SPA_PARAM_Meta,
|
|
||||||
+ SPA_PARAM_META_type, SPA_POD_Id (SPA_META_VideoCrop),
|
|
||||||
+ SPA_PARAM_META_size, SPA_POD_Int (sizeof(struct spa_meta_region))));
|
|
||||||
+ pw_stream_update_params(that->pw_stream_, params, 3);
|
|
||||||
}
|
|
||||||
|
|
||||||
// static
|
|
||||||
@@ -150,15 +136,25 @@ void BaseCapturerPipeWire::OnStreamProcess(void* data) {
|
|
||||||
BaseCapturerPipeWire* that = static_cast<BaseCapturerPipeWire*>(data);
|
|
||||||
RTC_DCHECK(that);
|
|
||||||
|
|
||||||
- pw_buffer* buf = nullptr;
|
|
||||||
+ struct pw_buffer *next_buffer;
|
|
||||||
+ struct pw_buffer *buffer = nullptr;
|
|
||||||
+
|
|
||||||
+ next_buffer = pw_stream_dequeue_buffer(that->pw_stream_);
|
|
||||||
+ while (next_buffer) {
|
|
||||||
+ buffer = next_buffer;
|
|
||||||
+ next_buffer = pw_stream_dequeue_buffer(that->pw_stream_);
|
|
||||||
|
|
||||||
- if (!(buf = pw_stream_dequeue_buffer(that->pw_stream_))) {
|
|
||||||
+ if (next_buffer)
|
|
||||||
+ pw_stream_queue_buffer (that->pw_stream_, buffer);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ if (!buffer) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
- that->HandleBuffer(buf);
|
|
||||||
+ that->HandleBuffer(buffer);
|
|
||||||
|
|
||||||
- pw_stream_queue_buffer(that->pw_stream_, buf);
|
|
||||||
+ pw_stream_queue_buffer(that->pw_stream_, buffer);
|
|
||||||
}
|
|
||||||
|
|
||||||
BaseCapturerPipeWire::BaseCapturerPipeWire(CaptureSourceType source_type)
|
|
||||||
@@ -169,38 +165,22 @@ BaseCapturerPipeWire::~BaseCapturerPipeWire() {
|
|
||||||
pw_thread_loop_stop(pw_main_loop_);
|
|
||||||
}
|
|
||||||
|
|
||||||
- if (pw_type_) {
|
|
||||||
- delete pw_type_;
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- if (spa_video_format_) {
|
|
||||||
- delete spa_video_format_;
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
if (pw_stream_) {
|
|
||||||
pw_stream_destroy(pw_stream_);
|
|
||||||
}
|
|
||||||
|
|
||||||
- if (pw_remote_) {
|
|
||||||
- pw_remote_destroy(pw_remote_);
|
|
||||||
+ if (pw_core_) {
|
|
||||||
+ pw_core_disconnect(pw_core_);
|
|
||||||
}
|
|
||||||
|
|
||||||
- if (pw_core_) {
|
|
||||||
- pw_core_destroy(pw_core_);
|
|
||||||
+ if (pw_context_) {
|
|
||||||
+ pw_context_destroy(pw_context_);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (pw_main_loop_) {
|
|
||||||
pw_thread_loop_destroy(pw_main_loop_);
|
|
||||||
}
|
|
||||||
|
|
||||||
- if (pw_loop_) {
|
|
||||||
- pw_loop_destroy(pw_loop_);
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- if (current_frame_) {
|
|
||||||
- free(current_frame_);
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
if (start_request_signal_id_) {
|
|
||||||
g_dbus_connection_signal_unsubscribe(connection_, start_request_signal_id_);
|
|
||||||
}
|
|
||||||
@@ -250,27 +230,35 @@ void BaseCapturerPipeWire::InitPortal() {
|
|
||||||
void BaseCapturerPipeWire::InitPipeWire() {
|
|
||||||
pw_init(/*argc=*/nullptr, /*argc=*/nullptr);
|
|
||||||
|
|
||||||
- pw_loop_ = pw_loop_new(/*properties=*/nullptr);
|
|
||||||
- pw_main_loop_ = pw_thread_loop_new(pw_loop_, "pipewire-main-loop");
|
|
||||||
-
|
|
||||||
- pw_core_ = pw_core_new(pw_loop_, /*properties=*/nullptr);
|
|
||||||
- pw_core_type_ = pw_core_get_type(pw_core_);
|
|
||||||
- pw_remote_ = pw_remote_new(pw_core_, nullptr, /*user_data_size=*/0);
|
|
||||||
+ pw_main_loop_ = pw_thread_loop_new("pipewire-main-loop", nullptr);
|
|
||||||
+ pw_context_ = pw_context_new(pw_thread_loop_get_loop(pw_main_loop_), nullptr, 0);
|
|
||||||
+ if (!pw_context_) {
|
|
||||||
+ RTC_LOG(LS_ERROR) << "Failed to create PipeWire context";
|
|
||||||
+ return;
|
|
||||||
+ }
|
|
||||||
|
|
||||||
- InitPipeWireTypes();
|
|
||||||
+ pw_core_ = pw_context_connect(pw_context_, nullptr, 0);
|
|
||||||
+ if (!pw_core_) {
|
|
||||||
+ RTC_LOG(LS_ERROR) << "Failed to connect PipeWire context";
|
|
||||||
+ return;
|
|
||||||
+ }
|
|
||||||
|
|
||||||
// Initialize event handlers, remote end and stream-related.
|
|
||||||
- pw_remote_events_.version = PW_VERSION_REMOTE_EVENTS;
|
|
||||||
- pw_remote_events_.state_changed = &OnStateChanged;
|
|
||||||
+ pw_core_events_.version = PW_VERSION_CORE_EVENTS;
|
|
||||||
+ pw_core_events_.error = &OnCoreError;
|
|
||||||
|
|
||||||
pw_stream_events_.version = PW_VERSION_STREAM_EVENTS;
|
|
||||||
pw_stream_events_.state_changed = &OnStreamStateChanged;
|
|
||||||
- pw_stream_events_.format_changed = &OnStreamFormatChanged;
|
|
||||||
+ pw_stream_events_.param_changed = &OnStreamParamChanged;
|
|
||||||
pw_stream_events_.process = &OnStreamProcess;
|
|
||||||
|
|
||||||
- pw_remote_add_listener(pw_remote_, &spa_remote_listener_, &pw_remote_events_,
|
|
||||||
- this);
|
|
||||||
- pw_remote_connect_fd(pw_remote_, pw_fd_);
|
|
||||||
+ pw_core_add_listener(pw_core_, &spa_core_listener_, &pw_core_events_, this);
|
|
||||||
+
|
|
||||||
+ pw_stream_ = CreateReceivingStream();
|
|
||||||
+ if (!pw_stream_) {
|
|
||||||
+ RTC_LOG(LS_ERROR) << "Failed to create PipeWire stream";
|
|
||||||
+ return;
|
|
||||||
+ }
|
|
||||||
|
|
||||||
if (pw_thread_loop_start(pw_main_loop_) < 0) {
|
|
||||||
RTC_LOG(LS_ERROR) << "Failed to start main PipeWire loop";
|
|
||||||
@@ -278,81 +266,132 @@ void BaseCapturerPipeWire::InitPipeWire() {
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
-void BaseCapturerPipeWire::InitPipeWireTypes() {
|
|
||||||
- spa_type_map* map = pw_core_type_->map;
|
|
||||||
- pw_type_ = new PipeWireType();
|
|
||||||
-
|
|
||||||
- spa_type_media_type_map(map, &pw_type_->media_type);
|
|
||||||
- spa_type_media_subtype_map(map, &pw_type_->media_subtype);
|
|
||||||
- spa_type_format_video_map(map, &pw_type_->format_video);
|
|
||||||
- spa_type_video_format_map(map, &pw_type_->video_format);
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
-void BaseCapturerPipeWire::CreateReceivingStream() {
|
|
||||||
+pw_stream* BaseCapturerPipeWire::CreateReceivingStream() {
|
|
||||||
spa_rectangle pwMinScreenBounds = spa_rectangle{1, 1};
|
|
||||||
- spa_rectangle pwScreenBounds =
|
|
||||||
- spa_rectangle{static_cast<uint32_t>(desktop_size_.width()),
|
|
||||||
- static_cast<uint32_t>(desktop_size_.height())};
|
|
||||||
+ spa_rectangle pwMaxScreenBounds = spa_rectangle{INT32_MAX, INT32_MAX};
|
|
||||||
|
|
||||||
- spa_fraction pwFrameRateMin = spa_fraction{0, 1};
|
|
||||||
- spa_fraction pwFrameRateMax = spa_fraction{60, 1};
|
|
||||||
+ auto stream = pw_stream_new(pw_core_, "webrtc-pipewire-stream", nullptr);
|
|
||||||
|
|
||||||
- pw_properties* reuseProps = pw_properties_new("pipewire.client.reuse", "1",
|
|
||||||
- /*end of varargs*/ nullptr);
|
|
||||||
- pw_stream_ = pw_stream_new(pw_remote_, "webrtc-consume-stream", reuseProps);
|
|
||||||
+ if (!stream) {
|
|
||||||
+ RTC_LOG(LS_ERROR) << "Could not create receiving stream.";
|
|
||||||
+ return nullptr;
|
|
||||||
+ }
|
|
||||||
|
|
||||||
uint8_t buffer[1024] = {};
|
|
||||||
- const spa_pod* params[1];
|
|
||||||
- spa_pod_builder builder = spa_pod_builder{buffer, sizeof(buffer)};
|
|
||||||
- params[0] = reinterpret_cast<spa_pod*>(spa_pod_builder_object(
|
|
||||||
- &builder,
|
|
||||||
- // id to enumerate formats
|
|
||||||
- pw_core_type_->param.idEnumFormat, pw_core_type_->spa_format, "I",
|
|
||||||
- pw_type_->media_type.video, "I", pw_type_->media_subtype.raw,
|
|
||||||
- // Video format: specified as id or enum (I), preferred format is BGRx,
|
|
||||||
- // then allowed formats are enumerated (e) and the format is undecided (u)
|
|
||||||
- // to allow negotiation
|
|
||||||
- ":", pw_type_->format_video.format, "Ieu", pw_type_->video_format.BGRx,
|
|
||||||
- SPA_POD_PROP_ENUM(2, pw_type_->video_format.RGBx,
|
|
||||||
- pw_type_->video_format.BGRx),
|
|
||||||
- // Video size: specified as rectangle (R), preferred size is specified as
|
|
||||||
- // first parameter, then allowed size is defined as range (r) from min and
|
|
||||||
- // max values and the format is undecided (u) to allow negotiation
|
|
||||||
- ":", pw_type_->format_video.size, "Rru", &pwScreenBounds, 2,
|
|
||||||
- &pwMinScreenBounds, &pwScreenBounds,
|
|
||||||
- // Frame rate: specified as fraction (F) and set to minimum frame rate
|
|
||||||
- // value
|
|
||||||
- ":", pw_type_->format_video.framerate, "F", &pwFrameRateMin,
|
|
||||||
- // Max frame rate: specified as fraction (F), preferred frame rate is set
|
|
||||||
- // to maximum value, then allowed frame rate is defined as range (r) from
|
|
||||||
- // min and max values and it is undecided (u) to allow negotiation
|
|
||||||
- ":", pw_type_->format_video.max_framerate, "Fru", &pwFrameRateMax, 2,
|
|
||||||
- &pwFrameRateMin, &pwFrameRateMax));
|
|
||||||
-
|
|
||||||
- pw_stream_add_listener(pw_stream_, &spa_stream_listener_, &pw_stream_events_,
|
|
||||||
- this);
|
|
||||||
+ const spa_pod* params[2];
|
|
||||||
+ spa_pod_builder builder = SPA_POD_BUILDER_INIT(buffer, sizeof (buffer));
|
|
||||||
+
|
|
||||||
+ params[0] = reinterpret_cast<spa_pod *>(spa_pod_builder_add_object(&builder,
|
|
||||||
+ SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat,
|
|
||||||
+ SPA_FORMAT_mediaType, SPA_POD_Id(SPA_MEDIA_TYPE_video),
|
|
||||||
+ SPA_FORMAT_mediaSubtype, SPA_POD_Id(SPA_MEDIA_SUBTYPE_raw),
|
|
||||||
+ SPA_FORMAT_VIDEO_format, SPA_POD_CHOICE_ENUM_Id(5, SPA_VIDEO_FORMAT_BGRx, SPA_VIDEO_FORMAT_RGBx, SPA_VIDEO_FORMAT_RGBA,
|
|
||||||
+ SPA_VIDEO_FORMAT_BGRx, SPA_VIDEO_FORMAT_BGRA),
|
|
||||||
+ SPA_FORMAT_VIDEO_size, SPA_POD_CHOICE_RANGE_Rectangle(&pwMinScreenBounds,
|
|
||||||
+ &pwMinScreenBounds,
|
|
||||||
+ &pwMaxScreenBounds),
|
|
||||||
+ 0));
|
|
||||||
+ pw_stream_add_listener(stream, &spa_stream_listener_, &pw_stream_events_, this);
|
|
||||||
+
|
|
||||||
pw_stream_flags flags = static_cast<pw_stream_flags>(
|
|
||||||
- PW_STREAM_FLAG_AUTOCONNECT | PW_STREAM_FLAG_INACTIVE |
|
|
||||||
- PW_STREAM_FLAG_MAP_BUFFERS);
|
|
||||||
- if (pw_stream_connect(pw_stream_, PW_DIRECTION_INPUT, /*port_path=*/nullptr,
|
|
||||||
- flags, params,
|
|
||||||
- /*n_params=*/1) != 0) {
|
|
||||||
+ PW_STREAM_FLAG_AUTOCONNECT | PW_STREAM_FLAG_INACTIVE);
|
|
||||||
+
|
|
||||||
+ if (pw_stream_connect(stream, PW_DIRECTION_INPUT, pw_stream_node_id_, PW_STREAM_FLAG_AUTOCONNECT, params, 1) != 0) {
|
|
||||||
RTC_LOG(LS_ERROR) << "Could not connect receiving stream.";
|
|
||||||
portal_init_failed_ = true;
|
|
||||||
- return;
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+ return stream;
|
|
||||||
}
|
|
||||||
|
|
||||||
void BaseCapturerPipeWire::HandleBuffer(pw_buffer* buffer) {
|
|
||||||
+ struct spa_meta_region* video_crop;
|
|
||||||
spa_buffer* spaBuffer = buffer->buffer;
|
|
||||||
- void* src = nullptr;
|
|
||||||
+ uint8_t *map = nullptr;
|
|
||||||
+ uint8_t* src = nullptr;
|
|
||||||
+ uint8_t* dst = nullptr;
|
|
||||||
+
|
|
||||||
+ if (spaBuffer->datas[0].chunk->size == 0) {
|
|
||||||
+ map = nullptr;
|
|
||||||
+ src = nullptr;
|
|
||||||
+ } else if (spaBuffer->datas[0].type == SPA_DATA_MemFd) {
|
|
||||||
+ map = static_cast<uint8_t*>(mmap(
|
|
||||||
+ nullptr, spaBuffer->datas[0].maxsize + spaBuffer->datas[0].mapoffset,
|
|
||||||
+ PROT_READ, MAP_PRIVATE, spaBuffer->datas[0].fd, 0));
|
|
||||||
+
|
|
||||||
+ if (map == MAP_FAILED) {
|
|
||||||
+ RTC_LOG(LS_ERROR) << "Failed to mmap the memory: " << std::strerror(errno);
|
|
||||||
+ return;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ src = SPA_MEMBER(map, spaBuffer->datas[0].mapoffset, uint8_t);
|
|
||||||
+ } else if (spaBuffer->datas[0].type == SPA_DATA_DmaBuf) {
|
|
||||||
+ int fd;
|
|
||||||
+ fd = spaBuffer->datas[0].fd;
|
|
||||||
|
|
||||||
- if (!(src = spaBuffer->datas[0].data)) {
|
|
||||||
+ map = static_cast<uint8_t*>(mmap(
|
|
||||||
+ nullptr, spaBuffer->datas[0].maxsize + spaBuffer->datas[0].mapoffset,
|
|
||||||
+ PROT_READ, MAP_PRIVATE, fd, 0));
|
|
||||||
+
|
|
||||||
+ if (map == MAP_FAILED) {
|
|
||||||
+ RTC_LOG(LS_ERROR) << "Failed to mmap the memory: " << std::strerror(errno);
|
|
||||||
+ return;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ SyncDmaBuf(fd, DMA_BUF_SYNC_START);
|
|
||||||
+
|
|
||||||
+ src = SPA_MEMBER(map, spaBuffer->datas[0].mapoffset, uint8_t);
|
|
||||||
+ } else if (spaBuffer->datas[0].type == SPA_DATA_MemPtr) {
|
|
||||||
+ map = nullptr;
|
|
||||||
+ src = static_cast<uint8_t*>(spaBuffer->datas[0].data);
|
|
||||||
+ } else {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
- uint32_t maxSize = spaBuffer->datas[0].maxsize;
|
|
||||||
- int32_t srcStride = spaBuffer->datas[0].chunk->stride;
|
|
||||||
+ if (!src) {
|
|
||||||
+ return;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ DesktopSize prev_crop_size = DesktopSize(0, 0);
|
|
||||||
+ if (video_crop_size_initialized_) {
|
|
||||||
+ prev_crop_size = video_crop_size_;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ if ((video_crop = static_cast<struct spa_meta_region*>(
|
|
||||||
+ spa_buffer_find_meta_data(spaBuffer, SPA_META_VideoCrop, sizeof(*video_crop))))) {
|
|
||||||
+ RTC_DCHECK(video_crop->region.size.width <= desktop_size_.width() &&
|
|
||||||
+ video_crop->region.size.height <= desktop_size_.height());
|
|
||||||
+ if ((video_crop->region.size.width != desktop_size_.width() ||
|
|
||||||
+ video_crop->region.size.height != desktop_size_.height()) && video_crop->region.size.width && video_crop->region.size.height) {
|
|
||||||
+ video_crop_size_ = DesktopSize(video_crop->region.size.width, video_crop->region.size.height);
|
|
||||||
+ video_crop_size_initialized_ = true;
|
|
||||||
+ } else {
|
|
||||||
+ video_crop_size_initialized_ = false;
|
|
||||||
+ }
|
|
||||||
+ } else {
|
|
||||||
+ video_crop_size_initialized_ = false;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ size_t frame_size;
|
|
||||||
+ if (video_crop_size_initialized_) {
|
|
||||||
+ frame_size =
|
|
||||||
+ video_crop_size_.width() * video_crop_size_.height() * kBytesPerPixel;
|
|
||||||
+ } else {
|
|
||||||
+ frame_size =
|
|
||||||
+ desktop_size_.width() * desktop_size_.height() * kBytesPerPixel;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ if (!current_frame_ ||
|
|
||||||
+ (video_crop_size_initialized_ && !video_crop_size_.equals(prev_crop_size))) {
|
|
||||||
+ current_frame_ = std::make_unique<uint8_t[]>(frame_size);
|
|
||||||
+ }
|
|
||||||
+ RTC_DCHECK(current_frame_ != nullptr);
|
|
||||||
+
|
|
||||||
+ const int32_t dstStride = video_crop_size_initialized_
|
|
||||||
+ ? video_crop_size_.width() * kBytesPerPixel
|
|
||||||
+ : desktop_size_.width() * kBytesPerPixel;
|
|
||||||
+ const int32_t srcStride = spaBuffer->datas[0].chunk->stride;
|
|
||||||
+
|
|
||||||
if (srcStride != (desktop_size_.width() * kBytesPerPixel)) {
|
|
||||||
RTC_LOG(LS_ERROR) << "Got buffer with stride different from screen stride: "
|
|
||||||
<< srcStride
|
|
||||||
@@ -361,21 +400,40 @@ void BaseCapturerPipeWire::HandleBuffer(pw_buffer* buffer) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
- if (!current_frame_) {
|
|
||||||
- current_frame_ = static_cast<uint8_t*>(malloc(maxSize));
|
|
||||||
+ dst = current_frame_.get();
|
|
||||||
+
|
|
||||||
+ // Adjust source content based on crop video position
|
|
||||||
+ if (video_crop_size_initialized_ &&
|
|
||||||
+ (video_crop->region.position.y + video_crop_size_.height() <= desktop_size_.height())) {
|
|
||||||
+ for (int i = 0; i < video_crop->region.position.y; ++i) {
|
|
||||||
+ src += srcStride;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ const int xOffset =
|
|
||||||
+ video_crop_size_initialized_ && (video_crop->region.position.x + video_crop_size_.width() <=
|
|
||||||
+ desktop_size_.width())
|
|
||||||
+ ? video_crop->region.position.x * kBytesPerPixel
|
|
||||||
+ : 0;
|
|
||||||
+ const int height = video_crop_size_initialized_ ? video_crop_size_.height() : desktop_size_.height();
|
|
||||||
+ for (int i = 0; i < height; ++i) {
|
|
||||||
+ // Adjust source content based on crop video position if needed
|
|
||||||
+ src += xOffset;
|
|
||||||
+ std::memcpy(dst, src, dstStride);
|
|
||||||
+ // If both sides decided to go with the RGBx format we need to convert it to
|
|
||||||
+ // BGRx to match color format expected by WebRTC.
|
|
||||||
+ if (spa_video_format_.format == SPA_VIDEO_FORMAT_RGBx ||
|
|
||||||
+ spa_video_format_.format == SPA_VIDEO_FORMAT_RGBA) {
|
|
||||||
+ ConvertRGBxToBGRx(dst, dstStride);
|
|
||||||
+ }
|
|
||||||
+ src += srcStride - xOffset;
|
|
||||||
+ dst += dstStride;
|
|
||||||
}
|
|
||||||
- RTC_DCHECK(current_frame_ != nullptr);
|
|
||||||
|
|
||||||
- // If both sides decided to go with the RGBx format we need to convert it to
|
|
||||||
- // BGRx to match color format expected by WebRTC.
|
|
||||||
- if (spa_video_format_->format == pw_type_->video_format.RGBx) {
|
|
||||||
- uint8_t* tempFrame = static_cast<uint8_t*>(malloc(maxSize));
|
|
||||||
- std::memcpy(tempFrame, src, maxSize);
|
|
||||||
- ConvertRGBxToBGRx(tempFrame, maxSize);
|
|
||||||
- std::memcpy(current_frame_, tempFrame, maxSize);
|
|
||||||
- free(tempFrame);
|
|
||||||
- } else {
|
|
||||||
- std::memcpy(current_frame_, src, maxSize);
|
|
||||||
+ if (map) {
|
|
||||||
+ if (spaBuffer->datas[0].type == SPA_DATA_DmaBuf) {
|
|
||||||
+ SyncDmaBuf(spaBuffer->datas[0].fd, DMA_BUF_SYNC_END);
|
|
||||||
+ }
|
|
||||||
+ munmap(map, spaBuffer->datas[0].maxsize + spaBuffer->datas[0].mapoffset);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -725,10 +783,7 @@ void BaseCapturerPipeWire::OnStartRequestResponseSignal(
|
|
||||||
g_variant_get(variant, "(u@a{sv})", &stream_id, &options);
|
|
||||||
RTC_DCHECK(options != nullptr);
|
|
||||||
|
|
||||||
- g_variant_lookup(options, "size", "(ii)", &width, &height);
|
|
||||||
-
|
|
||||||
- that->desktop_size_.set(width, height);
|
|
||||||
-
|
|
||||||
+ that->pw_stream_node_id_ = stream_id;
|
|
||||||
g_variant_unref(options);
|
|
||||||
g_variant_unref(variant);
|
|
||||||
}
|
|
||||||
@@ -813,10 +868,15 @@ void BaseCapturerPipeWire::CaptureFrame() {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
- std::unique_ptr<DesktopFrame> result(new BasicDesktopFrame(desktop_size_));
|
|
||||||
+ DesktopSize frame_size = desktop_size_;
|
|
||||||
+ if (video_crop_size_initialized_) {
|
|
||||||
+ frame_size = video_crop_size_;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ std::unique_ptr<DesktopFrame> result(new BasicDesktopFrame(frame_size));
|
|
||||||
result->CopyPixelsFrom(
|
|
||||||
- current_frame_, (desktop_size_.width() * kBytesPerPixel),
|
|
||||||
- DesktopRect::MakeWH(desktop_size_.width(), desktop_size_.height()));
|
|
||||||
+ current_frame_.get(), (frame_size.width() * kBytesPerPixel),
|
|
||||||
+ DesktopRect::MakeWH(frame_size.width(), frame_size.height()));
|
|
||||||
if (!result) {
|
|
||||||
callback_->OnCaptureResult(Result::ERROR_TEMPORARY, nullptr);
|
|
||||||
return;
|
|
||||||
@@ -837,4 +897,22 @@ bool BaseCapturerPipeWire::SelectSource(SourceId id) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
+// static
|
|
||||||
+std::unique_ptr<DesktopCapturer>
|
|
||||||
+BaseCapturerPipeWire::CreateRawScreenCapturer(
|
|
||||||
+ const DesktopCaptureOptions& options) {
|
|
||||||
+ std::unique_ptr<BaseCapturerPipeWire> capturer =
|
|
||||||
+ std::make_unique<BaseCapturerPipeWire>(BaseCapturerPipeWire::CaptureSourceType::kAny);
|
|
||||||
+ return std::move(capturer);}
|
|
||||||
+
|
|
||||||
+// static
|
|
||||||
+std::unique_ptr<DesktopCapturer>
|
|
||||||
+BaseCapturerPipeWire::CreateRawWindowCapturer(
|
|
||||||
+ const DesktopCaptureOptions& options) {
|
|
||||||
+
|
|
||||||
+ std::unique_ptr<BaseCapturerPipeWire> capturer =
|
|
||||||
+ std::make_unique<BaseCapturerPipeWire>(BaseCapturerPipeWire::CaptureSourceType::kAny);
|
|
||||||
+ return std::move(capturer);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
} // namespace webrtc
|
|
||||||
diff --git a/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.h b/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.h
|
|
||||||
index 56b101acbaa6..de54157d1a2a 100644
|
|
||||||
--- a/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.h
|
|
||||||
+++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.h
|
|
||||||
@@ -22,17 +22,13 @@
|
|
||||||
|
|
||||||
namespace webrtc {
|
|
||||||
|
|
||||||
-class PipeWireType {
|
|
||||||
- public:
|
|
||||||
- spa_type_media_type media_type;
|
|
||||||
- spa_type_media_subtype media_subtype;
|
|
||||||
- spa_type_format_video format_video;
|
|
||||||
- spa_type_video_format video_format;
|
|
||||||
-};
|
|
||||||
-
|
|
||||||
class BaseCapturerPipeWire : public DesktopCapturer {
|
|
||||||
public:
|
|
||||||
- enum CaptureSourceType { Screen = 1, Window };
|
|
||||||
+ enum CaptureSourceType : uint32_t {
|
|
||||||
+ kScreen = 0b01,
|
|
||||||
+ kWindow = 0b10,
|
|
||||||
+ kAny = 0b11
|
|
||||||
+ };
|
|
||||||
|
|
||||||
explicit BaseCapturerPipeWire(CaptureSourceType source_type);
|
|
||||||
~BaseCapturerPipeWire() override;
|
|
||||||
@@ -43,28 +39,32 @@ class BaseCapturerPipeWire : public DesktopCapturer {
|
|
||||||
bool GetSourceList(SourceList* sources) override;
|
|
||||||
bool SelectSource(SourceId id) override;
|
|
||||||
|
|
||||||
+ static std::unique_ptr<DesktopCapturer> CreateRawScreenCapturer(
|
|
||||||
+ const DesktopCaptureOptions& options);
|
|
||||||
+
|
|
||||||
+ static std::unique_ptr<DesktopCapturer> CreateRawWindowCapturer(
|
|
||||||
+ const DesktopCaptureOptions& options);
|
|
||||||
+
|
|
||||||
private:
|
|
||||||
// PipeWire types -->
|
|
||||||
+ pw_context* pw_context_ = nullptr;
|
|
||||||
pw_core* pw_core_ = nullptr;
|
|
||||||
- pw_type* pw_core_type_ = nullptr;
|
|
||||||
pw_stream* pw_stream_ = nullptr;
|
|
||||||
- pw_remote* pw_remote_ = nullptr;
|
|
||||||
- pw_loop* pw_loop_ = nullptr;
|
|
||||||
pw_thread_loop* pw_main_loop_ = nullptr;
|
|
||||||
- PipeWireType* pw_type_ = nullptr;
|
|
||||||
|
|
||||||
+ spa_hook spa_core_listener_ = {};
|
|
||||||
spa_hook spa_stream_listener_ = {};
|
|
||||||
- spa_hook spa_remote_listener_ = {};
|
|
||||||
|
|
||||||
+ pw_core_events pw_core_events_ = {};
|
|
||||||
pw_stream_events pw_stream_events_ = {};
|
|
||||||
- pw_remote_events pw_remote_events_ = {};
|
|
||||||
|
|
||||||
- spa_video_info_raw* spa_video_format_ = nullptr;
|
|
||||||
+ struct spa_video_info_raw spa_video_format_;
|
|
||||||
|
|
||||||
+ guint32 pw_stream_node_id_ = 0;
|
|
||||||
gint32 pw_fd_ = -1;
|
|
||||||
|
|
||||||
CaptureSourceType capture_source_type_ =
|
|
||||||
- BaseCapturerPipeWire::CaptureSourceType::Screen;
|
|
||||||
+ BaseCapturerPipeWire::CaptureSourceType::kAny;
|
|
||||||
|
|
||||||
// <-- end of PipeWire types
|
|
||||||
|
|
||||||
@@ -78,33 +78,37 @@ class BaseCapturerPipeWire : public DesktopCapturer {
|
|
||||||
guint sources_request_signal_id_ = 0;
|
|
||||||
guint start_request_signal_id_ = 0;
|
|
||||||
|
|
||||||
+ bool video_crop_size_initialized_ = false;
|
|
||||||
+ DesktopSize video_crop_size_;;
|
|
||||||
DesktopSize desktop_size_ = {};
|
|
||||||
DesktopCaptureOptions options_ = {};
|
|
||||||
|
|
||||||
- uint8_t* current_frame_ = nullptr;
|
|
||||||
+ std::unique_ptr<uint8_t[]> current_frame_;
|
|
||||||
Callback* callback_ = nullptr;
|
|
||||||
|
|
||||||
bool portal_init_failed_ = false;
|
|
||||||
|
|
||||||
void InitPortal();
|
|
||||||
void InitPipeWire();
|
|
||||||
- void InitPipeWireTypes();
|
|
||||||
|
|
||||||
- void CreateReceivingStream();
|
|
||||||
+ pw_stream* CreateReceivingStream();
|
|
||||||
void HandleBuffer(pw_buffer* buffer);
|
|
||||||
|
|
||||||
void ConvertRGBxToBGRx(uint8_t* frame, uint32_t size);
|
|
||||||
|
|
||||||
- static void OnStateChanged(void* data,
|
|
||||||
- pw_remote_state old_state,
|
|
||||||
- pw_remote_state state,
|
|
||||||
- const char* error);
|
|
||||||
+ static void SyncDmaBuf(int fd, uint64_t start_or_end);
|
|
||||||
+ static void OnCoreError(void *data,
|
|
||||||
+ uint32_t id,
|
|
||||||
+ int seq,
|
|
||||||
+ int res,
|
|
||||||
+ const char *message);
|
|
||||||
+ static void OnStreamParamChanged(void *data,
|
|
||||||
+ uint32_t id,
|
|
||||||
+ const struct spa_pod *format);
|
|
||||||
static void OnStreamStateChanged(void* data,
|
|
||||||
pw_stream_state old_state,
|
|
||||||
pw_stream_state state,
|
|
||||||
const char* error_message);
|
|
||||||
-
|
|
||||||
- static void OnStreamFormatChanged(void* data, const struct spa_pod* format);
|
|
||||||
static void OnStreamProcess(void* data);
|
|
||||||
static void OnNewBuffer(void* data, uint32_t id);
|
|
||||||
|
|
||||||
diff --git a/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc b/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc
|
|
||||||
index 26956fc67dc8..3813d697bb38 100644
|
|
||||||
--- a/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc
|
|
||||||
+++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc
|
|
||||||
@@ -15,7 +15,7 @@
|
|
||||||
namespace webrtc {
|
|
||||||
|
|
||||||
ScreenCapturerPipeWire::ScreenCapturerPipeWire()
|
|
||||||
- : BaseCapturerPipeWire(BaseCapturerPipeWire::CaptureSourceType::Screen) {}
|
|
||||||
+ : BaseCapturerPipeWire(BaseCapturerPipeWire::CaptureSourceType::kScreen) {}
|
|
||||||
ScreenCapturerPipeWire::~ScreenCapturerPipeWire() {}
|
|
||||||
|
|
||||||
// static
|
|
||||||
diff --git a/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc b/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc
|
|
||||||
index 35436475cb4d..c43a1f1a0c4e 100644
|
|
||||||
--- a/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc
|
|
||||||
+++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc
|
|
||||||
@@ -15,7 +15,7 @@
|
|
||||||
namespace webrtc {
|
|
||||||
|
|
||||||
WindowCapturerPipeWire::WindowCapturerPipeWire()
|
|
||||||
- : BaseCapturerPipeWire(BaseCapturerPipeWire::CaptureSourceType::Window) {}
|
|
||||||
+ : BaseCapturerPipeWire(BaseCapturerPipeWire::CaptureSourceType::kWindow) {}
|
|
||||||
WindowCapturerPipeWire::~WindowCapturerPipeWire() {}
|
|
||||||
|
|
||||||
// static
|
|
||||||
diff --git a/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_linux.cc b/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_linux.cc
|
|
||||||
index cf8a9dd0e0db..d27fab8d28d9 100644
|
|
||||||
--- a/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_linux.cc
|
|
||||||
+++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_linux.cc
|
|
||||||
@@ -26,7 +26,7 @@ std::unique_ptr<DesktopCapturer> DesktopCapturer::CreateRawScreenCapturer(
|
|
||||||
const DesktopCaptureOptions& options) {
|
|
||||||
#if defined(WEBRTC_USE_PIPEWIRE)
|
|
||||||
if (options.allow_pipewire() && DesktopCapturer::IsRunningUnderWayland()) {
|
|
||||||
- return ScreenCapturerPipeWire::CreateRawScreenCapturer(options);
|
|
||||||
+ return BaseCapturerPipeWire::CreateRawScreenCapturer(options);
|
|
||||||
}
|
|
||||||
#endif // defined(WEBRTC_USE_PIPEWIRE)
|
|
||||||
|
|
||||||
diff --git a/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_linux.cc b/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_linux.cc
|
|
||||||
index 82359e50c2db..bb9724cf7cc2 100644
|
|
||||||
--- a/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_linux.cc
|
|
||||||
+++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_linux.cc
|
|
||||||
@@ -26,7 +26,7 @@ std::unique_ptr<DesktopCapturer> DesktopCapturer::CreateRawWindowCapturer(
|
|
||||||
const DesktopCaptureOptions& options) {
|
|
||||||
#if defined(WEBRTC_USE_PIPEWIRE)
|
|
||||||
if (options.allow_pipewire() && DesktopCapturer::IsRunningUnderWayland()) {
|
|
||||||
- return WindowCapturerPipeWire::CreateRawWindowCapturer(options);
|
|
||||||
+ return BaseCapturerPipeWire::CreateRawWindowCapturer(options);
|
|
||||||
}
|
|
||||||
#endif // defined(WEBRTC_USE_PIPEWIRE)
|
|
||||||
|
|
||||||
@ -1,63 +0,0 @@
|
|||||||
diff -up firefox-68.0/config/system-headers.mozbuild.firefox-pipewire firefox-68.0/config/system-headers.mozbuild
|
|
||||||
--- firefox-68.0/config/system-headers.mozbuild.firefox-pipewire 2019-07-01 22:30:26.000000000 +0200
|
|
||||||
+++ firefox-68.0/config/system-headers.mozbuild 2019-07-08 15:26:15.397161627 +0200
|
|
||||||
@@ -314,6 +314,7 @@ system_headers = [
|
|
||||||
'Gestalt.h',
|
|
||||||
'getopt.h',
|
|
||||||
'gio/gio.h',
|
|
||||||
+ 'gio/gunixfdlist.h',
|
|
||||||
'glibconfig.h',
|
|
||||||
'glib.h',
|
|
||||||
'glib-object.h',
|
|
||||||
@@ -607,6 +608,7 @@ system_headers = [
|
|
||||||
'Pgenerr.h',
|
|
||||||
'PGenErr.h',
|
|
||||||
'Ph.h',
|
|
||||||
+ 'pipewire/pipewire.h',
|
|
||||||
'pixman.h',
|
|
||||||
'pk11func.h',
|
|
||||||
'pk11pqg.h',
|
|
||||||
diff -up firefox-68.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build.firefox-pipewire firefox-68.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build
|
|
||||||
--- firefox-68.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build.firefox-pipewire 2019-07-01 22:30:33.000000000 +0200
|
|
||||||
+++ firefox-68.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build 2019-07-08 15:26:15.397161627 +0200
|
|
||||||
@@ -194,6 +194,28 @@ if CONFIG["OS_TARGET"] == "Linux":
|
|
||||||
"/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_linux.cc"
|
|
||||||
]
|
|
||||||
|
|
||||||
+# PipeWire specific files
|
|
||||||
+if CONFIG["OS_TARGET"] == "Linux":
|
|
||||||
+
|
|
||||||
+ DEFINES["WEBRTC_USE_PIPEWIRE"] = "1"
|
|
||||||
+
|
|
||||||
+ OS_LIBS += [
|
|
||||||
+ "rt",
|
|
||||||
+ "pipewire-0.2",
|
|
||||||
+ "glib-2.0",
|
|
||||||
+ "gio-2.0",
|
|
||||||
+ "gobject-2.0"
|
|
||||||
+ ]
|
|
||||||
+
|
|
||||||
+ CXXFLAGS += CONFIG['TK_CFLAGS']
|
|
||||||
+
|
|
||||||
+ UNIFIED_SOURCES += [
|
|
||||||
+ "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc",
|
|
||||||
+ "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc",
|
|
||||||
+ "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc"
|
|
||||||
+ ]
|
|
||||||
+
|
|
||||||
+
|
|
||||||
if CONFIG["OS_TARGET"] == "NetBSD":
|
|
||||||
|
|
||||||
DEFINES["USE_X11"] = "1"
|
|
||||||
diff -up firefox-68.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h.firefox-pipewire firefox-68.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h
|
|
||||||
--- firefox-68.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h.firefox-pipewire 2019-07-08 16:42:13.936254926 +0200
|
|
||||||
+++ firefox-68.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h 2019-07-08 16:42:17.509264974 +0200
|
|
||||||
@@ -141,7 +141,7 @@ class DesktopCaptureOptions {
|
|
||||||
bool disable_effects_ = true;
|
|
||||||
bool detect_updated_region_ = false;
|
|
||||||
#if defined(WEBRTC_USE_PIPEWIRE)
|
|
||||||
- bool allow_pipewire_ = false;
|
|
||||||
+ bool allow_pipewire_ = true;
|
|
||||||
#endif
|
|
||||||
};
|
|
||||||
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
diff -up firefox-68.1.0/xpcom/threads/nsThread.cpp.old firefox-68.1.0/xpcom/threads/nsThread.cpp
|
|
||||||
--- firefox-68.1.0/xpcom/threads/nsThread.cpp.old 2019-09-20 12:17:35.481661390 +0200
|
|
||||||
+++ firefox-68.1.0/xpcom/threads/nsThread.cpp 2019-09-20 12:19:14.269180516 +0200
|
|
||||||
@@ -556,7 +556,8 @@ void nsThread::InitCommon() {
|
|
||||||
// kernel report them as separate regions, even when they are adjacent to
|
|
||||||
// heap memory. This allows us to accurately track the actual memory
|
|
||||||
// consumption of our allocated stacks.
|
|
||||||
- madvise(mStackBase, stackSize, MADV_NOHUGEPAGE);
|
|
||||||
+ // not supported on RHEL6
|
|
||||||
+ // madvise(mStackBase, stackSize, MADV_NOHUGEPAGE);
|
|
||||||
|
|
||||||
pthread_attr_destroy(&attr);
|
|
||||||
#elif defined(XP_WIN)
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
diff -up firefox-68.2.0/security/manager/ssl/nsNSSComponent.cpp.old firefox-68.2.0/security/manager/ssl/nsNSSComponent.cpp
|
|
||||||
--- firefox-68.2.0/security/manager/ssl/nsNSSComponent.cpp.old 2019-10-24 14:20:21.227037984 +0200
|
|
||||||
+++ firefox-68.2.0/security/manager/ssl/nsNSSComponent.cpp 2019-10-24 14:45:52.769506967 +0200
|
|
||||||
@@ -996,6 +996,9 @@ void nsNSSComponent::FillTLSVersionRange
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
+ // Enable TLS 1.3 as our NSS supports it.
|
|
||||||
+ supported.max = 0x304;
|
|
||||||
+
|
|
||||||
// Clip the defaults by what NSS actually supports to enable
|
|
||||||
// working with a system NSS with different ranges.
|
|
||||||
rangeOut.min = std::max(rangeOut.min, supported.min);
|
|
||||||
@ -1,54 +0,0 @@
|
|||||||
%dir %{gtk3_install_path}/bin
|
|
||||||
%{gtk3_install_path}/bin/gdk-pixbuf-query-loaders-%{__isa_bits}
|
|
||||||
%{gtk3_install_path}/bin/gdk-pixbuf-thumbnailer
|
|
||||||
%{gtk3_install_path}/bin/gio-querymodules-%{__isa_bits}
|
|
||||||
%{gtk3_install_path}/bin/glib-compile-schemas
|
|
||||||
%{gtk3_install_path}/bin/gtk-query-immodules-3.0-%{__isa_bits}
|
|
||||||
%{gtk3_install_path}/bin/gtk-update-icon-cache
|
|
||||||
%{gtk3_install_path}/bin/fc-cache
|
|
||||||
|
|
||||||
%{gtk3_install_path}/etc
|
|
||||||
|
|
||||||
%dir %{gtk3_install_path}/%{_lib}
|
|
||||||
%{gtk3_install_path}/%{_lib}/libatk-1.0.so.*
|
|
||||||
%{gtk3_install_path}/%{_lib}/libatk-bridge-2.0.so.*
|
|
||||||
%{gtk3_install_path}/%{_lib}/libatspi.so.*
|
|
||||||
%{gtk3_install_path}/%{_lib}/libcairo.so.*
|
|
||||||
%{gtk3_install_path}/%{_lib}/libcairo-gobject.so.*
|
|
||||||
%{gtk3_install_path}/%{_lib}/libfontconfig.so.*
|
|
||||||
%{gtk3_install_path}/%{_lib}/libfreetype.so.*
|
|
||||||
%{gtk3_install_path}/%{_lib}/libgdk-3.so.*
|
|
||||||
%{gtk3_install_path}/%{_lib}/libgdk_pixbuf-2.0.so.*
|
|
||||||
%{gtk3_install_path}/%{_lib}/libgio-2.0.so.*
|
|
||||||
%{gtk3_install_path}/%{_lib}/libglib-2.0.so.*
|
|
||||||
%{gtk3_install_path}/%{_lib}/libgmodule-2.0.so.*
|
|
||||||
%{gtk3_install_path}/%{_lib}/libgobject-2.0.so.*
|
|
||||||
%{gtk3_install_path}/%{_lib}/libgthread-2.0.so.*
|
|
||||||
%{gtk3_install_path}/%{_lib}/libgtk-3.so.*
|
|
||||||
%{gtk3_install_path}/%{_lib}/libharfbuzz.so.*
|
|
||||||
%{gtk3_install_path}/%{_lib}/libpango-1.0.so.*
|
|
||||||
%{gtk3_install_path}/%{_lib}/libpangocairo-1.0.so.*
|
|
||||||
%{gtk3_install_path}/%{_lib}/libpangoft2-1.0.so.*
|
|
||||||
%{gtk3_install_path}/%{_lib}/libpcre.so.*
|
|
||||||
%{gtk3_install_path}/%{_lib}/librsvg-2.so.*
|
|
||||||
%dir %{gtk3_install_path}/%{_lib}/cairo
|
|
||||||
%{gtk3_install_path}/%{_lib}/cairo/cairo-fdr.so.*
|
|
||||||
%{gtk3_install_path}/%{_lib}/cairo/cairo-sphinx.so.*
|
|
||||||
%{gtk3_install_path}/%{_lib}/cairo/libcairo-trace.so.*
|
|
||||||
%{gtk3_install_path}/%{_lib}/gdk-pixbuf-2.0
|
|
||||||
%ghost %attr(644, root, root) %{gtk3_install_path}/%{_lib}/gdk-pixbuf-2.0/2.10.0/loaders.cache
|
|
||||||
%{gtk3_install_path}/%{_lib}/gio
|
|
||||||
%ghost %attr(644, root, root) %{gtk3_install_path}/%{_lib}/gio/modules/giomodule.cache
|
|
||||||
%{gtk3_install_path}/%{_lib}/gtk-3.0
|
|
||||||
%ghost %attr(644, root, root) %{gtk3_install_path}/%{_lib}/gtk-3.0/3.0.0/immodules.cache
|
|
||||||
|
|
||||||
%{gtk3_install_path}/libexec
|
|
||||||
|
|
||||||
%{gtk3_install_path}/share
|
|
||||||
%ghost %attr(644, root, root) %{gtk3_install_path}/share/icons/Adwaita/icon-theme.cache
|
|
||||||
%ghost %attr(644, root, root) %{gtk3_install_path}/share/icons/hicolor/icon-theme.cache
|
|
||||||
%ghost %attr(644, root, root) %{gtk3_install_path}/share/glib-2.0/schemas/gschemas.compiled
|
|
||||||
|
|
||||||
%{gtk3_install_path}/var
|
|
||||||
%dir %{gtk3_install_path}/var/cache/fontconfig
|
|
||||||
|
|
||||||
@ -1,23 +0,0 @@
|
|||||||
# adwaita-icon-theme
|
|
||||||
touch --no-create %{gtk3_install_path}/share/icons/Adwaita &>/dev/null || :
|
|
||||||
touch --no-create %{gtk3_install_path}/share/icons/hicolor &>/dev/null || :
|
|
||||||
%{gtk3_install_path}/bin/gdk-pixbuf-query-loaders-%{__isa_bits} --update-cache || :
|
|
||||||
|
|
||||||
# glib2
|
|
||||||
%{gtk3_install_path}/bin/gio-querymodules-%{__isa_bits} %{gtk3_install_path}/%{_lib}/gio/modules
|
|
||||||
|
|
||||||
# gtk3
|
|
||||||
%{gtk3_install_path}/bin/gtk-query-immodules-3.0-%{__isa_bits} --update-cache
|
|
||||||
%{gtk3_install_path}/bin/glib-compile-schemas %{gtk3_install_path}/share/glib-2.0/schemas &> /dev/null || :
|
|
||||||
|
|
||||||
# fontconfig
|
|
||||||
umask 0022
|
|
||||||
|
|
||||||
# Force regeneration of all fontconfig cache files
|
|
||||||
# The check for existance is needed on dual-arch installs (the second
|
|
||||||
# copy of fontconfig might install the binary instead of the first)
|
|
||||||
# The HOME setting is to avoid problems if HOME hasn't been reset
|
|
||||||
# FIXME hardcoded version !
|
|
||||||
if [ -x %{gtk3_install_path}/bin/fc-cache ] && %{gtk3_install_path}/bin/fc-cache --version 2>&1 | grep -q 2.10.95 ; then
|
|
||||||
HOME=/root %{gtk3_install_path}/bin/fc-cache -f
|
|
||||||
fi
|
|
||||||
@ -1,3 +0,0 @@
|
|||||||
%{gtk3_install_path}/gtk-update-icon-cache %{gtk3_install_path}/share/icons/hicolor &>/dev/null || :
|
|
||||||
# adwaita
|
|
||||||
%{gtk3_install_path}/gtk-update-icon-cache %{gtk3_install_path}/share/icons/Adwaita &>/dev/null || :
|
|
||||||
@ -1,27 +0,0 @@
|
|||||||
# adwaita
|
|
||||||
if [ $1 -eq 0 ] ; then
|
|
||||||
touch --no-create %{gtk3_install_path}/share/icons/Adwaita &>/dev/null
|
|
||||||
touch --no-create %{gtk3_install_path}/share/icons/hicolor &>/dev/null
|
|
||||||
%{gtk3_install_path}/bin/gtk-update-icon-cache %{gtk3_install_path}/share/icons/Adwaita &>/dev/null || :
|
|
||||||
%{gtk3_install_path}/bin/gtk-update-icon-cache %{gtk3_install_path}/share/icons/hicolor &>/dev/null || :
|
|
||||||
fi
|
|
||||||
|
|
||||||
# gdk-pixbuf2
|
|
||||||
if [ $1 -gt 0 ]; then
|
|
||||||
%{gtk3_install_path}/bin/gdk-pixbuf-query-loaders-%{__isa_bits} --update-cache || :
|
|
||||||
fi
|
|
||||||
|
|
||||||
# glib2
|
|
||||||
[ ! -x %{gtk3_install_path}/bin/gio-querymodules-%{__isa_bits} ] || \
|
|
||||||
%{gtk3_install_path}/bin/gio-querymodules-%{__isa_bits} %{gtk3_install_path}/%{_lib}/gio/modules
|
|
||||||
|
|
||||||
# gtk3
|
|
||||||
if [ $1 -gt 0 ]; then
|
|
||||||
%{gtk3_install_path}/bin/gtk-query-immodules-3.0-%{__isa_bits} --update-cache
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ $1 -eq 0 ] ; then
|
|
||||||
rm -rf %{gtk3_install_path}/var/cache/fontconfig/* &>/dev/null || :
|
|
||||||
fi
|
|
||||||
|
|
||||||
%{gtk3_install_path}/bin/glib-compile-schemas %{gtk3_install_path}/share/glib-2.0/schemas &> /dev/null || :
|
|
||||||
@ -1,26 +0,0 @@
|
|||||||
%filter_provides_in %{gtk3_install_path}/%{_lib}
|
|
||||||
%filter_requires_in %{gtk3_install_path}/%{_lib}
|
|
||||||
|
|
||||||
%filter_from_requires /libgdk-3.*/d
|
|
||||||
%filter_from_requires /libatk-1.0.so.*/d
|
|
||||||
%filter_from_requires /libatk-bridge-2.0.so.*/d
|
|
||||||
%filter_from_requires /libatspi.so.*/d
|
|
||||||
%filter_from_requires /libcairo.so.*/d
|
|
||||||
%filter_from_requires /libcairo-gobject.so.*/d
|
|
||||||
%filter_from_requires /libfontconfig.so.*/d
|
|
||||||
%filter_from_requires /libfreetype.so.*/d
|
|
||||||
%filter_from_requires /libgdk-3.so.*/d
|
|
||||||
%filter_from_requires /libgdk_pixbuf-2.0.so.*/d
|
|
||||||
%filter_from_requires /libgio-2.0.so.*/d
|
|
||||||
%filter_from_requires /libglib-2.0.so.*/d
|
|
||||||
%filter_from_requires /libgmodule-2.0.so.*/d
|
|
||||||
%filter_from_requires /libgobject-2.0.so.*/d
|
|
||||||
%filter_from_requires /libgthread-2.0.so.*/d
|
|
||||||
%filter_from_requires /libgtk-3.so.*/d
|
|
||||||
%filter_from_requires /libharfbuzz.so.*/d
|
|
||||||
%filter_from_requires /libpango-1.0.so.*/d
|
|
||||||
%filter_from_requires /libpangocairo-1.0.so.*/d
|
|
||||||
%filter_from_requires /libpangoft2-1.0.so.*/d
|
|
||||||
%filter_from_requires /libpcre.so.*/d
|
|
||||||
|
|
||||||
# Don't forget to call %%filter_setup from the consumer!
|
|
||||||
@ -1,34 +0,0 @@
|
|||||||
%if "%{name}" == "gtk3-private"
|
|
||||||
function prepend_buildroot_include_path_to_compiler_flags() {
|
|
||||||
export CFLAGS="-I%{_buildrootdir}%{gtk3_install_path}/$@ $CFLAGS" \
|
|
||||||
export CXXFLAGS="-I%{_buildrootdir}%{gtk3_install_path}/$@ $CXXFLAGS"
|
|
||||||
}
|
|
||||||
|
|
||||||
prepend_buildroot_include_path_to_compiler_flags include
|
|
||||||
prepend_buildroot_include_path_to_compiler_flags include/glib-2.0
|
|
||||||
prepend_buildroot_include_path_to_compiler_flags include/glib-2.0
|
|
||||||
prepend_buildroot_include_path_to_compiler_flags include/gio-unix-2.0
|
|
||||||
prepend_buildroot_include_path_to_compiler_flags %{_lib}/glib-2.0/include
|
|
||||||
prepend_buildroot_include_path_to_compiler_flags include/freetype2
|
|
||||||
prepend_buildroot_include_path_to_compiler_flags include/fontconfig
|
|
||||||
prepend_buildroot_include_path_to_compiler_flags include/harfbuzz
|
|
||||||
prepend_buildroot_include_path_to_compiler_flags include/gdk-pixbuf-2.0
|
|
||||||
prepend_buildroot_include_path_to_compiler_flags include/atk-1.0
|
|
||||||
prepend_buildroot_include_path_to_compiler_flags include/at-spi-2.0
|
|
||||||
prepend_buildroot_include_path_to_compiler_flags include/at-spi2-atk/2.0
|
|
||||||
prepend_buildroot_include_path_to_compiler_flags include/cairo
|
|
||||||
prepend_buildroot_include_path_to_compiler_flags include/pango-1.0
|
|
||||||
prepend_buildroot_include_path_to_compiler_flags include/librsvg-2.0
|
|
||||||
prepend_buildroot_include_path_to_compiler_flags include/cairo
|
|
||||||
prepend_buildroot_include_path_to_compiler_flags include/gtk-3.0
|
|
||||||
prepend_buildroot_include_path_to_compiler_flags include/gtk-3.0/unix-print
|
|
||||||
prepend_buildroot_include_path_to_compiler_flags include/librsvg-2.0
|
|
||||||
%else
|
|
||||||
sed -i 's@%{gtk3_install_path}@%{_buildrootdir}%{gtk3_install_path}@g' %{_buildrootdir}%{gtk3_install_path}/%{_lib}/pkgconfig/*.pc
|
|
||||||
%endif
|
|
||||||
|
|
||||||
export LDFLAGS="-L%{_buildrootdir}%{gtk3_install_path}/%{_lib} $LDFLAGS"
|
|
||||||
export LDFLAGS="-Wl,-rpath,%{gtk3_install_path}/%{_lib} $LDFLAGS"
|
|
||||||
export LDFLAGS="-Wl,-rpath-link,%{_buildrootdir}%{gtk3_install_path}/%{_lib} $LDFLAGS"
|
|
||||||
|
|
||||||
export PKG_CONFIG_PATH=%{_buildrootdir}%{gtk3_install_path}/%{_lib}/pkgconfig
|
|
||||||
@ -1,7 +1,7 @@
|
|||||||
diff -up firefox-78.0/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092 firefox-78.0/extensions/pref/autoconfig/src/nsReadConfig.cpp
|
diff -up firefox-91.0/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092 firefox-91.0/extensions/pref/autoconfig/src/nsReadConfig.cpp
|
||||||
--- firefox-78.0/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092 2020-06-17 04:18:58.000000000 +0200
|
--- firefox-91.0/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092 2021-07-27 23:29:57.000000000 +0200
|
||||||
+++ firefox-78.0/extensions/pref/autoconfig/src/nsReadConfig.cpp 2020-06-25 13:45:28.816999491 +0200
|
+++ firefox-91.0/extensions/pref/autoconfig/src/nsReadConfig.cpp 2021-07-29 16:20:44.164513998 +0200
|
||||||
@@ -244,8 +244,20 @@ nsresult nsReadConfig::openAndEvaluateJS
|
@@ -249,8 +249,20 @@ nsresult nsReadConfig::openAndEvaluateJS
|
||||||
if (NS_FAILED(rv)) return rv;
|
if (NS_FAILED(rv)) return rv;
|
||||||
|
|
||||||
rv = NS_NewLocalFileInputStream(getter_AddRefs(inStr), jsFile);
|
rv = NS_NewLocalFileInputStream(getter_AddRefs(inStr), jsFile);
|
||||||
@ -12,7 +12,7 @@ diff -up firefox-78.0/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092 fi
|
|||||||
+ getter_AddRefs(jsFile));
|
+ getter_AddRefs(jsFile));
|
||||||
+ NS_ENSURE_SUCCESS(rv, rv);
|
+ NS_ENSURE_SUCCESS(rv, rv);
|
||||||
+
|
+
|
||||||
+ rv = jsFile->AppendNative(NS_LITERAL_CSTRING("pref"));
|
+ rv = jsFile->AppendNative(nsLiteralCString("pref"));
|
||||||
+ NS_ENSURE_SUCCESS(rv, rv);
|
+ NS_ENSURE_SUCCESS(rv, rv);
|
||||||
+ rv = jsFile->AppendNative(nsDependentCString(aFileName));
|
+ rv = jsFile->AppendNative(nsDependentCString(aFileName));
|
||||||
+ NS_ENSURE_SUCCESS(rv, rv);
|
+ NS_ENSURE_SUCCESS(rv, rv);
|
||||||
@ -23,10 +23,10 @@ diff -up firefox-78.0/extensions/pref/autoconfig/src/nsReadConfig.cpp.1170092 fi
|
|||||||
} else {
|
} else {
|
||||||
nsAutoCString location("resource://gre/defaults/autoconfig/");
|
nsAutoCString location("resource://gre/defaults/autoconfig/");
|
||||||
location += aFileName;
|
location += aFileName;
|
||||||
diff -up firefox-78.0/modules/libpref/Preferences.cpp.1170092 firefox-78.0/modules/libpref/Preferences.cpp
|
diff -up firefox-91.0/modules/libpref/Preferences.cpp.1170092 firefox-91.0/modules/libpref/Preferences.cpp
|
||||||
--- firefox-78.0/modules/libpref/Preferences.cpp.1170092 2020-06-25 13:45:28.818999498 +0200
|
--- firefox-91.0/modules/libpref/Preferences.cpp.1170092 2021-07-27 23:30:34.000000000 +0200
|
||||||
+++ firefox-78.0/modules/libpref/Preferences.cpp 2020-06-25 13:48:45.996708102 +0200
|
+++ firefox-91.0/modules/libpref/Preferences.cpp 2021-07-29 16:20:44.166514005 +0200
|
||||||
@@ -4499,6 +4499,8 @@ nsresult Preferences::InitInitialObjects
|
@@ -4553,6 +4553,8 @@ nsresult Preferences::InitInitialObjects
|
||||||
//
|
//
|
||||||
// Thus, in the omni.jar case, we always load app-specific default
|
// Thus, in the omni.jar case, we always load app-specific default
|
||||||
// preferences from omni.jar, whether or not `$app == $gre`.
|
// preferences from omni.jar, whether or not `$app == $gre`.
|
||||||
@ -35,10 +35,10 @@ diff -up firefox-78.0/modules/libpref/Preferences.cpp.1170092 firefox-78.0/modul
|
|||||||
|
|
||||||
nsresult rv = NS_ERROR_FAILURE;
|
nsresult rv = NS_ERROR_FAILURE;
|
||||||
UniquePtr<nsZipFind> find;
|
UniquePtr<nsZipFind> find;
|
||||||
diff -up firefox-78.0/toolkit/xre/nsXREDirProvider.cpp.1170092 firefox-78.0/toolkit/xre/nsXREDirProvider.cpp
|
diff -up firefox-91.0/toolkit/xre/nsXREDirProvider.cpp.1170092 firefox-91.0/toolkit/xre/nsXREDirProvider.cpp
|
||||||
--- firefox-78.0/toolkit/xre/nsXREDirProvider.cpp.1170092 2020-06-17 04:20:11.000000000 +0200
|
--- firefox-91.0/toolkit/xre/nsXREDirProvider.cpp.1170092 2021-07-27 23:30:56.000000000 +0200
|
||||||
+++ firefox-78.0/toolkit/xre/nsXREDirProvider.cpp 2020-06-25 13:48:28.613645633 +0200
|
+++ firefox-91.0/toolkit/xre/nsXREDirProvider.cpp 2021-07-29 16:26:20.071628932 +0200
|
||||||
@@ -60,6 +60,7 @@
|
@@ -71,6 +71,7 @@
|
||||||
#endif
|
#endif
|
||||||
#ifdef XP_UNIX
|
#ifdef XP_UNIX
|
||||||
# include <ctype.h>
|
# include <ctype.h>
|
||||||
@ -46,14 +46,14 @@ diff -up firefox-78.0/toolkit/xre/nsXREDirProvider.cpp.1170092 firefox-78.0/tool
|
|||||||
#endif
|
#endif
|
||||||
#ifdef XP_IOS
|
#ifdef XP_IOS
|
||||||
# include "UIKitDirProvider.h"
|
# include "UIKitDirProvider.h"
|
||||||
@@ -533,6 +534,21 @@ nsXREDirProvider::GetFile(const char* aP
|
@@ -550,6 +551,21 @@ nsXREDirProvider::GetFile(const char* aP
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+
|
+
|
||||||
+#if defined(XP_UNIX)
|
+#if defined(XP_UNIX)
|
||||||
+ if (!strcmp(aProperty, NS_APP_PREFS_SYSTEM_CONFIG_DIR)) {
|
+ if (!strcmp(aProperty, NS_APP_PREFS_SYSTEM_CONFIG_DIR)) {
|
||||||
+ nsCString sysConfigDir = NS_LITERAL_CSTRING("/etc/");
|
+ nsCString sysConfigDir = nsLiteralCString("/etc/");
|
||||||
+ nsCOMPtr<nsIXULAppInfo> appInfo = do_GetService("@mozilla.org/xre/app-info;1");
|
+ nsCOMPtr<nsIXULAppInfo> appInfo = do_GetService("@mozilla.org/xre/app-info;1");
|
||||||
+ if (!appInfo)
|
+ if (!appInfo)
|
||||||
+ return NS_ERROR_NOT_AVAILABLE;
|
+ return NS_ERROR_NOT_AVAILABLE;
|
||||||
@ -68,28 +68,27 @@ diff -up firefox-78.0/toolkit/xre/nsXREDirProvider.cpp.1170092 firefox-78.0/tool
|
|||||||
if (NS_FAILED(rv) || !file) return NS_ERROR_FAILURE;
|
if (NS_FAILED(rv) || !file) return NS_ERROR_FAILURE;
|
||||||
|
|
||||||
if (ensureFilePermissions) {
|
if (ensureFilePermissions) {
|
||||||
@@ -845,6 +861,17 @@ nsresult nsXREDirProvider::GetFilesInter
|
@@ -827,6 +843,16 @@ nsresult nsXREDirProvider::GetFilesInter
|
||||||
|
LoadDirIntoArray(mXULAppDir, kAppendBackgroundTasksPrefDir, directories);
|
||||||
LoadDirIntoArray(mXULAppDir, kAppendPrefDir, directories);
|
}
|
||||||
|
#endif
|
||||||
+ // Add /etc/<application>/pref/ directory if it exists
|
+ // Add /etc/<application>/pref/ directory if it exists
|
||||||
+ nsCOMPtr<nsIFile> systemPrefDir;
|
+ nsCOMPtr<nsIFile> systemPrefDir;
|
||||||
+ rv = NS_GetSpecialDirectory(NS_APP_PREFS_SYSTEM_CONFIG_DIR,
|
+ rv = NS_GetSpecialDirectory(NS_APP_PREFS_SYSTEM_CONFIG_DIR,
|
||||||
+ getter_AddRefs(systemPrefDir));
|
+ getter_AddRefs(systemPrefDir));
|
||||||
+ if (NS_SUCCEEDED(rv)) {
|
+ if (NS_SUCCEEDED(rv)) {
|
||||||
+ rv = systemPrefDir->AppendNative(NS_LITERAL_CSTRING("pref"));
|
+ rv = systemPrefDir->AppendNative(nsLiteralCString("pref"));
|
||||||
+ if (NS_SUCCEEDED(rv)) {
|
+ if (NS_SUCCEEDED(rv)) {
|
||||||
+ directories.AppendObject(systemPrefDir);
|
+ directories.AppendObject(systemPrefDir);
|
||||||
+ }
|
+ }
|
||||||
+ }
|
+ }
|
||||||
+
|
|
||||||
rv = NS_NewArrayEnumerator(aResult, directories, NS_GET_IID(nsIFile));
|
rv = NS_NewArrayEnumerator(aResult, directories, NS_GET_IID(nsIFile));
|
||||||
} else if (!strcmp(aProperty, NS_APP_CHROME_DIR_LIST)) {
|
} else if (!strcmp(aProperty, NS_APP_CHROME_DIR_LIST)) {
|
||||||
// NS_APP_CHROME_DIR_LIST is only used to get default (native) icons
|
diff -up firefox-91.0/xpcom/io/nsAppDirectoryServiceDefs.h.1170092 firefox-91.0/xpcom/io/nsAppDirectoryServiceDefs.h
|
||||||
diff -up firefox-78.0/xpcom/io/nsAppDirectoryServiceDefs.h.1170092 firefox-78.0/xpcom/io/nsAppDirectoryServiceDefs.h
|
--- firefox-91.0/xpcom/io/nsAppDirectoryServiceDefs.h.1170092 2021-07-27 23:31:38.000000000 +0200
|
||||||
--- firefox-78.0/xpcom/io/nsAppDirectoryServiceDefs.h.1170092 2020-06-17 04:20:17.000000000 +0200
|
+++ firefox-91.0/xpcom/io/nsAppDirectoryServiceDefs.h 2021-07-29 16:20:44.168514012 +0200
|
||||||
+++ firefox-78.0/xpcom/io/nsAppDirectoryServiceDefs.h 2020-06-25 13:45:28.819999502 +0200
|
@@ -59,6 +59,7 @@
|
||||||
@@ -60,6 +60,7 @@
|
|
||||||
#define NS_APP_PREFS_DEFAULTS_DIR_LIST "PrefDL"
|
#define NS_APP_PREFS_DEFAULTS_DIR_LIST "PrefDL"
|
||||||
#define NS_APP_PREFS_OVERRIDE_DIR \
|
#define NS_APP_PREFS_OVERRIDE_DIR \
|
||||||
"PrefDOverride" // Directory for per-profile defaults
|
"PrefDOverride" // Directory for per-profile defaults
|
||||||
|
|||||||
@ -1,13 +0,0 @@
|
|||||||
diff -up firefox-68.0/widget/gtk/nsWindow.cpp.1196777 firefox-68.0/widget/gtk/nsWindow.cpp
|
|
||||||
--- firefox-68.0/widget/gtk/nsWindow.cpp.1196777 2019-05-21 11:29:55.833376744 +0200
|
|
||||||
+++ firefox-68.0/widget/gtk/nsWindow.cpp 2019-05-21 12:15:35.446089316 +0200
|
|
||||||
@@ -156,7 +156,8 @@ const gint kEvents =
|
|
||||||
#if GTK_CHECK_VERSION(3, 4, 0)
|
|
||||||
GDK_SMOOTH_SCROLL_MASK | GDK_TOUCH_MASK |
|
|
||||||
#endif
|
|
||||||
- GDK_SCROLL_MASK | GDK_POINTER_MOTION_MASK | GDK_PROPERTY_CHANGE_MASK;
|
|
||||||
+ GDK_SCROLL_MASK | GDK_POINTER_MOTION_MASK | GDK_PROPERTY_CHANGE_MASK |
|
|
||||||
+ GDK_FOCUS_CHANGE_MASK;
|
|
||||||
|
|
||||||
#if !GTK_CHECK_VERSION(3, 22, 0)
|
|
||||||
typedef enum {
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
diff -up firefox-78.9.0/security/certverifier/NSSCertDBTrustDomain.cpp.slot-fail firefox-78.9.0/security/certverifier/NSSCertDBTrustDomain.cpp
|
|
||||||
--- firefox-78.9.0/security/certverifier/NSSCertDBTrustDomain.cpp.slot-fail 2021-04-08 08:02:13.879018493 +0200
|
|
||||||
+++ firefox-78.9.0/security/certverifier/NSSCertDBTrustDomain.cpp 2021-04-08 08:05:56.713623197 +0200
|
|
||||||
@@ -118,7 +118,7 @@ static Result FindRootsWithSubject(Uniqu
|
|
||||||
CERTCertificateList* rawResults = nullptr;
|
|
||||||
if (PK11_FindRawCertsWithSubject(rootsModule->slots[slotIndex], &subject,
|
|
||||||
&rawResults) != SECSuccess) {
|
|
||||||
- return Result::FATAL_ERROR_LIBRARY_FAILURE;
|
|
||||||
+ continue;
|
|
||||||
}
|
|
||||||
// rawResults == nullptr means we didn't find any matching certificates
|
|
||||||
if (!rawResults) {
|
|
||||||
@ -1,22 +1,12 @@
|
|||||||
# HG changeset patch
|
diff -up firefox-91.0/toolkit/components/extensions/schemas/runtime.json.mozilla-bmo1554971 firefox-91.0/toolkit/components/extensions/schemas/runtime.json
|
||||||
# Parent a25cebecb02d5460b8ad757fe9cb4a9c8d1d7658
|
--- firefox-91.0/toolkit/components/extensions/schemas/runtime.json.mozilla-bmo1554971 2021-07-29 17:20:08.523253193 +0200
|
||||||
Eliminate startup error message:
|
+++ firefox-91.0/toolkit/components/extensions/schemas/runtime.json 2021-07-29 17:21:23.517498581 +0200
|
||||||
JavaScript error: , line 0: Error: Type error for platformInfo value (Error processing arch: Invalid enumeration value "s390x") for runtime.getPlatformInfo.
|
|
||||||
|
|
||||||
Reported here: https://bugzilla.mozilla.org/show_bug.cgi?id=1554971
|
|
||||||
|
|
||||||
Uncertain if this is causing real problems or not. Also uncertain if the fix actually fixes anything.
|
|
||||||
No response from upstream yet.
|
|
||||||
|
|
||||||
diff -r a25cebecb02d -r 378b81b00e73 toolkit/components/extensions/schemas/runtime.json
|
|
||||||
--- a/toolkit/components/extensions/schemas/runtime.json Fri Jul 05 12:42:44 2019 +0200
|
|
||||||
+++ b/toolkit/components/extensions/schemas/runtime.json Fri Jul 19 13:19:30 2019 +0200
|
|
||||||
@@ -64,7 +64,7 @@
|
@@ -64,7 +64,7 @@
|
||||||
{
|
{
|
||||||
"id": "PlatformArch",
|
"id": "PlatformArch",
|
||||||
"type": "string",
|
"type": "string",
|
||||||
- "enum": ["arm", "x86-32", "x86-64"],
|
- "enum": ["aarch64", "arm", "ppc64", "s390x", "sparc64", "x86-32", "x86-64"],
|
||||||
+ "enum": ["arm", "x86-32", "x86-64", "s390x", "aarch64", "ppc64le"],
|
+ "enum": ["aarch64", "arm", "ppc64", "ppc64le", "s390x", "sparc64", "x86-32", "x86-64"],
|
||||||
"allowedContexts": ["content", "devtools"],
|
"allowedContexts": ["content", "devtools"],
|
||||||
"description": "The machine's processor architecture."
|
"description": "The machine's processor architecture."
|
||||||
},
|
},
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
sed -i 's@%{gtk3_install_path}@%{_buildrootdir}%{gtk3_install_path}@g' %{_buildrootdir}%{gtk3_install_path}/%{_lib}/pkgconfig/nss*.pc
|
sed -i 's@%{bundled_install_path}@%{_buildrootdir}%{bundled_install_path}@g' %{_buildrootdir}%{bundled_install_path}/%{_lib}/pkgconfig/nss*.pc
|
||||||
|
|
||||||
export LDFLAGS="-L%{_buildrootdir}%{gtk3_install_path}/%{_lib} $LDFLAGS"
|
export LDFLAGS="-L%{_buildrootdir}%{bundled_install_path}/%{_lib} $LDFLAGS"
|
||||||
export LDFLAGS="-Wl,-rpath,%{gtk3_install_path}/%{_lib} $LDFLAGS"
|
export LDFLAGS="-Wl,-rpath,%{bundled_install_path}/%{_lib} $LDFLAGS"
|
||||||
export LDFLAGS="-Wl,-rpath-link,%{_buildrootdir}%{gtk3_install_path}/%{_lib} $LDFLAGS"
|
export LDFLAGS="-Wl,-rpath-link,%{_buildrootdir}%{bundled_install_path}/%{_lib} $LDFLAGS"
|
||||||
export PKG_CONFIG_PATH=%{_buildrootdir}%{gtk3_install_path}/%{_lib}/pkgconfig
|
export PKG_CONFIG_PATH=%{_buildrootdir}%{bundled_install_path}/%{_lib}/pkgconfig
|
||||||
export PATH="{_buildrootdir}%{gtk3_install_path}/bin:$PATH"
|
export PATH="{_buildrootdir}%{bundled_install_path}/bin:$PATH"
|
||||||
|
|||||||
23
SOURCES/process-official-tarball
Executable file
23
SOURCES/process-official-tarball
Executable file
@ -0,0 +1,23 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
rm -rf ./process-tarball-dir
|
||||||
|
mkdir ./process-tarball-dir
|
||||||
|
tar -xJf $1 --directory process-tarball-dir
|
||||||
|
|
||||||
|
rm -vf ./process-tarball-dir/*/testing/web-platform/tests/conformance-checkers/html-rdfa/0030-isvalid.html
|
||||||
|
rm -vf ./process-tarball-dir/*/testing/web-platform/tests/conformance-checkers/html-rdfa/0008-isvalid.html
|
||||||
|
rm -vf ./process-tarball-dir/*/testing/web-platform/tests/conformance-checkers/html-rdfalite/0030-isvalid.html
|
||||||
|
rm -vf ./process-tarball-dir/*/testing/web-platform/tests/css/css-ui/support/cursors/woolly-64.svg
|
||||||
|
rm -vf ./process-tarball-dir/*/testing/web-platform/tests/css/css-ui/support/cursors/woolly.svg
|
||||||
|
rm -vf ./process-tarball-dir/*/testing/web-platform/tests/conformance-checkers/html-rdfa/0230-novalid.html
|
||||||
|
rm -vf ./process-tarball-dir/*/testing/web-platform/tests/conformance-checkers/html-rdfa/0231-isvalid.html
|
||||||
|
rm -vf ./process-tarball-dir/*/layout/inspector/tests/chrome/test_fontVariationsAPI.css
|
||||||
|
|
||||||
|
processed_tarball=${1/source/processed-source}
|
||||||
|
|
||||||
|
cd ./process-tarball-dir
|
||||||
|
tar -cf - ./* | xz -9 -T 0 -f > $processed_tarball
|
||||||
|
mv $processed_tarball ..
|
||||||
|
cd ..
|
||||||
|
|
||||||
|
rm -rf ./process-tarball-dir
|
||||||
@ -1,57 +0,0 @@
|
|||||||
commit 0b91f8a668201fc58fa732b8acc496caedfdbae0
|
|
||||||
Author: Florian Weimer <fw@deneb.enyo.de>
|
|
||||||
Date: Sun Apr 29 12:18:33 2018 -0700
|
|
||||||
|
|
||||||
Indicate that _PyGC_Head is only 8-byte aligned. (closes bpo-33374)
|
|
||||||
|
|
||||||
By spec, the "long double" in _PyGC_Head requires the union to always be 16-byte
|
|
||||||
aligned. However, obmalloc only yields 8-byte alignment. Compilers including GCC
|
|
||||||
8 are starting to use alignment information to do store-merging. So, the "long
|
|
||||||
double" needs to be changed to a simple "double" as was long ago done in Python
|
|
||||||
3 by e348c8d154cf6342c79d627ebfe89dfe9de23817. For 2.7, we need to add some
|
|
||||||
dummy padding to make sure _PyGC_Head stays the same size.
|
|
||||||
|
|
||||||
diff --git a/Include/objimpl.h b/Include/objimpl.h
|
|
||||||
index 5f28683329..cbf6bc3f87 100644
|
|
||||||
--- Python-2.7.13/Include/objimpl.h
|
|
||||||
+++ Python-2.7.13/Include/objimpl.h
|
|
||||||
@@ -248,6 +248,20 @@ PyAPI_FUNC(PyVarObject *) _PyObject_GC_Resize(PyVarObject *, Py_ssize_t);
|
|
||||||
/* for source compatibility with 2.2 */
|
|
||||||
#define _PyObject_GC_Del PyObject_GC_Del
|
|
||||||
|
|
||||||
+/*
|
|
||||||
+ * Former over-aligned definition of PyGC_Head, used to compute the size of the
|
|
||||||
+ * padding for the new version below.
|
|
||||||
+ */
|
|
||||||
+union _gc_head;
|
|
||||||
+union _gc_head_old {
|
|
||||||
+ struct {
|
|
||||||
+ union _gc_head_old *gc_next;
|
|
||||||
+ union _gc_head_old *gc_prev;
|
|
||||||
+ Py_ssize_t gc_refs;
|
|
||||||
+ } gc;
|
|
||||||
+ long double dummy;
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
/* GC information is stored BEFORE the object structure. */
|
|
||||||
typedef union _gc_head {
|
|
||||||
struct {
|
|
||||||
@@ -255,7 +269,8 @@ typedef union _gc_head {
|
|
||||||
union _gc_head *gc_prev;
|
|
||||||
Py_ssize_t gc_refs;
|
|
||||||
} gc;
|
|
||||||
- long double dummy; /* force worst-case alignment */
|
|
||||||
+ double dummy; /* Force at least 8-byte alignment. */
|
|
||||||
+ char dummy_padding[sizeof(union _gc_head_old)];
|
|
||||||
} PyGC_Head;
|
|
||||||
|
|
||||||
extern PyGC_Head *_PyGC_generation0;
|
|
||||||
diff --git a/Misc/NEWS.d/next/Core and Builtins/2018-04-29-12-07-00.bpo-33374.-xegL6.rst b/Misc/NEWS.d/next/Core and Builtins/2018-04-29-12-07-00.bpo-33374.-xegL6.rst
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000000..9ec1a605c8
|
|
||||||
--- /dev/null
|
|
||||||
+++ Python-2.7.13/Misc/NEWS.d/next/Core and Builtins/2018-04-29-12-07-00.bpo-33374.-xegL6.rst
|
|
||||||
@@ -0,0 +1,3 @@
|
|
||||||
+Tweak the definition of PyGC_Head, so compilers do not believe it is always
|
|
||||||
+16-byte aligned on x86. This prevents crashes with more aggressive
|
|
||||||
+optimizations present in GCC 8.
|
|
||||||
@ -1,17 +0,0 @@
|
|||||||
diff -up Python-2.7.13/configure.build Python-2.7.13/configure
|
|
||||||
--- Python-2.7.13/configure.build 2019-06-04 13:32:12.772134075 +0200
|
|
||||||
+++ Python-2.7.13/configure 2019-06-04 13:32:26.140144601 +0200
|
|
||||||
@@ -6018,11 +6018,11 @@ then
|
|
||||||
# debug builds.
|
|
||||||
OPT="-g -O0 -Wall $STRICT_PROTO"
|
|
||||||
else
|
|
||||||
- OPT="-g $WRAP -O3 -Wall $STRICT_PROTO"
|
|
||||||
+ OPT="-g $WRAP -O2 -Wall $STRICT_PROTO"
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
- OPT="-O3 -Wall $STRICT_PROTO"
|
|
||||||
+ OPT="-O2 -Wall $STRICT_PROTO"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
case $ac_sys_system in
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
diff -up firefox-68.0/python/mozbuild/mozbuild/controller/building.py.old firefox-68.0/python/mozbuild/mozbuild/controller/building.py
|
|
||||||
--- firefox-68.0/python/mozbuild/mozbuild/controller/building.py.old 2019-05-29 10:46:55.403262995 +0200
|
|
||||||
+++ firefox-68.0/python/mozbuild/mozbuild/controller/building.py 2019-05-29 10:47:42.691176970 +0200
|
|
||||||
@@ -571,7 +571,7 @@ class TerminalLoggingHandler(logging.Han
|
|
||||||
if self.footer:
|
|
||||||
self.footer.clear()
|
|
||||||
|
|
||||||
- self.fh.write(msg)
|
|
||||||
+ self.fh.write(msg.encode("utf-8"))
|
|
||||||
self.fh.write('\n')
|
|
||||||
|
|
||||||
if self.footer:
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
diff -up python3/Python-3.6.8/configure.old python3/Python-3.6.8/configure
|
|
||||||
--- Python-3.6.8/configure.old 2019-10-01 12:56:35.074551835 +0200
|
|
||||||
+++ Python-3.6.8/configure 2019-10-01 12:56:44.240517798 +0200
|
|
||||||
@@ -11438,7 +11438,7 @@ for ac_func in alarm accept4 setitimer g
|
|
||||||
sigaction sigaltstack siginterrupt sigpending sigrelse \
|
|
||||||
sigtimedwait sigwait sigwaitinfo snprintf strftime strlcpy symlinkat sync \
|
|
||||||
sysconf tcgetpgrp tcsetpgrp tempnam timegm times tmpfile tmpnam tmpnam_r \
|
|
||||||
- truncate uname unlinkat unsetenv utimensat utimes waitid waitpid wait3 wait4 \
|
|
||||||
+ truncate uname unlinkat unsetenv utimes waitid waitpid wait3 wait4 \
|
|
||||||
wcscoll wcsftime wcsxfrm wmemcmp writev _getpty
|
|
||||||
do :
|
|
||||||
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
|
||||||
@ -1,36 +0,0 @@
|
|||||||
diff -up firefox-78.0/xpcom/base/AvailableMemoryTracker.cpp.rhbz-1821418 firefox-78.0/xpcom/base/AvailableMemoryTracker.cpp
|
|
||||||
--- firefox-78.0/xpcom/base/AvailableMemoryTracker.cpp.rhbz-1821418 2020-06-17 04:20:44.000000000 +0200
|
|
||||||
+++ firefox-78.0/xpcom/base/AvailableMemoryTracker.cpp 2020-06-25 14:50:46.369798294 +0200
|
|
||||||
@@ -157,8 +157,12 @@ bool nsAvailableMemoryWatcher::IsVirtual
|
|
||||||
|
|
||||||
/* static */
|
|
||||||
bool nsAvailableMemoryWatcher::IsCommitSpaceLow(const MEMORYSTATUSEX& aStat) {
|
|
||||||
- if ((kLowCommitSpaceThreshold != 0) &&
|
|
||||||
- (aStat.ullAvailPageFile < kLowCommitSpaceThreshold)) {
|
|
||||||
+ const char* threshold = getenv("MOZ_GC_THRESHOLD");
|
|
||||||
+ if (threshold) {
|
|
||||||
+ kLowCommitSpaceThreshold = atoi(threshold);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ if ((kLowCommitSpaceThreshold == 0) || (aStat.ullAvailPageFile < kLowCommitSpaceThreshold)) {
|
|
||||||
sNumLowCommitSpaceEvents++;
|
|
||||||
CrashReporter::AnnotateCrashReport(
|
|
||||||
CrashReporter::Annotation::LowCommitSpaceEvents,
|
|
||||||
@@ -210,12 +214,15 @@ void nsAvailableMemoryWatcher::AdjustPol
|
|
||||||
// polling interval accordingly.
|
|
||||||
NS_IMETHODIMP
|
|
||||||
nsAvailableMemoryWatcher::Notify(nsITimer* aTimer) {
|
|
||||||
+ const char* threshold = getenv("MOZ_GC_THRESHOLD");
|
|
||||||
+ bool forceLowMem = (threshold && atoi(threshold) == 0);
|
|
||||||
+
|
|
||||||
MEMORYSTATUSEX stat;
|
|
||||||
stat.dwLength = sizeof(stat);
|
|
||||||
bool success = GlobalMemoryStatusEx(&stat);
|
|
||||||
|
|
||||||
- if (success) {
|
|
||||||
- bool lowMemory = IsVirtualMemoryLow(stat) || IsCommitSpaceLow(stat);
|
|
||||||
+ if (success || forceLowMemory) {
|
|
||||||
+ bool lowMemory = IsVirtualMemoryLow(stat) || IsCommitSpaceLow(stat || forceLowMem);
|
|
||||||
|
|
||||||
if (lowMemory) {
|
|
||||||
SendMemoryPressureEvent();
|
|
||||||
@ -1,29 +0,0 @@
|
|||||||
diff -up firefox-78.2.0/security/nss/lib/freebl/freebl.gyp.rhel6-abiv2-mozbz1642174 firefox-78.2.0/security/nss/lib/freebl/freebl.gyp
|
|
||||||
--- firefox-78.2.0/security/nss/lib/freebl/freebl.gyp.rhel6-abiv2-mozbz1642174 2020-09-12 08:29:08.527410514 +0200
|
|
||||||
+++ firefox-78.2.0/security/nss/lib/freebl/freebl.gyp 2020-09-12 08:42:26.279064334 +0200
|
|
||||||
@@ -259,7 +259,7 @@
|
|
||||||
'type': 'static_library',
|
|
||||||
'sources': [
|
|
||||||
'gcm-ppc.c',
|
|
||||||
- 'sha512-p8.s',
|
|
||||||
+ #'sha512-p8.s',
|
|
||||||
],
|
|
||||||
'dependencies': [
|
|
||||||
'<(DEPTH)/exports.gyp:nss_exports'
|
|
||||||
diff -up firefox-78.2.0/security/nss/lib/freebl/Makefile.rhel6-abiv2-mozbz1642174 firefox-78.2.0/security/nss/lib/freebl/Makefile
|
|
||||||
--- firefox-78.2.0/security/nss/lib/freebl/Makefile.rhel6-abiv2-mozbz1642174 2020-08-17 20:34:06.000000000 +0200
|
|
||||||
+++ firefox-78.2.0/security/nss/lib/freebl/Makefile 2020-09-12 08:28:08.089142990 +0200
|
|
||||||
@@ -267,9 +267,12 @@ ifeq ($(CPU_ARCH),arm)
|
|
||||||
endif
|
|
||||||
ifeq ($(CPU_ARCH),ppc)
|
|
||||||
EXTRA_SRCS += gcm-ppc.c
|
|
||||||
- ASFILES += sha512-p8.s
|
|
||||||
ifdef USE_64
|
|
||||||
DEFINES += -DNSS_NO_INIT_SUPPORT
|
|
||||||
+ #PPC_ABI := $(shell $(CC) -dM -E - < /dev/null | awk '$$2 == "_CALL_ELF" {print $$3}')
|
|
||||||
+ # ifeq ($(PPC_ABI),2)
|
|
||||||
+ # ASFILES += sha512-p8.s
|
|
||||||
+ # endif
|
|
||||||
endif # USE_64
|
|
||||||
endif # ppc
|
|
||||||
endif # Linux
|
|
||||||
@ -1,27 +0,0 @@
|
|||||||
diff -ru firefox-78.3.0/security/sandbox/linux/SandboxFilter.cpp firefox-78.4.0/security/sandbox/linux/SandboxFilter.cpp
|
|
||||||
--- firefox-78.3.0/security/sandbox/linux/SandboxFilter.cpp 2020-09-14 21:21:02.000000000 +0200
|
|
||||||
+++ firefox-78.4.0/security/sandbox/linux/SandboxFilter.cpp 2020-10-14 11:34:48.000000000 +0200
|
|
||||||
@@ -243,14 +243,21 @@
|
|
||||||
auto path = reinterpret_cast<const char*>(aArgs.args[1]);
|
|
||||||
auto buf = reinterpret_cast<statstruct*>(aArgs.args[2]);
|
|
||||||
auto flags = static_cast<int>(aArgs.args[3]);
|
|
||||||
+
|
|
||||||
+ if (fd != AT_FDCWD && (flags & AT_EMPTY_PATH) != 0 &&
|
|
||||||
+ strcmp(path, "") == 0) {
|
|
||||||
+ return ConvertError(fstatsyscall(fd, buf));
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
if (fd != AT_FDCWD && path[0] != '/') {
|
|
||||||
SANDBOX_LOG_ERROR("unsupported fd-relative fstatat(%d, \"%s\", %p, %d)",
|
|
||||||
fd, path, buf, flags);
|
|
||||||
return BlockedSyscallTrap(aArgs, nullptr);
|
|
||||||
}
|
|
||||||
- if ((flags & ~AT_SYMLINK_NOFOLLOW) != 0) {
|
|
||||||
+ if ((flags & ~(AT_SYMLINK_NOFOLLOW | AT_NO_AUTOMOUNT)) != 0) {
|
|
||||||
SANDBOX_LOG_ERROR("unsupported flags %d in fstatat(%d, \"%s\", %p, %d)",
|
|
||||||
- (flags & ~AT_SYMLINK_NOFOLLOW), fd, path, buf, flags);
|
|
||||||
+ (flags & ~(AT_SYMLINK_NOFOLLOW | AT_NO_AUTOMOUNT)), fd,
|
|
||||||
+ path, buf, flags);
|
|
||||||
return BlockedSyscallTrap(aArgs, nullptr);
|
|
||||||
}
|
|
||||||
return (flags & AT_SYMLINK_NOFOLLOW) == 0 ? broker->Stat(path, buf)
|
|
||||||
@ -1,39 +0,0 @@
|
|||||||
diff -up firefox-78.2.0/mozglue/build/ppc.cpp.ppc-vsx firefox-78.2.0/mozglue/build/ppc.cpp
|
|
||||||
--- firefox-78.2.0/mozglue/build/ppc.cpp.ppc-vsx 2020-09-11 07:07:05.850864720 +0200
|
|
||||||
+++ firefox-78.2.0/mozglue/build/ppc.cpp 2020-09-11 07:08:48.884202679 +0200
|
|
||||||
@@ -14,10 +14,6 @@
|
|
||||||
#if defined(XP_LINUX)
|
|
||||||
// Use the getauxval() function if available.
|
|
||||||
// ARCH_3_00 wasn't defined until glibc 2.23, so include just in case.
|
|
||||||
-# include <sys/auxv.h>
|
|
||||||
-# ifndef PPC_FEATURE2_ARCH_3_00
|
|
||||||
-# define PPC_FEATURE2_ARCH_3_00 0x00800000
|
|
||||||
-# endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
const unsigned PPC_FLAG_VMX = 1;
|
|
||||||
@@ -33,24 +29,8 @@ static signed get_ppc_cpu_flags(void) {
|
|
||||||
}
|
|
||||||
cpu_flags = 0;
|
|
||||||
|
|
||||||
-#if defined(XP_LINUX)
|
|
||||||
- // Try getauxval().
|
|
||||||
- unsigned long int cap = getauxval(AT_HWCAP);
|
|
||||||
- unsigned long int cap2 = getauxval(AT_HWCAP2);
|
|
||||||
-
|
|
||||||
- if (cap & PPC_FEATURE_HAS_ALTIVEC) {
|
|
||||||
- cpu_flags |= PPC_FLAG_VMX;
|
|
||||||
- }
|
|
||||||
- if (cap & PPC_FEATURE_HAS_VSX) {
|
|
||||||
- cpu_flags |= PPC_FLAG_VSX;
|
|
||||||
- }
|
|
||||||
- if (cap2 & PPC_FEATURE2_ARCH_3_00) {
|
|
||||||
- cpu_flags |= PPC_FLAG_VSX3;
|
|
||||||
- }
|
|
||||||
-#else
|
|
||||||
// Non-Linux detection here. Currently, on systems other than Linux,
|
|
||||||
// no CPU SIMD features will be detected.
|
|
||||||
-#endif
|
|
||||||
|
|
||||||
return cpu_flags;
|
|
||||||
}
|
|
||||||
@ -1,41 +0,0 @@
|
|||||||
diff -up firefox-78.2.0/third_party/rust/libdbus-sys/build.rs.rhel6-dbusver firefox-78.2.0/third_party/rust/libdbus-sys/build.rs
|
|
||||||
--- firefox-78.2.0/third_party/rust/libdbus-sys/build.rs.rhel6-dbusver 2020-08-17 20:34:46.000000000 +0200
|
|
||||||
+++ firefox-78.2.0/third_party/rust/libdbus-sys/build.rs 2020-09-09 21:06:34.932374254 +0200
|
|
||||||
@@ -3,5 +3,5 @@ extern crate pkg_config;
|
|
||||||
fn main() {
|
|
||||||
// See https://github.com/joshtriplett/metadeps/issues/9 for why we don't use
|
|
||||||
// metadeps here, but instead keep this manually in sync with Cargo.toml.
|
|
||||||
- pkg_config::Config::new().atleast_version("1.6").probe("dbus-1").unwrap();
|
|
||||||
+ pkg_config::Config::new().atleast_version("1.2").probe("dbus-1").unwrap();
|
|
||||||
}
|
|
||||||
diff -up firefox-78.2.0/third_party/rust/libdbus-sys/.cargo-checksum.json.rhel6-dbusver firefox-78.2.0/third_party/rust/libdbus-sys/.cargo-checksum.json
|
|
||||||
--- firefox-78.2.0/third_party/rust/libdbus-sys/.cargo-checksum.json.rhel6-dbusver 2020-08-17 20:35:05.000000000 +0200
|
|
||||||
+++ firefox-78.2.0/third_party/rust/libdbus-sys/.cargo-checksum.json 2020-09-09 21:11:37.045287830 +0200
|
|
||||||
@@ -1 +1 @@
|
|
||||||
-{"files":{"Cargo.toml":"7054b852a13a318562f3ef791e69802f234c9f3d943f2de2d1cef8b31fd0939a","LICENSE-APACHE":"453745410e3be8cf25d56872ea2aec975a78e6c9f217443d0bf908a5bce7c8ff","LICENSE-MIT":"de3911c2d98c8bd2d701ee721347053d9b55995a11f9a8c955e44d3ca1b376bf","build.rs":"9fbc218277d76a570c01c5795a7c8008f5458317cc036d7c88b1dc1a4af22fb7","src/lib.rs":"c8a0d43a3b7e9c8828d4946437379f1985492bd6b04fdd5e967bbcace2197c3d"},"package":"18cb88963258d00f4962205dbb5933d82780d9962c8c8a064b651d2ad7189210"}
|
|
||||||
\ No newline at end of file
|
|
||||||
+{"files":{"Cargo.toml":"7054b852a13a318562f3ef791e69802f234c9f3d943f2de2d1cef8b31fd0939a","LICENSE-APACHE":"453745410e3be8cf25d56872ea2aec975a78e6c9f217443d0bf908a5bce7c8ff","LICENSE-MIT":"de3911c2d98c8bd2d701ee721347053d9b55995a11f9a8c955e44d3ca1b376bf","build.rs":"41d24ea34bd37eb7a47253ac0681da2dde73e52caf04bbcecf795965e5d36466","src/lib.rs":"31e939a4a7f537265a84c91ba940ac31ac0f66c53a49971f1b21bbd2e4a7b5e9"},"package":"18cb88963258d00f4962205dbb5933d82780d9962c8c8a064b651d2ad7189210"}
|
|
||||||
diff -up firefox-78.2.0/third_party/rust/libdbus-sys/src/lib.rs.rhel6-dbusver firefox-78.2.0/third_party/rust/libdbus-sys/src/lib.rs
|
|
||||||
--- firefox-78.2.0/third_party/rust/libdbus-sys/src/lib.rs.rhel6-dbusver 2020-08-17 20:34:38.000000000 +0200
|
|
||||||
+++ firefox-78.2.0/third_party/rust/libdbus-sys/src/lib.rs 2020-09-09 21:06:34.933374260 +0200
|
|
||||||
@@ -252,13 +252,14 @@ extern "C" {
|
|
||||||
pub fn dbus_signature_validate_single(signature: *const c_char, error: *mut DBusError) -> u32;
|
|
||||||
|
|
||||||
pub fn dbus_threads_init_default() -> c_int;
|
|
||||||
+}
|
|
||||||
+ pub fn dbus_validate_bus_name(busname: *const c_char, error: *mut DBusError) -> u32 {return 1;}
|
|
||||||
+ pub fn dbus_validate_error_name(errorname: *const c_char, error: *mut DBusError) -> u32 {return 1;}
|
|
||||||
+ pub fn dbus_validate_interface(interface: *const c_char, error: *mut DBusError) -> u32 {return 1;}
|
|
||||||
+ pub fn dbus_validate_member(member: *const c_char, error: *mut DBusError) -> u32 {return 1;}
|
|
||||||
+ pub fn dbus_validate_path(path: *const c_char, error: *mut DBusError) -> u32 {return 1;}
|
|
||||||
|
|
||||||
- pub fn dbus_validate_bus_name(busname: *const c_char, error: *mut DBusError) -> u32;
|
|
||||||
- pub fn dbus_validate_error_name(errorname: *const c_char, error: *mut DBusError) -> u32;
|
|
||||||
- pub fn dbus_validate_interface(interface: *const c_char, error: *mut DBusError) -> u32;
|
|
||||||
- pub fn dbus_validate_member(member: *const c_char, error: *mut DBusError) -> u32;
|
|
||||||
- pub fn dbus_validate_path(path: *const c_char, error: *mut DBusError) -> u32;
|
|
||||||
-
|
|
||||||
+extern "C" {
|
|
||||||
pub fn dbus_watch_get_enabled(watch: *mut DBusWatch) -> u32;
|
|
||||||
pub fn dbus_watch_get_flags(watch: *mut DBusWatch) -> c_uint;
|
|
||||||
pub fn dbus_watch_get_unix_fd(watch: *mut DBusWatch) -> c_int;
|
|
||||||
@ -1,16 +0,0 @@
|
|||||||
diff -up firefox-78.2.0/media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc.rhel6-kernel firefox-78.2.0/media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc
|
|
||||||
--- firefox-78.2.0/media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc.rhel6-kernel 2020-09-09 19:56:13.159597467 +0200
|
|
||||||
+++ firefox-78.2.0/media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc 2020-09-09 19:56:31.457712629 +0200
|
|
||||||
@@ -385,11 +385,7 @@ bool DeviceInfoLinux::IsDeviceNameMatche
|
|
||||||
|
|
||||||
bool DeviceInfoLinux::IsVideoCaptureDevice(struct v4l2_capability* cap)
|
|
||||||
{
|
|
||||||
- if (cap->capabilities & V4L2_CAP_DEVICE_CAPS) {
|
|
||||||
- return cap->device_caps & V4L2_CAP_VIDEO_CAPTURE;
|
|
||||||
- } else {
|
|
||||||
- return cap->capabilities & V4L2_CAP_VIDEO_CAPTURE;
|
|
||||||
- }
|
|
||||||
+ return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
int32_t DeviceInfoLinux::FillCapabilities(int fd) {
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
diff -up firefox-78.2.0/python/mozbuild/mozbuild/controller/building.py.mach-fail firefox-78.2.0/python/mozbuild/mozbuild/controller/building.py
|
|
||||||
--- firefox-78.2.0/python/mozbuild/mozbuild/controller/building.py.mach-fail 2020-09-09 19:25:18.552930506 +0200
|
|
||||||
+++ firefox-78.2.0/python/mozbuild/mozbuild/controller/building.py 2020-09-09 19:25:31.081010223 +0200
|
|
||||||
@@ -591,7 +591,7 @@ class TerminalLoggingHandler(logging.Han
|
|
||||||
if self.footer:
|
|
||||||
self.footer.clear()
|
|
||||||
|
|
||||||
- self.fh.write(msg.encode("utf-8"))
|
|
||||||
+ self.fh.write(msg)
|
|
||||||
self.fh.write('\n')
|
|
||||||
|
|
||||||
if self.footer:
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
diff -up firefox-78.2.0/tools/profiler/gecko/nsProfiler.cpp.zconst firefox-78.2.0/tools/profiler/gecko/nsProfiler.cpp
|
|
||||||
--- firefox-78.2.0/tools/profiler/gecko/nsProfiler.cpp.zconst 2020-09-09 20:29:17.489123431 +0200
|
|
||||||
+++ firefox-78.2.0/tools/profiler/gecko/nsProfiler.cpp 2020-09-09 20:30:09.544457350 +0200
|
|
||||||
@@ -523,7 +523,7 @@ nsProfiler::GetProfileDataAsGzippedArray
|
|
||||||
stream.opaque = nullptr;
|
|
||||||
stream.next_out = (Bytef*)outBuff.Elements();
|
|
||||||
stream.avail_out = outBuff.Length();
|
|
||||||
- stream.next_in = (z_const Bytef*)aResult.Data();
|
|
||||||
+ stream.next_in = (Bytef*)aResult.Data();
|
|
||||||
stream.avail_in = aResult.Length();
|
|
||||||
|
|
||||||
// A windowBits of 31 is the default (15) plus 16 for emitting a
|
|
||||||
1093
SPECS/firefox.spec
1093
SPECS/firefox.spec
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user