Date: Friday, February 24, 2023 @ 07:17:50
Author: arojas
Revision: 469506
archrelease: copy kde-unstable to kde-unstable-x86_64
Added:
qt6-webengine/repos/kde-unstable-x86_64/PKGBUILD
(from rev 469505, qt6-webengine/kde-unstable/PKGBUILD)
Deleted:
qt6-webengine/repos/kde-unstable-x86_64/PKGBUILD
qt6-webengine/repos/kde-unstable-x86_64/fix-build.patch
qt6-webengine/repos/kde-unstable-x86_64/system-ffmpeg.patch
---------------------+
PKGBUILD | 85 ++++++++++++++++++++++----------------------------
fix-build.patch | 15 --------
system-ffmpeg.patch | 55 --------------------------------
3 files changed, 38 insertions(+), 117 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2023-02-24 07:17:37 UTC (rev 469505)
+++ PKGBUILD 2023-02-24 07:17:50 UTC (rev 469506)
@@ -1,47 +0,0 @@
-# Maintainer: Antonio Rojas <[email protected]>
-# Maintainer: Felix Yan <[email protected]>
-
-pkgname=qt6-webengine
-_qtver=6.5.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
- snappy nss libxslt minizip ffmpeg re2 libvpx libxtst ttf-font) #
pciutils
-makedepends=(cmake ninja python-html5lib gperf jsoncpp qt6-tools pipewire
nodejs qt6-websockets libepoxy git)
-optdepends=('pipewire: WebRTC desktop sharing under Wayland')
-groups=(qt6)
-_pkgfn=${pkgname/6-/}-everywhere-src-$_qtver
-source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz
- system-ffmpeg.patch
- fix-build.patch)
-sha256sums=('c7a9206ca87f4683fc88bb2dc0695a401122a1b898b5f6078d01c587f2fccc46'
- '4c12d31d020799d31355faa7d1fe2a5a807f7458e7f0c374adf55edb37032152'
- 'e1e04f57af6793ec362ed9f6b0b94b8028d67b97fca0c57139031fed302ea111')
-
-prepare() {
- patch -d $_pkgfn/src/3rdparty/chromium -Rp1 < system-ffmpeg.patch
- patch -d $_pkgfn/src/3rdparty -p1 < fix-build.patch
-}
-
-build() {
- cmake -B build -S $_pkgfn -G Ninja \
- -DCMAKE_MESSAGE_LOG_LEVEL=STATUS \
- -DCMAKE_TOOLCHAIN_FILE=/usr/lib/cmake/Qt6/qt.toolchain.cmake \
- -DQT_FEATURE_webengine_system_ffmpeg=ON \
- -DQT_FEATURE_webengine_system_icu=ON \
- -DQT_FEATURE_webengine_system_libevent=ON \
- -DQT_FEATURE_webengine_proprietary_codecs=ON \
- -DQT_FEATURE_webengine_kerberos=ON \
- -DQT_FEATURE_webengine_webrtc_pipewire=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 469505,
qt6-webengine/kde-unstable/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2023-02-24 07:17:50 UTC (rev 469506)
@@ -0,0 +1,38 @@
+# Maintainer: Antonio Rojas <[email protected]>
+# Maintainer: Felix Yan <[email protected]>
+
+pkgname=qt6-webengine
+_qtver=6.5.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
+ snappy nss libxslt minizip ffmpeg re2 libvpx libxtst ttf-font) #
pciutils
+makedepends=(cmake ninja python-html5lib gperf jsoncpp qt6-tools pipewire
nodejs qt6-websockets libepoxy git)
+optdepends=('pipewire: WebRTC desktop sharing under Wayland')
+groups=(qt6)
+_pkgfn=${pkgname/6-/}-everywhere-src-$_qtver
+source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz)
+sha256sums=('c81d890203f5de495d05830100d3ec7bd309f55edb2c389fc40d2f4d9e591133')
+
+build() {
+ cmake -B build -S $_pkgfn -G Ninja \
+ -DCMAKE_MESSAGE_LOG_LEVEL=STATUS \
+ -DCMAKE_TOOLCHAIN_FILE=/usr/lib/cmake/Qt6/qt.toolchain.cmake \
+ -DQT_FEATURE_webengine_system_ffmpeg=ON \
+ -DQT_FEATURE_webengine_system_icu=ON \
+ -DQT_FEATURE_webengine_system_libevent=ON \
+ -DQT_FEATURE_webengine_proprietary_codecs=ON \
+ -DQT_FEATURE_webengine_kerberos=ON \
+ -DQT_FEATURE_webengine_webrtc_pipewire=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: fix-build.patch
===================================================================
--- fix-build.patch 2023-02-24 07:17:37 UTC (rev 469505)
+++ fix-build.patch 2023-02-24 07:17:50 UTC (rev 469506)
@@ -1,15 +0,0 @@
-diff --git a/chromium/media/filters/h265_to_annex_b_bitstream_converter.cc
b/chromium/media/filters/h265_to_annex_b_bitstream_converter.cc
-index 28cf3f3fa57..4bc2033a1ed 100644
---- a/chromium/media/filters/h265_to_annex_b_bitstream_converter.cc
-+++ b/chromium/media/filters/h265_to_annex_b_bitstream_converter.cc
-@@ -270,8 +270,8 @@ bool H265ToAnnexBBitstreamConverter::WriteParamSet(
-
- // Verify space.
- uint32_t bytes_left = *out_size;
-- if (bytes_left < kParamSetStartCodeSize ||
-- bytes_left - kParamSetStartCodeSize < size) {
-+ if (bytes_left < kParamSetStartCodeSize2 ||
-+ bytes_left - kParamSetStartCodeSize2 < size) {
- return false;
- }
-
Deleted: system-ffmpeg.patch
===================================================================
--- system-ffmpeg.patch 2023-02-24 07:17:37 UTC (rev 469505)
+++ system-ffmpeg.patch 2023-02-24 07:17:50 UTC (rev 469506)
@@ -1,55 +0,0 @@
-From ded379824f5de39357b6b1894578101aba5cdf05 Mon Sep 17 00:00:00 2001
-From: Eugene Zemtsov <[email protected]>
-Date: Fri, 29 Jul 2022 04:41:04 +0000
-Subject: [PATCH] Roll src/third_party/ffmpeg/ 880df5ede..b71ecd02b (279
- commits)
-
-https://chromium.googlesource.com/chromium/third_party/ffmpeg.git/+log/880df5ede50a..b71ecd02b479
-
-$ git log 880df5ede..b71ecd02b --date=short --no-merges --format='%ad %ae %s'
-2022-07-27 eugene Roll for M106
-2022-07-25 andreas.rheinhardt avcodec/x86/pngdsp: Remove obsolete
ff_add_bytes_l2_mmx()
-2022-07-22 andreas.rheinhardt avcodec/hevcdec: Output MD5-message in one piece
-2022-07-24 epirat07 configure: properly require libx264 if enabled
-2022-07-24 zane avformat/argo_cvg: expose loop/reverb/checksum via metadata
-(...)
-2022-05-03 leo.izen avcodec/libjxldec: properly tag output colorspace
-2022-06-25 ffmpeg avfilter/Makefile: always make colorspace.o
-2022-03-02 brad avutil/ppc/cpu: Use proper header for OpenBSD PPC CPU detection
-2022-06-24 jamrial avformat/http: include version.h
-2022-05-16 mbonda-at-nvidia.com AV1 VDPAU hwaccel Decode support
-
-Created with:
- roll-dep src/third_party/ffmpeg
-
-ffmpeg usage fix:
- Switch from AVFrame::pkt_duration to AVFrame::duration,
- AVFrame::pkt_duration is deprecated
-
-Bug: 1344646
-Change-Id: Iaa3abf48ef81dae6d282bca8f0fa2a8dffeeba25
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3788638
-Reviewed-by: Will Cassella <[email protected]>
-Commit-Queue: Eugene Zemtsov <[email protected]>
-Cr-Commit-Position: refs/heads/main@{#1029623}
----
- media/filters/audio_file_reader.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/media/filters/audio_file_reader.cc
b/media/filters/audio_file_reader.cc
-index e1be5aa9a5b..951c003956f 100644
---- a/media/filters/audio_file_reader.cc
-+++ b/media/filters/audio_file_reader.cc
-@@ -243,10 +243,10 @@ bool AudioFileReader::OnNewFrame(
- // silence from being output. In the case where we are also discarding some
- // portion of the packet (as indicated by a negative pts), we further want
to
- // adjust the duration downward by however much exists before zero.
-- if (audio_codec_ == AudioCodec::kAAC && frame->pkt_duration) {
-+ if (audio_codec_ == AudioCodec::kAAC && frame->duration) {
- const base::TimeDelta pkt_duration = ConvertFromTimeBase(
- glue_->format_context()->streams[stream_index_]->time_base,
-- frame->pkt_duration + std::min(static_cast<int64_t>(0), frame->pts));
-+ frame->duration + std::min(static_cast<int64_t>(0), frame->pts));
- const base::TimeDelta frame_duration =
- base::Seconds(frames_read / static_cast<double>(sample_rate_));
-
