sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Qt6: Update to 6.7.1

Browse source 
As a patch release, Qt 6.7.1 does not introduce any new features but
contains more than 400 bug fixes, security updates, and other
improvements to the top of the Qt 6.7.0 release. See more information
about the most important changes and bug fixes from Qt 6.7.1 release
note.

Enable building of databases/qt6-base_sqldriver@mysql with MariaDB. [1]

Fix build of www/qt6-webengine with the SNDIO option enabled. [2]

Announcement: https://www.qt.io/blog/qt-6.7.1-released
Release note: https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.7.1/release-note.md

PR:		277922 [1], 279180 [2]
Reported by:	vvd [1], Benjamin Takacs <nimaje+fbz@bureaucracy.de> [2]
MFH:		2024Q2
Security:	f5fa174d-19de-11ef-83d8-4ccc6adda413
This commit is contained in:
Jason E. Hale 2024-05-24 04:48:58 -04:00
parent 1f5a0d033f
commit 359c8eed18
60 changed files with 335 additions and 6435 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mk/Uses/qt.mk
View file

@ -23,7 +23,7 @@ _QT_MK_INCLUDED= qt.mk
# Qt versions currently supported by the framework. # Qt versions currently supported by the framework.
_QT_SUPPORTED?= 5 6 _QT_SUPPORTED?= 5 6
QT5_VERSION?= 5.15.13 QT5_VERSION?= 5.15.13
QT6_VERSION?= 6.7.0 QT6_VERSION?= 6.7.1
PYSIDE6_VERSION?= 6.7.0 PYSIDE6_VERSION?= 6.7.0
# Support for intermediate Qt6 releases. This partially defines # Support for intermediate Qt6 releases. This partially defines

6
accessibility/qt6-speech/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1712112642 TIMESTAMP = 1716399184
SHA256 (KDE/Qt/6.7.0/qtspeech-everywhere-src-6.7.0.tar.xz) = 44768eba837d48c2233ef12aab562acf2d3c531b489f4ec70124e2bb313d1f11 SHA256 (KDE/Qt/6.7.1/qtspeech-everywhere-src-6.7.1.tar.xz) = 6c6f1d15c8fc0ef5cb0cfc401a07ecc56e34f1e8510126383cef658cf751eb88
SIZE (KDE/Qt/6.7.0/qtspeech-everywhere-src-6.7.0.tar.xz) = 261732 SIZE (KDE/Qt/6.7.1/qtspeech-everywhere-src-6.7.1.tar.xz) = 261772

6
comms/qt6-connectivity/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1712112647 TIMESTAMP = 1716399187
SHA256 (KDE/Qt/6.7.0/qtconnectivity-everywhere-src-6.7.0.tar.xz) = 07afd6aac19ff73c8ba1471057f43d4ef2737d6a8a772393ec907988dd71244c SHA256 (KDE/Qt/6.7.1/qtconnectivity-everywhere-src-6.7.1.tar.xz) = 70010afbe442bd41c9d4aad85d80fe0a8f2cbcf01cef3f3d88196e5520a73dcb
SIZE (KDE/Qt/6.7.0/qtconnectivity-everywhere-src-6.7.0.tar.xz) = 1060904 SIZE (KDE/Qt/6.7.1/qtconnectivity-everywhere-src-6.7.1.tar.xz) = 1061900

6
comms/qt6-sensors/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1712112654 TIMESTAMP = 1716399192
SHA256 (KDE/Qt/6.7.0/qtsensors-everywhere-src-6.7.0.tar.xz) = 1c3015200a30a64f760818e40794df719e068fc25179e96e88993dff38f7bcab SHA256 (KDE/Qt/6.7.1/qtsensors-everywhere-src-6.7.1.tar.xz) = d5694a17d90f71039c12daf9c1c14fd76baf447246798e7cad171038c80dfbf2
SIZE (KDE/Qt/6.7.0/qtsensors-everywhere-src-6.7.0.tar.xz) = 1494212 SIZE (KDE/Qt/6.7.1/qtsensors-everywhere-src-6.7.1.tar.xz) = 1494588

6
comms/qt6-serialbus/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1712112659 TIMESTAMP = 1716399194
SHA256 (KDE/Qt/6.7.0/qtserialbus-everywhere-src-6.7.0.tar.xz) = 498193a9860664f8a55f676656c45af179ac13d48184af43fc58ddf795bb76dd SHA256 (KDE/Qt/6.7.1/qtserialbus-everywhere-src-6.7.1.tar.xz) = 513905d545b81b040fc9d7a996aa2d6fa310048c36b24919a973f2a6a555628f
SIZE (KDE/Qt/6.7.0/qtserialbus-everywhere-src-6.7.0.tar.xz) = 546788 SIZE (KDE/Qt/6.7.1/qtserialbus-everywhere-src-6.7.1.tar.xz) = 547732

6
comms/qt6-serialport/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1712112663 TIMESTAMP = 1716399197
SHA256 (KDE/Qt/6.7.0/qtserialport-everywhere-src-6.7.0.tar.xz) = b1f02a3d8c9cc8ba2ffa7cca3749f1f147d327e8dfc633fd4ec3cb770d7981c9 SHA256 (KDE/Qt/6.7.1/qtserialport-everywhere-src-6.7.1.tar.xz) = e543a3788bfd522f2e4a111ba568214f1f5be6e55f08318c2dcd376124ea5886
SIZE (KDE/Qt/6.7.0/qtserialport-everywhere-src-6.7.0.tar.xz) = 270604 SIZE (KDE/Qt/6.7.1/qtserialport-everywhere-src-6.7.1.tar.xz) = 271220

4
databases/qt6-base_sqldriver/Makefile
View file

@ -30,8 +30,4 @@ sqlite_USES= sqlite:3
sqlite_CMAKE_ON= QT_FEATURE_system_sqlite sqlite_CMAKE_ON= QT_FEATURE_system_sqlite
${FLAVOR}_PLIST= ${.CURDIR}/pkg-plist.${FLAVOR} ${FLAVOR}_PLIST= ${.CURDIR}/pkg-plist.${FLAVOR}
.if ${FLAVOR:U} == mysql
IGNORE_WITH_MYSQL= 105m 106m 1011m
.endif
.include <bsd.port.mk> .include <bsd.port.mk>

6
databases/qt6-base_sqldriver/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1712112752 TIMESTAMP = 1716399242
SHA256 (KDE/Qt/6.7.0/qtbase-everywhere-src-6.7.0.tar.xz) = 11b2e29e2e52fb0e3b453ea13bbe51a10fdff36e1c192d8868c5a40233b8b254 SHA256 (KDE/Qt/6.7.1/qtbase-everywhere-src-6.7.1.tar.xz) = b7338da1bdccb4d861e714efffaa83f174dfe37e194916bfd7ec82279a6ace19
SIZE (KDE/Qt/6.7.0/qtbase-everywhere-src-6.7.0.tar.xz) = 49314276 SIZE (KDE/Qt/6.7.1/qtbase-everywhere-src-6.7.1.tar.xz) = 49324536

6
devel/qt6-5compat/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1712112788 TIMESTAMP = 1716399259
SHA256 (KDE/Qt/6.7.0/qt5compat-everywhere-src-6.7.0.tar.xz) = 9d49d4fd8345d8a40b63e0b65cd49c1d8286e33a7f1409bf1316763f654e19f5 SHA256 (KDE/Qt/6.7.1/qt5compat-everywhere-src-6.7.1.tar.xz) = 41c4bbe419158fc170ee3ef3ecffead506e70802109deec036d86e4244086009
SIZE (KDE/Qt/6.7.0/qt5compat-everywhere-src-6.7.0.tar.xz) = 14629204 SIZE (KDE/Qt/6.7.1/qt5compat-everywhere-src-6.7.1.tar.xz) = 14631152

3
devel/qt6-base/Makefile
View file

@ -3,9 +3,6 @@ DISTVERSION= ${QT6_VERSION}
CATEGORIES= devel CATEGORIES= devel
PKGNAMEPREFIX= qt6- PKGNAMEPREFIX= qt6-
PATCH_SITES= https://github.com/qt/qtbase/commit/
PATCHFILES+= 7c4e1357e49baebdd2d20710fccb5604cbb36c0d.patch:-p1 # CVE-2024-33861
MAINTAINER= kde@FreeBSD.org MAINTAINER= kde@FreeBSD.org
COMMENT= Qt base (core, gui, widgets, network,...) COMMENT= Qt base (core, gui, widgets, network,...)

8
devel/qt6-base/distinfo
View file

@ -1,5 +1,3 @@
TIMESTAMP = 1715748396 TIMESTAMP = 1716401147
SHA256 (KDE/Qt/6.7.0/qtbase-everywhere-src-6.7.0.tar.xz) = 11b2e29e2e52fb0e3b453ea13bbe51a10fdff36e1c192d8868c5a40233b8b254 SHA256 (KDE/Qt/6.7.1/qtbase-everywhere-src-6.7.1.tar.xz) = b7338da1bdccb4d861e714efffaa83f174dfe37e194916bfd7ec82279a6ace19
SIZE (KDE/Qt/6.7.0/qtbase-everywhere-src-6.7.0.tar.xz) = 49314276 SIZE (KDE/Qt/6.7.1/qtbase-everywhere-src-6.7.1.tar.xz) = 49324536
SHA256 (KDE/Qt/6.7.0/7c4e1357e49baebdd2d20710fccb5604cbb36c0d.patch) = fa921cb0eb73ed23a0a5c6cfaf10da2116511b60f2e49c8c406eef516363d228
SIZE (KDE/Qt/6.7.0/7c4e1357e49baebdd2d20710fccb5604cbb36c0d.patch) = 6164

13
devel/qt6-base/files/patch-cmake_FindMySQL.cmake Normal file
View file

@ -0,0 +1,13 @@
Use pkgconf to set hints for MariaDB, as well.
--- cmake/FindMySQL.cmake.orig 2024-05-08 09:42:08 UTC
+++ cmake/FindMySQL.cmake
@@ -43,7 +43,7 @@ if(PkgConfig_FOUND AND NOT DEFINED MySQL_ROOT)
find_package(PkgConfig QUIET)
endif()
if(PkgConfig_FOUND AND NOT DEFINED MySQL_ROOT)
- pkg_check_modules(PC_MySQL QUIET "mysqlclient")
+ pkg_search_module(PC_MySQL QUIET "libmariadb" "mysqlclient")
set(MySQL_include_dir_hints ${PC_MySQL_INCLUDEDIR})
set(MySQL_library_hints ${PC_MySQL_LIBDIR})
set(MySQL_library_hints_debug "")

15
devel/qt6-base/files/patch-src_corelib_tools_qspan.h
View file

@ -1,15 +0,0 @@
Fix warning which causes error in www/dooble due to -Werror being set.
/usr/local/include/qt6/QtCore/qspan.h:278:5: error: '__cpp_lib_span' is not defined, evaluates to 0
--- src/corelib/tools/qspan.h.orig 2024-01-22 10:20:09 UTC
+++ src/corelib/tools/qspan.h
@@ -275,7 +275,7 @@ class QSpanBase<T, q20::dynamic_extent> : protected QS
: QSpanBase(other.data(), other.size())
{}
-#if __cpp_lib_span
+#ifdef __cpp_lib_span
template <typename S, size_t N, if_qualification_conversion<S> = true>
Q_IMPLICIT constexpr QSpanBase(std::span<S, N> other) noexcept
: QSpanBase(other.data(), other.size())

6
devel/qt6-base/pkg-plist
View file

@ -1659,6 +1659,7 @@ bin/qmake6
%%QT_INCDIR%%/QtNetwork/QNetworkRequestFactory %%QT_INCDIR%%/QtNetwork/QNetworkRequestFactory
%%QT_INCDIR%%/QtNetwork/QOcspResponse %%QT_INCDIR%%/QtNetwork/QOcspResponse
%%QT_INCDIR%%/QtNetwork/QPasswordDigestor %%QT_INCDIR%%/QtNetwork/QPasswordDigestor
%%QT_INCDIR%%/QtNetwork/QRestAccessManager
%%QT_INCDIR%%/QtNetwork/QRestReply %%QT_INCDIR%%/QtNetwork/QRestReply
%%QT_INCDIR%%/QtNetwork/QSsl %%QT_INCDIR%%/QtNetwork/QSsl
%%QT_INCDIR%%/QtNetwork/QSslCertificate %%QT_INCDIR%%/QtNetwork/QSslCertificate
@ -3104,8 +3105,8 @@ lib/cmake/Qt6Xml/Qt6XmlVersionlessTargets.cmake
%%QT_LIBDIR%%/metatypes/qt6widgets_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6widgets_%%CMAKE_BUILD_TYPE%%_metatypes.json
%%X11%%%%QT_LIBDIR%%/metatypes/qt6xcbqpaprivate_%%CMAKE_BUILD_TYPE%%_metatypes.json %%X11%%%%QT_LIBDIR%%/metatypes/qt6xcbqpaprivate_%%CMAKE_BUILD_TYPE%%_metatypes.json
%%QT_LIBDIR%%/metatypes/qt6xml_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6xml_%%CMAKE_BUILD_TYPE%%_metatypes.json
%%DEBUG%%%%QT_LIBDIR%%/objects-Debug/ExampleIconsPrivate_resources_1/.rcc/qrc_example_icons_init.cpp.o %%DEBUG%%%%QT_LIBDIR%%/objects-Debug/ExampleIconsPrivate_resources_1/.qt/rcc/qrc_example_icons_init.cpp.o
%%NO_DEBUG%%%%QT_LIBDIR%%/objects-Release/ExampleIconsPrivate_resources_1/.rcc/qrc_example_icons_init.cpp.o %%NO_DEBUG%%%%QT_LIBDIR%%/objects-Release/ExampleIconsPrivate_resources_1/.qt/rcc/qrc_example_icons_init.cpp.o
%%QT_MKSPECDIR%%/aix-g++-64/qmake.conf %%QT_MKSPECDIR%%/aix-g++-64/qmake.conf
%%QT_MKSPECDIR%%/aix-g++-64/qplatformdefs.h %%QT_MKSPECDIR%%/aix-g++-64/qplatformdefs.h
%%QT_MKSPECDIR%%/aix-g++/qmake.conf %%QT_MKSPECDIR%%/aix-g++/qmake.conf
@ -3621,6 +3622,7 @@ libdata/pkgconfig/Qt6Xml.pc
%%QT_TOOLDIR%%/qt-cmake-private %%QT_TOOLDIR%%/qt-cmake-private
%%QT_TOOLDIR%%/qt-cmake-private-install.cmake %%QT_TOOLDIR%%/qt-cmake-private-install.cmake
%%QT_TOOLDIR%%/qt-cmake-standalone-test %%QT_TOOLDIR%%/qt-cmake-standalone-test
%%QT_TOOLDIR%%/qt-internal-configure-examples
%%QT_TOOLDIR%%/qt-internal-configure-tests %%QT_TOOLDIR%%/qt-internal-configure-tests
%%QT_TOOLDIR%%/qt-testrunner.py %%QT_TOOLDIR%%/qt-testrunner.py
%%QT_TOOLDIR%%/qvkgen %%QT_TOOLDIR%%/qvkgen

