Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
qtwebengine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Debian Qt and KDE Team
Qt5
qtwebengine
Commits
34daea95
Commit
34daea95
authored
4 years ago
by
Dmitry Shachnev
Browse files
Options
Downloads
Patches
Plain Diff
Add a patch to build openh264 with -DX86_32_PICASM on i386.
Closes: #965328.
parent
c87e0713
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
debian/changelog
+3
-0
3 additions, 0 deletions
debian/changelog
debian/patches/openh264-picasm.patch
+35
-0
35 additions, 0 deletions
debian/patches/openh264-picasm.patch
debian/patches/series
+1
-0
1 addition, 0 deletions
debian/patches/series
with
39 additions
and
0 deletions
debian/changelog
+
3
−
0
View file @
34daea95
qtwebengine-opensource-src (5.14.2+dfsg1-3) UNRELEASED; urgency=medium
[ Dmitry Shachnev ]
* Add a patch to build openh264 with -DX86_32_PICASM on i386, to fix errors
from new linker (closes: #965328).
-- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Mon, 20 Jul 2020 13:35:08 +0300
...
...
This diff is collapsed.
Click to expand it.
debian/patches/openh264-picasm.patch
0 → 100644
+
35
−
0
View file @
34daea95
Description: build openh264 with -DX86_32_PICASM on x86
To fix linker errors with new binutils, see #965328.
Author: Dmitry Shachnev <mitya57@debian.org>
Forwarded: not-yet
Last-Update: 2020-07-20
--- a/src/3rdparty/chromium/third_party/openh264/BUILD.gn
+++ b/src/3rdparty/chromium/third_party/openh264/BUILD.gn
@@ -67,7 +67,7 @@
if (use_assembler) {
sources = openh264_common_sources_asm_x86
defines = yasm_defines
if (target_cpu == "x86") {
- defines += [ "X86_32" ]
+ defines += [ "X86_32", "X86_32_PICASM" ]
} else { # x64
if (is_mac) {
defines += [
@@ -88,7 +88,7 @@
if (use_assembler) {
sources = openh264_processing_sources_asm_x86
defines = yasm_defines
if (target_cpu == "x86") {
- defines += [ "X86_32" ]
+ defines += [ "X86_32", "X86_32_PICASM" ]
} else { # x64
if (is_mac) {
defines += [
@@ -109,7 +109,7 @@
if (use_assembler) {
sources = openh264_encoder_sources_asm_x86
defines = yasm_defines
if (target_cpu == "x86") {
- defines += [ "X86_32" ]
+ defines += [ "X86_32", "X86_32_PICASM" ]
} else { # x64
if (is_mac) {
defines += [
This diff is collapsed.
Click to expand it.
debian/patches/series
+
1
−
0
View file @
34daea95
...
...
@@ -9,3 +9,4 @@ mipsel-no-dav1d.patch
mipsel-no-v8-embedded-builtins.patch
mipsel-link-atomic.patch
icu-67.patch
openh264-picasm.patch
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment