Attachment #251409 for bug #279693

View | Details | Raw Unified | Return to bug 279693
Collapse All | Expand All

Lines 1-11 Link Here

(-)b/www/tor-browser/Makefile (-2 / +2 lines)
1	PORTNAME= tor-browser	1	PORTNAME= tor-browser
2	DISTVERSION= 13.5a8	2	DISTVERSION= 13.5a9
3	CATEGORIES= www net security wayland	3	CATEGORIES= www net security wayland
4	MASTER_SITES= TOR \	4	MASTER_SITES= TOR \
5	https://build-sources.tbb.torproject.org/:source1 \	5	https://build-sources.tbb.torproject.org/:source1 \
6	LOCAL/jsm:source2	6	LOCAL/jsm:source2
7	MASTER_SITE_SUBDIR= torbrowser/${DISTVERSION}	7	MASTER_SITE_SUBDIR= torbrowser/${DISTVERSION}
8	DISTNAME= src-firefox-tor-browser-115.11.0esr-13.5-1-build2	8	DISTNAME= src-firefox-tor-browser-115.12.0esr-13.5-1-build2
9	DISTFILES= ${DISTNAME}.tar.xz \	9	DISTFILES= ${DISTNAME}.tar.xz \
10	manual_112141.zip:source1 \	10	manual_112141.zip:source1 \
11	firefox-tor-browser-13.0.1-build2-firefox-1l0n-out.tar:source2	11	firefox-tor-browser-13.0.1-build2-firefox-1l0n-out.tar:source2

Lines 1-6 Link Here

(-)b/www/tor-browser/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1716961934	1	TIMESTAMP = 1718132378
2	SHA256 (src-firefox-tor-browser-115.11.0esr-13.5-1-build2.tar.xz) = da56a1386c6779387f309e45287b799e2beca69d2c4ea44a9c6d2e01f1161121	2	SHA256 (src-firefox-tor-browser-115.12.0esr-13.5-1-build2.tar.xz) = 989d7c6f829ba33b7d908ecb74b437b423da8193c45f5e23050500810da8756c
3	SIZE (src-firefox-tor-browser-115.11.0esr-13.5-1-build2.tar.xz) = 552025576	3	SIZE (src-firefox-tor-browser-115.12.0esr-13.5-1-build2.tar.xz) = 552055468
4	SHA256 (manual_112141.zip) = f767bc5f655f1263623b7af588cfb045d3e41ee019dc7ecd713decc5c1a0ea9b	4	SHA256 (manual_112141.zip) = f767bc5f655f1263623b7af588cfb045d3e41ee019dc7ecd713decc5c1a0ea9b
5	SIZE (manual_112141.zip) = 26293073	5	SIZE (manual_112141.zip) = 26293073
6	SHA256 (firefox-tor-browser-13.0.1-build2-firefox-1l0n-out.tar) = bbd290cd134e3a114241077ba82582617ab6c5117ff2226381943c504bd09775	6	SHA256 (firefox-tor-browser-13.0.1-build2-firefox-1l0n-out.tar) = bbd290cd134e3a114241077ba82582617ab6c5117ff2226381943c504bd09775




From cd10f3ba0d83f34ca978cc4c7a552b72fdd068aa Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Tue, 28 Nov 2023 11:18:39 -0800
Subject: [PATCH 1/2] Flatten cursor.kind() matching in Item::parse down to one
 match

---
 bindgen/ir/item.rs | 84 ++++++++++++++++++++++------------------------
 1 file changed, 41 insertions(+), 43 deletions(-)

diff --git bindgen/ir/item.rs bindgen/ir/item.rs
index 0556452bfa..4f2d361e51 100644
--- third_party/rust/bindgen/ir/item.rs
+++ third_party/rust/bindgen/ir/item.rs
@@ -1427,53 +1427,52 @@
             }
         }
 