6
devel/qt6-languageserver/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1712112792 TIMESTAMP = 1716399262
SHA256 (KDE/Qt/6.7.0/qtlanguageserver-everywhere-src-6.7.0.tar.xz) = a99ecb342abdf7b7ac24804c89830a7991de95f9402f45a1e337ae851f76c9fc SHA256 (KDE/Qt/6.7.1/qtlanguageserver-everywhere-src-6.7.1.tar.xz) = a0fcda1464760e10d9d78d4260e78c94f7ef51343193d8fd2cfef991a4fa94f9
SIZE (KDE/Qt/6.7.0/qtlanguageserver-everywhere-src-6.7.0.tar.xz) = 145140 SIZE (KDE/Qt/6.7.1/qtlanguageserver-everywhere-src-6.7.1.tar.xz) = 145728

6
devel/qt6-location/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1712112799 TIMESTAMP = 1716399321
SHA256 (KDE/Qt/6.7.0/qtlocation-everywhere-src-6.7.0.tar.xz) = bb044d66bc17db98f526ec1b52d8e94810e046310f288561380774e5903ad46a SHA256 (KDE/Qt/6.7.1/qtlocation-everywhere-src-6.7.1.tar.xz) = 3870178c2ec9fda35f823ad24f3b883b70ec082a6a496eeb2d1fbd57b6268608
SIZE (KDE/Qt/6.7.0/qtlocation-everywhere-src-6.7.0.tar.xz) = 3165588 SIZE (KDE/Qt/6.7.1/qtlocation-everywhere-src-6.7.1.tar.xz) = 3166636

6
devel/qt6-positioning/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1712112802 TIMESTAMP = 1716399324
SHA256 (KDE/Qt/6.7.0/qtpositioning-everywhere-src-6.7.0.tar.xz) = 1d601ba43c26c8a01db81eeaaeea5943c015da98caa59d7905b86e0e9d609ddf SHA256 (KDE/Qt/6.7.1/qtpositioning-everywhere-src-6.7.1.tar.xz) = 5c2b0d46b8d35126e97c8efe22264b2de7ac1273a5ec38a0314731bb02804f53
SIZE (KDE/Qt/6.7.0/qtpositioning-everywhere-src-6.7.0.tar.xz) = 658368 SIZE (KDE/Qt/6.7.1/qtpositioning-everywhere-src-6.7.1.tar.xz) = 658028

6
devel/qt6-remoteobjects/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1712112805 TIMESTAMP = 1716399328
SHA256 (KDE/Qt/6.7.0/qtremoteobjects-everywhere-src-6.7.0.tar.xz) = a0ba60d625c9713fc8396b8db1e283df863bfaa06664d46496bd16fab5e4c695 SHA256 (KDE/Qt/6.7.1/qtremoteobjects-everywhere-src-6.7.1.tar.xz) = e7012b01baf854d699dd588de14ce2b36487b329096c7a9b5048b43e7949ccf4
SIZE (KDE/Qt/6.7.0/qtremoteobjects-everywhere-src-6.7.0.tar.xz) = 536264 SIZE (KDE/Qt/6.7.1/qtremoteobjects-everywhere-src-6.7.1.tar.xz) = 537016

6
devel/qt6-scxml/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1712112809 TIMESTAMP = 1716399333
SHA256 (KDE/Qt/6.7.0/qtscxml-everywhere-src-6.7.0.tar.xz) = 725b97bbb8766df733d7588488acd92375c218eeb376a95525572b4268a9257c SHA256 (KDE/Qt/6.7.1/qtscxml-everywhere-src-6.7.1.tar.xz) = 022d415284e889bd6687ea57f91853a12e39f254bc8f125ecee6a19b5167b24f
SIZE (KDE/Qt/6.7.0/qtscxml-everywhere-src-6.7.0.tar.xz) = 1167668 SIZE (KDE/Qt/6.7.1/qtscxml-everywhere-src-6.7.1.tar.xz) = 1168276

6
devel/qt6-tools/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1712112826 TIMESTAMP = 1716399345
SHA256 (KDE/Qt/6.7.0/qttools-everywhere-src-6.7.0.tar.xz) = c8da6b239e82fe1e23465cbf0936c0da5a334438d3fb433e19c503cbb1abee7b SHA256 (KDE/Qt/6.7.1/qttools-everywhere-src-6.7.1.tar.xz) = 0953cddf6248f3959279a10904892e8a98eb3e463d729a174b6fc47febd99824
SIZE (KDE/Qt/6.7.0/qttools-everywhere-src-6.7.0.tar.xz) = 9012572 SIZE (KDE/Qt/6.7.1/qttools-everywhere-src-6.7.1.tar.xz) = 9016376

6
devel/qt6-translations/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1712112830 TIMESTAMP = 1716399350
SHA256 (KDE/Qt/6.7.0/qttranslations-everywhere-src-6.7.0.tar.xz) = 26fc8047062ca4bacd1bd953be86fd39c6e0a5f5e9920c72ba9d40876cea4b56 SHA256 (KDE/Qt/6.7.1/qttranslations-everywhere-src-6.7.1.tar.xz) = 03d71565872b0e0e7303349071df031ab0f922f6dbdd3a5ec1ade9e188e4fbf4
SIZE (KDE/Qt/6.7.0/qttranslations-everywhere-src-6.7.0.tar.xz) = 1475980 SIZE (KDE/Qt/6.7.1/qttranslations-everywhere-src-6.7.1.tar.xz) = 1547716

14
devel/qt6-translations/pkg-plist
View file

@ -9,6 +9,7 @@
%%QT_L10NDIR%%/assistant_hr.qm %%QT_L10NDIR%%/assistant_hr.qm
%%QT_L10NDIR%%/assistant_hu.qm %%QT_L10NDIR%%/assistant_hu.qm
%%QT_L10NDIR%%/assistant_ja.qm %%QT_L10NDIR%%/assistant_ja.qm
%%QT_L10NDIR%%/assistant_ka.qm
%%QT_L10NDIR%%/assistant_ko.qm %%QT_L10NDIR%%/assistant_ko.qm
%%QT_L10NDIR%%/assistant_nl.qm %%QT_L10NDIR%%/assistant_nl.qm
%%QT_L10NDIR%%/assistant_pl.qm %%QT_L10NDIR%%/assistant_pl.qm
@ -32,6 +33,7 @@
%%QT_L10NDIR%%/designer_hr.qm %%QT_L10NDIR%%/designer_hr.qm
%%QT_L10NDIR%%/designer_hu.qm %%QT_L10NDIR%%/designer_hu.qm
%%QT_L10NDIR%%/designer_ja.qm %%QT_L10NDIR%%/designer_ja.qm
%%QT_L10NDIR%%/designer_ka.qm
%%QT_L10NDIR%%/designer_ko.qm %%QT_L10NDIR%%/designer_ko.qm
%%QT_L10NDIR%%/designer_nl.qm %%QT_L10NDIR%%/designer_nl.qm
%%QT_L10NDIR%%/designer_pl.qm %%QT_L10NDIR%%/designer_pl.qm
@ -54,6 +56,7 @@
%%QT_L10NDIR%%/linguist_hu.qm %%QT_L10NDIR%%/linguist_hu.qm
%%QT_L10NDIR%%/linguist_it.qm %%QT_L10NDIR%%/linguist_it.qm
%%QT_L10NDIR%%/linguist_ja.qm %%QT_L10NDIR%%/linguist_ja.qm
%%QT_L10NDIR%%/linguist_ka.qm
%%QT_L10NDIR%%/linguist_ko.qm %%QT_L10NDIR%%/linguist_ko.qm
%%QT_L10NDIR%%/linguist_nl.qm %%QT_L10NDIR%%/linguist_nl.qm
%%QT_L10NDIR%%/linguist_pl.qm %%QT_L10NDIR%%/linguist_pl.qm
@ -93,6 +96,7 @@
%%QT_L10NDIR%%/qt_help_hu.qm %%QT_L10NDIR%%/qt_help_hu.qm
%%QT_L10NDIR%%/qt_help_it.qm %%QT_L10NDIR%%/qt_help_it.qm
%%QT_L10NDIR%%/qt_help_ja.qm %%QT_L10NDIR%%/qt_help_ja.qm
%%QT_L10NDIR%%/qt_help_ka.qm
%%QT_L10NDIR%%/qt_help_ko.qm %%QT_L10NDIR%%/qt_help_ko.qm
%%QT_L10NDIR%%/qt_help_nl.qm %%QT_L10NDIR%%/qt_help_nl.qm
%%QT_L10NDIR%%/qt_help_nn.qm %%QT_L10NDIR%%/qt_help_nn.qm
@ -109,6 +113,7 @@
%%QT_L10NDIR%%/qt_hu.qm %%QT_L10NDIR%%/qt_hu.qm
%%QT_L10NDIR%%/qt_it.qm %%QT_L10NDIR%%/qt_it.qm
%%QT_L10NDIR%%/qt_ja.qm %%QT_L10NDIR%%/qt_ja.qm
%%QT_L10NDIR%%/qt_ka.qm
%%QT_L10NDIR%%/qt_ko.qm %%QT_L10NDIR%%/qt_ko.qm
%%QT_L10NDIR%%/qt_lt.qm %%QT_L10NDIR%%/qt_lt.qm
%%QT_L10NDIR%%/qt_lv.qm %%QT_L10NDIR%%/qt_lv.qm
@ -142,6 +147,7 @@
%%QT_L10NDIR%%/qtbase_hu.qm %%QT_L10NDIR%%/qtbase_hu.qm
%%QT_L10NDIR%%/qtbase_it.qm %%QT_L10NDIR%%/qtbase_it.qm
%%QT_L10NDIR%%/qtbase_ja.qm %%QT_L10NDIR%%/qtbase_ja.qm
%%QT_L10NDIR%%/qtbase_ka.qm
%%QT_L10NDIR%%/qtbase_ko.qm %%QT_L10NDIR%%/qtbase_ko.qm
%%QT_L10NDIR%%/qtbase_lv.qm %%QT_L10NDIR%%/qtbase_lv.qm
%%QT_L10NDIR%%/qtbase_nl.qm %%QT_L10NDIR%%/qtbase_nl.qm
@ -162,6 +168,7 @@
%%QT_L10NDIR%%/qtconnectivity_es.qm %%QT_L10NDIR%%/qtconnectivity_es.qm
%%QT_L10NDIR%%/qtconnectivity_hr.qm %%QT_L10NDIR%%/qtconnectivity_hr.qm
%%QT_L10NDIR%%/qtconnectivity_hu.qm %%QT_L10NDIR%%/qtconnectivity_hu.qm
%%QT_L10NDIR%%/qtconnectivity_ka.qm
%%QT_L10NDIR%%/qtconnectivity_ko.qm %%QT_L10NDIR%%/qtconnectivity_ko.qm
%%QT_L10NDIR%%/qtconnectivity_nl.qm %%QT_L10NDIR%%/qtconnectivity_nl.qm
%%QT_L10NDIR%%/qtconnectivity_pl.qm %%QT_L10NDIR%%/qtconnectivity_pl.qm
@ -183,6 +190,7 @@
%%QT_L10NDIR%%/qtdeclarative_hr.qm %%QT_L10NDIR%%/qtdeclarative_hr.qm
%%QT_L10NDIR%%/qtdeclarative_hu.qm %%QT_L10NDIR%%/qtdeclarative_hu.qm
%%QT_L10NDIR%%/qtdeclarative_ja.qm %%QT_L10NDIR%%/qtdeclarative_ja.qm
%%QT_L10NDIR%%/qtdeclarative_ka.qm
%%QT_L10NDIR%%/qtdeclarative_ko.qm %%QT_L10NDIR%%/qtdeclarative_ko.qm
%%QT_L10NDIR%%/qtdeclarative_lv.qm %%QT_L10NDIR%%/qtdeclarative_lv.qm
%%QT_L10NDIR%%/qtdeclarative_nl.qm %%QT_L10NDIR%%/qtdeclarative_nl.qm
@ -205,6 +213,7 @@
%%QT_L10NDIR%%/qtlocation_fr.qm %%QT_L10NDIR%%/qtlocation_fr.qm
%%QT_L10NDIR%%/qtlocation_hr.qm %%QT_L10NDIR%%/qtlocation_hr.qm
%%QT_L10NDIR%%/qtlocation_hu.qm %%QT_L10NDIR%%/qtlocation_hu.qm
%%QT_L10NDIR%%/qtlocation_ka.qm
%%QT_L10NDIR%%/qtlocation_ko.qm %%QT_L10NDIR%%/qtlocation_ko.qm
%%QT_L10NDIR%%/qtlocation_nl.qm %%QT_L10NDIR%%/qtlocation_nl.qm
%%QT_L10NDIR%%/qtlocation_pl.qm %%QT_L10NDIR%%/qtlocation_pl.qm
@ -228,6 +237,7 @@
%%QT_L10NDIR%%/qtmultimedia_hu.qm %%QT_L10NDIR%%/qtmultimedia_hu.qm
%%QT_L10NDIR%%/qtmultimedia_it.qm %%QT_L10NDIR%%/qtmultimedia_it.qm
%%QT_L10NDIR%%/qtmultimedia_ja.qm %%QT_L10NDIR%%/qtmultimedia_ja.qm
%%QT_L10NDIR%%/qtmultimedia_ka.qm
%%QT_L10NDIR%%/qtmultimedia_ko.qm %%QT_L10NDIR%%/qtmultimedia_ko.qm
%%QT_L10NDIR%%/qtmultimedia_nl.qm %%QT_L10NDIR%%/qtmultimedia_nl.qm
%%QT_L10NDIR%%/qtmultimedia_nn.qm %%QT_L10NDIR%%/qtmultimedia_nn.qm
@ -243,6 +253,7 @@
%%QT_L10NDIR%%/qtserialport_en.qm %%QT_L10NDIR%%/qtserialport_en.qm
%%QT_L10NDIR%%/qtserialport_es.qm %%QT_L10NDIR%%/qtserialport_es.qm
%%QT_L10NDIR%%/qtserialport_ja.qm %%QT_L10NDIR%%/qtserialport_ja.qm
%%QT_L10NDIR%%/qtserialport_ka.qm
%%QT_L10NDIR%%/qtserialport_ko.qm %%QT_L10NDIR%%/qtserialport_ko.qm
%%QT_L10NDIR%%/qtserialport_pl.qm %%QT_L10NDIR%%/qtserialport_pl.qm
%%QT_L10NDIR%%/qtserialport_ru.qm %%QT_L10NDIR%%/qtserialport_ru.qm
@ -252,6 +263,7 @@
%%QT_L10NDIR%%/qtwebengine_de.qm %%QT_L10NDIR%%/qtwebengine_de.qm
%%QT_L10NDIR%%/qtwebengine_en.qm %%QT_L10NDIR%%/qtwebengine_en.qm
%%QT_L10NDIR%%/qtwebengine_es.qm %%QT_L10NDIR%%/qtwebengine_es.qm
%%QT_L10NDIR%%/qtwebengine_ka.qm
%%QT_L10NDIR%%/qtwebengine_ko.qm %%QT_L10NDIR%%/qtwebengine_ko.qm
%%QT_L10NDIR%%/qtwebengine_pl.qm %%QT_L10NDIR%%/qtwebengine_pl.qm
%%QT_L10NDIR%%/qtwebengine_ru.qm %%QT_L10NDIR%%/qtwebengine_ru.qm
@ -263,7 +275,9 @@
%%QT_L10NDIR%%/qtwebsockets_es.qm %%QT_L10NDIR%%/qtwebsockets_es.qm
%%QT_L10NDIR%%/qtwebsockets_fr.qm %%QT_L10NDIR%%/qtwebsockets_fr.qm
%%QT_L10NDIR%%/qtwebsockets_ja.qm %%QT_L10NDIR%%/qtwebsockets_ja.qm
%%QT_L10NDIR%%/qtwebsockets_ka.qm
%%QT_L10NDIR%%/qtwebsockets_ko.qm %%QT_L10NDIR%%/qtwebsockets_ko.qm
%%QT_L10NDIR%%/qtwebsockets_pl.qm %%QT_L10NDIR%%/qtwebsockets_pl.qm
%%QT_L10NDIR%%/qtwebsockets_ru.qm %%QT_L10NDIR%%/qtwebsockets_ru.qm
%%QT_L10NDIR%%/qtwebsockets_uk.qm %%QT_L10NDIR%%/qtwebsockets_uk.qm
%%QT_L10NDIR%%/qtwebsockets_zh_CN.qm

6
graphics/qt6-3d/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1712113036 TIMESTAMP = 1716399415
SHA256 (KDE/Qt/6.7.0/qt3d-everywhere-src-6.7.0.tar.xz) = 803b82a8be8632b79f4fc717b236edba716100ab274a54349add439056896424 SHA256 (KDE/Qt/6.7.1/qt3d-everywhere-src-6.7.1.tar.xz) = f59ec0ac81bd6a1b88359bae7362017dc1ca3371726f5c5399a34d2f80d5357b
SIZE (KDE/Qt/6.7.0/qt3d-everywhere-src-6.7.0.tar.xz) = 141570596 SIZE (KDE/Qt/6.7.1/qt3d-everywhere-src-6.7.1.tar.xz) = 141586868

1
graphics/qt6-imageformats/Makefile
View file

@ -1,6 +1,5 @@
PORTNAME= imageformats PORTNAME= imageformats
DISTVERSION= ${QT6_VERSION} DISTVERSION= ${QT6_VERSION}
PORTREVISION= 1
CATEGORIES= graphics CATEGORIES= graphics
PKGNAMEPREFIX= qt6- PKGNAMEPREFIX= qt6-

6
graphics/qt6-imageformats/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1712113041 TIMESTAMP = 1716399418
SHA256 (KDE/Qt/6.7.0/qtimageformats-everywhere-src-6.7.0.tar.xz) = 516ce07ec8dd5a11c59816fe33ddb71d4f691d0ebbc1798ac338f23b86c029a7 SHA256 (KDE/Qt/6.7.1/qtimageformats-everywhere-src-6.7.1.tar.xz) = a733b98f771064d000476b8861f822143982749448ba8abf9f1813edb8dfe79f
SIZE (KDE/Qt/6.7.0/qtimageformats-everywhere-src-6.7.0.tar.xz) = 1968344 SIZE (KDE/Qt/6.7.1/qtimageformats-everywhere-src-6.7.1.tar.xz) = 1971500

6
graphics/qt6-lottie/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1712113044 TIMESTAMP = 1716399420
SHA256 (KDE/Qt/6.7.0/qtlottie-everywhere-src-6.7.0.tar.xz) = 9c0ffbde3c99e006bd13c844a1d691e275c02db1c3db44d05154c939d23ba2ed SHA256 (KDE/Qt/6.7.1/qtlottie-everywhere-src-6.7.1.tar.xz) = 6ade1069cbd3e68462b3d0be152e781021845f2496d3d528dbf8065e0994a27c
SIZE (KDE/Qt/6.7.0/qtlottie-everywhere-src-6.7.0.tar.xz) = 83008 SIZE (KDE/Qt/6.7.1/qtlottie-everywhere-src-6.7.1.tar.xz) = 83660

6
graphics/qt6-quickeffectmaker/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1712113053 TIMESTAMP = 1716399426
SHA256 (KDE/Qt/6.7.0/qtquickeffectmaker-everywhere-src-6.7.0.tar.xz) = 3d0fec664061ca35cc69162c8eb9ae3bc49628eb417ca9def5fb8946b8bc04d5 SHA256 (KDE/Qt/6.7.1/qtquickeffectmaker-everywhere-src-6.7.1.tar.xz) = 4b0212ac79f826455c71792c14e90d3420bdbd0bea4981dc2b3e5d8d316c36e2
SIZE (KDE/Qt/6.7.0/qtquickeffectmaker-everywhere-src-6.7.0.tar.xz) = 4358300 SIZE (KDE/Qt/6.7.1/qtquickeffectmaker-everywhere-src-6.7.1.tar.xz) = 4358308

6
graphics/qt6-svg/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1712113058 TIMESTAMP = 1716399430
SHA256 (KDE/Qt/6.7.0/qtsvg-everywhere-src-6.7.0.tar.xz) = 1518f40e08ff5e6153a6e26e5b95b033413ac143b70795dc1317e7f73ebf922d SHA256 (KDE/Qt/6.7.1/qtsvg-everywhere-src-6.7.1.tar.xz) = 3ed5b80f7228c41dd463b7a57284ed273d224d1c323c0dd78c5209635807cbce
SIZE (KDE/Qt/6.7.0/qtsvg-everywhere-src-6.7.0.tar.xz) = 1790244 SIZE (KDE/Qt/6.7.1/qtsvg-everywhere-src-6.7.1.tar.xz) = 1790712

6
graphics/qt6-wayland/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1712113061 TIMESTAMP = 1716399433
SHA256 (KDE/Qt/6.7.0/qtwayland-everywhere-src-6.7.0.tar.xz) = d73470e4217da388d8cd2a517ee8bb373853f33c569306e80f04397845157aea SHA256 (KDE/Qt/6.7.1/qtwayland-everywhere-src-6.7.1.tar.xz) = 7ef176a8e701c90edd8e591dad36f83c30d623ef94439ff62cafcffd46a83d20
SIZE (KDE/Qt/6.7.0/qtwayland-everywhere-src-6.7.0.tar.xz) = 1121748 SIZE (KDE/Qt/6.7.1/qtwayland-everywhere-src-6.7.1.tar.xz) = 1122036

6
misc/qt6-doc/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1712113085 TIMESTAMP = 1716399452
SHA256 (KDE/Qt/6.7.0/qtdoc-everywhere-src-6.7.0.tar.xz) = 991e5e10c04de4b5cc14577adaad69375dd092ee95a1577c0ce377c4b2019c40 SHA256 (KDE/Qt/6.7.1/qtdoc-everywhere-src-6.7.1.tar.xz) = cd682e0844ac2ed3e2ff78900b2cc5cc19a2da02969eb83e387339644113534d
SIZE (KDE/Qt/6.7.0/qtdoc-everywhere-src-6.7.0.tar.xz) = 13974180 SIZE (KDE/Qt/6.7.1/qtdoc-everywhere-src-6.7.1.tar.xz) = 14496284

14
misc/qt6-doc/pkg-plist
View file

@ -93,21 +93,27 @@
%%QT_DOCDIR%%/qtdoc/i18n-plural-rules.html %%QT_DOCDIR%%/qtdoc/i18n-plural-rules.html
%%QT_DOCDIR%%/qtdoc/i18n-source-translation.html %%QT_DOCDIR%%/qtdoc/i18n-source-translation.html
%%QT_DOCDIR%%/qtdoc/images/5OiIqFTjUZI.jpg %%QT_DOCDIR%%/qtdoc/images/5OiIqFTjUZI.jpg
%%QT_DOCDIR%%/qtdoc/images/Android_Studio_Settings.png
%%QT_DOCDIR%%/qtdoc/images/BenchmarkDemoQt6.png %%QT_DOCDIR%%/qtdoc/images/BenchmarkDemoQt6.png
%%QT_DOCDIR%%/qtdoc/images/CheckPluginInstall.png
%%QT_DOCDIR%%/qtdoc/images/CustomStyle_Dark.png %%QT_DOCDIR%%/qtdoc/images/CustomStyle_Dark.png
%%QT_DOCDIR%%/qtdoc/images/CustomStyle_Light.png %%QT_DOCDIR%%/qtdoc/images/CustomStyle_Light.png
%%QT_DOCDIR%%/qtdoc/images/FX_Material_Showroom.png %%QT_DOCDIR%%/qtdoc/images/FX_Material_Showroom.png
%%QT_DOCDIR%%/qtdoc/images/Material_Dark.png %%QT_DOCDIR%%/qtdoc/images/Material_Dark.png
%%QT_DOCDIR%%/qtdoc/images/Material_Light.png %%QT_DOCDIR%%/qtdoc/images/Material_Light.png
%%QT_DOCDIR%%/qtdoc/images/SettingsSet.png
%%QT_DOCDIR%%/qtdoc/images/Settings_CustomStyle.png %%QT_DOCDIR%%/qtdoc/images/Settings_CustomStyle.png
%%QT_DOCDIR%%/qtdoc/images/Settings_Material.png %%QT_DOCDIR%%/qtdoc/images/Settings_Material.png
%%QT_DOCDIR%%/qtdoc/images/Settings_Qt.png
%%QT_DOCDIR%%/qtdoc/images/Settings_iOS.png %%QT_DOCDIR%%/qtdoc/images/Settings_iOS.png
%%QT_DOCDIR%%/qtdoc/images/_AkKSLp5FnM.png
%%QT_DOCDIR%%/qtdoc/images/accessibleobjecttree.png %%QT_DOCDIR%%/qtdoc/images/accessibleobjecttree.png
%%QT_DOCDIR%%/qtdoc/images/addalarms.png %%QT_DOCDIR%%/qtdoc/images/addalarms.png
%%QT_DOCDIR%%/qtdoc/images/alarms2.png %%QT_DOCDIR%%/qtdoc/images/alarms2.png
%%QT_DOCDIR%%/qtdoc/images/alarms3.png %%QT_DOCDIR%%/qtdoc/images/alarms3.png
%%QT_DOCDIR%%/qtdoc/images/android-single-abis.png %%QT_DOCDIR%%/qtdoc/images/android-single-abis.png
%%QT_DOCDIR%%/qtdoc/images/android-source-folder.png %%QT_DOCDIR%%/qtdoc/images/android-source-folder.png
%%QT_DOCDIR%%/qtdoc/images/android_studio_select_run.png
%%QT_DOCDIR%%/qtdoc/images/animation-examples.png %%QT_DOCDIR%%/qtdoc/images/animation-examples.png
%%QT_DOCDIR%%/qtdoc/images/applicationwindow.png %%QT_DOCDIR%%/qtdoc/images/applicationwindow.png
%%QT_DOCDIR%%/qtdoc/images/arrow_bc.png %%QT_DOCDIR%%/qtdoc/images/arrow_bc.png
@ -125,6 +131,8 @@
%%QT_DOCDIR%%/qtdoc/images/colorpalette_urlselection.png %%QT_DOCDIR%%/qtdoc/images/colorpalette_urlselection.png
%%QT_DOCDIR%%/qtdoc/images/colorpalette_userlisting.png %%QT_DOCDIR%%/qtdoc/images/colorpalette_userlisting.png
%%QT_DOCDIR%%/qtdoc/images/controls.png %%QT_DOCDIR%%/qtdoc/images/controls.png
%%QT_DOCDIR%%/qtdoc/images/create_new_Qt_project_1.png
%%QT_DOCDIR%%/qtdoc/images/create_new_Qt_project_2.png
%%QT_DOCDIR%%/qtdoc/images/deployment-mac-application.png %%QT_DOCDIR%%/qtdoc/images/deployment-mac-application.png
%%QT_DOCDIR%%/qtdoc/images/deployment-mac-bundlestructure.png %%QT_DOCDIR%%/qtdoc/images/deployment-mac-bundlestructure.png
%%QT_DOCDIR%%/qtdoc/images/desktop_dark.png %%QT_DOCDIR%%/qtdoc/images/desktop_dark.png
@ -159,6 +167,7 @@
%%QT_DOCDIR%%/qtdoc/images/nmvurCcsWos.jpg %%QT_DOCDIR%%/qtdoc/images/nmvurCcsWos.jpg
%%QT_DOCDIR%%/qtdoc/images/ok.png %%QT_DOCDIR%%/qtdoc/images/ok.png
%%QT_DOCDIR%%/qtdoc/images/open-project.png %%QT_DOCDIR%%/qtdoc/images/open-project.png
%%QT_DOCDIR%%/qtdoc/images/open_existing_project.png
%%QT_DOCDIR%%/qtdoc/images/osmbuildings.jpg %%QT_DOCDIR%%/qtdoc/images/osmbuildings.jpg
%%QT_DOCDIR%%/qtdoc/images/piemenu.gif %%QT_DOCDIR%%/qtdoc/images/piemenu.gif
%%QT_DOCDIR%%/qtdoc/images/project-structure.png %%QT_DOCDIR%%/qtdoc/images/project-structure.png
@ -219,6 +228,9 @@
%%QT_DOCDIR%%/qtdoc/images/sa8155-target.png %%QT_DOCDIR%%/qtdoc/images/sa8155-target.png
%%QT_DOCDIR%%/qtdoc/images/sa8155p.png %%QT_DOCDIR%%/qtdoc/images/sa8155p.png
%%QT_DOCDIR%%/qtdoc/images/scalability-gridlayout.png %%QT_DOCDIR%%/qtdoc/images/scalability-gridlayout.png
%%QT_DOCDIR%%/qtdoc/images/select_example_project.png
%%QT_DOCDIR%%/qtdoc/images/select_gear_install_plugin.png
%%QT_DOCDIR%%/qtdoc/images/selectpluginjar.png
%%QT_DOCDIR%%/qtdoc/images/session.png %%QT_DOCDIR%%/qtdoc/images/session.png
%%QT_DOCDIR%%/qtdoc/images/small_dark.png %%QT_DOCDIR%%/qtdoc/images/small_dark.png
%%QT_DOCDIR%%/qtdoc/images/small_light.png %%QT_DOCDIR%%/qtdoc/images/small_light.png
@ -320,6 +332,8 @@
%%QT_DOCDIR%%/qtdoc/qt-gui-concepts.html %%QT_DOCDIR%%/qtdoc/qt-gui-concepts.html
%%QT_DOCDIR%%/qtdoc/qt-intro.html %%QT_DOCDIR%%/qtdoc/qt-intro.html
%%QT_DOCDIR%%/qtdoc/qt-online-installation.html %%QT_DOCDIR%%/qtdoc/qt-online-installation.html
%%QT_DOCDIR%%/qtdoc/qt-releases.html
%%QT_DOCDIR%%/qtdoc/qt-tools-for-android-studio.html
%%QT_DOCDIR%%/qtdoc/qt6-buildsystem.html %%QT_DOCDIR%%/qtdoc/qt6-buildsystem.html
%%QT_DOCDIR%%/qtdoc/qtconcurrent-mtexamples.html %%QT_DOCDIR%%/qtdoc/qtconcurrent-mtexamples.html
%%QT_DOCDIR%%/qtdoc/qtconcurrentexamples.html %%QT_DOCDIR%%/qtdoc/qtconcurrentexamples.html

