From dd955a48d88d9b98d49a61f10ab4b52f53cf83a0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 2 Apr 2024 20:14:09 +0100 Subject: gentoo auto-resync : 02:04:2024 - 20:14:09 --- dev-qt/qtmultimedia/Manifest | 12 +-- dev-qt/qtmultimedia/qtmultimedia-6.6.2.ebuild | 2 + dev-qt/qtmultimedia/qtmultimedia-6.6.3.ebuild | 2 + dev-qt/qtmultimedia/qtmultimedia-6.7.0.ebuild | 104 ++++++++++++++++++++++ dev-qt/qtmultimedia/qtmultimedia-6.7.0_rc2.ebuild | 87 ------------------ dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild | 2 + dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild | 2 + 7 files changed, 118 insertions(+), 93 deletions(-) create mode 100644 dev-qt/qtmultimedia/qtmultimedia-6.7.0.ebuild delete mode 100644 dev-qt/qtmultimedia/qtmultimedia-6.7.0_rc2.ebuild (limited to 'dev-qt/qtmultimedia') diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest index 1d7a3cc7ee1f..a0ff7d9cb54c 100644 --- a/dev-qt/qtmultimedia/Manifest +++ b/dev-qt/qtmultimedia/Manifest @@ -4,12 +4,12 @@ DIST qtmultimedia-everywhere-opensource-src-5.15.12.tar.xz 3830956 BLAKE2B c6fa2 DIST qtmultimedia-everywhere-opensource-src-5.15.13.tar.xz 3831376 BLAKE2B a8634a1dbba8c13dda2c97731806b1014ad80a1ed2506e9a4d42e1d002e562947496e045638875ed4d0c2d637605414dd8eab656fa03766817b7aa80db10145b SHA512 fa70146275d03c1bb8da1930eb66a9bbbf2a6c25cb6e6204a58b8338f58e671634eab878e9bac785ae2394de7dc38d30025a4afe4d26060e2f23a44758b2e5a4 DIST qtmultimedia-everywhere-src-6.6.2.tar.xz 8305476 BLAKE2B 8f252b236ef5fdbc7c4e2be498e2cdaaaf3c901a1d1890c7dfe1f6e8256bc656526e2a6a96649b29bb20baf882f46160f3d76b97cd80466b44a2dcc1b7aabfa5 SHA512 311f47acd7658d725855df06c25b4d516d4046922cc92ad44c91c48f1696fbcbb25a0d778b1a72f15834ce2e74ce64199814476ac04fc705fc19af73c91f2006 DIST qtmultimedia-everywhere-src-6.6.3.tar.xz 8266612 BLAKE2B 4394f0500c33659eca21b5f2ba59173268c6617f80166723c3fedaf2d2f795e118db6f13877e111d3fee418aa4ff5f63002a1c40cfa8b3751e6b314469562169 SHA512 4cad4a7c248adba709f5fda91780151a1136bd7ebb3a249602e401c2e3ae5aceb57a3ddc3825079bfbdb0200af403ad5cf3aa252b2090102f5ab22122445dc02 -DIST qtmultimedia-everywhere-src-6.7.0-rc2.tar.xz 8308020 BLAKE2B 71695dc5cc66805543061852bc199e0a9e6e150b8bb8143ee78e61b6236a11aaff898196bea2bb20135695ea6cf8c0570d5bb351428156b367bbcfa253bd000e SHA512 82328e6582d5f2028913d4bc9bf27b13c47d9a46684125a2116aa6d724575b796774f407bb6953dd909885a6de04a817446ac4248c7efb02f0e0adfcefcc8684 +DIST qtmultimedia-everywhere-src-6.7.0.tar.xz 8315312 BLAKE2B 769689567de9c400a5472d8d40966c942a2ec95d599d166f8a3c47cb6ac0c4d1dd66f33fa0f6f5fac22675134798ef986053eb924ed6c3a1d9035f27127cc612 SHA512 4e5fa8fff408b8abf761a12d9637c425fe9bfbf6475b44a69c8489fd61bf6cbcca95940a22d1b24aec59634a458888d2b34cb883c8e38d542f2f1cb36046e4c1 EBUILD qtmultimedia-5.15.12.ebuild 1511 BLAKE2B 81fd1f3d666a9c3da203ccc37ef635954c25d00e1928be7d2250fe7a8bbf564da4e61c2e1be07afc7bc51ac340c0605d241ef5bbcf5e1ec846e528886b8f6aea SHA512 5dd3b3f0b22029dadf98e404d4be3557eb335e666fc08ea7bd39134f9770433fe5e35524ca9df6e89deb342e2b8e03a679e0e7718d534693cb0191c618162b91 EBUILD qtmultimedia-5.15.13.ebuild 1517 BLAKE2B f58c9922692fdbcc42efab3ff9f7c02a1c6d77f809b4b828baf5765d6fe11301330b479ce1d1f610c1ca4bd8ddf91f717bee3307699d60beac354007a3b35e29 SHA512 eb2c7ff70d9efe5ad1753261e07f4c34f0f1736c39eb21c261ffb41627f87686355449a32d8df18418f1d2a1c66573049b79f7ee6731bc47e6483a671435a60a -EBUILD qtmultimedia-6.6.2.ebuild 2170 BLAKE2B fd230c42d990efc14874526cc8cda39287f04273e60e674f240744a14dae125caa0f28b9a8cdaebb6e2927adec9756d9da4d6c9378f590732c4abb134085d163 SHA512 21a1295d8d03d51027b1e9dd68fda8a947a7bf858edd9c16e2a0a45f6c1632f7b6a1df86f0ca2d2a2711c9d4be8b8b339adf2506771a938da3cfc1f075e3772a -EBUILD qtmultimedia-6.6.3.ebuild 2170 BLAKE2B fd230c42d990efc14874526cc8cda39287f04273e60e674f240744a14dae125caa0f28b9a8cdaebb6e2927adec9756d9da4d6c9378f590732c4abb134085d163 SHA512 21a1295d8d03d51027b1e9dd68fda8a947a7bf858edd9c16e2a0a45f6c1632f7b6a1df86f0ca2d2a2711c9d4be8b8b339adf2506771a938da3cfc1f075e3772a -EBUILD qtmultimedia-6.7.0_rc2.ebuild 2172 BLAKE2B 224fe5f641675256f4e9db192a4b5d25c700dba5463580ceef3c6a1d25bd58ef897d17c7c1bfcc8e3a23e1cccdb602fe1127711df247c75277c655266ecd5355 SHA512 0574b3debe66e2fbb9abe2f146ec3f5407e5985a770845134d5f0c277f37ad6b202cdb123955d5015ee1e139f6bf6416a7ab52b8f3d21f41f102b841c6156416 -EBUILD qtmultimedia-6.7.9999.ebuild 2620 BLAKE2B e226a9f7f9e8d87af37be513eee2dab4c63cbf9ce885a5a378969022d1cf4cc6f71cb8710e3b94e71026149805ce238eaeb4d9bfc79c9b7f4ea565a9e13a3287 SHA512 876f1e095cb3b8ef50a195608b12e723359057b637826c478de7a0ff4339110e6b32d9194acbf544d3358731c9fce44b9ffdb3e288c7d312b5b21db5e20e53ec -EBUILD qtmultimedia-6.9999.ebuild 2620 BLAKE2B e226a9f7f9e8d87af37be513eee2dab4c63cbf9ce885a5a378969022d1cf4cc6f71cb8710e3b94e71026149805ce238eaeb4d9bfc79c9b7f4ea565a9e13a3287 SHA512 876f1e095cb3b8ef50a195608b12e723359057b637826c478de7a0ff4339110e6b32d9194acbf544d3358731c9fce44b9ffdb3e288c7d312b5b21db5e20e53ec +EBUILD qtmultimedia-6.6.2.ebuild 2254 BLAKE2B b631a4ae836b6f5eab5f01bbf804f824152b028536c72c8e123c4aa1c12cfd5e885394ee4e05b51a8845fbbdabafe88ab072f2f2871ee22384e438638974919d SHA512 257fc597a5ee6e8ea80cb3739a3ef1c615017e8844139b3047c01c0e5459f9e0cf1ad2853f4419c16eadde137a48f04cdf4898c15699073f5b797a61b19291b4 +EBUILD qtmultimedia-6.6.3.ebuild 2254 BLAKE2B b631a4ae836b6f5eab5f01bbf804f824152b028536c72c8e123c4aa1c12cfd5e885394ee4e05b51a8845fbbdabafe88ab072f2f2871ee22384e438638974919d SHA512 257fc597a5ee6e8ea80cb3739a3ef1c615017e8844139b3047c01c0e5459f9e0cf1ad2853f4419c16eadde137a48f04cdf4898c15699073f5b797a61b19291b4 +EBUILD qtmultimedia-6.7.0.ebuild 2704 BLAKE2B f61d431f71e488eeead2e42464855cbfdb2968cead74e92ce57b23127531056978ad5ceef61178ca8f2ea094733c82be2bf9a64e197fac10cddb62438a16bf6d SHA512 9fdb73f26a29bf6a9da81ceadd0471e21eb857c9d95b2b62f68a5845ed79647e53eb3f29c5c3c99a22b734aa3f6591b8b14e9b0c39c2b2e7a4c4012fb23c98c0 +EBUILD qtmultimedia-6.7.9999.ebuild 2704 BLAKE2B f61d431f71e488eeead2e42464855cbfdb2968cead74e92ce57b23127531056978ad5ceef61178ca8f2ea094733c82be2bf9a64e197fac10cddb62438a16bf6d SHA512 9fdb73f26a29bf6a9da81ceadd0471e21eb857c9d95b2b62f68a5845ed79647e53eb3f29c5c3c99a22b734aa3f6591b8b14e9b0c39c2b2e7a4c4012fb23c98c0 +EBUILD qtmultimedia-6.9999.ebuild 2704 BLAKE2B f61d431f71e488eeead2e42464855cbfdb2968cead74e92ce57b23127531056978ad5ceef61178ca8f2ea094733c82be2bf9a64e197fac10cddb62438a16bf6d SHA512 9fdb73f26a29bf6a9da81ceadd0471e21eb857c9d95b2b62f68a5845ed79647e53eb3f29c5c3c99a22b734aa3f6591b8b14e9b0c39c2b2e7a4c4012fb23c98c0 MISC metadata.xml 888 BLAKE2B bf3f5b1376585d4aa9021aa838b486b8143e5fbf7c5bf7c7324500de96ab86fd0176993567f97f5e5d115284f8c3ccc16475f787407d747689aefa82cf9a9534 SHA512 98e962234f1ed462444e5f7f3e77a08794b2d0480df7773e822a5671cdfbf708b51edfafacffade2ad5f8b177d89cc0d53b975ef181be66b885c17db2a4a542b diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.6.2.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.6.2.ebuild index a3be54875174..5e96be6b4dda 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-6.6.2.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-6.6.2.ebuild @@ -54,6 +54,8 @@ DEPEND=" 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 diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.6.3.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.6.3.ebuild index a3be54875174..5e96be6b4dda 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-6.6.3.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-6.6.3.ebuild @@ -54,6 +54,8 @@ DEPEND=" 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 diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.7.0.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.7.0.ebuild new file mode 100644 index 000000000000..6ed0ab79449b --- /dev/null +++ b/dev-qt/qtmultimedia/qtmultimedia-6.7.0.ebuild @@ -0,0 +1,104 @@ +# 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 ) + vaapi? ( ffmpeg opengl ) + test? ( qml ) +" + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[gui,network,opengl=,vulkan=,widgets] + alsa? ( 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" + +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 + # 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 alsa) + $(qt_feature ffmpeg) + $(qt_feature gstreamer) + $(usev gstreamer $(qt_feature opengl gstreamer_gl)) + $(qt_feature pulseaudio) + $(qt_feature v4l linux_v4l) + $(qt_feature vaapi) + ) + + 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.0_rc2.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.7.0_rc2.ebuild deleted file mode 100644 index 2359fc0aabd3..000000000000 --- a/dev-qt/qtmultimedia/qtmultimedia-6.7.0_rc2.ebuild +++ /dev/null @@ -1,87 +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 ) - vaapi? ( ffmpeg opengl ) - test? ( qml ) -" - -RDEPEND=" - ~dev-qt/qtbase-${PV}:6[gui,network,opengl=,vulkan=,widgets] - alsa? ( 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" - -CMAKE_SKIP_TESTS=( - # 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 - # 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 alsa) - $(qt_feature ffmpeg) - $(qt_feature gstreamer) - $(usev gstreamer $(qt_feature opengl gstreamer_gl)) - $(qt_feature pulseaudio) - $(qt_feature v4l linux_v4l) - $(qt_feature vaapi) - ) - - qt6-build_src_configure -} diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild index 4f3890da25d9..6ed0ab79449b 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild @@ -54,6 +54,8 @@ DEPEND=" 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 diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild index 4f3890da25d9..6ed0ab79449b 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild @@ -54,6 +54,8 @@ DEPEND=" 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 -- cgit v1.2.3