-        // Guess how does clang treat extern "C" blocks?
-        if cursor.kind() == CXCursor_UnexposedDecl {
-            Err(ParseError::Recurse)
-        } else {
+        match cursor.kind() {
+            // Guess how does clang treat extern "C" blocks?
+            CXCursor_UnexposedDecl => Err(ParseError::Recurse),
+
             // We allowlist cursors here known to be unhandled, to prevent being
             // too noisy about this.
-            match cursor.kind() {
-                CXCursor_MacroDefinition |
-                CXCursor_MacroExpansion |
-                CXCursor_UsingDeclaration |
-                CXCursor_UsingDirective |
-                CXCursor_StaticAssert |
-                CXCursor_FunctionTemplate => {
-                    debug!(
-                        "Unhandled cursor kind {:?}: {:?}",
-                        cursor.kind(),
-                        cursor
-                    );
-                }
-                CXCursor_InclusionDirective => {
-                    let file = cursor.get_included_file_name();
-                    match file {
-                        None => {
-                            warn!(
-                                "Inclusion of a nameless file in {:?}",
-                                cursor
-                            );
-                        }
-                        Some(filename) => {
-                            ctx.include_file(filename);
-                        }
-                    }
-                }
-                _ => {
-                    // ignore toplevel operator overloads
-                    let spelling = cursor.spelling();
-                    if !spelling.starts_with("operator") {
+            CXCursor_MacroDefinition |
+            CXCursor_MacroExpansion |
+            CXCursor_UsingDeclaration |
+            CXCursor_UsingDirective |
+            CXCursor_StaticAssert |
+            CXCursor_FunctionTemplate => {
+                debug!(
+                    "Unhandled cursor kind {:?}: {:?}",
+                    cursor.kind(),
+                    cursor
+                );
+                Err(ParseError::Continue)
+            }
+            CXCursor_InclusionDirective => {
+                let file = cursor.get_included_file_name();
+                match file {
+                    None => {
                         warn!(
-                            "Unhandled cursor kind {:?}: {:?}",
-                            cursor.kind(),
+                            "Inclusion of a nameless file in {:?}",
                             cursor
                         );
                     }
+                    Some(filename) => {
+                        ctx.include_file(filename);
+                    }
                 }
+                Err(ParseError::Continue)
+            }
+            _ => {
+                // ignore toplevel operator overloads
+                let spelling = cursor.spelling();
+                if !spelling.starts_with("operator") {
+                    warn!(
+                        "Unhandled cursor kind {:?}: {:?}",
+                        cursor.kind(),
+                        cursor
+                    );
+                }
+                Err(ParseError::Continue)
             }
-
-            Err(ParseError::Continue)
         }
     }
 

From 2997017b5a3065b83e9d76f0080d6cb99c94c0c1 Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Tue, 28 Nov 2023 11:21:18 -0800
Subject: [PATCH 2/2] Handle CXCursor_LinkageSpec in Clang 18+

---
 bindgen/ir/item.rs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git bindgen/ir/item.rs bindgen/ir/item.rs
index 4f2d361e51..dd587b088b 100644
--- third_party/rust/bindgen/ir/item.rs
+++ third_party/rust/bindgen/ir/item.rs
@@ -1433,8 +1433,11 @@ impl Item {
         }
 
         match cursor.kind() {
-            // Guess how does clang treat extern "C" blocks?
-            CXCursor_UnexposedDecl => Err(ParseError::Recurse),
+            // On Clang 18+, extern "C" is reported accurately as a LinkageSpec.
+            // Older LLVM treat it as UnexposedDecl.
+            CXCursor_LinkageSpec | CXCursor_UnexposedDecl => {
+                Err(ParseError::Recurse)
+            }
 
             // We allowlist cursors here known to be unhandled, to prevent being
             // too noisy about this.
diff --git dom/media/gmp-plugin-openh264/gmp-fake-openh264.cpp dom/media/gmp-plugin-openh264/gmp-fake-openh264.cpp
--- dom/media/gmp-plugin-openh264/gmp-fake-openh264.cpp
+++ dom/media/gmp-plugin-openh264/gmp-fake-openh264.cpp
@@ -97,11 +97,11 @@
     uint32_t width_;
     uint32_t height_;
     uint8_t y_;
     uint8_t u_;
     uint8_t v_;
-    uint32_t timestamp_;
+    uint64_t timestamp_;
   } idr_nalu;
 };
 #pragma pack(pop)
 
 #define ENCODED_FRAME_MAGIC 0x004000b8
diff --git dom/media/gtest/TestGMPRemoveAndDelete.cpp dom/media/gtest/TestGMPRemoveAndDelete.cpp
--- dom/media/gtest/TestGMPRemoveAndDelete.cpp
+++ dom/media/gtest/TestGMPRemoveAndDelete.cpp
@@ -359,11 +359,11 @@
       uint32_t width_;
       uint32_t height_;
       uint8_t y_;
       uint8_t u_;
       uint8_t v_;
-      uint32_t timestamp_;
+      uint64_t timestamp_;
     } idr_nalu;
   };
 #pragma pack(pop)
 
   GMPVideoFrame* absFrame;