6
misc/qt6-examples/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1712114556 TIMESTAMP = 1716400386
SHA256 (KDE/Qt/6.7.0/qt-everywhere-src-6.7.0.tar.xz) = bf5089912364f99cf9baf6c109de76a3172eec6267f148c69800575c47f90087 SHA256 (KDE/Qt/6.7.1/qt-everywhere-src-6.7.1.tar.xz) = 38dbf2768776e875ed5cdea8cccf1a240512a29769768084430914c4a33bedc4
SIZE (KDE/Qt/6.7.0/qt-everywhere-src-6.7.0.tar.xz) = 934507900 SIZE (KDE/Qt/6.7.1/qt-everywhere-src-6.7.1.tar.xz) = 935584748

82
misc/qt6-examples/pkg-plist
View file

@ -1002,6 +1002,7 @@
%%QT_EXAMPLEDIR%%/demos/calqlatr/ios/Assets.xcassets/AppIcon.appiconset/AppleIconCalqlatr.png %%QT_EXAMPLEDIR%%/demos/calqlatr/ios/Assets.xcassets/AppIcon.appiconset/AppleIconCalqlatr.png
%%QT_EXAMPLEDIR%%/demos/calqlatr/ios/Assets.xcassets/AppIcon.appiconset/Contents.json %%QT_EXAMPLEDIR%%/demos/calqlatr/ios/Assets.xcassets/AppIcon.appiconset/Contents.json
%%QT_EXAMPLEDIR%%/demos/calqlatr/main.cpp %%QT_EXAMPLEDIR%%/demos/calqlatr/main.cpp
%%QT_EXAMPLEDIR%%/demos/calqlatr/qmldir
%%QT_EXAMPLEDIR%%/demos/car-configurator/CMakeLists.txt %%QT_EXAMPLEDIR%%/demos/car-configurator/CMakeLists.txt
%%QT_EXAMPLEDIR%%/demos/car-configurator/CarRendering.qmlproject %%QT_EXAMPLEDIR%%/demos/car-configurator/CarRendering.qmlproject
%%QT_EXAMPLEDIR%%/demos/car-configurator/CarRendering.qmlproject.qtds %%QT_EXAMPLEDIR%%/demos/car-configurator/CarRendering.qmlproject.qtds
@ -1705,6 +1706,7 @@
%%QT_EXAMPLEDIR%%/demos/mediaplayer/doc/images/theme_info.png %%QT_EXAMPLEDIR%%/demos/mediaplayer/doc/images/theme_info.png
%%QT_EXAMPLEDIR%%/demos/mediaplayer/doc/src/mediaplayer.qdoc %%QT_EXAMPLEDIR%%/demos/mediaplayer/doc/src/mediaplayer.qdoc
%%QT_EXAMPLEDIR%%/demos/mediaplayer/doc/src/mediaplayer.rst %%QT_EXAMPLEDIR%%/demos/mediaplayer/doc/src/mediaplayer.rst
%%QT_EXAMPLEDIR%%/demos/mediaplayer/filenameprovider.h
%%QT_EXAMPLEDIR%%/demos/mediaplayer/main.cpp %%QT_EXAMPLEDIR%%/demos/mediaplayer/main.cpp
%%QT_EXAMPLEDIR%%/demos/mediaplayer/mediaplayer.py %%QT_EXAMPLEDIR%%/demos/mediaplayer/mediaplayer.py
%%QT_EXAMPLEDIR%%/demos/mediaplayer/mediaplayer.pyproject %%QT_EXAMPLEDIR%%/demos/mediaplayer/mediaplayer.pyproject
@ -3051,7 +3053,6 @@
%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo.png %%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo.png
%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo.pro %%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo.pro
%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo.svg %%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo.svg
%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/Button.qml
%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/CMakeLists.txt %%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/CMakeLists.txt
%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/CameraBasic.qml %%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/CameraBasic.qml
%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/CameraDrag.qml %%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/CameraDrag.qml
@ -3099,6 +3100,9 @@
%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/images/leaves.jpg %%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/images/leaves.jpg
%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/images/up.png %%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/images/up.png
%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/qmldir %%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/qmldir
%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/qmlvideo_global.h
%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/videosingleton.cpp
%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/qmlvideo/videosingleton.h
%%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/trace.h %%QT_EXAMPLEDIR%%/multimedia/video/qmlvideo/trace.h
%%QT_EXAMPLEDIR%%/multimedia/video/recorder/AudioInputSelect.qml %%QT_EXAMPLEDIR%%/multimedia/video/recorder/AudioInputSelect.qml
%%QT_EXAMPLEDIR%%/multimedia/video/recorder/CMakeLists.txt %%QT_EXAMPLEDIR%%/multimedia/video/recorder/CMakeLists.txt
@ -3651,6 +3655,48 @@
%%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/zoomselector.cpp %%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/zoomselector.cpp
%%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/zoomselector.h %%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/zoomselector.h
%%QT_EXAMPLEDIR%%/pdfwidgets/pdfwidgets.pro %%QT_EXAMPLEDIR%%/pdfwidgets/pdfwidgets.pro
%%QT_EXAMPLEDIR%%/platforms/CMakeLists.txt
%%QT_EXAMPLEDIR%%/platforms/android/CMakeLists.txt
%%QT_EXAMPLEDIR%%/platforms/android/doc/images/portrait_java.png
%%QT_EXAMPLEDIR%%/platforms/android/doc/src/qml_in_java_based_android_project.qdoc
%%QT_EXAMPLEDIR%%/platforms/android/qml_in_android_view/CMakeLists.txt
%%QT_EXAMPLEDIR%%/platforms/android/qml_in_android_view/main.cpp
%%QT_EXAMPLEDIR%%/platforms/android/qml_in_android_view/main.qml
%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/CMakeLists.txt
%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/build.gradle
%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/AndroidManifest.xml
%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/java/com/example/qml_in_java_based_android_project/Colors.java
%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/java/com/example/qml_in_java_based_android_project/MainActivity.java
%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/drawable/ic_launcher_background.xml
%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/drawable/ic_launcher_foreground.xml
%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/layout/activity_main.xml
%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-hdpi/ic_launcher.webp
%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp
%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-mdpi/ic_launcher.webp
%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp
%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp
%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp
%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp
%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/values/colors.xml
%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/values/strings.xml
%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/values/styles.xml
%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/values/themes.xml
%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/xml/backup_rules.xml
%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/app/src/main/res/xml/data_extraction_rules.xml
%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/build.gradle
%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/gradle.properties
%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/gradle/wrapper/gradle-wrapper.properties
%%QT_EXAMPLEDIR%%/platforms/android/qml_in_java_based_android_project/settings.gradle
%%QT_EXAMPLEDIR%%/positioning/CMakeLists.txt %%QT_EXAMPLEDIR%%/positioning/CMakeLists.txt
%%QT_EXAMPLEDIR%%/positioning/logfilepositionsource/CMakeLists.txt %%QT_EXAMPLEDIR%%/positioning/logfilepositionsource/CMakeLists.txt
%%QT_EXAMPLEDIR%%/positioning/logfilepositionsource/clientapplication.cpp %%QT_EXAMPLEDIR%%/positioning/logfilepositionsource/clientapplication.cpp
@ -3863,29 +3909,32 @@
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml-advanced/advanced7-Foreign-objects-integration/qmldir.in %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml-advanced/advanced7-Foreign-objects-integration/qmldir.in
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml-advanced/extending-qml-advanced.pro %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml-advanced/extending-qml-advanced.pro
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/CMakeLists.txt %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/CMakeLists.txt
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter1-basics/App.qml
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter1-basics/CMakeLists.txt %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter1-basics/CMakeLists.txt
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter1-basics/app.qml
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter1-basics/chapter1-basics.pro %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter1-basics/chapter1-basics.pro
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter1-basics/chapter1-basics.qrc %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter1-basics/chapter1-basics.qrc
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter1-basics/main.cpp %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter1-basics/main.cpp
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter1-basics/piechart.cpp %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter1-basics/piechart.cpp
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter1-basics/piechart.h %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter1-basics/piechart.h
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter1-basics/qmldir
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter2-methods/App.qml
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter2-methods/CMakeLists.txt %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter2-methods/CMakeLists.txt
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter2-methods/app.qml
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter2-methods/chapter2-methods.pro %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter2-methods/chapter2-methods.pro
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter2-methods/chapter2-methods.qrc %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter2-methods/chapter2-methods.qrc
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter2-methods/main.cpp %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter2-methods/main.cpp
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter2-methods/piechart.cpp %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter2-methods/piechart.cpp
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter2-methods/piechart.h %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter2-methods/piechart.h
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter2-methods/qmldir
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter3-bindings/App.qml
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter3-bindings/CMakeLists.txt %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter3-bindings/CMakeLists.txt
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter3-bindings/app.qml
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter3-bindings/chapter3-bindings.pro %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter3-bindings/chapter3-bindings.pro
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter3-bindings/chapter3-bindings.qrc %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter3-bindings/chapter3-bindings.qrc
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter3-bindings/main.cpp %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter3-bindings/main.cpp
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter3-bindings/piechart.cpp %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter3-bindings/piechart.cpp
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter3-bindings/piechart.h %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter3-bindings/piechart.h
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter3-bindings/qmldir
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter4-customPropertyTypes/App.qml
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter4-customPropertyTypes/CMakeLists.txt %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter4-customPropertyTypes/CMakeLists.txt
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter4-customPropertyTypes/app.qml
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter4-customPropertyTypes/chapter4-customPropertyTypes.qrc %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter4-customPropertyTypes/chapter4-customPropertyTypes.qrc
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter4-customPropertyTypes/main.cpp %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter4-customPropertyTypes/main.cpp
@ -3893,8 +3942,9 @@
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter4-customPropertyTypes/piechart.h %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter4-customPropertyTypes/piechart.h
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter4-customPropertyTypes/pieslice.cpp %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter4-customPropertyTypes/pieslice.cpp
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter4-customPropertyTypes/pieslice.h %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter4-customPropertyTypes/pieslice.h
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter4-customPropertyTypes/qmldir
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter5-listproperties/App.qml
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter5-listproperties/CMakeLists.txt %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter5-listproperties/CMakeLists.txt
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter5-listproperties/app.qml
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter5-listproperties/chapter5-listproperties.pro %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter5-listproperties/chapter5-listproperties.pro
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter5-listproperties/chapter5-listproperties.qrc %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter5-listproperties/chapter5-listproperties.qrc
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter5-listproperties/main.cpp %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter5-listproperties/main.cpp
@ -3902,6 +3952,8 @@
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter5-listproperties/piechart.h %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter5-listproperties/piechart.h
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter5-listproperties/pieslice.cpp %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter5-listproperties/pieslice.cpp
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter5-listproperties/pieslice.h %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter5-listproperties/pieslice.h
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter5-listproperties/qmldir
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/App.qml
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/CMakeLists.txt %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/CMakeLists.txt
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/Charts/CMakeLists.txt %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/Charts/CMakeLists.txt
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/Charts/Charts.pro %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/Charts/Charts.pro
@ -3912,10 +3964,10 @@
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/Charts/pieslice.h %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/Charts/pieslice.h
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/Charts/qmldir %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/Charts/qmldir
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/app.pro %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/app.pro
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/app.qml
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/app.qrc %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/app.qrc
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/chapter6-plugins.pro %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/chapter6-plugins.pro
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/main.cpp %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/main.cpp
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/qmldir
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/extending-qml.pro %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/extending-qml.pro
%%QT_EXAMPLEDIR%%/qml/tutorials/tutorials.pro %%QT_EXAMPLEDIR%%/qml/tutorials/tutorials.pro
%%QT_EXAMPLEDIR%%/qmlcompiler/tutorials/helloworld/chapter1/CMakeLists.txt %%QT_EXAMPLEDIR%%/qmlcompiler/tutorials/helloworld/chapter1/CMakeLists.txt
@ -4972,7 +5024,6 @@
%%QT_EXAMPLEDIR%%/quick/shared/Images.qml %%QT_EXAMPLEDIR%%/quick/shared/Images.qml
%%QT_EXAMPLEDIR%%/quick/shared/Label.qml %%QT_EXAMPLEDIR%%/quick/shared/Label.qml
%%QT_EXAMPLEDIR%%/quick/shared/LauncherList.qml %%QT_EXAMPLEDIR%%/quick/shared/LauncherList.qml
%%QT_EXAMPLEDIR%%/quick/shared/QtBundleQmlModuleForMacOS.cmake
%%QT_EXAMPLEDIR%%/quick/shared/README %%QT_EXAMPLEDIR%%/quick/shared/README
%%QT_EXAMPLEDIR%%/quick/shared/SimpleLauncherDelegate.qml %%QT_EXAMPLEDIR%%/quick/shared/SimpleLauncherDelegate.qml
%%QT_EXAMPLEDIR%%/quick/shared/Slider.qml %%QT_EXAMPLEDIR%%/quick/shared/Slider.qml
@ -7608,6 +7659,7 @@
%%QT_EXAMPLEDIR%%/websockets/sslechoclient/sslechoclient.h %%QT_EXAMPLEDIR%%/websockets/sslechoclient/sslechoclient.h
%%QT_EXAMPLEDIR%%/websockets/sslechoclient/sslechoclient.pro %%QT_EXAMPLEDIR%%/websockets/sslechoclient/sslechoclient.pro
%%QT_EXAMPLEDIR%%/websockets/sslechoserver/CMakeLists.txt %%QT_EXAMPLEDIR%%/websockets/sslechoserver/CMakeLists.txt
%%QT_EXAMPLEDIR%%/websockets/sslechoserver/generate.sh
%%QT_EXAMPLEDIR%%/websockets/sslechoserver/localhost.cert %%QT_EXAMPLEDIR%%/websockets/sslechoserver/localhost.cert
%%QT_EXAMPLEDIR%%/websockets/sslechoserver/localhost.key %%QT_EXAMPLEDIR%%/websockets/sslechoserver/localhost.key
%%QT_EXAMPLEDIR%%/websockets/sslechoserver/main.cpp %%QT_EXAMPLEDIR%%/websockets/sslechoserver/main.cpp
@ -7754,7 +7806,6 @@
%%QT_EXAMPLEDIR%%/widgets/doc/src/calendarwidget.qdoc %%QT_EXAMPLEDIR%%/widgets/doc/src/calendarwidget.qdoc
%%QT_EXAMPLEDIR%%/widgets/doc/src/chip.qdoc %%QT_EXAMPLEDIR%%/widgets/doc/src/chip.qdoc
%%QT_EXAMPLEDIR%%/widgets/doc/src/collidingmice-example.qdoc %%QT_EXAMPLEDIR%%/widgets/doc/src/collidingmice-example.qdoc
%%QT_EXAMPLEDIR%%/widgets/doc/src/coloreditorfactory.qdoc
%%QT_EXAMPLEDIR%%/widgets/doc/src/combowidgetmapper.qdoc %%QT_EXAMPLEDIR%%/widgets/doc/src/combowidgetmapper.qdoc
%%QT_EXAMPLEDIR%%/widgets/doc/src/completer.qdoc %%QT_EXAMPLEDIR%%/widgets/doc/src/completer.qdoc
%%QT_EXAMPLEDIR%%/widgets/doc/src/composition.qdoc %%QT_EXAMPLEDIR%%/widgets/doc/src/composition.qdoc
@ -7774,7 +7825,6 @@
%%QT_EXAMPLEDIR%%/widgets/doc/src/gallery.qdoc %%QT_EXAMPLEDIR%%/widgets/doc/src/gallery.qdoc
%%QT_EXAMPLEDIR%%/widgets/doc/src/gradients.qdoc %%QT_EXAMPLEDIR%%/widgets/doc/src/gradients.qdoc
%%QT_EXAMPLEDIR%%/widgets/doc/src/graphicsview-simpleanchorlayout.qdoc %%QT_EXAMPLEDIR%%/widgets/doc/src/graphicsview-simpleanchorlayout.qdoc
%%QT_EXAMPLEDIR%%/widgets/doc/src/groupbox.qdoc
%%QT_EXAMPLEDIR%%/widgets/doc/src/imagecomposition.qdoc %%QT_EXAMPLEDIR%%/widgets/doc/src/imagecomposition.qdoc
%%QT_EXAMPLEDIR%%/widgets/doc/src/licensewizard.qdoc %%QT_EXAMPLEDIR%%/widgets/doc/src/licensewizard.qdoc
%%QT_EXAMPLEDIR%%/widgets/doc/src/lineedits.qdoc %%QT_EXAMPLEDIR%%/widgets/doc/src/lineedits.qdoc
@ -7948,13 +7998,6 @@
%%QT_EXAMPLEDIR%%/widgets/itemviews/basicsortfiltermodel/main.cpp %%QT_EXAMPLEDIR%%/widgets/itemviews/basicsortfiltermodel/main.cpp
%%QT_EXAMPLEDIR%%/widgets/itemviews/basicsortfiltermodel/window.cpp %%QT_EXAMPLEDIR%%/widgets/itemviews/basicsortfiltermodel/window.cpp
%%QT_EXAMPLEDIR%%/widgets/itemviews/basicsortfiltermodel/window.h %%QT_EXAMPLEDIR%%/widgets/itemviews/basicsortfiltermodel/window.h
%%QT_EXAMPLEDIR%%/widgets/itemviews/coloreditorfactory/CMakeLists.txt
%%QT_EXAMPLEDIR%%/widgets/itemviews/coloreditorfactory/coloreditorfactory.pro
%%QT_EXAMPLEDIR%%/widgets/itemviews/coloreditorfactory/colorlisteditor.cpp
%%QT_EXAMPLEDIR%%/widgets/itemviews/coloreditorfactory/colorlisteditor.h
%%QT_EXAMPLEDIR%%/widgets/itemviews/coloreditorfactory/main.cpp
%%QT_EXAMPLEDIR%%/widgets/itemviews/coloreditorfactory/window.cpp
%%QT_EXAMPLEDIR%%/widgets/itemviews/coloreditorfactory/window.h
%%QT_EXAMPLEDIR%%/widgets/itemviews/combowidgetmapper/CMakeLists.txt %%QT_EXAMPLEDIR%%/widgets/itemviews/combowidgetmapper/CMakeLists.txt
%%QT_EXAMPLEDIR%%/widgets/itemviews/combowidgetmapper/combowidgetmapper.pro %%QT_EXAMPLEDIR%%/widgets/itemviews/combowidgetmapper/combowidgetmapper.pro
%%QT_EXAMPLEDIR%%/widgets/itemviews/combowidgetmapper/main.cpp %%QT_EXAMPLEDIR%%/widgets/itemviews/combowidgetmapper/main.cpp
@ -8389,11 +8432,6 @@
%%QT_EXAMPLEDIR%%/widgets/widgets/calendarwidget/main.cpp %%QT_EXAMPLEDIR%%/widgets/widgets/calendarwidget/main.cpp
%%QT_EXAMPLEDIR%%/widgets/widgets/calendarwidget/window.cpp %%QT_EXAMPLEDIR%%/widgets/widgets/calendarwidget/window.cpp
%%QT_EXAMPLEDIR%%/widgets/widgets/calendarwidget/window.h %%QT_EXAMPLEDIR%%/widgets/widgets/calendarwidget/window.h
%%QT_EXAMPLEDIR%%/widgets/widgets/groupbox/CMakeLists.txt
%%QT_EXAMPLEDIR%%/widgets/widgets/groupbox/groupbox.pro
%%QT_EXAMPLEDIR%%/widgets/widgets/groupbox/main.cpp
%%QT_EXAMPLEDIR%%/widgets/widgets/groupbox/window.cpp
%%QT_EXAMPLEDIR%%/widgets/widgets/groupbox/window.h
%%QT_EXAMPLEDIR%%/widgets/widgets/lineedits/CMakeLists.txt %%QT_EXAMPLEDIR%%/widgets/widgets/lineedits/CMakeLists.txt
%%QT_EXAMPLEDIR%%/widgets/widgets/lineedits/lineedits.pro %%QT_EXAMPLEDIR%%/widgets/widgets/lineedits/lineedits.pro
%%QT_EXAMPLEDIR%%/widgets/widgets/lineedits/main.cpp %%QT_EXAMPLEDIR%%/widgets/widgets/lineedits/main.cpp

