[arch-commits] Commit in qt6-webengine/repos/kde-unstable-x86_64 (4 files)
Antonio Rojas
arojas at gemini.archlinux.org
Wed Mar 16 11:51:07 UTC 2022
Date: Wednesday, March 16, 2022 @ 11:51:06
Author: arojas
Revision: 439762
archrelease: copy kde-unstable to kde-unstable-x86_64
Added:
qt6-webengine/repos/kde-unstable-x86_64/PKGBUILD
(from rev 439761, qt6-webengine/kde-unstable/PKGBUILD)
Deleted:
qt6-webengine/repos/kde-unstable-x86_64/PKGBUILD
qt6-webengine/repos/kde-unstable-x86_64/chromium-93-ffmpeg-4.4.patch
qt6-webengine/repos/kde-unstable-x86_64/chromium-94-ffmpeg-roll.patch
-------------------------------+
PKGBUILD | 102 ++++++++++++++++++----------------------
chromium-93-ffmpeg-4.4.patch | 36 --------------
chromium-94-ffmpeg-roll.patch | 49 -------------------
3 files changed, 46 insertions(+), 141 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-03-16 11:50:43 UTC (rev 439761)
+++ PKGBUILD 2022-03-16 11:51:06 UTC (rev 439762)
@@ -1,56 +0,0 @@
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-
-pkgname=qt6-webengine
-_qtver=6.3.0-beta2
-pkgver=${_qtver/-/}
-pkgrel=1
-arch=(x86_64)
-url='https://www.qt.io'
-license=(GPL3 LGPL3 FDL custom)
-pkgdesc='Provides support for web applications using the Chromium browser project'
-depends=(qt6-webchannel qt6-positioning libxcomposite libxrandr libxkbfile
- libevent snappy nss libxslt minizip ffmpeg re2 libvpx libxtst ttf-font pciutils)
-makedepends=(cmake ninja python-html5lib gperf jsoncpp qt6-tools pipewire nodejs qt6-websockets)
-optdepends=('pipewire: WebRTC desktop sharing under Wayland')
-groups=(qt6)
-options=(debug)
-_pkgfn=${pkgname/6-/}-everywhere-src-$_qtver
-source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz
- chromium-93-ffmpeg-4.4.patch
- chromium-94-ffmpeg-roll.patch
- qt6-webengine-system-libxslt.patch::https://code.qt.io/cgit/qt/qtwebengine.git/patch/?id=bcce1113)
-sha256sums=('d98e275b82eeb8639785079b033bca17ac543ddb6943545e67e0eccaa5f87ed1'
- '1a9e074f417f8ffd78bcd6874d8e2e74a239905bf662f76a7755fa40dc476b57'
- '56acb6e743d2ab1ed9f3eb01700ade02521769978d03ac43226dec94659b3ace'
- '1a4c12e6036a8bf97d2779e89321a44a4a1a750f1691fd8fcbf3269dea0d7558')
-
-prepare() {
-# Patches to build with ffmpeg 4.4; remove when ffmpeg 5.0 moves to stable
- if ! pkg-config --atleast-version 59 libavformat; then
- patch -d $_pkgfn/src/3rdparty/chromium -p1 -i "$srcdir"/chromium-93-ffmpeg-4.4.patch
- patch -d $_pkgfn/src/3rdparty/chromium -Rp1 -i "$srcdir"/chromium-94-ffmpeg-roll.patch
- fi
-
- patch -d $_pkgfn -p1 < qt6-webengine-system-libxslt.patch # Fix using system libxslt
-}
-
-build() {
- cmake -B build -S $_pkgfn -G Ninja \
- -DCMAKE_TOOLCHAIN_FILE=/usr/lib/cmake/Qt6/qt.toolchain.cmake \
- -DQT_FEATURE_webengine_system_ffmpeg=ON \
- -DQT_FEATURE_webengine_system_icu=OFF \
- -DQT_FEATURE_webengine_system_libevent=ON \
- -DQT_FEATURE_webengine_system_libxslt=ON \
- -DQT_FEATURE_webengine_proprietary_codecs=ON \
- -DQT_FEATURE_webengine_kerberos=ON \
- -DQT_FEATURE_webengine_webrtc_pipewire=ON \
- -DQT_FEATURE_webengine_full_debug_info=ON
- cmake --build build
-}
-
-package() {
- DESTDIR="$pkgdir" cmake --install build
-
- install -Dm644 "$srcdir"/${_pkgfn}/src/3rdparty/chromium/LICENSE "$pkgdir"/usr/share/licenses/${pkgname}/LICENSE.chromium
-}
Copied: qt6-webengine/repos/kde-unstable-x86_64/PKGBUILD (from rev 439761, qt6-webengine/kde-unstable/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-03-16 11:51:06 UTC (rev 439762)
@@ -0,0 +1,46 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+
+pkgname=qt6-webengine
+_qtver=6.3.0-beta3
+pkgver=${_qtver/-/}
+pkgrel=1
+arch=(x86_64)
+url='https://www.qt.io'
+license=(GPL3 LGPL3 FDL custom)
+pkgdesc='Provides support for web applications using the Chromium browser project'
+depends=(qt6-webchannel qt6-positioning libxcomposite libxrandr libxkbfile
+ libevent snappy nss libxslt minizip ffmpeg re2 libvpx libxtst ttf-font pciutils)
+makedepends=(cmake ninja python-html5lib gperf jsoncpp qt6-tools pipewire nodejs qt6-websockets)
+optdepends=('pipewire: WebRTC desktop sharing under Wayland')
+groups=(qt6)
+options=(debug)
+_pkgfn=${pkgname/6-/}-everywhere-src-$_qtver
+source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz
+ qt6-webengine-ffmpeg5.patch::https://code.qt.io/cgit/qt/qtwebengine-chromium.git/patch/?id=b5afc89e)
+sha256sums=('847495f1415646327ff3656375730336c5cc08226eaef21cb961a513569ec449'
+ '415d7867de841f72fd4308c41ba0d506058ea46e8b5f36a99cd4382721fd376c')
+
+prepare() {
+ patch -d $_pkgfn/src/3rdparty -p1 < qt6-webengine-ffmpeg5.patch # Fix build with ffmpeg 5
+}
+
+build() {
+ cmake -B build -S $_pkgfn -G Ninja \
+ -DCMAKE_TOOLCHAIN_FILE=/usr/lib/cmake/Qt6/qt.toolchain.cmake \
+ -DQT_FEATURE_webengine_system_ffmpeg=ON \
+ -DQT_FEATURE_webengine_system_icu=OFF \
+ -DQT_FEATURE_webengine_system_libevent=ON \
+ -DQT_FEATURE_webengine_system_libxslt=ON \
+ -DQT_FEATURE_webengine_proprietary_codecs=ON \
+ -DQT_FEATURE_webengine_kerberos=ON \
+ -DQT_FEATURE_webengine_webrtc_pipewire=ON \
+ -DQT_FEATURE_webengine_full_debug_info=ON
+ cmake --build build
+}
+
+package() {
+ DESTDIR="$pkgdir" cmake --install build
+
+ install -Dm644 "$srcdir"/${_pkgfn}/src/3rdparty/chromium/LICENSE "$pkgdir"/usr/share/licenses/${pkgname}/LICENSE.chromium
+}
Deleted: chromium-93-ffmpeg-4.4.patch
===================================================================
--- chromium-93-ffmpeg-4.4.patch 2022-03-16 11:50:43 UTC (rev 439761)
+++ chromium-93-ffmpeg-4.4.patch 2022-03-16 11:51:06 UTC (rev 439762)
@@ -1,36 +0,0 @@
-diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
-index ac4713b07268..492a9a37d096 100644
---- a/media/filters/ffmpeg_demuxer.cc
-+++ b/media/filters/ffmpeg_demuxer.cc
-@@ -427,11 +427,11 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) {
- scoped_refptr<DecoderBuffer> buffer;
-
- if (type() == DemuxerStream::TEXT) {
-- size_t id_size = 0;
-+ int id_size = 0;
- uint8_t* id_data = av_packet_get_side_data(
- packet.get(), AV_PKT_DATA_WEBVTT_IDENTIFIER, &id_size);
-
-- size_t settings_size = 0;
-+ int settings_size = 0;
- uint8_t* settings_data = av_packet_get_side_data(
- packet.get(), AV_PKT_DATA_WEBVTT_SETTINGS, &settings_size);
-
-@@ -443,7 +443,7 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) {
- buffer = DecoderBuffer::CopyFrom(packet->data, packet->size,
- side_data.data(), side_data.size());
- } else {
-- size_t side_data_size = 0;
-+ int side_data_size = 0;
- uint8_t* side_data = av_packet_get_side_data(
- packet.get(), AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL, &side_data_size);
-
-@@ -504,7 +504,7 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) {
- packet->size - data_offset);
- }
-
-- size_t skip_samples_size = 0;
-+ int skip_samples_size = 0;
- const uint32_t* skip_samples_ptr =
- reinterpret_cast<const uint32_t*>(av_packet_get_side_data(
- packet.get(), AV_PKT_DATA_SKIP_SAMPLES, &skip_samples_size));
Deleted: chromium-94-ffmpeg-roll.patch
===================================================================
--- chromium-94-ffmpeg-roll.patch 2022-03-16 11:50:43 UTC (rev 439761)
+++ chromium-94-ffmpeg-roll.patch 2022-03-16 11:51:06 UTC (rev 439762)
@@ -1,49 +0,0 @@
-From b94755e4633045be96ab5e0bdde0db7e16a804bd Mon Sep 17 00:00:00 2001
-From: "liberato at chromium.org" <liberato at chromium.org>
-Date: Fri, 6 Aug 2021 04:25:31 +0000
-Subject: [PATCH] FFmpeg M94 roll.
-
-Contains DEPS update + chromium-side fixes.
-
-Bug: 1227259
-Change-Id: I61c5eaa789ea12c17d0cbcbf837435b9cf32479b
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3011889
-Reviewed-by: Thomas Guilbert <tguilbert at chromium.org>
-Commit-Queue: Frank Liberato <liberato at chromium.org>
-Cr-Commit-Position: refs/heads/master@{#909174}
----
- media/ffmpeg/ffmpeg_common.h | 1 +
- media/filters/ffmpeg_demuxer.cc | 4 ++--
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/media/ffmpeg/ffmpeg_common.h b/media/ffmpeg/ffmpeg_common.h
-index cede8ac5a7..97d6307e28 100644
---- a/media/ffmpeg/ffmpeg_common.h
-+++ b/media/ffmpeg/ffmpeg_common.h
-@@ -29,6 +29,7 @@ extern "C" {
- #include <libavformat/avformat.h>
- #include <libavformat/avio.h>
- #include <libavutil/avutil.h>
-+#include <libavutil/channel_layout.h>
- #include <libavutil/imgutils.h>
- #include <libavutil/log.h>
- #include <libavutil/mastering_display_metadata.h>
-diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
-index ac4713b072..605001d935 100644
---- a/media/filters/ffmpeg_demuxer.cc
-+++ b/media/filters/ffmpeg_demuxer.cc
-@@ -106,12 +106,12 @@ static base::TimeDelta ExtractStartTime(AVStream* stream) {
-
- // Next try to use the first DTS value, for codecs where we know PTS == DTS
- // (excludes all H26x codecs). The start time must be returned in PTS.
-- if (stream->first_dts != kNoFFmpegTimestamp &&
-+ if (av_stream_get_first_dts(stream) != kNoFFmpegTimestamp &&
- stream->codecpar->codec_id != AV_CODEC_ID_HEVC &&
- stream->codecpar->codec_id != AV_CODEC_ID_H264 &&
- stream->codecpar->codec_id != AV_CODEC_ID_MPEG4) {
- const base::TimeDelta first_pts =
-- ConvertFromTimeBase(stream->time_base, stream->first_dts);
-+ ConvertFromTimeBase(stream->time_base, av_stream_get_first_dts(stream));
- if (first_pts < start_time)
- start_time = first_pts;
- }
More information about the arch-commits
mailing list