diff --git dom/media/webrtc/libwebrtcglue/WebrtcGmpVideoCodec.h dom/media/webrtc/libwebrtcglue/WebrtcGmpVideoCodec.h
--- dom/media/webrtc/libwebrtcglue/WebrtcGmpVideoCodec.h
+++ dom/media/webrtc/libwebrtcglue/WebrtcGmpVideoCodec.h
@@ -300,11 +300,11 @@
 
   struct InputImageData {
     int64_t timestamp_us;
   };
   // Map rtp time -> input image data
-  DataMutex<std::map<uint32_t, InputImageData>> mInputImageMap;
+  DataMutex<std::map<uint64_t, InputImageData>> mInputImageMap;
 
   MediaEventProducer<uint64_t> mInitPluginEvent;
   MediaEventProducer<uint64_t> mReleasePluginEvent;
 };
 
diff --git dom/media/webrtc/libwebrtcglue/WebrtcGmpVideoCodec.cpp dom/media/webrtc/libwebrtcglue/WebrtcGmpVideoCodec.cpp
--- dom/media/webrtc/libwebrtcglue/WebrtcGmpVideoCodec.cpp
+++ dom/media/webrtc/libwebrtcglue/WebrtcGmpVideoCodec.cpp
@@ -538,11 +538,11 @@
     return;
   }
 
   webrtc::VideoFrameType ft;
   GmpFrameTypeToWebrtcFrameType(aEncodedFrame->FrameType(), &ft);
-  uint32_t timestamp = (aEncodedFrame->TimeStamp() * 90ll + 999) / 1000;
+  uint64_t timestamp = (aEncodedFrame->TimeStamp() * 90ll + 999) / 1000;
 
   GMP_LOG_DEBUG("GMP Encoded: %" PRIu64 ", type %d, len %d",
                 aEncodedFrame->TimeStamp(), aEncodedFrame->BufferType(),
                 aEncodedFrame->Size());
 





Relevant bug report: https://bugzilla.mozilla.org/show_bug.cgi?id=1882291


diff --git a/Cargo.lock b/Cargo.lock
--- Cargo.lock
+++ Cargo.lock
@@ -4274,10 +4274,11 @@
 [[package]]
 name = "qcms"
 version = "0.2.0"
 dependencies = [
  "libc",
+ "version_check",
 ]
 
 [[package]]
 name = "qlog"
 version = "0.4.0"
diff --git a/gfx/qcms/Cargo.toml b/gfx/qcms/Cargo.toml
--- gfx/qcms/Cargo.toml
+++ gfx/qcms/Cargo.toml
@@ -18,5 +18,8 @@
 iccv4-enabled = []
 cmyk = []
 
 [dependencies]
 libc = {version = "0.2", optional = true }
+
+[build-dependencies]
+version_check = "0.9"
diff --git a/gfx/qcms/build.rs b/gfx/qcms/build.rs
new file mode 100644
--- /dev/null
+++ gfx/qcms/build.rs
@@ -0,0 +1,7 @@
+extern crate version_check as rustc;
+
+fn main() {
+    if rustc::is_min_version("1.78.0").unwrap_or(false) {
+        println!("cargo:rustc-cfg=stdsimd_split");
+    }
+}
diff --git a/gfx/qcms/src/lib.rs b/gfx/qcms/src/lib.rs
--- gfx/qcms/src/lib.rs
+++ gfx/qcms/src/lib.rs
@@ -5,13 +5,15 @@
 #![allow(non_camel_case_types)]
 #![allow(non_snake_case)]
 #![allow(non_upper_case_globals)]
 // These are needed for the neon SIMD code and can be removed once the MSRV supports the
 // instrinsics we use