29
multimedia/qt6-multimedia/Makefile
View file

@ -3,9 +3,6 @@ DISTVERSION= ${QT6_VERSION}
CATEGORIES= multimedia CATEGORIES= multimedia
PKGNAMEPREFIX= qt6- PKGNAMEPREFIX= qt6-
PATCH_SITES= https://github.com/qt/qtmultimedia/commit/
PATCHFILES+= 7fcea568c9c64f3bcebda21f0df02aa0107dfd0c.patch:-p1
MAINTAINER= kde@FreeBSD.org MAINTAINER= kde@FreeBSD.org
COMMENT= Qt audio, video, radio and camera support module COMMENT= Qt audio, video, radio and camera support module
@ -14,19 +11,18 @@ LIB_DEPENDS= libxkbcommon.so:x11/libxkbcommon
USES= cmake compiler:c++17-lang gl localbase:ldflags pkgconfig qt-dist:6 USES= cmake compiler:c++17-lang gl localbase:ldflags pkgconfig qt-dist:6
USE_GL= opengl USE_GL= opengl
USE_QT= base declarative USE_QT= base declarative shadertools:build
CXXFLAGS_powerpc64= -mvsx
CFLAGS_powerpc= -DPFFFT_SIMD_DISABLE CFLAGS_powerpc= -DPFFFT_SIMD_DISABLE
CXXFLAGS_powerpc64= -mvsx
OPTIONS_DEFINE= FFMPEG GSTREAMER Q3D V4L VAAPI X11 OPTIONS_DEFINE= FFMPEG GSTREAMER Q3D V4L VAAPI X11
OPTIONS_DEFAULT= FFMPEG GSTREAMER PULSEAUDIO Q3D V4L VAAPI X11 OPTIONS_DEFAULT= FFMPEG GSTREAMER PULSEAUDIO Q3D V4L VAAPI X11
AUDIO_DESC= Low-level audio backend
OPTIONS_SINGLE= AUDIO OPTIONS_SINGLE= AUDIO
OPTIONS_SINGLE_AUDIO= ALSA PULSEAUDIO OPTIONS_SINGLE_AUDIO= ALSA PULSEAUDIO
OPTIONS_SUB= yes OPTIONS_SUB= yes
AUDIO_DESC= Low level Audio Backend
ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
ALSA_CMAKE_BOOL= FEATURE_alsa ALSA_CMAKE_BOOL= FEATURE_alsa
@ -35,12 +31,16 @@ FFMPEG_CMAKE_BOOL= FEATURE_ffmpeg
GSTREAMER_USES= gnome gstreamer:1 GSTREAMER_USES= gnome gstreamer:1
GSTREAMER_USE= GL=egl GNOME=glib20 GSTREAMER=bad,gl,good,ugly GSTREAMER_USE= GL=egl GNOME=glib20 GSTREAMER=bad,gl,good,ugly
GSTREAMER_CMAKE_BOOL= FEATURE_gstreamer GSTREAMER_CMAKE_BOOL= FEATURE_gstreamer \
FEATURE_gstreamer_1_0 \
FEATURE_gstreamer_app \
FEATURE_gstreamer_gl \
FEATURE_gstreamer_photography
PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio
PULSEAUDIO_CMAKE_BOOL= FEATURE_pulseaudio PULSEAUDIO_CMAKE_BOOL= FEATURE_pulseaudio
Q3D_DESC= Spatial Audio via Quick3D Q3D_DESC= Spatial audio support via QtQuick3D
Q3D_USE= QT=quick3d,shadertools Q3D_USE= QT=quick3d,shadertools
Q3D_CMAKE_BOOL= FEATURE_spatialaudio_quick3d Q3D_CMAKE_BOOL= FEATURE_spatialaudio_quick3d
@ -53,16 +53,11 @@ VAAPI_USE= GL=egl
VAAPI_CMAKE_BOOL= FEATURE_vaapi VAAPI_CMAKE_BOOL= FEATURE_vaapi
VAAPI_IMPLIES= FFMPEG VAAPI_IMPLIES= FFMPEG
# We assume that the Qt stack has been built with consistent X11 options.
# QT_FEATURE_xlib is defined globally by devel/qt6-base based upon whether
# the X11 option was enabled in that port.
X11_USES= xorg X11_USES= xorg
X11_USE= XORG=x11,xext,xrandr X11_USE= XORG=x11,xext,xrandr
X11_CMAKE_BOOL= FEATURE_xlib
X11_IMPLIES= FFMPEG X11_IMPLIES= FFMPEG
.include <bsd.port.options.mk>
post-install:
.if !(${PORT_OPTIONS:MFFMPEG} || ${PORT_OPTIONS:MGSTREAMER})
@${REINPLACE_CMD} '/MultimediaPlugins\.cmake/d' ${TMPPLIST}
.endif
.include <bsd.port.mk> .include <bsd.port.mk>

8
multimedia/qt6-multimedia/distinfo
View file

@ -1,5 +1,3 @@
TIMESTAMP = 1712784204 TIMESTAMP = 1716422731
SHA256 (KDE/Qt/6.7.0/qtmultimedia-everywhere-src-6.7.0.tar.xz) = f394bae49e3d4ee6a3b0c9e1e5e31bb870cc04a4b44f4cda3615baf7bd078c70 SHA256 (KDE/Qt/6.7.1/qtmultimedia-everywhere-src-6.7.1.tar.xz) = 656d1543727f5bf1bd39fe2548ac454860109dc8555df77d7940f21e3d65cd3e
SIZE (KDE/Qt/6.7.0/qtmultimedia-everywhere-src-6.7.0.tar.xz) = 8315312 SIZE (KDE/Qt/6.7.1/qtmultimedia-everywhere-src-6.7.1.tar.xz) = 8362120
SHA256 (KDE/Qt/6.7.0/7fcea568c9c64f3bcebda21f0df02aa0107dfd0c.patch) = ccaf3db6425e43ae19354ae797dbff66176e63a7c31238bbeb90dd10cf940e03
SIZE (KDE/Qt/6.7.0/7fcea568c9c64f3bcebda21f0df02aa0107dfd0c.patch) = 8797

11
multimedia/qt6-multimedia/files/patch-src_multimedia_configure.cmake
View file

