From acfd7c956a7b45da7af1452ec12e0b2d5e6ac65b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 26 Feb 2025 19:26:07 +0000 Subject: gentoo auto-resync : 26:02:2025 - 19:26:07 --- dev-qt/qtmultimedia/Manifest | 10 +- dev-qt/qtmultimedia/metadata.xml | 3 +- dev-qt/qtmultimedia/qtmultimedia-6.8.1.ebuild | 151 ----------------------- dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild | 22 ++-- dev-qt/qtmultimedia/qtmultimedia-6.9.9999.ebuild | 22 ++-- dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild | 22 ++-- 6 files changed, 36 insertions(+), 194 deletions(-) delete mode 100644 dev-qt/qtmultimedia/qtmultimedia-6.8.1.ebuild (limited to 'dev-qt/qtmultimedia') diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest index b1e8edb99bc6..435ff04e046b 100644 --- a/dev-qt/qtmultimedia/Manifest +++ b/dev-qt/qtmultimedia/Manifest @@ -2,12 +2,10 @@ AUX qtmultimedia-6.7.3-eigen-ppc-no-vsx.patch 5814 BLAKE2B aaf9c453258b1afe6a443 AUX qtmultimedia-6.8.1-qversionnumber.patch 303 BLAKE2B 1745e30f52b9049d599941a2210cadfa7c36a6ca9e2fee107eb8d62c463b16741c3c586ce06d496db17f0f3b09c119e4c8bc53552d803da996ab9cdd682ecd7f SHA512 7440184de27da704550e94876985c254ff8ef7342577d26cdef1b4e621068f54c010a2670a0cb21c7bd6bfd9f253005c0f5d9c41ea98eea35f6507ead14c8018 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.8.1.tar.xz 9664564 BLAKE2B 675544811c845ddb34908fe82e33824451e6ec8fecb66730a2f4dbe754c4466db3ae6e157fac9e8d5d0505adf90ac65bed807bd52eaad0de05047e4532b8ebeb SHA512 77f8e913116ff75cf4602e9c5ee01c48161fb40aaadca0e09ca2f89292071fc6f2918403932b9b0653bbc2b007f25362e0cb84a382baedd67e9e4c31bc414463 DIST qtmultimedia-everywhere-src-6.8.2.tar.xz 9646120 BLAKE2B 14651f1f116e462449678c8c566aaac20356b61b73b023b3aa3e0199b1f44844fb76da82406d653c004a104abd48db6bf8d8d67a3a5216e33447f3505f2fbdfa SHA512 557017faec2596368a453adfee284d88cd83033e73e78b01a6d1918cdf86a283e0a8bfd8a211b31591a7d69fde130528b7a266213460ca37647b13f90b4e22f3 EBUILD qtmultimedia-5.15.16.ebuild 1504 BLAKE2B 7f3ba094454f1836208d3e33d2faaf6bf9b8eb281e9b6b7a8b596b9bfde2c67f3a0e3dc7da90c7b9c87c0f65540225ab315d98dc8f46a3ac82d0520b711fc1c5 SHA512 64b840b6169c5b77d83f58e41b93567e7ed287a634d5d225a2d41e17a0ada8694a7c86e3465659ba79d6af6501b40c88c6321fc6f836064989586220d8d12c1d -EBUILD qtmultimedia-6.8.1.ebuild 4140 BLAKE2B d7ce39836e535940235d0e1fbb924f5af70f0abf581d61390bea068b6c7a63b01dae49edc2891278792d307735080bb44e65a6e1c3a29286b02f69f1c43eae55 SHA512 c4742a0fddbc96c508b25805b71aa7cb03dd4cf9095dabe3b974ca7d365460bafe337dcfedf511d2c81661d6ab2eb34b74870d6966dfc6ca316ee9646b30a570 EBUILD qtmultimedia-6.8.2.ebuild 4237 BLAKE2B c1f471908372712d230d0a428b8b34ac3b170fc5feff333c8092788c2d7caabd19f1b907ba9964664b6dd0b46a134d0cc4a615469a5a83c916120b0d6c9b5318 SHA512 74b043e8c583dc924dfe6f0283e06bd03799d0d95ce12208171e2378ba938443ad4449b7464e78b7b7d81e6d36536fbe842f1020ffe7a821172e1a92a39d7bb9 -EBUILD qtmultimedia-6.8.9999.ebuild 4243 BLAKE2B 76ca3a131f79d77df263884b4d3c4c40a6860b2c8ae8ff00647c1d0c7b49f78870f3bc7e9350f2052d7b043172fa485f83f2ec4846f4ac8d55d049d97cdf1afc SHA512 bc7cc998cba90b2cffccdc0ee108f5760e083c5847522f719fabc872d6a4337b2cbb3fd5cfaee2cd117ec54ec1bd4f6c5b8eb741366dcc8077732067680e4457 -EBUILD qtmultimedia-6.9.9999.ebuild 4243 BLAKE2B 76ca3a131f79d77df263884b4d3c4c40a6860b2c8ae8ff00647c1d0c7b49f78870f3bc7e9350f2052d7b043172fa485f83f2ec4846f4ac8d55d049d97cdf1afc SHA512 bc7cc998cba90b2cffccdc0ee108f5760e083c5847522f719fabc872d6a4337b2cbb3fd5cfaee2cd117ec54ec1bd4f6c5b8eb741366dcc8077732067680e4457 -EBUILD qtmultimedia-6.9999.ebuild 4243 BLAKE2B 76ca3a131f79d77df263884b4d3c4c40a6860b2c8ae8ff00647c1d0c7b49f78870f3bc7e9350f2052d7b043172fa485f83f2ec4846f4ac8d55d049d97cdf1afc SHA512 bc7cc998cba90b2cffccdc0ee108f5760e083c5847522f719fabc872d6a4337b2cbb3fd5cfaee2cd117ec54ec1bd4f6c5b8eb741366dcc8077732067680e4457 -MISC metadata.xml 888 BLAKE2B bf3f5b1376585d4aa9021aa838b486b8143e5fbf7c5bf7c7324500de96ab86fd0176993567f97f5e5d115284f8c3ccc16475f787407d747689aefa82cf9a9534 SHA512 98e962234f1ed462444e5f7f3e77a08794b2d0480df7773e822a5671cdfbf708b51edfafacffade2ad5f8b177d89cc0d53b975ef181be66b885c17db2a4a542b +EBUILD qtmultimedia-6.8.9999.ebuild 4087 BLAKE2B 2a623eaaeadb0aa6a1038c21436fcb8f038652fee943a9dc3fd6d38d113e99e9d19d15b1884b78640271ecdfa7364619e7529338f53feadd9a15655b434d7616 SHA512 74e251fd626af157a4b9fb761a3159e4f0a8777564634e375e0b42d9281dd7aa5b4cce5fbd2267840722e3a8491e95e9df7a4f4c8c02ef534c2ce3c976f6f12e +EBUILD qtmultimedia-6.9.9999.ebuild 4087 BLAKE2B 2a623eaaeadb0aa6a1038c21436fcb8f038652fee943a9dc3fd6d38d113e99e9d19d15b1884b78640271ecdfa7364619e7529338f53feadd9a15655b434d7616 SHA512 74e251fd626af157a4b9fb761a3159e4f0a8777564634e375e0b42d9281dd7aa5b4cce5fbd2267840722e3a8491e95e9df7a4f4c8c02ef534c2ce3c976f6f12e +EBUILD qtmultimedia-6.9999.ebuild 4087 BLAKE2B 2a623eaaeadb0aa6a1038c21436fcb8f038652fee943a9dc3fd6d38d113e99e9d19d15b1884b78640271ecdfa7364619e7529338f53feadd9a15655b434d7616 SHA512 74e251fd626af157a4b9fb761a3159e4f0a8777564634e375e0b42d9281dd7aa5b4cce5fbd2267840722e3a8491e95e9df7a4f4c8c02ef534c2ce3c976f6f12e +MISC metadata.xml 956 BLAKE2B b2e3df423a5f95be4b82001abc2d5d1b2729c40b0733e4e600d4945834fa6eff26c209f828770aede742a2a762c781615f3493707c67868c0c54e9648ae225df SHA512 455b348a5a8e0fe57807dce5a19584a604fe38658b950c1d47880d31d241ed91597619b29e16db53e9723f4e51cd2d8a55f9a5aa64c2dbce32d1b804ae3f6f20 diff --git a/dev-qt/qtmultimedia/metadata.xml b/dev-qt/qtmultimedia/metadata.xml index 28f9bdbd0ddf..c80793a61966 100644 --- a/dev-qt/qtmultimedia/metadata.xml +++ b/dev-qt/qtmultimedia/metadata.xml @@ -7,7 +7,8 @@ Enable screen capture support with Qt's EGL Full Screen/Single Surface platform plugin - Enable audio support via media-libs/gstreamer + Enable media-libs/gstreamer support + Enable media-video/pipewire support Build QML/QtQuick bindings and imports Build the QtMultimediaWidgets module diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.8.1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.8.1.ebuild deleted file mode 100644 index 3bed1852e8eb..000000000000 --- a/dev-qt/qtmultimedia/qtmultimedia-6.8.1.ebuild +++ /dev/null @@ -1,151 +0,0 @@ -# Copyright 2021-2025 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 screencast v4l vaapi vulkan wayland -" -# tst_qmediaplayerbackend hard requires qml, review in case becomes optional -REQUIRED_USE=" - || ( ffmpeg gstreamer ) - eglfs? ( ffmpeg opengl qml ) - screencast? ( ffmpeg ) - 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) -# := skipped on pipewire due to only being used through dbus -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 - ) - screencast? ( - ~dev-qt/qtbase-${PV}:6[dbus] - media-video/pipewire - ) -" -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_qmediaframeinputsbackend - tst_qmediaplayer_gstreamer - tst_qmediaplayerbackend - tst_qsoundeffect - # may try to use v4l2 or hardware acceleration depending on availability - tst_qmediarecorderbackend - 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 - "${FILESDIR}"/${PN}-6.8.1-qversionnumber.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 -DDISABLE_SIMD -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 screencast pipewire) - $(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.8.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild index ebedbf72d367..aba8e63d54d5 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild @@ -12,21 +12,18 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then fi IUSE=" - +X alsa eglfs +ffmpeg gstreamer opengl pulseaudio - qml screencast v4l vaapi vulkan wayland + +X alsa +dbus eglfs +ffmpeg gstreamer opengl pipewire pulseaudio + qml v4l vaapi vulkan wayland " # tst_qmediaplayerbackend hard requires qml, review in case becomes optional REQUIRED_USE=" || ( ffmpeg gstreamer ) eglfs? ( ffmpeg opengl qml ) - screencast? ( ffmpeg ) 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) -# := skipped on pipewire due to only being used through dbus +# dlopen/dbus: pipewire RDEPEND=" ~dev-qt/qtbase-${PV}:6[gui,network,opengl=,vulkan=,widgets] alsa? ( @@ -44,7 +41,7 @@ RDEPEND=" gstreamer? ( dev-libs/glib:2 media-libs/gst-plugins-bad:1.0 - media-libs/gst-plugins-base:1.0[X=] + media-libs/gst-plugins-base:1.0 media-libs/gstreamer:1.0 opengl? ( ~dev-qt/qtbase-${PV}:6[X?,wayland?] @@ -52,15 +49,15 @@ RDEPEND=" ) ) opengl? ( media-libs/libglvnd ) + pipewire? ( + ~dev-qt/qtbase-${PV}:6[dbus?] + media-video/pipewire:= + ) pulseaudio? ( media-libs/libpulse ) qml? ( ~dev-qt/qtdeclarative-${PV}:6 ~dev-qt/qtquick3d-${PV}:6 ) - screencast? ( - ~dev-qt/qtbase-${PV}:6[dbus] - media-video/pipewire - ) " DEPEND=" ${RDEPEND} @@ -117,8 +114,9 @@ src_configure() { $(qt_feature wayland gstreamer_gl_wayland) ") ") + $(qt_feature pipewire) + $(usev pipewire $(qt_feature dbus pipewire_screencapture)) $(qt_feature pulseaudio) - $(qt_feature screencast pipewire) $(qt_feature v4l linux_v4l) $(qt_feature vaapi) ) diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.9.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.9.9999.ebuild index ebedbf72d367..aba8e63d54d5 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-6.9.9999.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-6.9.9999.ebuild @@ -12,21 +12,18 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then fi IUSE=" - +X alsa eglfs +ffmpeg gstreamer opengl pulseaudio - qml screencast v4l vaapi vulkan wayland + +X alsa +dbus eglfs +ffmpeg gstreamer opengl pipewire pulseaudio + qml v4l vaapi vulkan wayland " # tst_qmediaplayerbackend hard requires qml, review in case becomes optional REQUIRED_USE=" || ( ffmpeg gstreamer ) eglfs? ( ffmpeg opengl qml ) - screencast? ( ffmpeg ) 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) -# := skipped on pipewire due to only being used through dbus +# dlopen/dbus: pipewire RDEPEND=" ~dev-qt/qtbase-${PV}:6[gui,network,opengl=,vulkan=,widgets] alsa? ( @@ -44,7 +41,7 @@ RDEPEND=" gstreamer? ( dev-libs/glib:2 media-libs/gst-plugins-bad:1.0 - media-libs/gst-plugins-base:1.0[X=] + media-libs/gst-plugins-base:1.0 media-libs/gstreamer:1.0 opengl? ( ~dev-qt/qtbase-${PV}:6[X?,wayland?] @@ -52,15 +49,15 @@ RDEPEND=" ) ) opengl? ( media-libs/libglvnd ) + pipewire? ( + ~dev-qt/qtbase-${PV}:6[dbus?] + media-video/pipewire:= + ) pulseaudio? ( media-libs/libpulse ) qml? ( ~dev-qt/qtdeclarative-${PV}:6 ~dev-qt/qtquick3d-${PV}:6 ) - screencast? ( - ~dev-qt/qtbase-${PV}:6[dbus] - media-video/pipewire - ) " DEPEND=" ${RDEPEND} @@ -117,8 +114,9 @@ src_configure() { $(qt_feature wayland gstreamer_gl_wayland) ") ") + $(qt_feature pipewire) + $(usev pipewire $(qt_feature dbus pipewire_screencapture)) $(qt_feature pulseaudio) - $(qt_feature screencast pipewire) $(qt_feature v4l linux_v4l) $(qt_feature vaapi) ) diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild index ebedbf72d367..aba8e63d54d5 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild @@ -12,21 +12,18 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then fi IUSE=" - +X alsa eglfs +ffmpeg gstreamer opengl pulseaudio - qml screencast v4l vaapi vulkan wayland + +X alsa +dbus eglfs +ffmpeg gstreamer opengl pipewire pulseaudio + qml v4l vaapi vulkan wayland " # tst_qmediaplayerbackend hard requires qml, review in case becomes optional REQUIRED_USE=" || ( ffmpeg gstreamer ) eglfs? ( ffmpeg opengl qml ) - screencast? ( ffmpeg ) 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) -# := skipped on pipewire due to only being used through dbus +# dlopen/dbus: pipewire RDEPEND=" ~dev-qt/qtbase-${PV}:6[gui,network,opengl=,vulkan=,widgets] alsa? ( @@ -44,7 +41,7 @@ RDEPEND=" gstreamer? ( dev-libs/glib:2 media-libs/gst-plugins-bad:1.0 - media-libs/gst-plugins-base:1.0[X=] + media-libs/gst-plugins-base:1.0 media-libs/gstreamer:1.0 opengl? ( ~dev-qt/qtbase-${PV}:6[X?,wayland?] @@ -52,15 +49,15 @@ RDEPEND=" ) ) opengl? ( media-libs/libglvnd ) + pipewire? ( + ~dev-qt/qtbase-${PV}:6[dbus?] + media-video/pipewire:= + ) pulseaudio? ( media-libs/libpulse ) qml? ( ~dev-qt/qtdeclarative-${PV}:6 ~dev-qt/qtquick3d-${PV}:6 ) - screencast? ( - ~dev-qt/qtbase-${PV}:6[dbus] - media-video/pipewire - ) " DEPEND=" ${RDEPEND} @@ -117,8 +114,9 @@ src_configure() { $(qt_feature wayland gstreamer_gl_wayland) ") ") + $(qt_feature pipewire) + $(usev pipewire $(qt_feature dbus pipewire_screencapture)) $(qt_feature pulseaudio) - $(qt_feature screencast pipewire) $(qt_feature v4l linux_v4l) $(qt_feature vaapi) ) -- cgit v1.2.3