-#![cfg_attr(feature = "neon", feature(stdsimd))]
+#![cfg_attr(all(stdsimd_split, target_arch = "arm", feature = "neon"), feature(stdarch_arm_neon_intrinsics))]
+#![cfg_attr(all(stdsimd_split, target_arch = "arm", feature = "neon"), feature(stdarch_arm_feature_detection))]
+#![cfg_attr(all(not(stdsimd_split), target_arch = "arm", feature = "neon"), feature(stdsimd))]
 #![cfg_attr(
-    feature = "neon",
+    all(target_arch = "arm", feature = "neon"),
     feature(arm_target_feature, raw_ref_op)
 
 )]
 
 /// These values match the Rendering Intent values from the ICC spec


Return to bug 279693

Added Link Here

(-)b/www/tor-browser/files/patch-llvm18 (+199 lines)
1	From cd10f3ba0d83f34ca978cc4c7a552b72fdd068aa Mon Sep 17 00:00:00 2001
2	From: David Tolnay <dtolnay@gmail.com>
3	Date: Tue, 28 Nov 2023 11:18:39 -0800
4	Subject: [PATCH 1/2] Flatten cursor.kind() matching in Item::parse down to one
5	match
6
7	---
8	bindgen/ir/item.rs \| 84 ++++++++++++++++++++++------------------------
9	1 file changed, 41 insertions(+), 43 deletions(-)
10
11	diff --git bindgen/ir/item.rs bindgen/ir/item.rs
12	index 0556452bfa..4f2d361e51 100644
13	--- third_party/rust/bindgen/ir/item.rs
14	+++ third_party/rust/bindgen/ir/item.rs
15	@@ -1427,53 +1427,52 @@
16	}
17	}
18
19	- // Guess how does clang treat extern "C" blocks?
20	- if cursor.kind() == CXCursor_UnexposedDecl {
21	- Err(ParseError::Recurse)
22	- } else {
23	+ match cursor.kind() {
24	+ // Guess how does clang treat extern "C" blocks?
25	+ CXCursor_UnexposedDecl => Err(ParseError::Recurse),
26	+
27	// We allowlist cursors here known to be unhandled, to prevent being
28	// too noisy about this.
29	- match cursor.kind() {
30	- CXCursor_MacroDefinition \|
31	- CXCursor_MacroExpansion \|
32	- CXCursor_UsingDeclaration \|
33	- CXCursor_UsingDirective \|
34	- CXCursor_StaticAssert \|
35	- CXCursor_FunctionTemplate => {
36	- debug!(
37	- "Unhandled cursor kind {:?}: {:?}",
38	- cursor.kind(),
39	- cursor
40	- );
41	- }
42	- CXCursor_InclusionDirective => {
43	- let file = cursor.get_included_file_name();
44	- match file {
45	- None => {
46	- warn!(
47	- "Inclusion of a nameless file in {:?}",
48	- cursor
49	- );
50	- }
51	- Some(filename) => {
52	- ctx.include_file(filename);
53	- }
54	- }
55	- }
56	- _ => {
57	- // ignore toplevel operator overloads
58	- let spelling = cursor.spelling();
59	- if !spelling.starts_with("operator") {
60	+ CXCursor_MacroDefinition \|
61	+ CXCursor_MacroExpansion \|
62	+ CXCursor_UsingDeclaration \|
63	+ CXCursor_UsingDirective \|
64	+ CXCursor_StaticAssert \|
65	+ CXCursor_FunctionTemplate => {
66	+ debug!(
67	+ "Unhandled cursor kind {:?}: {:?}",
68	+ cursor.kind(),
69	+ cursor
70	+ );
71	+ Err(ParseError::Continue)
72	+ }
73	+ CXCursor_InclusionDirective => {
74	+ let file = cursor.get_included_file_name();
75	+ match file {
76	+ None => {
77	warn!(
78	- "Unhandled cursor kind {:?}: {:?}",
79	- cursor.kind(),
80	+ "Inclusion of a nameless file in {:?}",
81	cursor
82	);
83	}
84	+ Some(filename) => {
85	+ ctx.include_file(filename);
86	+ }
87	}
88	+ Err(ParseError::Continue)
89	+ }
90	+ _ => {
91	+ // ignore toplevel operator overloads
92	+ let spelling = cursor.spelling();
93	+ if !spelling.starts_with("operator") {
94	+ warn!(
95	+ "Unhandled cursor kind {:?}: {:?}",
96	+ cursor.kind(),
97	+ cursor
98	+ );
99	+ }
100	+ Err(ParseError::Continue)
101	}
102	-
103	- Err(ParseError::Continue)
104	}
105	}
106
107
108	From 2997017b5a3065b83e9d76f0080d6cb99c94c0c1 Mon Sep 17 00:00:00 2001
109	From: David Tolnay <dtolnay@gmail.com>
110	Date: Tue, 28 Nov 2023 11:21:18 -0800
111	Subject: [PATCH 2/2] Handle CXCursor_LinkageSpec in Clang 18+
112
113	---
114	bindgen/ir/item.rs \| 7 +++++--
115	1 file changed, 5 insertions(+), 2 deletions(-)
116
117	diff --git bindgen/ir/item.rs bindgen/ir/item.rs
118	index 4f2d361e51..dd587b088b 100644
119	--- third_party/rust/bindgen/ir/item.rs
120	+++ third_party/rust/bindgen/ir/item.rs
121	@@ -1433,8 +1433,11 @@ impl Item {
122	}
123
124	match cursor.kind() {
125	- // Guess how does clang treat extern "C" blocks?
126	- CXCursor_UnexposedDecl => Err(ParseError::Recurse),
127	+ // On Clang 18+, extern "C" is reported accurately as a LinkageSpec.
128	+ // Older LLVM treat it as UnexposedDecl.
129	+ CXCursor_LinkageSpec \| CXCursor_UnexposedDecl => {
130	+ Err(ParseError::Recurse)
131	+ }
132
133	// We allowlist cursors here known to be unhandled, to prevent being
134	// too noisy about this.
135	diff --git dom/media/gmp-plugin-openh264/gmp-fake-openh264.cpp dom/media/gmp-plugin-openh264/gmp-fake-openh264.cpp
136	--- dom/media/gmp-plugin-openh264/gmp-fake-openh264.cpp
137	+++ dom/media/gmp-plugin-openh264/gmp-fake-openh264.cpp
138	@@ -97,11 +97,11 @@
139	uint32_t width_;
140	uint32_t height_;
141	uint8_t y_;
142	uint8_t u_;
143	uint8_t v_;
144	- uint32_t timestamp_;
145	+ uint64_t timestamp_;
146	} idr_nalu;
147	};
148	#pragma pack(pop)
149
150	#define ENCODED_FRAME_MAGIC 0x004000b8
151	diff --git dom/media/gtest/TestGMPRemoveAndDelete.cpp dom/media/gtest/TestGMPRemoveAndDelete.cpp
152	--- dom/media/gtest/TestGMPRemoveAndDelete.cpp
153	+++ dom/media/gtest/TestGMPRemoveAndDelete.cpp
154	@@ -359,11 +359,11 @@
155	uint32_t width_;
156	uint32_t height_;
157	uint8_t y_;
158	uint8_t u_;
159	uint8_t v_;
160	- uint32_t timestamp_;
161	+ uint64_t timestamp_;
162	} idr_nalu;
163	};
164	#pragma pack(pop)
165
166	GMPVideoFrame* absFrame;
167	diff --git dom/media/webrtc/libwebrtcglue/WebrtcGmpVideoCodec.h dom/media/webrtc/libwebrtcglue/WebrtcGmpVideoCodec.h
168	--- dom/media/webrtc/libwebrtcglue/WebrtcGmpVideoCodec.h
169	+++ dom/media/webrtc/libwebrtcglue/WebrtcGmpVideoCodec.h
170	@@ -300,11 +300,11 @@
171
172	struct InputImageData {
173	int64_t timestamp_us;
174	};
175	// Map rtp time -> input image data
176	- DataMutex<std::map<uint32_t, InputImageData>> mInputImageMap;
177	+ DataMutex<std::map<uint64_t, InputImageData>> mInputImageMap;
178
179	MediaEventProducer<uint64_t> mInitPluginEvent;
180	MediaEventProducer<uint64_t> mReleasePluginEvent;
181	};
182
183	diff --git dom/media/webrtc/libwebrtcglue/WebrtcGmpVideoCodec.cpp dom/media/webrtc/libwebrtcglue/WebrtcGmpVideoCodec.cpp
184	--- dom/media/webrtc/libwebrtcglue/WebrtcGmpVideoCodec.cpp
185	+++ dom/media/webrtc/libwebrtcglue/WebrtcGmpVideoCodec.cpp
186	@@ -538,11 +538,11 @@
187	return;
188	}
189
190	webrtc::VideoFrameType ft;
191	GmpFrameTypeToWebrtcFrameType(aEncodedFrame->FrameType(), &ft);
192	- uint32_t timestamp = (aEncodedFrame->TimeStamp() * 90ll + 999) / 1000;
193	+ uint64_t timestamp = (aEncodedFrame->TimeStamp() * 90ll + 999) / 1000;
194
195	GMP_LOG_DEBUG("GMP Encoded: %" PRIu64 ", type %d, len %d",
196	aEncodedFrame->TimeStamp(), aEncodedFrame->BufferType(),
197	aEncodedFrame->Size());
198
199