@ -1,4 +1,4 @@
--- src/multimedia/configure.cmake.orig 2024-03-19 05:09:26 UTC --- src/multimedia/configure.cmake.orig 2024-05-09 03:10:16 UTC
+++ src/multimedia/configure.cmake +++ src/multimedia/configure.cmake
@@ -76,7 +76,7 @@ qt_feature("ffmpeg" PRIVATE @@ -76,7 +76,7 @@ qt_feature("ffmpeg" PRIVATE
LABEL "FFmpeg" LABEL "FFmpeg"
@ -9,12 +9,3 @@
) )
qt_feature("alsa" PUBLIC PRIVATE qt_feature("alsa" PUBLIC PRIVATE
LABEL "ALSA (experimental)" LABEL "ALSA (experimental)"
@@ -101,7 +101,7 @@ qt_feature("gstreamer_1_0" PRIVATE
)
qt_feature("gstreamer_1_0" PRIVATE
LABEL "GStreamer 1.0"
- CONDITION ( LINUX AND GStreamer_FOUND )
+ CONDITION GStreamer_FOUND
ENABLE INPUT_gstreamer STREQUAL 'yes'
DISABLE INPUT_gstreamer STREQUAL 'no'
)

2
multimedia/qt6-multimedia/pkg-help Normal file
View file

@ -0,0 +1,2 @@
The X11 option should only be enabled if the FFMPEG option is also
enabled and devel/qt6-base has been built with the X11 option enabled.

49
multimedia/qt6-multimedia/pkg-plist
View file

@ -3,6 +3,7 @@
%%ALSA%%%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qalsaaudiosink_p.h %%ALSA%%%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qalsaaudiosink_p.h
%%ALSA%%%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qalsaaudiosource_p.h %%ALSA%%%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qalsaaudiosource_p.h
%%ALSA%%%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qalsamediadevices_p.h %%ALSA%%%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qalsamediadevices_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudiodecoder_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudiodevice_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudiodevice_p.h
%%PULSEAUDIO%%%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudioengine_pulse_p.h %%PULSEAUDIO%%%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudioengine_pulse_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudiohelpers_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudiohelpers_p.h
@ -14,6 +15,7 @@
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qcapturablewindow_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qcapturablewindow_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qerrorinfo_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qerrorinfo_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qimagevideobuffer_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qimagevideobuffer_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmaybe_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmediaplayer_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmediaplayer_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmediarecorder_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmediarecorder_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmediastoragelocation_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmediastoragelocation_p.h
@ -144,6 +146,40 @@
%%QT_INCDIR%%/QtMultimediaWidgets/qtmultimediawidgetsglobal.h %%QT_INCDIR%%/QtMultimediaWidgets/qtmultimediawidgetsglobal.h
%%QT_INCDIR%%/QtMultimediaWidgets/qtmultimediawidgetsversion.h %%QT_INCDIR%%/QtMultimediaWidgets/qtmultimediawidgetsversion.h
%%QT_INCDIR%%/QtMultimediaWidgets/qvideowidget.h %%QT_INCDIR%%/QtMultimediaWidgets/qvideowidget.h
%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/%%FULLVER%%/QtQGstreamerMediaPlugin/private/qglist_helper_p.h
%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/%%FULLVER%%/QtQGstreamerMediaPlugin/private/qgst_debug_p.h
%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/%%FULLVER%%/QtQGstreamerMediaPlugin/private/qgst_handle_types_p.h
%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/%%FULLVER%%/QtQGstreamerMediaPlugin/private/qgst_p.h
%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/%%FULLVER%%/QtQGstreamerMediaPlugin/private/qgstappsource_p.h
%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/%%FULLVER%%/QtQGstreamerMediaPlugin/private/qgstpipeline_p.h
%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/%%FULLVER%%/QtQGstreamerMediaPlugin/private/qgstreameraudiodecoder_p.h
%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/%%FULLVER%%/QtQGstreamerMediaPlugin/private/qgstreameraudiodevice_p.h
%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/%%FULLVER%%/QtQGstreamerMediaPlugin/private/qgstreameraudioinput_p.h
%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/%%FULLVER%%/QtQGstreamerMediaPlugin/private/qgstreameraudiooutput_p.h
%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/%%FULLVER%%/QtQGstreamerMediaPlugin/private/qgstreameraudiosink_p.h
%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/%%FULLVER%%/QtQGstreamerMediaPlugin/private/qgstreameraudiosource_p.h
%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/%%FULLVER%%/QtQGstreamerMediaPlugin/private/qgstreamerbufferprobe_p.h
%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/%%FULLVER%%/QtQGstreamerMediaPlugin/private/qgstreamercamera_p.h
%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/%%FULLVER%%/QtQGstreamerMediaPlugin/private/qgstreamerformatinfo_p.h
%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/%%FULLVER%%/QtQGstreamerMediaPlugin/private/qgstreamerimagecapture_p.h
%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/%%FULLVER%%/QtQGstreamerMediaPlugin/private/qgstreamerintegration_p.h
%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/%%FULLVER%%/QtQGstreamerMediaPlugin/private/qgstreamermediacapture_p.h
%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/%%FULLVER%%/QtQGstreamerMediaPlugin/private/qgstreamermediaencoder_p.h
%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/%%FULLVER%%/QtQGstreamerMediaPlugin/private/qgstreamermediaplayer_p.h
%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/%%FULLVER%%/QtQGstreamerMediaPlugin/private/qgstreamermessage_p.h
%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/%%FULLVER%%/QtQGstreamerMediaPlugin/private/qgstreamermetadata_p.h
%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/%%FULLVER%%/QtQGstreamerMediaPlugin/private/qgstreamervideodevices_p.h
%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/%%FULLVER%%/QtQGstreamerMediaPlugin/private/qgstreamervideooutput_p.h
%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/%%FULLVER%%/QtQGstreamerMediaPlugin/private/qgstreamervideooverlay_p.h
%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/%%FULLVER%%/QtQGstreamerMediaPlugin/private/qgstreamervideosink_p.h
%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/%%FULLVER%%/QtQGstreamerMediaPlugin/private/qgstsubtitlesink_p.h
%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/%%FULLVER%%/QtQGstreamerMediaPlugin/private/qgstutils_p.h
%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/%%FULLVER%%/QtQGstreamerMediaPlugin/private/qgstvideobuffer_p.h
%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/%%FULLVER%%/QtQGstreamerMediaPlugin/private/qgstvideorenderersink_p.h
%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/QtQGstreamerMediaPlugin
%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/QtQGstreamerMediaPluginDepends
%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/QtQGstreamerMediaPluginVersion
%%GSTREAMER%%%%QT_INCDIR%%/QtQGstreamerMediaPlugin/qtqgstreamermediapluginversion.h
%%Q3D%%%%QT_INCDIR%%/QtQuick3DSpatialAudio/%%FULLVER%%/QtQuick3DSpatialAudio/private/qquick3dambientsound_p.h %%Q3D%%%%QT_INCDIR%%/QtQuick3DSpatialAudio/%%FULLVER%%/QtQuick3DSpatialAudio/private/qquick3dambientsound_p.h
%%Q3D%%%%QT_INCDIR%%/QtQuick3DSpatialAudio/%%FULLVER%%/QtQuick3DSpatialAudio/private/qquick3daudioengine_p.h %%Q3D%%%%QT_INCDIR%%/QtQuick3DSpatialAudio/%%FULLVER%%/QtQuick3DSpatialAudio/private/qquick3daudioengine_p.h
%%Q3D%%%%QT_INCDIR%%/QtQuick3DSpatialAudio/%%FULLVER%%/QtQuick3DSpatialAudio/private/qquick3daudiolistener_p.h %%Q3D%%%%QT_INCDIR%%/QtQuick3DSpatialAudio/%%FULLVER%%/QtQuick3DSpatialAudio/private/qquick3daudiolistener_p.h
@ -232,6 +268,14 @@ lib/cmake/Qt6MultimediaWidgets/Qt6MultimediaWidgetsDependencies.cmake
lib/cmake/Qt6MultimediaWidgets/Qt6MultimediaWidgetsTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6MultimediaWidgets/Qt6MultimediaWidgetsTargets-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/Qt6MultimediaWidgets/Qt6MultimediaWidgetsTargets.cmake lib/cmake/Qt6MultimediaWidgets/Qt6MultimediaWidgetsTargets.cmake
lib/cmake/Qt6MultimediaWidgets/Qt6MultimediaWidgetsVersionlessTargets.cmake lib/cmake/Qt6MultimediaWidgets/Qt6MultimediaWidgetsVersionlessTargets.cmake
%%GSTREAMER%%lib/cmake/Qt6QGstreamerMediaPluginPrivate/Qt6QGstreamerMediaPluginPrivateAdditionalTargetInfo.cmake
%%GSTREAMER%%lib/cmake/Qt6QGstreamerMediaPluginPrivate/Qt6QGstreamerMediaPluginPrivateConfig.cmake
%%GSTREAMER%%lib/cmake/Qt6QGstreamerMediaPluginPrivate/Qt6QGstreamerMediaPluginPrivateConfigVersion.cmake
%%GSTREAMER%%lib/cmake/Qt6QGstreamerMediaPluginPrivate/Qt6QGstreamerMediaPluginPrivateConfigVersionImpl.cmake
%%GSTREAMER%%lib/cmake/Qt6QGstreamerMediaPluginPrivate/Qt6QGstreamerMediaPluginPrivateDependencies.cmake
%%GSTREAMER%%lib/cmake/Qt6QGstreamerMediaPluginPrivate/Qt6QGstreamerMediaPluginPrivateTargets-%%CMAKE_BUILD_TYPE%%.cmake
%%GSTREAMER%%lib/cmake/Qt6QGstreamerMediaPluginPrivate/Qt6QGstreamerMediaPluginPrivateTargets.cmake
%%GSTREAMER%%lib/cmake/Qt6QGstreamerMediaPluginPrivate/Qt6QGstreamerMediaPluginPrivateVersionlessTargets.cmake
%%Q3D%%lib/cmake/Qt6Qml/QmlPlugins/Qt6quick3dspatialaudioAdditionalTargetInfo.cmake %%Q3D%%lib/cmake/Qt6Qml/QmlPlugins/Qt6quick3dspatialaudioAdditionalTargetInfo.cmake
%%Q3D%%lib/cmake/Qt6Qml/QmlPlugins/Qt6quick3dspatialaudioConfig.cmake %%Q3D%%lib/cmake/Qt6Qml/QmlPlugins/Qt6quick3dspatialaudioConfig.cmake
%%Q3D%%lib/cmake/Qt6Qml/QmlPlugins/Qt6quick3dspatialaudioConfigVersion.cmake %%Q3D%%lib/cmake/Qt6Qml/QmlPlugins/Qt6quick3dspatialaudioConfigVersion.cmake
@ -273,6 +317,8 @@ lib/cmake/Qt6SpatialAudio/Qt6SpatialAudioVersionlessTargets.cmake
%%QT_LIBDIR%%/libQt6MultimediaWidgets.so %%QT_LIBDIR%%/libQt6MultimediaWidgets.so
%%QT_LIBDIR%%/libQt6MultimediaWidgets.so.6 %%QT_LIBDIR%%/libQt6MultimediaWidgets.so.6
%%QT_LIBDIR%%/libQt6MultimediaWidgets.so.%%FULLVER%% %%QT_LIBDIR%%/libQt6MultimediaWidgets.so.%%FULLVER%%
%%GSTREAMER%%%%QT_LIBDIR%%/libQt6QGstreamerMediaPlugin.a
%%GSTREAMER%%%%QT_LIBDIR%%/libQt6QGstreamerMediaPlugin.prl
%%Q3D%%%%QT_LIBDIR%%/libQt6Quick3DSpatialAudio.prl %%Q3D%%%%QT_LIBDIR%%/libQt6Quick3DSpatialAudio.prl
%%Q3D%%%%QT_LIBDIR%%/libQt6Quick3DSpatialAudio.so %%Q3D%%%%QT_LIBDIR%%/libQt6Quick3DSpatialAudio.so
%%Q3D%%%%QT_LIBDIR%%/libQt6Quick3DSpatialAudio.so.6 %%Q3D%%%%QT_LIBDIR%%/libQt6Quick3DSpatialAudio.so.6
@ -284,6 +330,7 @@ lib/cmake/Qt6SpatialAudio/Qt6SpatialAudioVersionlessTargets.cmake
%%QT_LIBDIR%%/metatypes/qt6multimedia_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6multimedia_%%CMAKE_BUILD_TYPE%%_metatypes.json
%%QT_LIBDIR%%/metatypes/qt6multimediaquickprivate_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6multimediaquickprivate_%%CMAKE_BUILD_TYPE%%_metatypes.json
%%QT_LIBDIR%%/metatypes/qt6multimediawidgets_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6multimediawidgets_%%CMAKE_BUILD_TYPE%%_metatypes.json
%%GSTREAMER%%%%QT_LIBDIR%%/metatypes/qt6qgstreamermediapluginprivate_%%CMAKE_BUILD_TYPE%%_metatypes.json
%%Q3D%%%%QT_LIBDIR%%/metatypes/qt6quick3dspatialaudioprivate_%%CMAKE_BUILD_TYPE%%_metatypes.json %%Q3D%%%%QT_LIBDIR%%/metatypes/qt6quick3dspatialaudioprivate_%%CMAKE_BUILD_TYPE%%_metatypes.json
%%QT_LIBDIR%%/metatypes/qt6spatialaudio_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6spatialaudio_%%CMAKE_BUILD_TYPE%%_metatypes.json
%%QT_MKSPECDIR%%/modules/qt_lib_multimedia.pri %%QT_MKSPECDIR%%/modules/qt_lib_multimedia.pri
@ -291,6 +338,7 @@ lib/cmake/Qt6SpatialAudio/Qt6SpatialAudioVersionlessTargets.cmake
%%QT_MKSPECDIR%%/modules/qt_lib_multimediaquick_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_multimediaquick_private.pri
%%QT_MKSPECDIR%%/modules/qt_lib_multimediawidgets.pri %%QT_MKSPECDIR%%/modules/qt_lib_multimediawidgets.pri
%%QT_MKSPECDIR%%/modules/qt_lib_multimediawidgets_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_multimediawidgets_private.pri
%%GSTREAMER%%%%QT_MKSPECDIR%%/modules/qt_lib_qgstreamermediaplugin_private.pri
%%Q3D%%%%QT_MKSPECDIR%%/modules/qt_lib_quick3dspatialaudio_private.pri %%Q3D%%%%QT_MKSPECDIR%%/modules/qt_lib_quick3dspatialaudio_private.pri
%%QT_MKSPECDIR%%/modules/qt_lib_spatialaudio.pri %%QT_MKSPECDIR%%/modules/qt_lib_spatialaudio.pri
%%QT_MKSPECDIR%%/modules/qt_lib_spatialaudio_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_spatialaudio_private.pri
@ -309,5 +357,6 @@ libdata/pkgconfig/Qt6SpatialAudio.pc
%%QT_DATADIR%%/modules/Multimedia.json %%QT_DATADIR%%/modules/Multimedia.json
%%QT_DATADIR%%/modules/MultimediaQuickPrivate.json %%QT_DATADIR%%/modules/MultimediaQuickPrivate.json
%%QT_DATADIR%%/modules/MultimediaWidgets.json %%QT_DATADIR%%/modules/MultimediaWidgets.json
%%GSTREAMER%%%%QT_DATADIR%%/modules/QGstreamerMediaPluginPrivate.json
%%Q3D%%%%QT_DATADIR%%/modules/Quick3DSpatialAudioPrivate.json %%Q3D%%%%QT_DATADIR%%/modules/Quick3DSpatialAudioPrivate.json
%%QT_DATADIR%%/modules/SpatialAudio.json %%QT_DATADIR%%/modules/SpatialAudio.json

6
net/qt6-coap/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1712114578 TIMESTAMP = 1716400397
SHA256 (KDE/Qt/6.7.0/qt-qtcoap-v6.7.0_GH0.tar.gz) = fb3c8b7b49a642139840130a603c05f9d8413e963d644b0c897de863baad118e SHA256 (KDE/Qt/6.7.1/qt-qtcoap-v6.7.1_GH0.tar.gz) = d624777e8204996084c010dba7346df84e6b66e3d0e1156ce686da0bbec73d26
SIZE (KDE/Qt/6.7.0/qt-qtcoap-v6.7.0_GH0.tar.gz) = 183108 SIZE (KDE/Qt/6.7.1/qt-qtcoap-v6.7.1_GH0.tar.gz) = 183915

6
net/qt6-networkauth/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1712114580 TIMESTAMP = 1716400399
SHA256 (KDE/Qt/6.7.0/qtnetworkauth-everywhere-src-6.7.0.tar.xz) = 993105616ff0223d3d826e2a497440035721c6e1acdae232935fae3bcfa74a45 SHA256 (KDE/Qt/6.7.1/qtnetworkauth-everywhere-src-6.7.1.tar.xz) = 012b3a05c34f2cdd197bd209696493c9e8085daeaa36589fd791d449d841575d
SIZE (KDE/Qt/6.7.0/qtnetworkauth-everywhere-src-6.7.0.tar.xz) = 143660 SIZE (KDE/Qt/6.7.1/qtnetworkauth-everywhere-src-6.7.1.tar.xz) = 144184

6
science/qt6-quick3dphysics/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1712114589 TIMESTAMP = 1716400405
SHA256 (KDE/Qt/6.7.0/qtquick3dphysics-everywhere-src-6.7.0.tar.xz) = 80045f261109f3f3807c0b405d056e935210a36499c3a9aff78296d8940e04e6 SHA256 (KDE/Qt/6.7.1/qtquick3dphysics-everywhere-src-6.7.1.tar.xz) = 2f0f51429883b08e5f5a6bd571185725af3fd47741665eadd47a121748cfbd75
SIZE (KDE/Qt/6.7.0/qtquick3dphysics-everywhere-src-6.7.0.tar.xz) = 4702492 SIZE (KDE/Qt/6.7.1/qtquick3dphysics-everywhere-src-6.7.1.tar.xz) = 4703476

6
www/qt6-httpserver/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1712114591 TIMESTAMP = 1716400407
SHA256 (KDE/Qt/6.7.0/qthttpserver-everywhere-src-6.7.0.tar.xz) = c2e2e38b2b21537eeef20d097bb5f216081462c44b78d63045e60d6fd9f89bfa SHA256 (KDE/Qt/6.7.1/qthttpserver-everywhere-src-6.7.1.tar.xz) = ed20831ea20524c8d5e74a70dab7b59ae0ee3ccdc266ee5b7ffbf8147df4bbdb
SIZE (KDE/Qt/6.7.0/qthttpserver-everywhere-src-6.7.0.tar.xz) = 163044 SIZE (KDE/Qt/6.7.1/qthttpserver-everywhere-src-6.7.1.tar.xz) = 163700

6
www/qt6-webchannel/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1712114594 TIMESTAMP = 1716400409
SHA256 (KDE/Qt/6.7.0/qtwebchannel-everywhere-src-6.7.0.tar.xz) = 26bfbd404e0c82bfbeeaef81796eb7a7cf931c5c1a5e942a315ca7126322efff SHA256 (KDE/Qt/6.7.1/qtwebchannel-everywhere-src-6.7.1.tar.xz) = b9d995edfce90bce04635305936e49a8ae61196d74bcce0f09d26b285d2dcc6f
SIZE (KDE/Qt/6.7.0/qtwebchannel-everywhere-src-6.7.0.tar.xz) = 206600 SIZE (KDE/Qt/6.7.1/qtwebchannel-everywhere-src-6.7.1.tar.xz) = 206564

6
www/qt6-webengine/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1712115499 TIMESTAMP = 1716400783
SHA256 (KDE/Qt/6.7.0/qtwebengine-everywhere-src-6.7.0.tar.xz) = 1a5ba443635dc1f439ab802ac6d761b8def5ebb24e5219bb7289288e72c147de SHA256 (KDE/Qt/6.7.1/qtwebengine-everywhere-src-6.7.1.tar.xz) = 53f08012609a7d949b0e951728ac2364a06466325ffd163b56a87c3fd021dc44
SIZE (KDE/Qt/6.7.0/qtwebengine-everywhere-src-6.7.0.tar.xz) = 550907592 SIZE (KDE/Qt/6.7.1/qtwebengine-everywhere-src-6.7.1.tar.xz) = 550975920

6091
www/qt6-webengine/files/patch-security-rollup
View file

File diff suppressed because it is too large Load diff

10
www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_sndio_sndio__input.cc
View file

@ -13,7 +13,7 @@
+ +
+namespace media { +namespace media {
+ +
+static const SampleFormat kSampleFormat = kSampleFormatS16; +static const SampleFormat kSampleFormatAI = kSampleFormatS16;
+ +
+void SndioAudioInputStream::OnMoveCallback(void *arg, int delta) +void SndioAudioInputStream::OnMoveCallback(void *arg, int delta)
+{ +{
@ -59,7 +59,7 @@
+ sio_initpar(&par); + sio_initpar(&par);
+ par.rate = params.sample_rate(); + par.rate = params.sample_rate();
+ par.rchan = params.channels(); + par.rchan = params.channels();
+ par.bits = SampleFormatToBitsPerChannel(kSampleFormat); + par.bits = SampleFormatToBitsPerChannel(kSampleFormatAI);
+ par.bps = par.bits / 8; + par.bps = par.bits / 8;
+ par.sig = sig = par.bits != 8 ? 1 : 0; + par.sig = sig = par.bits != 8 ? 1 : 0;
+ par.le = SIO_LE_NATIVE; + par.le = SIO_LE_NATIVE;
@ -79,7 +79,7 @@
+ +
+ if (par.rate != (unsigned int)params.sample_rate() || + if (par.rate != (unsigned int)params.sample_rate() ||
+ par.rchan != (unsigned int)params.channels() || + par.rchan != (unsigned int)params.channels() ||
+ par.bits != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) || + par.bits != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormatAI) ||
+ par.sig != (unsigned int)sig || + par.sig != (unsigned int)sig ||
+ (par.bps > 1 && par.le != SIO_LE_NATIVE) || + (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
+ (par.bits != par.bps * 8)) { + (par.bits != par.bps * 8)) {
@ -87,7 +87,7 @@
+ goto bad_close; + goto bad_close;
+ } + }
+ state = kStopped; + state = kStopped;
+ buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)]; + buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormatAI)];
+ sio_onmove(hdl, &OnMoveCallback, this); + sio_onmove(hdl, &OnMoveCallback, this);
+ return OpenOutcome::kSuccess; + return OpenOutcome::kSuccess;
+bad_close: +bad_close:
@ -176,7 +176,7 @@
+ GetAgcVolume(&normalized_volume); + GetAgcVolume(&normalized_volume);
+ +
+ // read one block + // read one block
+ todo = nframes * params.GetBytesPerFrame(kSampleFormat); + todo = nframes * params.GetBytesPerFrame(kSampleFormatAI);
+ data = buffer; + data = buffer;
+ while (todo > 0) { + while (todo > 0) {
+ n = sio_read(hdl, data, todo); + n = sio_read(hdl, data, todo);

12
www/qt6-webengine/files/patch-src_3rdparty_chromium_media_audio_sndio_sndio__output.cc
View file

@ -14,7 +14,7 @@
+ +
+namespace media { +namespace media {
+ +
+static const SampleFormat kSampleFormat = kSampleFormatS16; +static const SampleFormat kSampleFormatAO = kSampleFormatS16;
+ +
+void SndioAudioOutputStream::OnMoveCallback(void *arg, int delta) { +void SndioAudioOutputStream::OnMoveCallback(void *arg, int delta) {
+ SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg); + SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
@ -58,7 +58,7 @@
+ state = kStopped; + state = kStopped;
+ volpending = 0; + volpending = 0;
+ vol = SIO_MAXVOL; + vol = SIO_MAXVOL;
+ buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)]; + buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormatAO)];
+ return true; + return true;
+} +}
+ +
@ -80,7 +80,7 @@
+ sio_initpar(&par); + sio_initpar(&par);
+ par.rate = params.sample_rate(); + par.rate = params.sample_rate();
+ par.pchan = params.channels(); + par.pchan = params.channels();
+ par.bits = SampleFormatToBitsPerChannel(kSampleFormat); + par.bits = SampleFormatToBitsPerChannel(kSampleFormatAO);
+ par.bps = par.bits / 8; + par.bps = par.bits / 8;
+ par.sig = sig = par.bits != 8 ? 1 : 0; + par.sig = sig = par.bits != 8 ? 1 : 0;
+ par.le = SIO_LE_NATIVE; + par.le = SIO_LE_NATIVE;
@ -98,7 +98,7 @@
+ } + }
+ if (par.rate != (unsigned int)params.sample_rate() || + if (par.rate != (unsigned int)params.sample_rate() ||
+ par.pchan != (unsigned int)params.channels() || + par.pchan != (unsigned int)params.channels() ||
+ par.bits != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) || + par.bits != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormatAO) ||
+ par.sig != (unsigned int)sig || + par.sig != (unsigned int)sig ||
+ (par.bps > 1 && par.le != SIO_LE_NATIVE) || + (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
+ (par.bits != par.bps * 8)) { + (par.bits != par.bps * 8)) {
@ -170,12 +170,12 @@
+ if (count == 0) { + if (count == 0) {
+ // We have to submit something to the device + // We have to submit something to the device
+ count = audio_bus->frames(); + count = audio_bus->frames();
+ memset(buffer, 0, count * params.GetBytesPerFrame(kSampleFormat)); + memset(buffer, 0, count * params.GetBytesPerFrame(kSampleFormatAO));
+ LOG(WARNING) << "No data to play, running empty cycle."; + LOG(WARNING) << "No data to play, running empty cycle.";
+ } + }
+ +
+ // Submit data to the device + // Submit data to the device
+ avail = count * params.GetBytesPerFrame(kSampleFormat); + avail = count * params.GetBytesPerFrame(kSampleFormatAO);
+ result = sio_write(hdl, buffer, avail); + result = sio_write(hdl, buffer, avail);
+ if (result == 0) { + if (result == 0) {
+ LOG(WARNING) << "Audio device disconnected."; + LOG(WARNING) << "Audio device disconnected.";

114
www/qt6-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_pc_legacy__stats__collector.cc
View file

@ -1,114 +0,0 @@
commit 267f9bdd53a37d1cbee760d5af07880198e1beef
Author: Tommi <tommi@webrtc.org>
Date: 2023-12-21T14:08:26+01:00
Update LegacyStatsCollector to conform with Wc++11-narrowing
Bug: none
Change-Id: Ida6a1af5c324473a55ea4f3b143862ea016ff50a
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/332240
Commit-Queue: Tomas Gunnarsson <tommi@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Auto-Submit: Tomas Gunnarsson <tommi@webrtc.org>
Reviewed-by: Alexander Kornienko <alexfh@google.com>
Reviewed-by: Henrik Boström <hbos@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41432}
--- src/3rdparty/chromium/third_party/webrtc/pc/legacy_stats_collector.cc.orig 2024-02-10 00:27:53 UTC
+++ src/3rdparty/chromium/third_party/webrtc/pc/legacy_stats_collector.cc
@@ -188,9 +188,10 @@ void ExtractStats(const cricket::VoiceReceiverInfo& in
{StatsReport::kStatsValueNameAccelerateRate, info.accelerate_rate},
{StatsReport::kStatsValueNamePreemptiveExpandRate,
info.preemptive_expand_rate},
- {StatsReport::kStatsValueNameTotalAudioEnergy, info.total_output_energy},
+ {StatsReport::kStatsValueNameTotalAudioEnergy,
+ static_cast<float>(info.total_output_energy)},
{StatsReport::kStatsValueNameTotalSamplesDuration,
- info.total_output_duration}};
+ static_cast<float>(info.total_output_duration)}};
const IntForAdd ints[] = {
{StatsReport::kStatsValueNameCurrentDelayMs, info.delay_estimate_ms},
@@ -244,9 +245,10 @@ void ExtractStats(const cricket::VoiceSenderInfo& info
SetAudioProcessingStats(report, info.apm_statistics);
const FloatForAdd floats[] = {
- {StatsReport::kStatsValueNameTotalAudioEnergy, info.total_input_energy},
+ {StatsReport::kStatsValueNameTotalAudioEnergy,
+ static_cast<float>(info.total_input_energy)},
{StatsReport::kStatsValueNameTotalSamplesDuration,
- info.total_input_duration}};
+ static_cast<float>(info.total_input_duration)}};
RTC_DCHECK_GE(info.audio_level, 0);
const IntForAdd ints[] = {
@@ -340,7 +342,8 @@ void ExtractStats(const cricket::VideoReceiverInfo& in
{StatsReport::kStatsValueNamePlisSent, info.plis_sent},
{StatsReport::kStatsValueNameRenderDelayMs, info.render_delay_ms},
{StatsReport::kStatsValueNameTargetDelayMs, info.target_delay_ms},
- {StatsReport::kStatsValueNameFramesDecoded, info.frames_decoded},
+ {StatsReport::kStatsValueNameFramesDecoded,
+ static_cast<int>(info.frames_decoded)},
};
for (const auto& i : ints)
@@ -384,15 +387,19 @@ void ExtractStats(const cricket::VideoSenderInfo& info
info.encode_usage_percent},
{StatsReport::kStatsValueNameFirsReceived, info.firs_received},
{StatsReport::kStatsValueNameFrameHeightSent, info.send_frame_height},
- {StatsReport::kStatsValueNameFrameRateInput, round(info.framerate_input)},
+ {StatsReport::kStatsValueNameFrameRateInput,
+ static_cast<int>(round(info.framerate_input))},
{StatsReport::kStatsValueNameFrameRateSent, info.framerate_sent},
{StatsReport::kStatsValueNameFrameWidthSent, info.send_frame_width},
- {StatsReport::kStatsValueNameNacksReceived, info.nacks_received},
+ {StatsReport::kStatsValueNameNacksReceived,
+ static_cast<int>(info.nacks_received)},
{StatsReport::kStatsValueNamePacketsLost, info.packets_lost},
{StatsReport::kStatsValueNamePacketsSent, info.packets_sent},
{StatsReport::kStatsValueNamePlisReceived, info.plis_received},
- {StatsReport::kStatsValueNameFramesEncoded, info.frames_encoded},
- {StatsReport::kStatsValueNameHugeFramesSent, info.huge_frames_sent},
+ {StatsReport::kStatsValueNameFramesEncoded,
+ static_cast<int>(info.frames_encoded)},
+ {StatsReport::kStatsValueNameHugeFramesSent,
+ static_cast<int>(info.huge_frames_sent)},
};
for (const auto& i : ints)
@@ -780,19 +787,25 @@ StatsReport* LegacyStatsCollector::AddConnectionInfoRe
AddCandidateReport(remote_candidate_stats, false)->id());
const Int64ForAdd int64s[] = {
- {StatsReport::kStatsValueNameBytesReceived, info.recv_total_bytes},
- {StatsReport::kStatsValueNameBytesSent, info.sent_total_bytes},
- {StatsReport::kStatsValueNamePacketsSent, info.sent_total_packets},
- {StatsReport::kStatsValueNameRtt, info.rtt},
+ {StatsReport::kStatsValueNameBytesReceived,
+ static_cast<int64_t>(info.recv_total_bytes)},
+ {StatsReport::kStatsValueNameBytesSent,
+ static_cast<int64_t>(info.sent_total_bytes)},
+ {StatsReport::kStatsValueNamePacketsSent,
+ static_cast<int64_t>(info.sent_total_packets)},
+ {StatsReport::kStatsValueNameRtt, static_cast<int64_t>(info.rtt)},
{StatsReport::kStatsValueNameSendPacketsDiscarded,
- info.sent_discarded_packets},
+ static_cast<int64_t>(info.sent_discarded_packets)},
{StatsReport::kStatsValueNameSentPingRequestsTotal,
- info.sent_ping_requests_total},
+ static_cast<int64_t>(info.sent_ping_requests_total)},
{StatsReport::kStatsValueNameSentPingRequestsBeforeFirstResponse,
- info.sent_ping_requests_before_first_response},
- {StatsReport::kStatsValueNameSentPingResponses, info.sent_ping_responses},
- {StatsReport::kStatsValueNameRecvPingRequests, info.recv_ping_requests},
- {StatsReport::kStatsValueNameRecvPingResponses, info.recv_ping_responses},
+ static_cast<int64_t>(info.sent_ping_requests_before_first_response)},
+ {StatsReport::kStatsValueNameSentPingResponses,
+ static_cast<int64_t>(info.sent_ping_responses)},
+ {StatsReport::kStatsValueNameRecvPingRequests,
+ static_cast<int64_t>(info.recv_ping_requests)},
+ {StatsReport::kStatsValueNameRecvPingResponses,
+ static_cast<int64_t>(info.recv_ping_responses)},
};
for (const auto& i : int64s)
report->AddInt64(i.name, i.value);

