[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtmultimedia/files/, dev-qt/qtmultimedia/

["Ionen Wolkens" <ionen@gentoo.org>]

commit:     2c084f5bb50cb7b987704df90a40a9514300e4ff
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 27 22:53:59 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Jan  6 22:48:46 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c084f5b

dev-qt/qtmultimedia: drop 6.7.2-r2, 6.7.3

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-qt/qtmultimedia/Manifest                       |   2 -
 .../files/qtmultimedia-6.7.2-ffmpeg-6.1.2.patch    |  42 -------
 .../qtmultimedia-6.7.2-gstreamer-no-v4l.patch      |  20 ---
 dev-qt/qtmultimedia/qtmultimedia-6.7.2-r2.ebuild   | 122 ------------------
 dev-qt/qtmultimedia/qtmultimedia-6.7.3.ebuild      | 140 ---------------------
 5 files changed, 326 deletions(-)

diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index b06f423b8581..cd40ae1bc062 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -1,5 +1,3 @@
 DIST qtmultimedia-5.15.16-gentoo-kde-1.tar.xz 1496 BLAKE2B 760f0ee32f353849c0e826622fea0e744ceb4e96d3ae3a6e903b32e7e5211d803e29761538c45797f61f0766ae726206fd799fc4d2fa094f46176ee0d6d5a0fb SHA512 97b161727450864643c0c2d395757d3f78503c02d26151017bdbebfd55e7ffeeffc63e530baecdba4a43dc364dad614dd893278eb84e89587c8ac51f89e14f87
 DIST qtmultimedia-everywhere-opensource-src-5.15.16.tar.xz 3824912 BLAKE2B d98fcc82164d36f2bc21769796ce69c4b0aff57295795004cc609662a10fa80ecf8709c39ed53f96576071fd9e1e2d6eaadcc4eeb97c3fa6406ca7e2f8dcafe7 SHA512 a848affbc38a532455a34bdf887948210ff9794dae312115be0622246993324902b81209c2cac89ca5db63e6fcc29690f47c1255b1b7c4de68bf6ad5a6ecc5e7
-DIST qtmultimedia-everywhere-src-6.7.2.tar.xz 8451800 BLAKE2B 44523ebe4f1b0c910fdad8ff29f24273c1b7872e9f5dd58b2dd779e61fe3b5c1a97ee900009ca693c740a6e578f9dd62995ac101ef70e1cd718af1bd1c355430 SHA512 bfcd04a5ba142e2a3bee3b67a261ffb4f651ac4e043e3dcafc0175bd25409de375041aa6fdda4f6899b00e4bad6c06ae9fd0d6a1e7db0b874f1bcf0a578d3c70
-DIST qtmultimedia-everywhere-src-6.7.3.tar.xz 9360356 BLAKE2B c3ba0c1729b412022959900d4ee7b31f92df5c1b03326ffaea974a59a217be8f39cacf62e03374d63e1d804798ac1bfcfda011a42047ebaa53f5dc1511a44f06 SHA512 6c8c7c18ad71e32507af57456d1c11544f3e6c67c9cd3811a83fd0c20e12d6457ab294d91905e3911bdef1977ec1b535de82e9d92b2a38bd9eef7851e6349b5a
 DIST qtmultimedia-everywhere-src-6.8.1.tar.xz 9664564 BLAKE2B 675544811c845ddb34908fe82e33824451e6ec8fecb66730a2f4dbe754c4466db3ae6e157fac9e8d5d0505adf90ac65bed807bd52eaad0de05047e4532b8ebeb SHA512 77f8e913116ff75cf4602e9c5ee01c48161fb40aaadca0e09ca2f89292071fc6f2918403932b9b0653bbc2b007f25362e0cb84a382baedd67e9e4c31bc414463

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
deleted file mode 100644
index d364699fc401..000000000000
--- a/dev-qt/qtmultimedia/files/qtmultimedia-6.7.2-ffmpeg-6.1.2.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-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/files/qtmultimedia-6.7.2-gstreamer-no-v4l.patch b/dev-qt/qtmultimedia/files/qtmultimedia-6.7.2-gstreamer-no-v4l.patch
deleted file mode 100644
index 0f61539b00d2..000000000000
--- a/dev-qt/qtmultimedia/files/qtmultimedia-6.7.2-gstreamer-no-v4l.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-# https://bugs.gentoo.org/934582
-
---- a/src/plugins/multimedia/gstreamer/mediacapture/qgstreamercamera.cpp
-+++ b/src/plugins/multimedia/gstreamer/mediacapture/qgstreamercamera.cpp
-@@ -718,6 +718,7 @@ int QGstreamerCamera::getV4L2Parameter(quint32 id) const
-         return control.value;
-     });
- }
-+#endif // QT_CONFIG(linux_v4l)
- 
- QGstreamerCustomCamera::QGstreamerCustomCamera(QCamera *camera)
-     : QGstreamerCameraBase{
-@@ -766,6 +767,4 @@ void QGstreamerCustomCamera::setActive(bool active)
-     emit activeChanged(active);
- }
- 
--#endif
--
- QT_END_NAMESPACE
-

diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.7.2-r2.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.7.2-r2.ebuild
deleted file mode 100644
index 75aefa2fa156..000000000000
--- a/dev-qt/qtmultimedia/qtmultimedia-6.7.2-r2.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic qt6-build
-
-DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt6 framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86"
-fi
-
-IUSE="+X alsa eglfs +ffmpeg gstreamer opengl pulseaudio qml v4l vaapi vulkan"
-# tst_qmediaplayerbackend hard requires qml, review in case becomes optional
-REQUIRED_USE="
-	|| ( ffmpeg gstreamer )
-	eglfs? ( ffmpeg opengl qml )
-	vaapi? ( ffmpeg opengl )
-	test? ( qml )
-"
-
-RDEPEND="
-	~dev-qt/qtbase-${PV}:6[gui,network,opengl=,vulkan=,widgets]
-	alsa? (
-		!pulseaudio? ( media-libs/alsa-lib )
-	)
-	ffmpeg? (
-		~dev-qt/qtbase-${PV}:6[X=,concurrent,eglfs=]
-		media-video/ffmpeg:=[vaapi?]
-		X? (
-			x11-libs/libX11
-			x11-libs/libXext
-			x11-libs/libXrandr
-		)
-	)
-	gstreamer? (
-		dev-libs/glib:2
-		media-libs/gst-plugins-bad:1.0
-		media-libs/gst-plugins-base:1.0[X=,opengl?]
-		media-libs/gstreamer:1.0
-	)
-	opengl? ( media-libs/libglvnd )
-	pulseaudio? ( media-libs/libpulse )
-	qml? (
-		~dev-qt/qtdeclarative-${PV}:6
-		~dev-qt/qtquick3d-${PV}:6
-	)
-"
-DEPEND="
-	${RDEPEND}
-	X? ( x11-base/xorg-proto )
-	v4l? ( sys-kernel/linux-headers )
-	vulkan? ( dev-util/vulkan-headers )
-"
-BDEPEND="~dev-qt/qtshadertools-${PV}:6"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gstreamer-no-v4l.patch
-	"${FILESDIR}"/${P}-ffmpeg-6.1.2.patch
-)
-
-CMAKE_SKIP_TESTS=(
-	# unimportant and expects all backends to be available (bug #928420)
-	tst_backends
-	# tries to use real alsa or pulseaudio and fails in sandbox
-	tst_qaudiosink
-	tst_qaudiosource
-	tst_qmediacapturesession
-	tst_qmediaplayerbackend
-	tst_qsoundeffect
-	# may try to use v4l2 or hardware acceleration depending on availability
-	tst_qscreencapture_integration
-	tst_qscreencapturebackend
-	tst_qvideoframebackend
-	# fails with offscreen rendering
-	tst_qvideoframecolormanagement
-	tst_qwindowcapturebackend
-)
-
-src_configure() {
-	# normally passed by the build system, but needed for 32-on-64 chroots
-	use x86 && append-cppflags -DPFFFT_SIMD_DISABLE
-
-	local mycmakeargs=(
-		$(cmake_use_find_package qml Qt6Qml)
-		$(qt_feature ffmpeg)
-		$(qt_feature gstreamer)
-		$(usev gstreamer $(qt_feature opengl gstreamer_gl))
-		$(qt_feature pulseaudio)
-		$(qt_feature v4l linux_v4l)
-		$(qt_feature vaapi)
-	)
-
-	# ALSA backend is experimental off-by-default and can take priority
-	# causing problems (bug #935146), disable if USE=pulseaudio is set
-	# (also do not want unnecessary usage of ALSA plugins -> pulse)
-	if use alsa && use pulseaudio; then
-		# einfo should be enough given pure-ALSA users tend to disable pulse
-		einfo "Warning: USE=alsa is ignored when USE=pulseaudio is set"
-		mycmakeargs+=( -DQT_FEATURE_alsa=OFF )
-	else
-		mycmakeargs+=( $(qt_feature alsa) )
-	fi
-
-	qt6-build_src_configure
-}
-
-src_install() {
-	qt6-build_src_install
-
-	if use test; then
-		local delete=( # sigh
-			"${D}${QT6_LIBDIR}"/cmake/Qt6Multimedia/Qt6MockMultimediaPlugin*.cmake
-			"${D}${QT6_MKSPECSDIR}"/modules/qt_plugin_mockmultimediaplugin.pri
-			"${D}${QT6_PLUGINDIR}"/multimedia/libmockmultimediaplugin.*
-			"${D}${QT6_PLUGINDIR}"/multimedia/objects-*
-		)
-		# using -f given not tracking which tests may be skipped or not
-		rm -rf -- "${delete[@]}" || die
-	fi
-}

diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.7.3.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.7.3.ebuild
deleted file mode 100644
index 4c90076675b9..000000000000
--- a/dev-qt/qtmultimedia/qtmultimedia-6.7.3.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic qt6-build
-
-DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt6 framework"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv x86"
-fi
-
-IUSE="
-	+X alsa eglfs +ffmpeg gstreamer opengl pulseaudio
-	qml v4l vaapi vulkan wayland
-"
-# tst_qmediaplayerbackend hard requires qml, review in case becomes optional
-REQUIRED_USE="
-	|| ( ffmpeg gstreamer )
-	eglfs? ( ffmpeg opengl qml )
-	test? ( qml )
-	vaapi? ( ffmpeg opengl )
-"
-
-# gstreamer[X=] is to avoid broken gst detect if -X w/ gst[X] w/o xorg-proto
-# (*could* be removed if gst-plugins-base[X] RDEPENDs on xorg-proto)
-RDEPEND="
-	~dev-qt/qtbase-${PV}:6[gui,network,opengl=,vulkan=,widgets]
-	alsa? (
-		!pulseaudio? ( media-libs/alsa-lib )
-	)
-	ffmpeg? (
-		~dev-qt/qtbase-${PV}:6[X=,concurrent,eglfs=]
-		media-video/ffmpeg:=[vaapi?]
-		X? (
-			x11-libs/libX11
-			x11-libs/libXext
-			x11-libs/libXrandr
-		)
-	)
-	gstreamer? (
-		dev-libs/glib:2
-		media-libs/gst-plugins-bad:1.0
-		media-libs/gst-plugins-base:1.0[X=]
-		media-libs/gstreamer:1.0
-		opengl? (
-			~dev-qt/qtbase-${PV}:6[X?,wayland?]
-			media-libs/gst-plugins-base:1.0[X?,egl,opengl,wayland?]
-		)
-	)
-	opengl? ( media-libs/libglvnd )
-	pulseaudio? ( media-libs/libpulse )
-	qml? (
-		~dev-qt/qtdeclarative-${PV}:6
-		~dev-qt/qtquick3d-${PV}:6
-	)
-"
-DEPEND="
-	${RDEPEND}
-	X? ( x11-base/xorg-proto )
-	v4l? ( sys-kernel/linux-headers )
-	vulkan? ( dev-util/vulkan-headers )
-"
-BDEPEND="~dev-qt/qtshadertools-${PV}:6"
-
-CMAKE_SKIP_TESTS=(
-	# unimportant and expects all backends to be available (bug #928420)
-	tst_backends
-	# tries to use real alsa or pulseaudio and fails in sandbox
-	tst_qaudiosink
-	tst_qaudiosource
-	tst_qmediacapture_gstreamer
-	tst_qmediacapturesession
-	tst_qmediaplayerbackend
-	tst_qsoundeffect
-	# may try to use v4l2 or hardware acceleration depending on availability
-	tst_qscreencapture_integration
-	tst_qscreencapturebackend
-	tst_qvideoframebackend
-	# fails with offscreen rendering
-	tst_qvideoframecolormanagement
-	tst_qwindowcapturebackend
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.7.3-eigen-ppc-no-vsx.patch
-)
-
-src_configure() {
-	# eigen + ppc32 seems broken w/ -maltivec (forced by Qt, bug #943402)
-	use ppc && append-cppflags -DEIGEN_DONT_VECTORIZE
-
-	# normally passed by the build system, but needed for 32-on-64 chroots
-	use x86 && append-cppflags -DPFFFT_SIMD_DISABLE
-
-	local mycmakeargs=(
-		$(cmake_use_find_package qml Qt6Qml)
-		$(qt_feature ffmpeg)
-		$(qt_feature gstreamer)
-		$(usev gstreamer "
-			$(qt_feature opengl gstreamer_gl)
-			$(usev opengl "
-				$(qt_feature X gstreamer_gl_x11)
-				$(qt_feature wayland gstreamer_gl_wayland)
-			")
-		")
-		$(qt_feature pulseaudio)
-		$(qt_feature v4l linux_v4l)
-		$(qt_feature vaapi)
-	)
-
-	# ALSA backend is experimental off-by-default and can take priority
-	# causing problems (bug #935146), disable if USE=pulseaudio is set
-	# (also do not want unnecessary usage of ALSA plugins -> pulse)
-	if use alsa && use pulseaudio; then
-		# einfo should be enough given pure-ALSA users tend to disable pulse
-		einfo "Warning: USE=alsa is ignored when USE=pulseaudio is set"
-		mycmakeargs+=( -DQT_FEATURE_alsa=OFF )
-	else
-		mycmakeargs+=( $(qt_feature alsa) )
-	fi
-
-	qt6-build_src_configure
-}
-
-src_install() {
-	qt6-build_src_install
-
-	if use test; then
-		local delete=( # sigh
-			"${D}${QT6_LIBDIR}"/cmake/Qt6Multimedia/Qt6MockMultimediaPlugin*.cmake
-			"${D}${QT6_MKSPECSDIR}"/modules/qt_plugin_mockmultimediaplugin.pri
-			"${D}${QT6_PLUGINDIR}"/multimedia/libmockmultimediaplugin.*
-			"${D}${QT6_PLUGINDIR}"/multimedia/objects-*
-		)
-		# using -f given not tracking which tests may be skipped or not
-		rm -rf -- "${delete[@]}" || die
-	fi
-}