Removed Link Here

(-)a/www/tor-browser/files/patch-rust-1.78.0-arm (-64 lines)
1	Relevant bug report: https://bugzilla.mozilla.org/show_bug.cgi?id=1882291
2
3
4	diff --git a/Cargo.lock b/Cargo.lock
5	--- Cargo.lock
6	+++ Cargo.lock
7	@@ -4274,10 +4274,11 @@
8	[[package]]
9	name = "qcms"
10	version = "0.2.0"
11	dependencies = [
12	"libc",
13	+ "version_check",
14	]
15
16	[[package]]
17	name = "qlog"
18	version = "0.4.0"
19	diff --git a/gfx/qcms/Cargo.toml b/gfx/qcms/Cargo.toml
20	--- gfx/qcms/Cargo.toml
21	+++ gfx/qcms/Cargo.toml
22	@@ -18,5 +18,8 @@
23	iccv4-enabled = []
24	cmyk = []
25
26	[dependencies]
27	libc = {version = "0.2", optional = true }
28	+
29	+[build-dependencies]
30	+version_check = "0.9"
31	diff --git a/gfx/qcms/build.rs b/gfx/qcms/build.rs
32	new file mode 100644
33	--- /dev/null
34	+++ gfx/qcms/build.rs
35	@@ -0,0 +1,7 @@
36	+extern crate version_check as rustc;
37	+
38	+fn main() {
39	+ if rustc::is_min_version("1.78.0").unwrap_or(false) {
40	+ println!("cargo:rustc-cfg=stdsimd_split");
41	+ }
42	+}
43	diff --git a/gfx/qcms/src/lib.rs b/gfx/qcms/src/lib.rs
44	--- gfx/qcms/src/lib.rs
45	+++ gfx/qcms/src/lib.rs
46	@@ -5,13 +5,15 @@
47	#![allow(non_camel_case_types)]
48	#![allow(non_snake_case)]
49	#![allow(non_upper_case_globals)]
50	// These are needed for the neon SIMD code and can be removed once the MSRV supports the
51	// instrinsics we use
52	-#![cfg_attr(feature = "neon", feature(stdsimd))]
53	+#![cfg_attr(all(stdsimd_split, target_arch = "arm", feature = "neon"), feature(stdarch_arm_neon_intrinsics))]
54	+#![cfg_attr(all(stdsimd_split, target_arch = "arm", feature = "neon"), feature(stdarch_arm_feature_detection))]
55	+#![cfg_attr(all(not(stdsimd_split), target_arch = "arm", feature = "neon"), feature(stdsimd))]
56	#![cfg_attr(
57	- feature = "neon",
58	+ all(target_arch = "arm", feature = "neon"),
59	feature(arm_target_feature, raw_ref_op)
60
61	)]
62
63	/// These values match the Rendering Intent values from the ICC spec
64