6
www/qt6-websockets/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1712115502 TIMESTAMP = 1716400785
SHA256 (KDE/Qt/6.7.0/qtwebsockets-everywhere-src-6.7.0.tar.xz) = 5ffc77da6b36cdf18e04c975a0fbf243968806a93a6291bcd2e9cd0b26139736 SHA256 (KDE/Qt/6.7.1/qtwebsockets-everywhere-src-6.7.1.tar.xz) = fe16a6e4d2b819c72a56f671c5c697bae4c7f9fee4df2a4473b14caf7602feeb
SIZE (KDE/Qt/6.7.0/qtwebsockets-everywhere-src-6.7.0.tar.xz) = 454868 SIZE (KDE/Qt/6.7.1/qtwebsockets-everywhere-src-6.7.1.tar.xz) = 459720

6
www/qt6-webview/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1712115504 TIMESTAMP = 1716400787
SHA256 (KDE/Qt/6.7.0/qtwebview-everywhere-src-6.7.0.tar.xz) = 3619e07138cc1fe2fa091e25ba6548f5f11f26f1ebf68a56f193aed336ea5cf9 SHA256 (KDE/Qt/6.7.1/qtwebview-everywhere-src-6.7.1.tar.xz) = 64ce8f1b3e3734d6b1ca3a5a0c93b209b34e46e4fcd333c6e702f5dd076c906b
SIZE (KDE/Qt/6.7.0/qtwebview-everywhere-src-6.7.0.tar.xz) = 138160 SIZE (KDE/Qt/6.7.1/qtwebview-everywhere-src-6.7.1.tar.xz) = 138776

