From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CB7F4158083 for ; Thu, 12 Sep 2024 03:16:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AC175E29CD; Thu, 12 Sep 2024 03:16:44 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 15ABCE29CD for ; Thu, 12 Sep 2024 03:16:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 034F634027D for ; Thu, 12 Sep 2024 03:16:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 060EB16D8 for ; Thu, 12 Sep 2024 03:16:41 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1726110972.8c66f04d366049d1c073b563126646fac97c4856.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtmultimedia/files/, dev-qt/qtmultimedia/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qtmultimedia/files/qtmultimedia-6.7.2-ffmpeg-6.1.2.patch dev-qt/qtmultimedia/qtmultimedia-6.7.2-r2.ebuild X-VCS-Directories: dev-qt/qtmultimedia/files/ dev-qt/qtmultimedia/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 8c66f04d366049d1c073b563126646fac97c4856 X-VCS-Branch: master Date: Thu, 12 Sep 2024 03:16:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1e30749f-4b74-4501-9878-340f031b666f X-Archives-Hash: f262b3db369338bd7ceb50feef592115 commit: 8c66f04d366049d1c073b563126646fac97c4856 Author: Ionen Wolkens gentoo org> AuthorDate: Thu Sep 12 03:12:07 2024 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Thu Sep 12 03:16:12 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c66f04d dev-qt/qtmultimedia: backport minor fix for ffmpeg-6.1.2+ See patch comment, do not believe this is worth a revbump. Signed-off-by: Ionen Wolkens gentoo.org> .../files/qtmultimedia-6.7.2-ffmpeg-6.1.2.patch | 42 ++++++++++++++++++++++ dev-qt/qtmultimedia/qtmultimedia-6.7.2-r2.ebuild | 1 + 2 files changed, 43 insertions(+) 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 +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 +--- 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_ptrplayer.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=(