[arch-commits] Commit in (67 files)
Antonio Rojas
arojas at gemini.archlinux.org
Sat Feb 5 23:14:02 UTC 2022
Date: Saturday, February 5, 2022 @ 23:14:01
Author: arojas
Revision: 436271
Qt 6.3 beta 1
Added:
qt6-3d/kde-unstable/
qt6-5compat/kde-unstable/
qt6-base/kde-unstable/
qt6-charts/kde-unstable/
qt6-connectivity/kde-unstable/
qt6-datavis3d/kde-unstable/
qt6-declarative/kde-unstable/
qt6-doc/kde-unstable/
qt6-imageformats/kde-unstable/
qt6-languageserver/
qt6-languageserver/kde-unstable/
qt6-languageserver/kde-unstable/PKGBUILD
qt6-lottie/kde-unstable/
qt6-multimedia/kde-unstable/
qt6-networkauth/kde-unstable/
qt6-positioning/kde-unstable/
qt6-quick3d/kde-unstable/
qt6-quicktimeline/kde-unstable/
qt6-remoteobjects/kde-unstable/
qt6-scxml/kde-unstable/
qt6-sensors/kde-unstable/
qt6-serialbus/kde-unstable/
qt6-serialport/kde-unstable/
qt6-shadertools/kde-unstable/
qt6-svg/kde-unstable/
qt6-tools/kde-unstable/
qt6-translations/kde-unstable/
qt6-virtualkeyboard/kde-unstable/
qt6-wayland/kde-unstable/
qt6-webchannel/kde-unstable/
qt6-webengine/kde-unstable/
qt6-webengine/kde-unstable/chromium-93-ffmpeg-4.4.patch
qt6-webengine/kde-unstable/chromium-94-ffmpeg-roll.patch
qt6-websockets/kde-unstable/
qt6-webview/kde-unstable/
Modified:
qt6-3d/kde-unstable/PKGBUILD
qt6-5compat/kde-unstable/PKGBUILD
qt6-base/kde-unstable/PKGBUILD
qt6-charts/kde-unstable/PKGBUILD
qt6-connectivity/kde-unstable/PKGBUILD
qt6-datavis3d/kde-unstable/PKGBUILD
qt6-declarative/kde-unstable/PKGBUILD
qt6-doc/kde-unstable/PKGBUILD
qt6-imageformats/kde-unstable/PKGBUILD
qt6-lottie/kde-unstable/PKGBUILD
qt6-multimedia/kde-unstable/PKGBUILD
qt6-networkauth/kde-unstable/PKGBUILD
qt6-positioning/kde-unstable/PKGBUILD
qt6-quick3d/kde-unstable/PKGBUILD
qt6-quicktimeline/kde-unstable/PKGBUILD
qt6-remoteobjects/kde-unstable/PKGBUILD
qt6-scxml/kde-unstable/PKGBUILD
qt6-sensors/kde-unstable/PKGBUILD
qt6-serialbus/kde-unstable/PKGBUILD
qt6-serialport/kde-unstable/PKGBUILD
qt6-shadertools/kde-unstable/PKGBUILD
qt6-svg/kde-unstable/PKGBUILD
qt6-tools/kde-unstable/PKGBUILD
qt6-translations/kde-unstable/PKGBUILD
qt6-virtualkeyboard/kde-unstable/PKGBUILD
qt6-wayland/kde-unstable/PKGBUILD
qt6-webchannel/kde-unstable/PKGBUILD
qt6-webengine/kde-unstable/PKGBUILD
qt6-websockets/kde-unstable/PKGBUILD
qt6-webview/kde-unstable/PKGBUILD
Deleted:
qt6-quick3d/kde-unstable/qt6-quick3d-assimp-5.1.patch
qt6-webengine/kde-unstable/qt6-webengine-ffmpeg5.patch
----------------------------------------------------------+
PKGBUILD | 335 ++++++-------
qt6-languageserver/kde-unstable/PKGBUILD | 30 +
qt6-quick3d-assimp-5.1.patch | 137 -----
qt6-webengine-ffmpeg5.patch | 150 -----
qt6-webengine/kde-unstable/chromium-93-ffmpeg-4.4.patch | 36 +
qt6-webengine/kde-unstable/chromium-94-ffmpeg-roll.patch | 49 +
6 files changed, 284 insertions(+), 453 deletions(-)
Modified: qt6-3d/kde-unstable/PKGBUILD
===================================================================
--- qt6-3d/trunk/PKGBUILD 2022-02-04 18:12:59 UTC (rev 436192)
+++ qt6-3d/kde-unstable/PKGBUILD 2022-02-05 23:14:01 UTC (rev 436271)
@@ -3,9 +3,9 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=qt6-3d
-_qtver=6.2.3
+_qtver=6.3.0-beta1
pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=1
arch=(x86_64)
url='https://www.qt.io'
license=(GPL3 LGPL3 FDL custom)
@@ -15,9 +15,9 @@
optdepends=('qt6-shadertools: RHI renderer' 'qt6-declarative: QML bindings' 'assimp: assimp importer plugin')
groups=(qt6)
options=(debug)
-_pkgfn="${pkgname/6-/}-everywhere-src-$_qtver"
-source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz)
-sha256sums=('7ae9b513a88e729bf7db5e0e5c8d38b62e1c06f968aa620db423cd102dbbc85d')
+_pkgfn=${pkgname/6-/}-everywhere-src-$_qtver
+source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz)
+sha256sums=('2a2379a0e2a1ad71168aee4c5439a76307eb90af133a136dd6d9651525eeba9f')
build() {
cmake -B build -S $_pkgfn -G Ninja
Modified: qt6-5compat/kde-unstable/PKGBUILD
===================================================================
--- qt6-5compat/trunk/PKGBUILD 2022-02-04 18:12:59 UTC (rev 436192)
+++ qt6-5compat/kde-unstable/PKGBUILD 2022-02-05 23:14:01 UTC (rev 436271)
@@ -3,9 +3,9 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=qt6-5compat
-_qtver=6.2.3
+_qtver=6.3.0-beta1
pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=1
arch=(x86_64)
url='https://www.qt.io'
license=(GPL3 LGPL3 FDL custom)
@@ -15,9 +15,9 @@
optdepends=('qt6-declarative: for QtGraphicalEffects')
groups=(qt6)
options=(debug)
-_pkgfn="${pkgname/6-/}-everywhere-src-$_qtver"
-source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz)
-sha256sums=('1cf89198cf2cf8a5c15336ccd69fa1f39b779feb64117d6bbf5509c21c123f53')
+_pkgfn=${pkgname/6-/}-everywhere-src-$_qtver
+source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz)
+sha256sums=('1d2f308c892d4c287d3322430affa85cccdd36e877a46eba6127b0e06b789c6a')
build() {
cmake -B build -S $_pkgfn -G Ninja
Modified: qt6-base/kde-unstable/PKGBUILD
===================================================================
--- qt6-base/trunk/PKGBUILD 2022-02-04 18:12:59 UTC (rev 436192)
+++ qt6-base/kde-unstable/PKGBUILD 2022-02-05 23:14:01 UTC (rev 436271)
@@ -3,9 +3,9 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=qt6-base
-_qtver=6.2.3
+_qtver=6.3.0-beta1
pkgver=${_qtver/-/}
-pkgrel=4
+pkgrel=1
arch=(x86_64)
url='https://www.qt.io'
license=(GPL3 LGPL3 FDL custom)
@@ -25,11 +25,11 @@
'perl: for syncqt')
groups=(qt6)
options=(debug)
-_pkgfn="${pkgname/6-/}-everywhere-src-$_qtver"
-source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz
+_pkgfn=${pkgname/6-/}-everywhere-src-$_qtver
+source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz
qt6-base-cflags.patch
qt6-base-nostrip.patch)
-sha256sums=('34d6d0072e197241463c417ad72610c3d44e2efd6062868e9a95283103d75df4'
+sha256sums=('66a95fd9550472c868bc4b97509ef033daa1f3fd93cad779928852f3646edbbd'
'5411edbe215c24b30448fac69bd0ba7c882f545e8cf05027b2b6e2227abc5e78'
'4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094')
@@ -54,6 +54,7 @@
-DQT_FEATURE_journald=ON \
-DQT_FEATURE_openssl_linked=ON \
-DQT_FEATURE_system_sqlite=ON \
+ -DQT_FEATURE_system_xcb_xinput=ON \
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON
cmake --build build
}
Modified: qt6-charts/kde-unstable/PKGBUILD
===================================================================
--- qt6-charts/trunk/PKGBUILD 2022-02-04 18:12:59 UTC (rev 436192)
+++ qt6-charts/kde-unstable/PKGBUILD 2022-02-05 23:14:01 UTC (rev 436271)
@@ -2,9 +2,9 @@
# Maintainer: Felix Yan <felixonmars at archlinux.org>
pkgname=qt6-charts
-_qtver=6.2.3
+_qtver=6.3.0-beta1
pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=1
arch=(x86_64)
url='https://www.qt.io'
license=(GPL3 LGPL3 FDL custom)
@@ -13,9 +13,9 @@
makedepends=(cmake ninja)
groups=(qt6)
options=(debug)
-_pkgfn="${pkgname/6-/}-everywhere-src-$_qtver"
-source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz)
-sha256sums=('52581b5e2bbf7eb65a7f22f8698ddc0551f2c3af29aa87784e0b22ed991ce003')
+_pkgfn=${pkgname/6-/}-everywhere-src-$_qtver
+source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz)
+sha256sums=('57f13b39e4bd9b36853c272f40f5409745ba45b2ef27fdf0ee5dc775b0744675')
build() {
cmake -B build -S $_pkgfn -G Ninja
Modified: qt6-connectivity/kde-unstable/PKGBUILD
===================================================================
--- qt6-connectivity/trunk/PKGBUILD 2022-02-04 18:12:59 UTC (rev 436192)
+++ qt6-connectivity/kde-unstable/PKGBUILD 2022-02-05 23:14:01 UTC (rev 436271)
@@ -2,9 +2,9 @@
# Maintainer: Felix Yan <felixonmars at archlinux.org>
pkgname=qt6-connectivity
-_qtver=6.2.3
+_qtver=6.3.0-beta1
pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=1
arch=(x86_64)
url='https://www.qt.io'
license=(GPL3 LGPL3 FDL custom)
@@ -14,9 +14,9 @@
optdepends=('qt6-declarative: QML bindings')
groups=(qt6)
options=(debug)
-_pkgfn="${pkgname/6-/}-everywhere-src-$_qtver"
-source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz)
-sha256sums=('4ce029b4d4ac201c99d750c8c98868e1c165f61933ca027e173df0d7300d906f')
+_pkgfn=${pkgname/6-/}-everywhere-src-$_qtver
+source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz)
+sha256sums=('0f515931d435da692cb82f0b7178f613dfdd4b4ed3f135b57242986ffb4af6da')
build() {
cmake -B build -S $_pkgfn -G Ninja
Modified: qt6-datavis3d/kde-unstable/PKGBUILD
===================================================================
--- qt6-datavis3d/trunk/PKGBUILD 2022-02-04 18:12:59 UTC (rev 436192)
+++ qt6-datavis3d/kde-unstable/PKGBUILD 2022-02-05 23:14:01 UTC (rev 436271)
@@ -2,9 +2,9 @@
# Maintainer: Felix Yan <felixonmars at archlinux.org>
pkgname=qt6-datavis3d
-_qtver=6.2.3
+_qtver=6.3.0-beta1
pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=1
arch=(x86_64)
url='https://www.qt.io'
license=(GPL3 LGPL3 FDL custom)
@@ -14,9 +14,9 @@
optdepends=('qt6-declarative: QML bindings')
groups=(qt6)
options=(debug)
-_pkgfn="${pkgname/6-/}-everywhere-src-$_qtver"
-source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz)
-sha256sums=('6f62df92b171c3c0b854f2422489f69da3e443a1e5be24df714422ee957fa95f')
+_pkgfn=${pkgname/6-/}-everywhere-src-$_qtver
+source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz)
+sha256sums=('f204adb1ce8e08a9b364dd9c352378a75743a0e0728ada1ff350f44e003759d8')
build() {
cmake -B build -S $_pkgfn -G Ninja
Modified: qt6-declarative/kde-unstable/PKGBUILD
===================================================================
--- qt6-declarative/trunk/PKGBUILD 2022-02-04 18:12:59 UTC (rev 436192)
+++ qt6-declarative/kde-unstable/PKGBUILD 2022-02-05 23:14:01 UTC (rev 436271)
@@ -3,23 +3,24 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=qt6-declarative
-_qtver=6.2.3
+_qtver=6.3.0-beta1
pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=1
arch=(x86_64)
url='https://www.qt.io'
license=(GPL3 LGPL3 FDL custom)
pkgdesc='Classes for QML and JavaScript languages'
depends=(qt6-base)
-makedepends=(cmake ninja python at-spi2-core qt6-shadertools)
+makedepends=(cmake ninja python at-spi2-core qt6-shadertools qt6-languageserver)
+optdepends=('qt6-languageserver: for qmlls')
conflicts=(qt6-quickcontrols2)
provides=(qt6-quickcontrols2)
replaces=(qt6-quickcontrols2)
groups=(qt6)
options=(debug)
-_pkgfn="${pkgname/6-/}-everywhere-src-$_qtver"
-source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz)
-sha256sums=('2618c31f64820ed426ebfe2c10b6f3a43f08d2c03d6c63f024bc396455c1a86b')
+_pkgfn=${pkgname/6-/}-everywhere-src-$_qtver
+source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz)
+sha256sums=('29e66fb972a28ab7fdec7317ebe1675da17bec7d7fe3e9a0791dac3e8086e087')
build() {
export CXXFLAGS+=" -ffat-lto-objects"
Modified: qt6-doc/kde-unstable/PKGBUILD
===================================================================
--- qt6-doc/trunk/PKGBUILD 2022-02-04 18:12:59 UTC (rev 436192)
+++ qt6-doc/kde-unstable/PKGBUILD 2022-02-05 23:14:01 UTC (rev 436271)
@@ -4,7 +4,7 @@
pkgbase=qt6-doc
pkgname=(qt6-doc qt6-examples)
-_qtver=6.2.3
+_qtver=6.3.0-beta1
pkgver=${_qtver/-/}
pkgrel=1
arch=('any')
@@ -11,11 +11,11 @@
url='https://www.qt.io'
license=(GPL3 LGPL3 FDL custom)
makedepends=(cmake ninja mariadb-libs unixodbc postgresql alsa-lib gst-plugins-base-libs
- gtk3 libpulse cups freetds vulkan-headers clang python llvm qt6-tools)
+ gtk3 libpulse cups freetds vulkan-headers clang python llvm qt6-tools qt6-declarative)
groups=(qt6)
-_pkgfn="qt-everywhere-src-$_qtver"
-source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/single/$_pkgfn.tar.xz)
-sha256sums=('f784998a159334d1f47617fd51bd0619b9dbfe445184567d2cd7c820ccb12771')
+_pkgfn=qt-everywhere-src-$_qtver
+source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/single/$_pkgfn.tar.xz)
+sha256sums=('69a50e3413cd12b667fcdaaf4bf4b442f015925daf07cea8d2d490d3d34de15b')
build() {
cmake -B build -S $_pkgfn -G Ninja \
Modified: qt6-imageformats/kde-unstable/PKGBUILD
===================================================================
--- qt6-imageformats/trunk/PKGBUILD 2022-02-04 18:12:59 UTC (rev 436192)
+++ qt6-imageformats/kde-unstable/PKGBUILD 2022-02-05 23:14:01 UTC (rev 436271)
@@ -3,9 +3,9 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=qt6-imageformats
-_qtver=6.2.3
+_qtver=6.3.0-beta1
pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=1
arch=(x86_64)
url='https://www.qt.io'
license=(GPL3 LGPL3 FDL custom)
@@ -14,9 +14,9 @@
makedepends=(cmake ninja)
groups=(qt6)
options=(debug)
-_pkgfn="${pkgname/6-/}-everywhere-src-$_qtver"
-source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz)
-sha256sums=('9150bce23e6002e3c08229222142374b24db91132e1ff5c05bce028fc8fc0af6')
+_pkgfn=${pkgname/6-/}-everywhere-src-$_qtver
+source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz)
+sha256sums=('36f7dcbc54854109ea2f30d523a0ff963ef0c579a2fd7f648dd78e54f15fbb44')
build() {
cmake -B build -S $_pkgfn -G Ninja
Added: qt6-languageserver/kde-unstable/PKGBUILD
===================================================================
--- qt6-languageserver/kde-unstable/PKGBUILD (rev 0)
+++ qt6-languageserver/kde-unstable/PKGBUILD 2022-02-05 23:14:01 UTC (rev 436271)
@@ -0,0 +1,30 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+
+pkgname=qt6-languageserver
+_qtver=6.3.0-beta1
+pkgver=${_qtver/-/}
+pkgrel=1
+arch=(x86_64)
+url='https://www.qt.io'
+license=(GPL3 LGPL3 FDL custom)
+pkgdesc='An implementation of the Language Server Protocol'
+depends=(qt6-base)
+makedepends=(cmake ninja)
+groups=(qt6)
+options=(debug)
+_pkgfn=${pkgname/6-/}-everywhere-src-$_qtver
+source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz)
+sha256sums=('1371b88d0e071d28e23efcedceb56e0735cd6897768ade596698bf25e4f20869')
+
+build() {
+ cmake -B build -S $_pkgfn -G Ninja
+ cmake --build build
+}
+
+package() {
+ DESTDIR="$pkgdir" cmake --install build
+
+ install -d "$pkgdir"/usr/share/licenses
+ ln -s /usr/share/licenses/qt6-base "$pkgdir"/usr/share/licenses/$pkgname
+}
Modified: qt6-lottie/kde-unstable/PKGBUILD
===================================================================
--- qt6-lottie/trunk/PKGBUILD 2022-02-04 18:12:59 UTC (rev 436192)
+++ qt6-lottie/kde-unstable/PKGBUILD 2022-02-05 23:14:01 UTC (rev 436271)
@@ -2,9 +2,9 @@
# Maintainer: Felix Yan <felixonmars at archlinux.org>
pkgname=qt6-lottie
-_qtver=6.2.3
+_qtver=6.3.0-beta1
pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=1
arch=(x86_64)
url='https://www.qt.io'
license=(GPL3 LGPL3 FDL custom)
@@ -14,9 +14,9 @@
optdepends=('qt6-declarative: QML bindings')
groups=(qt6)
options=(debug)
-_pkgfn="${pkgname/6-/}-everywhere-src-$_qtver"
-source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz)
-sha256sums=('f3ccb557e841b239ead86977d94ff05888585f173b03f2f037df2b4969707be9')
+_pkgfn=${pkgname/6-/}-everywhere-src-$_qtver
+source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz)
+sha256sums=('8d0fabef4def816fc16fc3289ab046d977e8e551356cae132678fe3cbabac2f6')
build() {
cmake -B build -S $_pkgfn -G Ninja
Modified: qt6-multimedia/kde-unstable/PKGBUILD
===================================================================
--- qt6-multimedia/trunk/PKGBUILD 2022-02-04 18:12:59 UTC (rev 436192)
+++ qt6-multimedia/kde-unstable/PKGBUILD 2022-02-05 23:14:01 UTC (rev 436271)
@@ -2,15 +2,15 @@
# Maintainer: Felix Yan <felixonmars at archlinux.org>
pkgname=qt6-multimedia
-_qtver=6.2.3
+_qtver=6.3.0-beta1
pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=1
arch=(x86_64)
url='https://www.qt.io'
license=(GPL3 LGPL3 FDL custom)
pkgdesc='Classes for audio, video, radio and camera functionality'
depends=(qt6-base gst-plugins-base)
-makedepends=(cmake ninja qt6-declarative qt6-shadertools)
+makedepends=(cmake ninja qt6-declarative qt6-shadertools libpulse)
optdepends=('qt6-declarative: QML bindings'
'gst-plugins-good: camera support, additional plugins'
'gst-plugins-bad: camera support, additional plugins'
@@ -18,9 +18,9 @@
'gst-libav: ffmpeg plugin')
groups=(qt6)
options=(debug)
-_pkgfn="${pkgname/6-/}-everywhere-src-$_qtver"
-source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz)
-sha256sums=('d97aa2f3ccb1e3e9f3ebe986a298c2927aa543d2b987c8ec496c452ff61ee687')
+_pkgfn=${pkgname/6-/}-everywhere-src-$_qtver
+source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz)
+sha256sums=('de3df9cad5ff2973e457c2a36a8520b146e2de933823de84b4180cb09305df6b')
build() {
cmake -B build -S $_pkgfn -G Ninja
Modified: qt6-networkauth/kde-unstable/PKGBUILD
===================================================================
--- qt6-networkauth/trunk/PKGBUILD 2022-02-04 18:12:59 UTC (rev 436192)
+++ qt6-networkauth/kde-unstable/PKGBUILD 2022-02-05 23:14:01 UTC (rev 436271)
@@ -3,9 +3,9 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=qt6-networkauth
-_qtver=6.2.3
+_qtver=6.3.0-beta1
pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=1
arch=(x86_64)
url='https://www.qt.io'
license=(GPL3 LGPL3 FDL custom)
@@ -14,9 +14,9 @@
makedepends=(cmake ninja)
groups=(qt6)
options=(debug)
-_pkgfn="${pkgname/6-/}-everywhere-src-$_qtver"
-source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz)
-sha256sums=('6e074154b72d0654d3cbb26b4e8ca0dffe3d20b1d0a1d8e6b298e011598ab847')
+_pkgfn=${pkgname/6-/}-everywhere-src-$_qtver
+source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz)
+sha256sums=('9978eb62b2051e8ef1c51dc1fb9e078845cc1feeaa078f42227e482ee274f669')
build() {
cmake -B build -S $_pkgfn -G Ninja
Modified: qt6-positioning/kde-unstable/PKGBUILD
===================================================================
--- qt6-positioning/trunk/PKGBUILD 2022-02-04 18:12:59 UTC (rev 436192)
+++ qt6-positioning/kde-unstable/PKGBUILD 2022-02-05 23:14:01 UTC (rev 436271)
@@ -2,9 +2,9 @@
# Maintainer: Felix Yan <felixonmars at archlinux.org>
pkgname=qt6-positioning
-_qtver=6.2.3
+_qtver=6.3.0-beta1
pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=1
arch=(x86_64)
url='https://www.qt.io'
license=(GPL3 LGPL3 FDL custom)
@@ -17,9 +17,9 @@
replaces=(qt6-location)
groups=(qt6)
options=(debug)
-_pkgfn="${pkgname/6-/}-everywhere-src-$_qtver"
-source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz)
-sha256sums=('4ff9b93e45f1e7d76c3ae72e03bb714a5312500181b4a75649a7d39f564dbccf')
+_pkgfn=${pkgname/6-/}-everywhere-src-$_qtver
+source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz)
+sha256sums=('bd519ac884bfbec1488c86881c30a6a26ef93bcc481536d277825ea5ab81d8e2')
build() {
cmake -B build -S $_pkgfn -G Ninja
Modified: qt6-quick3d/kde-unstable/PKGBUILD
===================================================================
--- qt6-quick3d/trunk/PKGBUILD 2022-02-04 18:12:59 UTC (rev 436192)
+++ qt6-quick3d/kde-unstable/PKGBUILD 2022-02-05 23:14:01 UTC (rev 436271)
@@ -3,9 +3,9 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=qt6-quick3d
-_qtver=6.2.3
+_qtver=6.3.0-beta1
pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=1
arch=(x86_64)
url='https://www.qt.io'
license=(GPL3)
@@ -15,16 +15,10 @@
optdepends=('qt6-shadertools: for shadergen' 'assimp: assimp import plugin')
groups=(qt6)
options=(debug)
-_pkgfn="${pkgname/6-/}-everywhere-src-$_qtver"
-source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz
- qt6-quick3d-assimp-5.1.patch)
-sha256sums=('c45294f917232320a2cf67ee25b518f6ff3cdf989b8cecfb2ed73569ab28661e'
- '49eb8feec3fdd1972266cf97fd8d40f0eb7e544c1957569c4b9f182348b17492')
+_pkgfn=${pkgname/6-/}-everywhere-src-$_qtver
+source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz)
+sha256sums=('7c913d7b99386f4c6c7b37c1eb14b40edfd0861ed90f5517399be09a1b42cf40')
-prepare() {
- patch -d $_pkgfn -p1 < qt6-quick3d-assimp-5.1.patch # Fix build with assimp 5.1
-}
-
build() {
cmake -B build -S $_pkgfn -G Ninja
cmake --build build
Deleted: qt6-quick3d/kde-unstable/qt6-quick3d-assimp-5.1.patch
===================================================================
--- qt6-quick3d/trunk/qt6-quick3d-assimp-5.1.patch 2022-02-04 18:12:59 UTC (rev 436192)
+++ qt6-quick3d/kde-unstable/qt6-quick3d-assimp-5.1.patch 2022-02-05 23:14:01 UTC (rev 436271)
@@ -1,137 +0,0 @@
-diff --git a/src/plugins/assetimporters/assimp/assimpimporter.cpp b/src/plugins/assetimporters/assimp/assimpimporter.cpp
-index cb8f92a3..4ce57d64 100644
---- a/src/plugins/assetimporters/assimp/assimpimporter.cpp
-+++ b/src/plugins/assetimporters/assimp/assimpimporter.cpp
-@@ -1268,7 +1268,7 @@ void AssimpImporter::generateMaterial(aiMaterial *material, QTextStream &output,
- // GLTF Mode
- {
- aiColor4D baseColorFactor;
-- result = material->Get(AI_MATKEY_GLTF_PBRMETALLICROUGHNESS_BASE_COLOR_FACTOR, baseColorFactor);
-+ result = material->Get(AI_MATKEY_BASE_COLOR, baseColorFactor);
- if (result == aiReturn_SUCCESS)
- QSSGQmlUtilities::writeQmlPropertyHelper(output,
- tabLevel + 1,
-@@ -1276,7 +1276,7 @@ void AssimpImporter::generateMaterial(aiMaterial *material, QTextStream &output,
- QStringLiteral("baseColor"),
- aiColorToQColor(baseColorFactor));
-
-- QString baseColorImage = generateImage(material, AI_MATKEY_GLTF_PBRMETALLICROUGHNESS_BASE_COLOR_TEXTURE, tabLevel + 1);
-+ QString baseColorImage = generateImage(material, aiTextureType_BASE_COLOR, 0, tabLevel + 1);
- if (!baseColorImage.isNull()) {
- output << QSSGQmlUtilities::insertTabs(tabLevel + 1) << QStringLiteral("baseColorMap: ") << baseColorImage << QStringLiteral("\n");
- output << QSSGQmlUtilities::insertTabs(tabLevel + 1) << QStringLiteral("opacityChannel: Material.A\n");
-@@ -1294,7 +1294,7 @@ void AssimpImporter::generateMaterial(aiMaterial *material, QTextStream &output,
- }
-
- ai_real metallicFactor;
-- result = material->Get(AI_MATKEY_GLTF_PBRMETALLICROUGHNESS_METALLIC_FACTOR, metallicFactor);
-+ result = material->Get(AI_MATKEY_METALLIC_FACTOR, metallicFactor);
- if (result == aiReturn_SUCCESS) {
- QSSGQmlUtilities::writeQmlPropertyHelper(output,
- tabLevel + 1,
-@@ -1304,7 +1304,7 @@ void AssimpImporter::generateMaterial(aiMaterial *material, QTextStream &output,
- }
-
- ai_real roughnessFactor;
-- result = material->Get(AI_MATKEY_GLTF_PBRMETALLICROUGHNESS_ROUGHNESS_FACTOR, roughnessFactor);
-+ result = material->Get(AI_MATKEY_ROUGHNESS_FACTOR, roughnessFactor);
- if (result == aiReturn_SUCCESS) {
- QSSGQmlUtilities::writeQmlPropertyHelper(output,
- tabLevel + 1,
-@@ -1410,16 +1410,14 @@ void AssimpImporter::generateMaterial(aiMaterial *material, QTextStream &output,
- }
-
- {
-- bool isUnlit;
-- result = material->Get(AI_MATKEY_GLTF_UNLIT, isUnlit);
-- if (result == aiReturn_SUCCESS && isUnlit)
-+ aiShadingMode shadingMode;
-+ material->Get(AI_MATKEY_SHADING_MODEL, shadingMode);
-+ if (shadingMode == aiShadingMode_Unlit)
- output << QSSGQmlUtilities::insertTabs(tabLevel + 1) << QStringLiteral("lighting: PrincipledMaterial.NoLighting\n");
- }
-
- // SpecularGlossiness Properties
-- bool hasSpecularGlossiness;
-- result = material->Get(AI_MATKEY_GLTF_PBRSPECULARGLOSSINESS, hasSpecularGlossiness);
-- if (result == aiReturn_SUCCESS && hasSpecularGlossiness) {
-+ {
-
- // diffuseFactor (color) // not used (yet), but ends up being diffuseColor
- // {
-@@ -1448,7 +1446,7 @@ void AssimpImporter::generateMaterial(aiMaterial *material, QTextStream &output,
- // glossinessFactor (float)
- {
- ai_real glossiness;
-- result = material->Get(AI_MATKEY_GLTF_PBRSPECULARGLOSSINESS_GLOSSINESS_FACTOR, glossiness);
-+ result = material->Get(AI_MATKEY_GLOSSINESS_FACTOR, glossiness);
- if (result == aiReturn_SUCCESS)
- QSSGQmlUtilities::writeQmlPropertyHelper(output,
- tabLevel + 1,
-@@ -1560,7 +1558,7 @@ QString AssimpImporter::generateImage(aiMaterial *material, aiTextureType textur
-
- if (m_gltfMode) {
- uint gltfUvIndex = 0;
-- result = material->Get(AI_MATKEY_GLTF_TEXTURE_TEXCOORD(textureType, index), gltfUvIndex);
-+ result = material->Get(AI_MATKEY_UVWSRC(textureType, index), gltfUvIndex);
- if (result == aiReturn_SUCCESS)
- uvIndex = gltfUvIndex;
- }
-diff --git a/src/plugins/assetimporters/assimp/assimpimporter_rt.cpp b/src/plugins/assetimporters/assimp/assimpimporter_rt.cpp
-index c3c77d7e..90aee0c5 100644
---- a/src/plugins/assetimporters/assimp/assimpimporter_rt.cpp
-+++ b/src/plugins/assetimporters/assimp/assimpimporter_rt.cpp
-@@ -344,7 +344,7 @@ static void setMaterialProperties(QSSGSceneDesc::Material &target, const aiMater
- texInfo.transform = &transform;
-
- if (sceneInfo.ver == SceneInfo::GltfVersion::v2) {
-- material.Get(AI_MATKEY_GLTF_TEXTURE_TEXCOORD(textureType, index), texInfo.uvIndex);
-+ material.Get(AI_MATKEY_UVWSRC(textureType, index), texInfo.uvIndex);
- material.Get(AI_MATKEY_GLTF_MAPPINGFILTER_MIN(textureType, index), texInfo.minFilter);
- material.Get(AI_MATKEY_GLTF_MAPPINGFILTER_MAG(textureType, index), texInfo.magFilter);
- }
-@@ -414,12 +414,12 @@ static void setMaterialProperties(QSSGSceneDesc::Material &target, const aiMater
- aiReturn result;
- {
- aiColor4D baseColorFactor;
-- result = source.Get(AI_MATKEY_GLTF_PBRMETALLICROUGHNESS_BASE_COLOR_FACTOR, baseColorFactor);
-+ result = source.Get(AI_MATKEY_BASE_COLOR, baseColorFactor);
- if (result == aiReturn_SUCCESS)
- QSSGSceneDesc::setProperty(target, "baseColor", &QQuick3DPrincipledMaterial::setBaseColor, aiColorToQColor(baseColorFactor));
- }
-
-- if (auto baseColorTexture = createTextureNode(source, AI_MATKEY_GLTF_PBRMETALLICROUGHNESS_BASE_COLOR_TEXTURE)) {
-+ if (auto baseColorTexture = createTextureNode(source, aiTextureType_BASE_COLOR, 0)) {
- QSSGSceneDesc::setProperty(target, "baseColorMap", &QQuick3DPrincipledMaterial::setBaseColorMap, baseColorTexture);
- QSSGSceneDesc::setProperty(target, "opacityChannel", &QQuick3DPrincipledMaterial::setOpacityChannel, QQuick3DPrincipledMaterial::TextureChannelMapping::A);
- }
-@@ -433,14 +433,14 @@ static void setMaterialProperties(QSSGSceneDesc::Material &target, const aiMater
-
- {
- ai_real metallicFactor;
-- result = source.Get(AI_MATKEY_GLTF_PBRMETALLICROUGHNESS_METALLIC_FACTOR, metallicFactor);
-+ result = source.Get(AI_MATKEY_METALLIC_FACTOR, metallicFactor);
- if (result == aiReturn_SUCCESS)
- QSSGSceneDesc::setProperty(target, "metalness", &QQuick3DPrincipledMaterial::setMetalness, float(metallicFactor));
- }
-
- {
- ai_real roughnessFactor;
-- result = source.Get(AI_MATKEY_GLTF_PBRMETALLICROUGHNESS_ROUGHNESS_FACTOR, roughnessFactor);
-+ result = source.Get(AI_MATKEY_ROUGHNESS_FACTOR, roughnessFactor);
- if (result == aiReturn_SUCCESS)
- QSSGSceneDesc::setProperty(target, "roughness", &QQuick3DPrincipledMaterial::setRoughness, float(roughnessFactor));
- }
-@@ -509,9 +509,9 @@ static void setMaterialProperties(QSSGSceneDesc::Material &target, const aiMater
- }
-
- {
-- bool isUnlit = false;
-- result = source.Get(AI_MATKEY_GLTF_UNLIT, isUnlit);
-- if (result == aiReturn_SUCCESS && isUnlit)
-+ aiShadingMode shadingMode;
-+ source.Get(AI_MATKEY_SHADING_MODEL, shadingMode);
-+ if (shadingMode == aiShadingMode_Unlit)
- QSSGSceneDesc::setProperty(target, "lighting", &QQuick3DPrincipledMaterial::setLighting, QQuick3DPrincipledMaterial::Lighting::NoLighting);
- }
- } else { // Ver1
Modified: qt6-quicktimeline/kde-unstable/PKGBUILD
===================================================================
--- qt6-quicktimeline/trunk/PKGBUILD 2022-02-04 18:12:59 UTC (rev 436192)
+++ qt6-quicktimeline/kde-unstable/PKGBUILD 2022-02-05 23:14:01 UTC (rev 436271)
@@ -3,9 +3,9 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=qt6-quicktimeline
-_qtver=6.2.3
+_qtver=6.3.0-beta1
pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=1
arch=(x86_64)
url='https://www.qt.io'
license=(GPL3 LGPL3 FDL custom)
@@ -14,9 +14,9 @@
makedepends=(cmake ninja)
groups=(qt6)
options=(debug)
-_pkgfn="${pkgname/6-/}-everywhere-src-$_qtver"
-source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz)
-sha256sums=('aa29504d234c891dac3ac8bf390f77e43d9827d0f5cea411039144f2ef2c2333')
+_pkgfn=${pkgname/6-/}-everywhere-src-$_qtver
+source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz)
+sha256sums=('798167bbfcc39a58ae9dbc45c57aebdbad68a27e563aa8e61803ffca123d9c50')
build() {
cmake -B build -S $_pkgfn -G Ninja
Modified: qt6-remoteobjects/kde-unstable/PKGBUILD
===================================================================
--- qt6-remoteobjects/trunk/PKGBUILD 2022-02-04 18:12:59 UTC (rev 436192)
+++ qt6-remoteobjects/kde-unstable/PKGBUILD 2022-02-05 23:14:01 UTC (rev 436271)
@@ -2,9 +2,9 @@
# Maintainer: Felix Yan <felixonmars at archlinux.org>
pkgname=qt6-remoteobjects
-_qtver=6.2.3
+_qtver=6.3.0-beta1
pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=1
arch=(x86_64)
url='https://www.qt.io'
license=(GPL3 LGPL3 FDL custom)
@@ -14,9 +14,9 @@
optdepends=('qt6-declarative: QML bindings')
groups=(qt6)
options=(debug)
-_pkgfn="${pkgname/6-/}-everywhere-src-$_qtver"
-source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz)
-sha256sums=('4df699c83560e121999eb4d76591d1b9e73a8e99353c93fad357e27d5b8a1945')
+_pkgfn=${pkgname/6-/}-everywhere-src-$_qtver
+source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz)
+sha256sums=('14b8176cff0e1af59a79f42d80bf60b4950ab1d8969fa3e91ca207bfeaa0b97a')
build() {
cmake -B build -S $_pkgfn -G Ninja
Modified: qt6-scxml/kde-unstable/PKGBUILD
===================================================================
--- qt6-scxml/trunk/PKGBUILD 2022-02-04 18:12:59 UTC (rev 436192)
+++ qt6-scxml/kde-unstable/PKGBUILD 2022-02-05 23:14:01 UTC (rev 436271)
@@ -2,9 +2,9 @@
# Maintainer: Felix Yan <felixonmars at archlinux.org>
pkgname=qt6-scxml
-_qtver=6.2.3
+_qtver=6.3.0-beta1
pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=1
arch=(x86_64)
url='https://www.qt.io'
license=(GPL3 LGPL3 FDL custom)
@@ -14,9 +14,9 @@
optdepends=('qt6-declarative: QML bindings')
groups=(qt6)
options=(debug)
-_pkgfn="${pkgname/6-/}-everywhere-src-$_qtver"
-source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz)
-sha256sums=('5a3a3fe517c7acb5c3d09abbe6546fad65353fe366433b2cff245ad61b748b4d')
+_pkgfn=${pkgname/6-/}-everywhere-src-$_qtver
+source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz)
+sha256sums=('b0a24a6ef3c23bcc7b14848ad886a1aaa5cf0ec1f2621b3b814b6cfe56bde0cf')
build() {
cmake -B build -S $_pkgfn -G Ninja
Modified: qt6-sensors/kde-unstable/PKGBUILD
===================================================================
--- qt6-sensors/trunk/PKGBUILD 2022-02-04 18:12:59 UTC (rev 436192)
+++ qt6-sensors/kde-unstable/PKGBUILD 2022-02-05 23:14:01 UTC (rev 436271)
@@ -2,9 +2,9 @@
# Maintainer: Felix Yan <felixonmars at archlinux.org>
pkgname=qt6-sensors
-_qtver=6.2.3
+_qtver=6.3.0-beta1
pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=1
arch=(x86_64)
url='https://www.qt.io'
license=(GPL3 LGPL3 FDL custom)
@@ -14,9 +14,9 @@
optdepends=('qt6-declarative: QML bindings')
groups=(qt6)
options=(debug)
-_pkgfn="${pkgname/6-/}-everywhere-src-$_qtver"
-source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz)
-sha256sums=('2e30390299bf5735cd73ac1c1a5a33ab691cf45589ac5422b283e56914825761')
+_pkgfn=${pkgname/6-/}-everywhere-src-$_qtver
+source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz)
+sha256sums=('1d2536a4acf3c6308803e5ecf3735c2be711ffa94f1fda21ec44ba50be634918')
build() {
cmake -B build -S $_pkgfn -G Ninja
Modified: qt6-serialbus/kde-unstable/PKGBUILD
===================================================================
--- qt6-serialbus/trunk/PKGBUILD 2022-02-04 18:12:59 UTC (rev 436192)
+++ qt6-serialbus/kde-unstable/PKGBUILD 2022-02-05 23:14:01 UTC (rev 436271)
@@ -2,9 +2,9 @@
# Maintainer: Felix Yan <felixonmars at archlinux.org>
pkgname=qt6-serialbus
-_qtver=6.2.3
+_qtver=6.3.0-beta1
pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=1
arch=(x86_64)
url='https://www.qt.io'
license=(GPL3 LGPL3 FDL custom)
@@ -13,9 +13,9 @@
makedepends=(cmake ninja)
groups=(qt6)
options=(debug)
-_pkgfn="${pkgname/6-/}-everywhere-src-$_qtver"
-source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz)
-sha256sums=('3737162639fd69942d86ac6025783b8e7bc6e0c336767cfa82ddbbb4fa56b512')
+_pkgfn=${pkgname/6-/}-everywhere-src-$_qtver
+source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz)
+sha256sums=('fc83dae007fd018d567bbc334536a4fdeb3b688e3aa16e7cd9f2d9003599cc3b')
build() {
cmake -B build -S $_pkgfn -G Ninja
Modified: qt6-serialport/kde-unstable/PKGBUILD
===================================================================
--- qt6-serialport/trunk/PKGBUILD 2022-02-04 18:12:59 UTC (rev 436192)
+++ qt6-serialport/kde-unstable/PKGBUILD 2022-02-05 23:14:01 UTC (rev 436271)
@@ -2,9 +2,9 @@
# Maintainer: Felix Yan <felixonmars at archlinux.org>
pkgname=qt6-serialport
-_qtver=6.2.3
+_qtver=6.3.0-beta1
pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=1
arch=(x86_64)
url='https://www.qt.io'
license=(GPL3 LGPL3 FDL custom)
@@ -13,9 +13,9 @@
makedepends=(cmake ninja)
groups=(qt6)
options=(debug)
-_pkgfn="${pkgname/6-/}-everywhere-src-$_qtver"
-source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz)
-sha256sums=('ce610c0edbdf22332acb445053e4f91d5f8579c21c07e5cd680b0cf770a0e2cf')
+_pkgfn=${pkgname/6-/}-everywhere-src-$_qtver
+source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz)
+sha256sums=('bdfa72ed80a21530e812dba846a8d6b026b238b61cb18674e6607b5023dc8b6d')
build() {
cmake -B build -S $_pkgfn -G Ninja
Modified: qt6-shadertools/kde-unstable/PKGBUILD
===================================================================
--- qt6-shadertools/trunk/PKGBUILD 2022-02-04 18:12:59 UTC (rev 436192)
+++ qt6-shadertools/kde-unstable/PKGBUILD 2022-02-05 23:14:01 UTC (rev 436271)
@@ -3,9 +3,9 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=qt6-shadertools
-_qtver=6.2.3
+_qtver=6.3.0-beta1
pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=1
arch=(x86_64)
url='https://www.qt.io'
license=(GPL3)
@@ -14,9 +14,9 @@
makedepends=(cmake ninja)
groups=(qt6)
options=(debug)
-_pkgfn="${pkgname/6-/}-everywhere-src-$_qtver"
-source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz)
-sha256sums=('8eb506e12e8e7096e02e7d44e53b927151c4f93b9c48e3e758e9702cd77f7ca7')
+_pkgfn=${pkgname/6-/}-everywhere-src-$_qtver
+source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz)
+sha256sums=('c09efc62187b07b7bd02e264ec6f412629e138761053f9311671485c3281f71e')
build() {
cmake -B build -S $_pkgfn -G Ninja
Modified: qt6-svg/kde-unstable/PKGBUILD
===================================================================
--- qt6-svg/trunk/PKGBUILD 2022-02-04 18:12:59 UTC (rev 436192)
+++ qt6-svg/kde-unstable/PKGBUILD 2022-02-05 23:14:01 UTC (rev 436271)
@@ -3,9 +3,9 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=qt6-svg
-_qtver=6.2.3
+_qtver=6.3.0-beta1
pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=1
arch=(x86_64)
url='https://www.qt.io'
license=(GPL3 LGPL3 FDL custom)
@@ -14,9 +14,9 @@
makedepends=(cmake ninja)
groups=(qt6)
options=(debug)
-_pkgfn="${pkgname/6-/}-everywhere-src-$_qtver"
-source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz)
-sha256sums=('4a6bc9eeafa231ee9516f0fe84ddb0fbe8fba94844f4e7bd34c381e01610e2ee')
+_pkgfn=${pkgname/6-/}-everywhere-src-$_qtver
+source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz)
+sha256sums=('3ccb9730489f51021c38b9185cc2e0a9b6532b353417573b7d07709c48bfd809')
build() {
cmake -B build -S $_pkgfn -G Ninja
Modified: qt6-tools/kde-unstable/PKGBUILD
===================================================================
--- qt6-tools/trunk/PKGBUILD 2022-02-04 18:12:59 UTC (rev 436192)
+++ qt6-tools/kde-unstable/PKGBUILD 2022-02-05 23:14:01 UTC (rev 436271)
@@ -3,9 +3,9 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=qt6-tools
-_qtver=6.2.3
+_qtver=6.3.0-beta1
pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=1
arch=(x86_64)
url='https://www.qt.io'
license=(GPL3 LGPL3 FDL custom)
@@ -12,12 +12,12 @@
pkgdesc='A cross-platform application and UI framework (Development Tools, QtHelp)'
depends=(qt6-base)
makedepends=(cmake ninja qt6-declarative clang llvm)
-optdepends=('clang: for qdoc and lupdate')
+optdepends=('qt6-declarative: for qdoc' 'clang: for qdoc and lupdate')
groups=(qt6)
options=(debug)
-_pkgfn="${pkgname/6-/}-everywhere-src-$_qtver"
-source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz)
-sha256sums=('9aadbd5a14fad8874d2aa76be79652ec5ed81d31d49b3eff245ebeffc7d8ac08')
+_pkgfn=${pkgname/6-/}-everywhere-src-$_qtver
+source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz)
+sha256sums=('6342888856bf81e17f63d7e1e85d056cd14cbcdfa4cd0cd993c97f72efbd79b9')
build() {
cmake -B build -S $_pkgfn -G Ninja \
Modified: qt6-translations/kde-unstable/PKGBUILD
===================================================================
--- qt6-translations/trunk/PKGBUILD 2022-02-04 18:12:59 UTC (rev 436192)
+++ qt6-translations/kde-unstable/PKGBUILD 2022-02-05 23:14:01 UTC (rev 436271)
@@ -3,7 +3,7 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=qt6-translations
-_qtver=6.2.3
+_qtver=6.3.0-beta1
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)
@@ -13,9 +13,9 @@
depends=()
makedepends=(cmake ninja qt6-tools)
groups=(qt6)
-_pkgfn="${pkgname/6-/}-everywhere-src-$_qtver"
-source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz)
-sha256sums=('e5923d76d82460e8b35fc5a34674ec4c70120ba641fc80ee42848bf2df1bb70c')
+_pkgfn=${pkgname/6-/}-everywhere-src-$_qtver
+source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz)
+sha256sums=('7b3cb474f0ea79238b310e399c821e33d145505720233fb1692b1455f7e43fbf')
build() {
export PATH="/usr/lib/qt6/bin:$PATH"
Modified: qt6-virtualkeyboard/kde-unstable/PKGBUILD
===================================================================
--- qt6-virtualkeyboard/trunk/PKGBUILD 2022-02-04 18:12:59 UTC (rev 436192)
+++ qt6-virtualkeyboard/kde-unstable/PKGBUILD 2022-02-05 23:14:01 UTC (rev 436271)
@@ -2,9 +2,9 @@
# Maintainer: Felix Yan <felixonmars at archlinux.org>
pkgname=qt6-virtualkeyboard
-_qtver=6.2.3
+_qtver=6.3.0-beta1
pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=1
arch=(x86_64)
url='https://www.qt.io'
license=(GPL3 LGPL3 FDL custom)
@@ -13,9 +13,9 @@
makedepends=(cmake ninja)
groups=(qt6)
options=(debug)
-_pkgfn="${pkgname/6-/}-everywhere-src-$_qtver"
-source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz)
-sha256sums=('0c0d095c64510ae3804f5ce77d11d573b07661ccf03dc0b88da191574f5057be')
+_pkgfn=${pkgname/6-/}-everywhere-src-$_qtver
+source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz)
+sha256sums=('56ad8932cd676338691c744ffdf598c48264967bdd16878328ce1d83945a416c')
build() {
cmake -B build -S $_pkgfn -G Ninja
Modified: qt6-wayland/kde-unstable/PKGBUILD
===================================================================
--- qt6-wayland/trunk/PKGBUILD 2022-02-04 18:12:59 UTC (rev 436192)
+++ qt6-wayland/kde-unstable/PKGBUILD 2022-02-05 23:14:01 UTC (rev 436271)
@@ -3,9 +3,9 @@
# Contributor: Andrea Scarpino <andrea at archlinux.org>
pkgname=qt6-wayland
-_qtver=6.2.3
+_qtver=6.3.0-beta1
pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=1
arch=(x86_64)
url='https://www.qt.io'
license=(GPL3 LGPL3 FDL custom)
@@ -14,9 +14,9 @@
makedepends=(cmake ninja)
groups=(qt6)
options=(debug)
-_pkgfn="${pkgname/6-/}-everywhere-src-$_qtver"
-source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz)
-sha256sums=('48fdc52b1241d35532a24beebf5856d78eadc0f1f88a0a48b51a51e279c4ce72')
+_pkgfn=${pkgname/6-/}-everywhere-src-$_qtver
+source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz)
+sha256sums=('ddecc0ca56cf04c075b1d6c0dadf902e78db6257e0324caf227845adc8cc65b5')
build() {
cmake -B build -S $_pkgfn -G Ninja
Modified: qt6-webchannel/kde-unstable/PKGBUILD
===================================================================
--- qt6-webchannel/trunk/PKGBUILD 2022-02-04 18:12:59 UTC (rev 436192)
+++ qt6-webchannel/kde-unstable/PKGBUILD 2022-02-05 23:14:01 UTC (rev 436271)
@@ -2,9 +2,9 @@
# Maintainer: Felix Yan <felixonmars at archlinux.org>
pkgname=qt6-webchannel
-_qtver=6.2.3
+_qtver=6.3.0-beta1
pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=1
arch=(x86_64)
url='https://www.qt.io'
license=(GPL3 LGPL3 FDL custom)
@@ -13,9 +13,9 @@
makedepends=(cmake ninja qt6-websockets)
groups=(qt6)
options=(debug)
-_pkgfn="${pkgname/6-/}-everywhere-src-$_qtver"
-source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz)
-sha256sums=('d1118c94399061836dc11e372de829781a2bc7a1748478f264ae6da7de5bd509')
+_pkgfn=${pkgname/6-/}-everywhere-src-$_qtver
+source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz)
+sha256sums=('9339df1c9fd359c1230139a4bdf05237ac55f6fe34c1d4cd7a64da3879475b6e')
build() {
cmake -B build -S $_pkgfn -G Ninja
Modified: qt6-webengine/kde-unstable/PKGBUILD
===================================================================
--- qt6-webengine/trunk/PKGBUILD 2022-02-04 18:12:59 UTC (rev 436192)
+++ qt6-webengine/kde-unstable/PKGBUILD 2022-02-05 23:14:01 UTC (rev 436271)
@@ -2,35 +2,42 @@
# Maintainer: Felix Yan <felixonmars at archlinux.org>
pkgname=qt6-webengine
-_qtver=6.2.3
+_qtver=6.3.0-beta1
pkgver=${_qtver/-/}
-pkgrel=8
+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 pciutils libxss libxkbfile
- libevent snappy nss libxslt minizip ffmpeg re2 libvpx libxtst ttf-font)
-makedepends=(cmake ninja python2 python gperf jsoncpp qt6-tools pipewire nodejs qt6-websockets)
+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/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz
- qt6-webengine-ffmpeg5.patch)
-sha256sums=('a72293b799a91189e12c91480d485d079cbce90b069439acf0bf81847cd02058'
- 'c50d3019626183e753c53a997dc8a55938847543aa3178d4c51f377be741c693')
+_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)
+sha256sums=('0b46ac44c10f63d5a09bc5b1e750c1f143afbb00cdebc4a261835a5eb3d27e22'
+ '1a9e074f417f8ffd78bcd6874d8e2e74a239905bf662f76a7755fa40dc476b57'
+ '56acb6e743d2ab1ed9f3eb01700ade02521769978d03ac43226dec94659b3ace')
prepare() {
- patch -d $_pkgfn/src/3rdparty -p1 < qt6-webengine-ffmpeg5.patch # Fix build with ffmpeg 5
+# 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
}
-
+
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=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 \
Added: qt6-webengine/kde-unstable/chromium-93-ffmpeg-4.4.patch
===================================================================
--- qt6-webengine/kde-unstable/chromium-93-ffmpeg-4.4.patch (rev 0)
+++ qt6-webengine/kde-unstable/chromium-93-ffmpeg-4.4.patch 2022-02-05 23:14:01 UTC (rev 436271)
@@ -0,0 +1,36 @@
+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));
Added: qt6-webengine/kde-unstable/chromium-94-ffmpeg-roll.patch
===================================================================
--- qt6-webengine/kde-unstable/chromium-94-ffmpeg-roll.patch (rev 0)
+++ qt6-webengine/kde-unstable/chromium-94-ffmpeg-roll.patch 2022-02-05 23:14:01 UTC (rev 436271)
@@ -0,0 +1,49 @@
+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;
+ }
Deleted: qt6-webengine/kde-unstable/qt6-webengine-ffmpeg5.patch
===================================================================
--- qt6-webengine/trunk/qt6-webengine-ffmpeg5.patch 2022-02-04 18:12:59 UTC (rev 436192)
+++ qt6-webengine/kde-unstable/qt6-webengine-ffmpeg5.patch 2022-02-05 23:14:01 UTC (rev 436271)
@@ -1,150 +0,0 @@
-diff --git a/chromium/media/ffmpeg/ffmpeg_common.h b/chromium/media/ffmpeg/ffmpeg_common.h
-index 2734a485cbd..70b1877a43c 100644
---- a/chromium/media/ffmpeg/ffmpeg_common.h
-+++ b/chromium/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/chromium/media/filters/audio_file_reader.cc b/chromium/media/filters/audio_file_reader.cc
-index cb81d920def..bd73908d0ca 100644
---- a/chromium/media/filters/audio_file_reader.cc
-+++ b/chromium/media/filters/audio_file_reader.cc
-@@ -85,7 +85,7 @@ bool AudioFileReader::OpenDemuxer() {
- }
-
- bool AudioFileReader::OpenDecoder() {
-- AVCodec* codec = avcodec_find_decoder(codec_context_->codec_id);
-+ const AVCodec* codec = avcodec_find_decoder(codec_context_->codec_id);
- if (codec) {
- // MP3 decodes to S16P which we don't support, tell it to use S16 instead.
- if (codec_context_->sample_fmt == AV_SAMPLE_FMT_S16P)
-diff --git a/chromium/media/filters/ffmpeg_audio_decoder.cc b/chromium/media/filters/ffmpeg_audio_decoder.cc
-index 0d825ed791b..72fac6167ef 100644
---- a/chromium/media/filters/ffmpeg_audio_decoder.cc
-+++ b/chromium/media/filters/ffmpeg_audio_decoder.cc
-@@ -329,7 +329,7 @@ bool FFmpegAudioDecoder::ConfigureDecoder(const AudioDecoderConfig& config) {
- }
- }
-
-- AVCodec* codec = avcodec_find_decoder(codec_context_->codec_id);
-+ const AVCodec* codec = avcodec_find_decoder(codec_context_->codec_id);
- if (!codec ||
- avcodec_open2(codec_context_.get(), codec, &codec_options) < 0) {
- DLOG(ERROR) << "Could not initialize audio decoder: "
-diff --git a/chromium/media/filters/ffmpeg_demuxer.cc b/chromium/media/filters/ffmpeg_demuxer.cc
-index d34db63f3ef..427565b00c1 100644
---- a/chromium/media/filters/ffmpeg_demuxer.cc
-+++ b/chromium/media/filters/ffmpeg_demuxer.cc
-@@ -98,12 +98,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;
- }
-@@ -408,11 +408,11 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) {
- scoped_refptr<DecoderBuffer> buffer;
-
- if (type() == DemuxerStream::TEXT) {
-- int id_size = 0;
-+ size_t id_size = 0;
- uint8_t* id_data = av_packet_get_side_data(
- packet.get(), AV_PKT_DATA_WEBVTT_IDENTIFIER, &id_size);
-
-- int settings_size = 0;
-+ size_t settings_size = 0;
- uint8_t* settings_data = av_packet_get_side_data(
- packet.get(), AV_PKT_DATA_WEBVTT_SETTINGS, &settings_size);
-
-@@ -424,7 +424,7 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) {
- buffer = DecoderBuffer::CopyFrom(packet->data, packet->size,
- side_data.data(), side_data.size());
- } else {
-- int side_data_size = 0;
-+ size_t side_data_size = 0;
- uint8_t* side_data = av_packet_get_side_data(
- packet.get(), AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL, &side_data_size);
-
-@@ -485,7 +485,7 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) {
- packet->size - data_offset);
- }
-
-- int skip_samples_size = 0;
-+ size_t 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));
-diff --git a/chromium/media/filters/ffmpeg_glue.cc b/chromium/media/filters/ffmpeg_glue.cc
-index 0ef3521473d..8483ecc348f 100644
---- a/chromium/media/filters/ffmpeg_glue.cc
-+++ b/chromium/media/filters/ffmpeg_glue.cc
-@@ -59,7 +59,6 @@ static int64_t AVIOSeekOperation(void* opaque, int64_t offset, int whence) {
- }
-
- void FFmpegGlue::InitializeFFmpeg() {
-- av_register_all();
- }
-
- static void LogContainer(bool is_local_file,
-@@ -95,9 +94,6 @@ FFmpegGlue::FFmpegGlue(FFmpegURLProtocol* protocol) {
- // Enable fast, but inaccurate seeks for MP3.
- format_context_->flags |= AVFMT_FLAG_FAST_SEEK;
-
-- // Ensures we can read out various metadata bits like vp8 alpha.
-- format_context_->flags |= AVFMT_FLAG_KEEP_SIDE_DATA;
--
- // Ensures format parsing errors will bail out. From an audit on 11/2017, all
- // instances were real failures. Solves bugs like http://crbug.com/710791.
- format_context_->error_recognition |= AV_EF_EXPLODE;
-diff --git a/chromium/media/filters/ffmpeg_video_decoder.cc b/chromium/media/filters/ffmpeg_video_decoder.cc
-index ef12477ee89..7996606f5f9 100644
---- a/chromium/media/filters/ffmpeg_video_decoder.cc
-+++ b/chromium/media/filters/ffmpeg_video_decoder.cc
-@@ -391,7 +391,7 @@ bool FFmpegVideoDecoder::ConfigureDecoder(const VideoDecoderConfig& config,
- if (decode_nalus_)
- codec_context_->flags2 |= AV_CODEC_FLAG2_CHUNKS;
-
-- AVCodec* codec = avcodec_find_decoder(codec_context_->codec_id);
-+ const AVCodec* codec = avcodec_find_decoder(codec_context_->codec_id);
- if (!codec || avcodec_open2(codec_context_.get(), codec, NULL) < 0) {
- ReleaseFFmpegResources();
- return false;
-diff --git a/chromium/media/filters/media_file_checker.cc b/chromium/media/filters/media_file_checker.cc
-index 59c2a2fc618..1a9872c7acb 100644
---- a/chromium/media/filters/media_file_checker.cc
-+++ b/chromium/media/filters/media_file_checker.cc
-@@ -68,7 +68,7 @@ bool MediaFileChecker::Start(base::TimeDelta check_time) {
- auto context = AVStreamToAVCodecContext(format_context->streams[i]);
- if (!context)
- continue;
-- AVCodec* codec = avcodec_find_decoder(cp->codec_id);
-+ const AVCodec* codec = avcodec_find_decoder(cp->codec_id);
- if (codec && avcodec_open2(context.get(), codec, nullptr) >= 0) {
- auto loop = std::make_unique<FFmpegDecodingLoop>(context.get());
- stream_contexts[i] = {std::move(context), std::move(loop)};
-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 9002b874611..d12fade8b63 100644
---- 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
-@@ -203,7 +203,7 @@ int32_t H264DecoderImpl::InitDecode(const VideoCodec* codec_settings,
- // a pointer |this|.
- av_context_->opaque = this;
-
-- AVCodec* codec = avcodec_find_decoder(av_context_->codec_id);
-+ const AVCodec* codec = avcodec_find_decoder(av_context_->codec_id);
- if (!codec) {
- // This is an indication that FFmpeg has not been initialized or it has not
- // been compiled/initialized with the correct set of codecs.
Modified: qt6-websockets/kde-unstable/PKGBUILD
===================================================================
--- qt6-websockets/trunk/PKGBUILD 2022-02-04 18:12:59 UTC (rev 436192)
+++ qt6-websockets/kde-unstable/PKGBUILD 2022-02-05 23:14:01 UTC (rev 436271)
@@ -2,9 +2,9 @@
# Maintainer: Felix Yan <felixonmars at archlinux.org>
pkgname=qt6-websockets
-_qtver=6.2.3
+_qtver=6.3.0-beta1
pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=1
arch=(x86_64)
url='https://www.qt.io'
license=(GPL3 LGPL3 FDL custom)
@@ -14,9 +14,9 @@
optdepends=('qt6-declarative: QML bindings')
groups=(qt6)
options=(debug)
-_pkgfn="${pkgname/6-/}-everywhere-src-$_qtver"
-source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz)
-sha256sums=('d7034b1a741d24e7d4e84cab34a5cf205c580f877c81ea26b3c3080efcdb2aaf')
+_pkgfn=${pkgname/6-/}-everywhere-src-$_qtver
+source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz)
+sha256sums=('b365005114fd0ba29a8a5012e83cdef9f5a70cbaedf39750b994efd36ab8b1c2')
build() {
cmake -B build -S $_pkgfn -G Ninja
Modified: qt6-webview/kde-unstable/PKGBUILD
===================================================================
--- qt6-webview/trunk/PKGBUILD 2022-02-04 18:12:59 UTC (rev 436192)
+++ qt6-webview/kde-unstable/PKGBUILD 2022-02-05 23:14:01 UTC (rev 436271)
@@ -2,9 +2,9 @@
# Maintainer: Felix Yan <felixonmars at archlinux.org>
pkgname=qt6-webview
-_qtver=6.2.3
+_qtver=6.3.0-beta1
pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=1
arch=(x86_64)
url='https://www.qt.io'
license=(GPL3 LGPL3 FDL custom)
@@ -13,9 +13,9 @@
makedepends=(cmake ninja)
groups=(qt6)
options=(debug)
-_pkgfn="${pkgname/6-/}-everywhere-src-$_qtver"
-source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz)
-sha256sums=('1d021de337c3ec972bb74506e64f30af6b86119885b6852212c31a38f4fb70b6')
+_pkgfn=${pkgname/6-/}-everywhere-src-$_qtver
+source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz)
+sha256sums=('453a2ac550f02d42f5820132d77ba45a7962587791202d84215ed3813241e367')
build() {
cmake -B build -S $_pkgfn -G Ninja
More information about the arch-commits
mailing list