6
x11-toolkits/qt6-charts/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1712115516 TIMESTAMP = 1716400793
SHA256 (KDE/Qt/6.7.0/qtcharts-everywhere-src-6.7.0.tar.xz) = 899d5498c91bfb01fde2ff2438c82adf4d4d9b3cf646e7ad7b0036dbf32b7ca4 SHA256 (KDE/Qt/6.7.1/qtcharts-everywhere-src-6.7.1.tar.xz) = c236875ab3c812f0d59bad81a783095ae50932c7bea23cb81cd55437083d5d8c
SIZE (KDE/Qt/6.7.0/qtcharts-everywhere-src-6.7.0.tar.xz) = 4660736 SIZE (KDE/Qt/6.7.1/qtcharts-everywhere-src-6.7.1.tar.xz) = 4661252

6
x11-toolkits/qt6-datavis3d/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1712115524 TIMESTAMP = 1716400800
SHA256 (KDE/Qt/6.7.0/qtdatavis3d-everywhere-src-6.7.0.tar.xz) = 5a93248d1893790c5630fcbf7ba8394b7eb62411e4a80aa54d7ba8bd40091ba9 SHA256 (KDE/Qt/6.7.1/qtdatavis3d-everywhere-src-6.7.1.tar.xz) = ea0d10cd2fefbfa71aa7e8a83bf61a61b845c41b95458b5b82cb603beb621a7c
SIZE (KDE/Qt/6.7.0/qtdatavis3d-everywhere-src-6.7.0.tar.xz) = 3947500 SIZE (KDE/Qt/6.7.1/qtdatavis3d-everywhere-src-6.7.1.tar.xz) = 3948188

6
x11-toolkits/qt6-declarative/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1712115587 TIMESTAMP = 1716400841
SHA256 (KDE/Qt/6.7.0/qtdeclarative-everywhere-src-6.7.0.tar.xz) = 5a0c39579a74d7cca581162c866ed0887287d4f8d5abff7ab9492d4a58fa9e2c SHA256 (KDE/Qt/6.7.1/qtdeclarative-everywhere-src-6.7.1.tar.xz) = 81135c96ed2f599385b8a68c57f4f438dad193c62f946f5b200a321558fd9f1c
SIZE (KDE/Qt/6.7.0/qtdeclarative-everywhere-src-6.7.0.tar.xz) = 35360444 SIZE (KDE/Qt/6.7.1/qtdeclarative-everywhere-src-6.7.1.tar.xz) = 35624448

8
x11-toolkits/qt6-declarative/pkg-plist
View file

@ -2384,8 +2384,8 @@ lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsVersionlessTargets.cmake
%%QT_MKSPECDIR%%/modules/qt_lib_quicktestutilsprivate_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_quicktestutilsprivate_private.pri
%%QT_MKSPECDIR%%/modules/qt_lib_quickwidgets.pri %%QT_MKSPECDIR%%/modules/qt_lib_quickwidgets.pri
%%QT_MKSPECDIR%%/modules/qt_lib_quickwidgets_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_quickwidgets_private.pri
%%DEBUG%%%%QT_LIBDIR%%/objects-Debug/QmlTypeRegistrarPrivate_resources_1/.rcc/qrc_jsRootMetaTypes_init.cpp.o %%DEBUG%%%%QT_LIBDIR%%/objects-Debug/QmlTypeRegistrarPrivate_resources_1/.qt/rcc/qrc_jsRootMetaTypes_init.cpp.o
%%NO_DEBUG%%%%QT_LIBDIR%%/objects-Release/QmlTypeRegistrarPrivate_resources_1/.rcc/qrc_jsRootMetaTypes_init.cpp.o %%NO_DEBUG%%%%QT_LIBDIR%%/objects-Release/QmlTypeRegistrarPrivate_resources_1/.qt/rcc/qrc_jsRootMetaTypes_init.cpp.o
%%QT_PLUGINDIR%%/qmllint/libquicklintplugin.so %%QT_PLUGINDIR%%/qmllint/libquicklintplugin.so
%%QT_PLUGINDIR%%/qmltooling/libqmldbg_debugger.so %%QT_PLUGINDIR%%/qmltooling/libqmldbg_debugger.so
%%QT_PLUGINDIR%%/qmltooling/libqmldbg_inspector.so %%QT_PLUGINDIR%%/qmltooling/libqmldbg_inspector.so
@ -2423,8 +2423,8 @@ lib/cmake/Qt6QuickWidgets/Qt6QuickWidgetsVersionlessTargets.cmake
%%QT_QMLDIR%%/Qt/labs/wavefrontmesh/qmldir %%QT_QMLDIR%%/Qt/labs/wavefrontmesh/qmldir
%%QT_QMLDIR%%/Qt/test/controls/QuickControlsTestUtilsPrivate.qmltypes %%QT_QMLDIR%%/Qt/test/controls/QuickControlsTestUtilsPrivate.qmltypes
%%QT_QMLDIR%%/Qt/test/controls/libquickcontrolstestutilsprivateplugin.so %%QT_QMLDIR%%/Qt/test/controls/libquickcontrolstestutilsprivateplugin.so
%%DEBUG%%%%QT_QMLDIR%%/Qt/test/controls/objects-Debug/QuickControlsTestUtilsPrivate_resources_1/.rcc/qrc_qmake_Qt_test_controls_init.cpp.o %%DEBUG%%%%QT_QMLDIR%%/Qt/test/controls/objects-Debug/QuickControlsTestUtilsPrivate_resources_1/.qt/rcc/qrc_qmake_Qt_test_controls_init.cpp.o
%%NO_DEBUG%%%%QT_QMLDIR%%/Qt/test/controls/objects-Release/QuickControlsTestUtilsPrivate_resources_1/.rcc/qrc_qmake_Qt_test_controls_init.cpp.o %%NO_DEBUG%%%%QT_QMLDIR%%/Qt/test/controls/objects-Release/QuickControlsTestUtilsPrivate_resources_1/.qt/rcc/qrc_qmake_Qt_test_controls_init.cpp.o
%%QT_QMLDIR%%/Qt/test/controls/qmldir %%QT_QMLDIR%%/Qt/test/controls/qmldir
%%QT_QMLDIR%%/QtCore/libqtqmlcoreplugin.so %%QT_QMLDIR%%/QtCore/libqtqmlcoreplugin.so
%%QT_QMLDIR%%/QtCore/plugins.qmltypes %%QT_QMLDIR%%/QtCore/plugins.qmltypes

6
x11-toolkits/qt6-graphs/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1712115596 TIMESTAMP = 1716400847
SHA256 (KDE/Qt/6.7.0/qtgraphs-everywhere-src-6.7.0.tar.xz) = 4b35d1967e62af0f9d224c173921f22256e29fbbf62ed9de828466c5878b9495 SHA256 (KDE/Qt/6.7.1/qtgraphs-everywhere-src-6.7.1.tar.xz) = 71584a991c89a2fef4a9ad36040eba67700908f314a5fe734098096ef4ffbc38
SIZE (KDE/Qt/6.7.0/qtgraphs-everywhere-src-6.7.0.tar.xz) = 4393072 SIZE (KDE/Qt/6.7.1/qtgraphs-everywhere-src-6.7.1.tar.xz) = 4395880

38
x11-toolkits/qt6-graphs/pkg-plist
View file

@ -183,18 +183,32 @@ lib/cmake/Qt6Qml/QmlPlugins/Qt6GraphspluginTargets.cmake
%%QT_MKSPECDIR%%/modules/qt_lib_graphs.pri %%QT_MKSPECDIR%%/modules/qt_lib_graphs.pri
%%QT_MKSPECDIR%%/modules/qt_lib_graphs_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_graphs_private.pri
%%QT_QMLDIR%%/QtGraphs/Graphs.qmltypes %%QT_QMLDIR%%/QtGraphs/Graphs.qmltypes
%%QT_QMLDIR%%/QtGraphs/graphs2d/qml/designer/GraphsViewSpecifics.qml %%QT_QMLDIR%%/QtGraphs/designer/Bars3DSpecifics.qml
%%QT_QMLDIR%%/QtGraphs/graphs2d/qml/designer/default/BarSeries.qml %%QT_QMLDIR%%/QtGraphs/designer/GraphsCameraSection.qml
%%QT_QMLDIR%%/QtGraphs/graphs2d/qml/designer/default/LineSeries.qml %%QT_QMLDIR%%/QtGraphs/designer/GraphsSection.qml
%%QT_QMLDIR%%/QtGraphs/graphs2d/qml/designer/default/ScatterSeries.qml %%QT_QMLDIR%%/QtGraphs/designer/GraphsViewSpecifics.qml
%%QT_QMLDIR%%/QtGraphs/graphs3d/qml/designer/Bars3DSpecifics.qml %%QT_QMLDIR%%/QtGraphs/designer/Scatter3DSpecifics.qml
%%QT_QMLDIR%%/QtGraphs/graphs3d/qml/designer/GraphsCameraSection.qml %%QT_QMLDIR%%/QtGraphs/designer/Surface3DSpecifics.qml
%%QT_QMLDIR%%/QtGraphs/graphs3d/qml/designer/GraphsSection.qml %%QT_QMLDIR%%/QtGraphs/designer/default/BarSeries.qml
%%QT_QMLDIR%%/QtGraphs/graphs3d/qml/designer/Scatter3DSpecifics.qml %%QT_QMLDIR%%/QtGraphs/designer/default/Bars3D.qml
%%QT_QMLDIR%%/QtGraphs/graphs3d/qml/designer/Surface3DSpecifics.qml %%QT_QMLDIR%%/QtGraphs/designer/default/LineSeries.qml
%%QT_QMLDIR%%/QtGraphs/graphs3d/qml/designer/default/Bars3D.qml %%QT_QMLDIR%%/QtGraphs/designer/default/Scatter3D.qml
%%QT_QMLDIR%%/QtGraphs/graphs3d/qml/designer/default/Scatter3D.qml %%QT_QMLDIR%%/QtGraphs/designer/default/ScatterSeries.qml
%%QT_QMLDIR%%/QtGraphs/graphs3d/qml/designer/default/Surface3D.qml %%QT_QMLDIR%%/QtGraphs/designer/default/Surface3D.qml
%%QT_QMLDIR%%/QtGraphs/designer/images/bars3d-icon.png
%%QT_QMLDIR%%/QtGraphs/designer/images/bars3d-icon16.png
%%QT_QMLDIR%%/QtGraphs/designer/images/barseries-icon.png
%%QT_QMLDIR%%/QtGraphs/designer/images/barseries-icon16.png
%%QT_QMLDIR%%/QtGraphs/designer/images/lineseries-chart-icon.png
%%QT_QMLDIR%%/QtGraphs/designer/images/lineseries-chart-icon16.png
%%QT_QMLDIR%%/QtGraphs/designer/images/scatter3d-icon.png
%%QT_QMLDIR%%/QtGraphs/designer/images/scatter3d-icon16.png
%%QT_QMLDIR%%/QtGraphs/designer/images/scatterseries-chart-icon.png
%%QT_QMLDIR%%/QtGraphs/designer/images/scatterseries-chart-icon16.png
%%QT_QMLDIR%%/QtGraphs/designer/images/surface3d-icon.png
%%QT_QMLDIR%%/QtGraphs/designer/images/surface3d-icon16.png
%%QT_QMLDIR%%/QtGraphs/designer/qtgraphs.metainfo
%%QT_QMLDIR%%/QtGraphs/designer/qtgraphs2d.metainfo
%%QT_QMLDIR%%/QtGraphs/libgraphsplugin.so %%QT_QMLDIR%%/QtGraphs/libgraphsplugin.so
%%QT_QMLDIR%%/QtGraphs/qmldir %%QT_QMLDIR%%/QtGraphs/qmldir
libdata/pkgconfig/Qt6Graphs.pc libdata/pkgconfig/Qt6Graphs.pc

6
x11-toolkits/qt6-quick3d/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1712115683 TIMESTAMP = 1716400903
SHA256 (KDE/Qt/6.7.0/qtquick3d-everywhere-src-6.7.0.tar.xz) = 8bb943bf3f65a933b74fcd93d927e22b8621484030586c15586728e2f67ed910 SHA256 (KDE/Qt/6.7.1/qtquick3d-everywhere-src-6.7.1.tar.xz) = ce390dcc7fbbda2004bcfdaa980986b137b83cbeb12d55c1c880a13995a93fe9
SIZE (KDE/Qt/6.7.0/qtquick3d-everywhere-src-6.7.0.tar.xz) = 66175916 SIZE (KDE/Qt/6.7.1/qtquick3d-everywhere-src-6.7.1.tar.xz) = 66184636

6
x11-toolkits/qt6-quicktimeline/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1712115685 TIMESTAMP = 1716400905
SHA256 (KDE/Qt/6.7.0/qtquicktimeline-everywhere-src-6.7.0.tar.xz) = eb45657c6c6b5d57775473d4d69e7d964a17778695ffb2ff50a75aa1b63489bd SHA256 (KDE/Qt/6.7.1/qtquicktimeline-everywhere-src-6.7.1.tar.xz) = 2d79204d87b7a13cb0154f1ab705afcd1f8c668c0a03e0694205141f54725744
SIZE (KDE/Qt/6.7.0/qtquicktimeline-everywhere-src-6.7.0.tar.xz) = 109548 SIZE (KDE/Qt/6.7.1/qtquicktimeline-everywhere-src-6.7.1.tar.xz) = 110116

6
x11-toolkits/qt6-shadertools/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1712115689 TIMESTAMP = 1716400908
SHA256 (KDE/Qt/6.7.0/qtshadertools-everywhere-src-6.7.0.tar.xz) = 3e13f967c62f0815c901e754cbc472a2e19170da0c7a505230d559615f7998af SHA256 (KDE/Qt/6.7.1/qtshadertools-everywhere-src-6.7.1.tar.xz) = e585e3a985b2e2bad8191a84489a04e69c3defc6022a8e746aad22a1f17910c2
SIZE (KDE/Qt/6.7.0/qtshadertools-everywhere-src-6.7.0.tar.xz) = 1110704 SIZE (KDE/Qt/6.7.1/qtshadertools-everywhere-src-6.7.1.tar.xz) = 1111284

6
x11-toolkits/qt6-virtualkeyboard/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1712115695 TIMESTAMP = 1716400913
SHA256 (KDE/Qt/6.7.0/qtvirtualkeyboard-everywhere-src-6.7.0.tar.xz) = d61bb2a18b1b06f64c956b2bde740c90a4bb46c47a99b31462e6e8d278a0cb6a SHA256 (KDE/Qt/6.7.1/qtvirtualkeyboard-everywhere-src-6.7.1.tar.xz) = 7b6cd83d1b7f622f909b38bd429536b9d0829621f2d111b3a2f90d8bcdcba85d
SIZE (KDE/Qt/6.7.0/qtvirtualkeyboard-everywhere-src-6.7.0.tar.xz) = 3720012 SIZE (KDE/Qt/6.7.1/qtvirtualkeyboard-everywhere-src-6.7.1.tar.xz) = 3729484