From 3ea54510168a7ed4271b85f7292beca67346bfe9 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Thu, 12 Sep 2024 12:31:24 +0100
Subject: gentoo auto-resync : 12:09:2024 - 12:31:23

---
 dev-qt/Manifest.gz                                 | Bin 11707 -> 11716 bytes
 dev-qt/qtmultimedia/Manifest                       |   3 +-
 .../files/qtmultimedia-6.7.2-ffmpeg-6.1.2.patch    |  42 +++++++++++++++++++++
 dev-qt/qtmultimedia/qtmultimedia-6.7.2-r2.ebuild   |   1 +
 4 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 dev-qt/qtmultimedia/files/qtmultimedia-6.7.2-ffmpeg-6.1.2.patch

(limited to 'dev-qt')

diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 686e22093b4e..bcc93fa9c1b4 100644
Binary files a/dev-qt/Manifest.gz and b/dev-qt/Manifest.gz differ
diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index 422dd7166f31..92d4090dcdef 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -1,9 +1,10 @@
+AUX qtmultimedia-6.7.2-ffmpeg-6.1.2.patch 2059 BLAKE2B 67af9cb2b860b46dd643b5677a9c50bde9d2f58db9262283b4de8a3708e1a1e7a23063dbdbf14ff6952a4150a9d716d22089535adbd611a2340c7fe1f780a6ec SHA512 33815330435ff9f21659161c1be3085bbb5b3ddd0449748bb962cd1f64ca4a4349b2a26e0615affb56250172e5fefe21fac4e569bab6a832cc563127ef2bb328
 AUX qtmultimedia-6.7.2-gstreamer-no-v4l.patch 567 BLAKE2B e7adab12e4823370677e0c466058cf4966b8384937edb7759ecb84062fcd43f205944835bbf9885a99bf117d310a7e6d23b05a167cab3be2ef994c21a7ebc07e SHA512 dc41e9e82ef2a740bba967cc6430f0e72c88810b978bb61e78b6f19fc980de9744cf9f05f7d787bc2c5807c54fb630b83b58c805d693d7c2306588773c1db481
 DIST qtmultimedia-5.15.14-gentoo-kde-1.tar.xz 1492 BLAKE2B e2474990d9efc327f35a979c1f317cb213c6121b4e1285294c132a1266eaeb559e7239c7cd58da072e50dc85dd9aa0c1b6aa493f95fe31268171780cd3346883 SHA512 5427c7a5e06f8296b091b2bb3fc67e678ac01bd1179de5a11c38cfe9f87ba8e3ac87a1395c2c3044ad31fc5c040230e35a1e71e173e12109c24cd97da70d9e9d
 DIST qtmultimedia-everywhere-opensource-src-5.15.14.tar.xz 3842164 BLAKE2B 0065c95b4f14e566c667e16c4eb264e466174a9548c6a4bd39dbab9cf14ddad444cc3318ecdf18ca9e3999a3f95a669fd121937287d466a6b9a9c14af74ff686 SHA512 6059bd9aec65888ed6f3a1f87506a94ea567f9e064bb4a586859bc8f76ee4dca573eb256623452ddd9daf2305f49c707673425ea08edca9cd2db7b56bf5cab9c
 DIST qtmultimedia-everywhere-src-6.7.2.tar.xz 8451800 BLAKE2B 44523ebe4f1b0c910fdad8ff29f24273c1b7872e9f5dd58b2dd779e61fe3b5c1a97ee900009ca693c740a6e578f9dd62995ac101ef70e1cd718af1bd1c355430 SHA512 bfcd04a5ba142e2a3bee3b67a261ffb4f651ac4e043e3dcafc0175bd25409de375041aa6fdda4f6899b00e4bad6c06ae9fd0d6a1e7db0b874f1bcf0a578d3c70
 EBUILD qtmultimedia-5.15.14.ebuild 1511 BLAKE2B 81fd1f3d666a9c3da203ccc37ef635954c25d00e1928be7d2250fe7a8bbf564da4e61c2e1be07afc7bc51ac340c0605d241ef5bbcf5e1ec846e528886b8f6aea SHA512 5dd3b3f0b22029dadf98e404d4be3557eb335e666fc08ea7bd39134f9770433fe5e35524ca9df6e89deb342e2b8e03a679e0e7718d534693cb0191c618162b91
