archlinuxarm/PKGBUILDs
1
0
Fork 0
mirror of https://github.com/archlinuxarm/PKGBUILDs.git synced 2024-11-08 22:45:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

extra/qt5-webengine to 5.15.17-6

Browse source
This commit is contained in:
Kevin Mihelich 2024-07-26 17:51:43 +00:00
parent 9e8573160d
commit b75fc916de
4 changed files with 37 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
extra/qt5-webengine/.SRCINFO
View file

@ -1,7 +1,7 @@
pkgbase = qt5-webengine
pkgdesc = Provides support for web applications using the Chromium browser project
pkgver = 5.15.17
pkgrel = 5
pkgrel = 6
url = https://www.qt.io
arch = x86_64
groups = qt5
@ -45,16 +45,14 @@ pkgbase = qt5-webengine
source = qt5-webengine-ninja-1.12.patch
source = python3.12-imp.patch
source = python3.12-six.patch
source = no-h264.patch
sha256sums = c2488e6d6778cf9954fcc45e94acb762376581a99df7f889f13a93cefd356940
sha256sums = SKIP
sha256sums = c50d3019626183e753c53a997dc8a55938847543aa3178d4c51f377be741c693
sha256sums = cd8d3c4e2b8c352c7ff8ecc457c7551d59f7aa43806d41e75661b5b95ee33c37
sha256sums = 82a56cfc3e278617e11093078abe672a73c6fdaad98a2c8604ad8f22bc879ce5
sha256sums = 5e3a3c4711d964d5152a04059a2b5c1d14bb13dd29bce370120f60e85b476b6f
sha256sums = 7cac28ba784d24b4abf6414079548ada165343af507ecd8e23cbe7e4f63ae52f
sha256sums = 6672741b64d896dc555c8ee42ca2329c4f20d5f406095a69fe72da44b3a142f4
sha256sums = 1f4357708e985bb5aca61a7e5dc4c0c1285d2af00994bb49ff89ede78198e0d2
sha256sums = ac87ec55ee5cbcf2d520e1ea433d041c0bf754271a17f859edbb9976f192ce3f
sha256sums = b8f65c5bd5f0ce5ee297d3642c9e0ef58fbc525e304386d05cfa950b66cf206b
pkgname = qt5-webengine

9
extra/qt5-webengine/PKGBUILD
View file