-EBUILD qtmultimedia-6.7.2-r2.ebuild 3247 BLAKE2B cf452a84f0b696c23d1e01261292284b019c1f8331684b27f24e5cc0e6d12a759ab8af62823aecbcf76359ec1f81863ff469cf0239c92c959ccfd8cb388c0a55 SHA512 e69f82784a2ad6416b98b630ce01c7f76df6c6d56c3ac968bd6ccccadc8270c1d614af2b524663b53fb6cf7a84bba1f3e613217a5607bbe5e63d34a6b30570a2
+EBUILD qtmultimedia-6.7.2-r2.ebuild 3286 BLAKE2B 59566faeeb43449047c4829393193bb3f23ccf0bb02cc79885d3e8ff103c5bc191f79b26677ca460c18f3709802e310ef8abbdc414937f1141045f0848d43ba2 SHA512 4b99fb509091805e90d022c08e5f0de87fe6dc378318500cba843aacfb4a6cd613f0069d34286c3510f05282391be1b92618e0fe6f21badfa5e6433193e2cd84
 EBUILD qtmultimedia-6.7.9999.ebuild 3608 BLAKE2B 1ee127fe1352a46e26f487800599baf10a7317362921a31a09721738e007236c3382b7223b90a345aab40a627db6213e5bc3a424c8437796159eec5082d5b2cd SHA512 713a37bde7cd80849d350b054df8e9f466397025d368e1b466948079d0cc50d7a46dcc03d1b7c1125bfc61219b905a48f274244972c31c296e504c78a4fd9967
 EBUILD qtmultimedia-6.8.9999.ebuild 3897 BLAKE2B f937f76181691a4533062d584722c1cb59143c9b5f5dda6ff3f358ff6897e52b7ae872fc2e7b6fbfdae252a15a71187db0392697db815a55176182a4744c3aa0 SHA512 6f18cf3bb54f58b3e0437b2ac5f5038423283af926b041bfac2914bf3fdcbe9cd44a993e9cb56cd477e5b360bcf8df00274487ecdb766ac07a1806846941e81f
 EBUILD qtmultimedia-6.9999.ebuild 3897 BLAKE2B f937f76181691a4533062d584722c1cb59143c9b5f5dda6ff3f358ff6897e52b7ae872fc2e7b6fbfdae252a15a71187db0392697db815a55176182a4744c3aa0 SHA512 6f18cf3bb54f58b3e0437b2ac5f5038423283af926b041bfac2914bf3fdcbe9cd44a993e9cb56cd477e5b360bcf8df00274487ecdb766ac07a1806846941e81f
diff --git a/dev-qt/qtmultimedia/files/qtmultimedia-6.7.2-ffmpeg-6.1.2.patch b/dev-qt/qtmultimedia/files/qtmultimedia-6.7.2-ffmpeg-6.1.2.patch
new file mode 100644
index 000000000000..d364699fc401
--- /dev/null
+++ b/dev-qt/qtmultimedia/files/qtmultimedia-6.7.2-ffmpeg-6.1.2.patch
@@ -0,0 +1,42 @@
+Fix was for ffmpeg-7.0.1 (masked) but the change was backported to 6.1.2.
+
+Should hardly be an issue but it does cause a test failure when it
+attempts to compare the return error when reading a (intentionally)
+corrupted file (aborts either way, just differently). Still some time
+until 6.7.3, and prefer to keep tests in a working state meanwhile.
+
+https://bugreports.qt.io/browse/QTBUG-126687
+https://github.com/qt/qtmultimedia/commit/8d809d56697f8d23669a9b1476ac0b0748e32e0d
+From: Pavel Dubsky <pavel.dubsky@qt.io>
+Date: Wed, 10 Jul 2024 14:42:51 +0200
+Subject: [PATCH] Process FFmpeg AVERROR_INVALIDDATA from avformat_open_input
+
+FFmpeg version n7.0.1 changed the error code that is returned from
+function mp3_read_header: AVERROR(EINVAL) -> AVERROR_INVALIDDATA.
+
+Task-number: QTBUG-126687
+Pick-to: 6.8 6.7 6.5
+Change-Id: I6aee7771a9d1f80ea459376711d5264bed9a7bac
+Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
+--- a/src/plugins/multimedia/ffmpeg/playbackengine/qffmpegmediadataholder.cpp
++++ b/src/plugins/multimedia/ffmpeg/playbackengine/qffmpegmediadataholder.cpp
+@@ -194,7 +194,7 @@ loadMedia(const QUrl &mediaUrl, QIODevice *stream, const std::shared_ptr<ICancel
+         auto code = QMediaPlayer::ResourceError;
+         if (ret == AVERROR(EACCES))
+             code = QMediaPlayer::AccessDeniedError;
+-        else if (ret == AVERROR(EINVAL))
++        else if (ret == AVERROR(EINVAL) || ret == AVERROR_INVALIDDATA)
+             code = QMediaPlayer::FormatError;
+ 
+         return MediaDataHolder::ContextError{ code, QMediaPlayer::tr("Could not open file") };
+--- a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
++++ b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
+@@ -962,7 +962,7 @@ void tst_QMediaPlayerBackend::setSource_emitsError_whenSdpFileIsLoaded()
+     });
+ 
+     m_fixture->player.setSource(sdpUrl);
+-    QTRY_COMPARE_EQ(m_fixture->player.error(), QMediaPlayer::ResourceError);
++    QTRY_COMPARE_EQ(m_fixture->player.error(), QMediaPlayer::FormatError);
+ #endif // QT_CONFIG(process)
+ }
+ 
diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.7.2-r2.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.7.2-r2.ebuild
index 74869683aa32..75aefa2fa156 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-6.7.2-r2.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-6.7.2-r2.ebuild
@@ -57,6 +57,7 @@ BDEPEND="~dev-qt/qtshadertools-${PV}:6"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-gstreamer-no-v4l.patch
+	"${FILESDIR}"/${P}-ffmpeg-6.1.2.patch
 )
 
 CMAKE_SKIP_TESTS=(
-- 
cgit v1.2.3