@ -12,7 +12,7 @@ highmem=1
pkgname=qt5-webengine
_basever=5.15.14
pkgver=5.15.17
pkgrel=5
pkgrel=6
arch=('x86_64')
url='https://www.qt.io'
license=('LGPL3' 'LGPL2.1' 'BSD')
@ -32,7 +32,6 @@ source=(kde-$_pkgfqn::git+https://code.qt.io/qt/qtwebengine.git#tag=v${pkgver}-l
qt5-webengine-ninja-1.12.patch
python3.12-imp.patch
python3.12-six.patch
no-h264.patch
0001-ARM-toolchain-fixes.patch
0002-Fix-ARM-skia-ICE.patch
0003-bind-gen-Support-single_process-flag-in-generate_bin.patch
@ -40,13 +39,12 @@ source=(kde-$_pkgfqn::git+https://code.qt.io/qt/qtwebengine.git#tag=v${pkgver}-l
sha256sums=('c2488e6d6778cf9954fcc45e94acb762376581a99df7f889f13a93cefd356940'
'SKIP'
'c50d3019626183e753c53a997dc8a55938847543aa3178d4c51f377be741c693'
'cd8d3c4e2b8c352c7ff8ecc457c7551d59f7aa43806d41e75661b5b95ee33c37'
'82a56cfc3e278617e11093078abe672a73c6fdaad98a2c8604ad8f22bc879ce5'
'5e3a3c4711d964d5152a04059a2b5c1d14bb13dd29bce370120f60e85b476b6f'
'7cac28ba784d24b4abf6414079548ada165343af507ecd8e23cbe7e4f63ae52f'
'6672741b64d896dc555c8ee42ca2329c4f20d5f406095a69fe72da44b3a142f4'
'1f4357708e985bb5aca61a7e5dc4c0c1285d2af00994bb49ff89ede78198e0d2'
'ac87ec55ee5cbcf2d520e1ea433d041c0bf754271a17f859edbb9976f192ce3f'
'b8f65c5bd5f0ce5ee297d3642c9e0ef58fbc525e304386d05cfa950b66cf206b'
'abccb5349ec341fd912be93d055f0cdf6becfdb5fa3312769777f750cfd4351a'
'cad41451dffb5cc67c57882526c6c19795e6e49e7b704f92ec76dd3499486654'
'4e58aca7f71037f154bbdfd03deb671462da433c241fd6429ca6adf2c7738f75'
@ -67,9 +65,8 @@ prepare() {
patch -p2 -d src/3rdparty/chromium -i "$srcdir"/qt5-webengine-ninja-1.12.patch # Fix build with ninja 1.12
patch -p1 -d src/3rdparty/chromium -i "$srcdir"/python3.12-imp.patch # Fix build with python 3.12 - patch from Debian
patch -p1 -d src/3rdparty/chromium -i "$srcdir"/python3.12-six.patch # Fix build with python 3.12 - patch from Debian
# Fix build with ffmpeg 7 - OpenSUSE and Chromium patches
# Fix build with ffmpeg 7 - Chromium patches
patch -p1 -d src/3rdparty/chromium -i "$srcdir"/qt5-webengine-ffmpeg7.patch
patch -p1 -i ../no-h264.patch
[[ $CARCH == "armv7h" ]] && export NINJAJOBS="-j1"
cd "$srcdir/kde-$_pkgfqn/src/3rdparty"

33
extra/qt5-webengine/no-h264.patch
View file

@ -1,33 +0,0 @@
From: Fabian Vogt <fabian@ritter-vogt.de>
Subject: Don't require open264 when proprietary_codecs are supported
Amended on 2024-01-30: also disable h265
diff --git a/src/3rdparty/chromium/third_party/webrtc/webrtc.gni b/src/3rdparty/chromium/third_party/webrtc/webrtc.gni
index 5a1c43c8888..d867f7e5330 100644
--- a/src/3rdparty/chromium/third_party/webrtc/webrtc.gni
+++ b/src/3rdparty/chromium/third_party/webrtc/webrtc.gni
@@ -186,8 +186,7 @@ declare_args() {
#
# Enabling H264 when building with MSVC is currently not supported, see
# bugs.webrtc.org/9213#c13 for more info.
- rtc_use_h264 =
- proprietary_codecs && !is_android && !is_ios && !(is_win && !is_clang)
+ rtc_use_h264 = false
# Enable this flag to make webrtc::Mutex be implemented by absl::Mutex.
rtc_use_absl_mutex = false
diff --git a/src/core/config/common.pri b/src/core/config/common.pri
index fc46d55ce..27558a500 100644
--- a/src/core/config/common.pri
+++ b/src/core/config/common.pri
@@ -26,9 +26,6 @@ qtConfig(webengine-webrtc) {
qtConfig(webengine-proprietary-codecs) {
gn_args += proprietary_codecs=true ffmpeg_branding=\"Chrome\"
- qtConfig(webengine-webrtc) {
- gn_args += rtc_use_h264=true
- }
} else {
gn_args += proprietary_codecs=false
}

32
extra/qt5-webengine/qt5-webengine-ffmpeg7.patch
View file

@ -463,3 +463,35 @@ index e1be5aa9a5b13..951c003956fb5 100644
const base::TimeDelta frame_duration = base::TimeDelta::FromSecondsD(
frames_read / static_cast<double>(sample_rate_));
diff --git a/chromium/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc b/chromium/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc
index c6446c2..805b95b 100644
--- a/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc
+++ b/third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc
@@ -114,7 +114,6 @@ int H264DecoderImpl::AVGetBuffer2(AVCodecContext* context,
int total_size = y_size + 2 * uv_size;
av_frame->format = context->pix_fmt;
- av_frame->reordered_opaque = context->reordered_opaque;
// Set |av_frame| members as required by FFmpeg.
av_frame->data[kYPlaneIndex] = frame_buffer->MutableDataY();
@@ -273,8 +272,6 @@ int32_t H264DecoderImpl::Decode(const EncodedImage& input_image,
return WEBRTC_VIDEO_CODEC_ERROR;
}
packet.size = static_cast<int>(input_image.size());
- int64_t frame_timestamp_us = input_image.ntp_time_ms_ * 1000; // ms -> μs
- av_context_->reordered_opaque = frame_timestamp_us;
int result = avcodec_send_packet(av_context_.get(), &packet);
if (result < 0) {
@@ -290,10 +287,6 @@ int32_t H264DecoderImpl::Decode(const EncodedImage& input_image,
return WEBRTC_VIDEO_CODEC_ERROR;
}
- // We don't expect reordering. Decoded frame tamestamp should match
- // the input one.
- RTC_DCHECK_EQ(av_frame_->reordered_opaque, frame_timestamp_us);
-
absl::optional<uint8_t> qp;
// TODO(sakal): Maybe it is possible to get QP directly from FFmpeg.
h264_bitstream_parser_.ParseBitstream(input_image.data(), input_image.size());