From 20b6ab983b55b022c6e4af317154089e18ad41cb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 2 Sep 2024 12:28:17 +0100 Subject: gentoo auto-resync : 02:09:2024 - 12:28:17 --- dev-qt/Manifest.gz | Bin 11729 -> 11725 bytes dev-qt/qtmultimedia/Manifest | 8 +- dev-qt/qtmultimedia/qtmultimedia-6.7.2-r1.ebuild | 121 ----------------------- dev-qt/qtmultimedia/qtmultimedia-6.7.2-r2.ebuild | 121 +++++++++++++++++++++++ dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild | 2 +- dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild | 2 +- dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild | 2 +- 7 files changed, 128 insertions(+), 128 deletions(-) delete mode 100644 dev-qt/qtmultimedia/qtmultimedia-6.7.2-r1.ebuild create mode 100644 dev-qt/qtmultimedia/qtmultimedia-6.7.2-r2.ebuild (limited to 'dev-qt') diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz index 6b835d3ef1cb..f5dd834c1b07 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 0329603e2f62..e148d9cff7ac 100644 --- a/dev-qt/qtmultimedia/Manifest +++ b/dev-qt/qtmultimedia/Manifest @@ -3,8 +3,8 @@ DIST qtmultimedia-5.15.14-gentoo-kde-1.tar.xz 1492 BLAKE2B e2474990d9efc327f35a9 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-r1.ebuild 3243 BLAKE2B 33b3027b45a188cdf255de400a73f2eae5b1baa707f499b5f4809ef392cc6d708818445bb1d14e535f71092380693323a0807babb3afc591eeade74f922ee044 SHA512 b1d23276920b596cf3dda2b3f2bdd7d1ab9beb6e73b5ec2784c2e1a1235a6e263a104d0768e69dce8ef7ccd8b7344b80cf7fb7a76ea6c230cad084a6d57b4326 -EBUILD qtmultimedia-6.7.9999.ebuild 3193 BLAKE2B a468e06a8276724e38bc98d9a002b303c0cf33962d55ac6eb547e1b68f341b27b12d7d0f9221807b2de9ed0744cd870ba136b2db490364a869b31fcdf0c64577 SHA512 a0cd8932088823005f19b78a2d8009f27b48c8458d6b5f9018a291a5881ef36987fed03494e08859aa74f03692f665b8aeb0a555fd4f2f7bddda22ccba5ad667 -EBUILD qtmultimedia-6.8.9999.ebuild 3834 BLAKE2B 20cb0f0218058e53d0fa8210fb6bfa96458cc53cabe3a186623de043edaa1e3cfa9900dcb7182efc6881ebf26a76a77e233750d2abfa53b0dfe5cf9373cf45c3 SHA512 3c37270cb928afcab7cd01a476ae5b74467d4b00e551911bec8b124b9d6f83a36e1db8c389a1118c0be04d66d5a65152a241be62260c10c9cdec7c2b4674cc1c -EBUILD qtmultimedia-6.9999.ebuild 3834 BLAKE2B 20cb0f0218058e53d0fa8210fb6bfa96458cc53cabe3a186623de043edaa1e3cfa9900dcb7182efc6881ebf26a76a77e233750d2abfa53b0dfe5cf9373cf45c3 SHA512 3c37270cb928afcab7cd01a476ae5b74467d4b00e551911bec8b124b9d6f83a36e1db8c389a1118c0be04d66d5a65152a241be62260c10c9cdec7c2b4674cc1c +EBUILD qtmultimedia-6.7.2-r2.ebuild 3247 BLAKE2B cf452a84f0b696c23d1e01261292284b019c1f8331684b27f24e5cc0e6d12a759ab8af62823aecbcf76359ec1f81863ff469cf0239c92c959ccfd8cb388c0a55 SHA512 e69f82784a2ad6416b98b630ce01c7f76df6c6d56c3ac968bd6ccccadc8270c1d614af2b524663b53fb6cf7a84bba1f3e613217a5607bbe5e63d34a6b30570a2 +EBUILD qtmultimedia-6.7.9999.ebuild 3197 BLAKE2B 8cca6522b8fea6cafd06d3dc27a890337d1bd853b4ab634f5845430dd8f9fe3ca775f0c3d2f8fd9b5d9aa8c886b2d5844e2bf09bb985666c4be3e2319f8ae156 SHA512 4b0eefcf9244f8a98e0b2d3e687e2219bfb9d28bdb3298bccccd1eec16a07b9a6a03b4e1fdfaabe7bcb90b16c5d60a83eaf74dd7194fb4b87bb914ab961fa455 +EBUILD qtmultimedia-6.8.9999.ebuild 3838 BLAKE2B b9329acdcdf75429543feaed309357c4eaf4a9041b55da43ffdb6d386e0c40976a5882e03cbae77c440d90c53108a2fda30db22d18c2e51a2563a16d2ca8e2b3 SHA512 444818fec37bfd2dd8a0eaae2058f848a530fda1227d62fdbe39b78a163006e1cc0e46d0c1c70d24cd0b0a067393631162c814f371f48c843ae1b0d099e458b1 +EBUILD qtmultimedia-6.9999.ebuild 3838 BLAKE2B b9329acdcdf75429543feaed309357c4eaf4a9041b55da43ffdb6d386e0c40976a5882e03cbae77c440d90c53108a2fda30db22d18c2e51a2563a16d2ca8e2b3 SHA512 444818fec37bfd2dd8a0eaae2058f848a530fda1227d62fdbe39b78a163006e1cc0e46d0c1c70d24cd0b0a067393631162c814f371f48c843ae1b0d099e458b1 MISC metadata.xml 888 BLAKE2B bf3f5b1376585d4aa9021aa838b486b8143e5fbf7c5bf7c7324500de96ab86fd0176993567f97f5e5d115284f8c3ccc16475f787407d747689aefa82cf9a9534 SHA512 98e962234f1ed462444e5f7f3e77a08794b2d0480df7773e822a5671cdfbf708b51edfafacffade2ad5f8b177d89cc0d53b975ef181be66b885c17db2a4a542b diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.7.2-r1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.7.2-r1.ebuild deleted file mode 100644 index f86755c55902..000000000000 --- a/dev-qt/qtmultimedia/qtmultimedia-6.7.2-r1.ebuild +++ /dev/null @@ -1,121 +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? ( - !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 -) - -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.2-r2.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.7.2-r2.ebuild new file mode 100644 index 000000000000..74869683aa32 --- /dev/null +++ b/dev-qt/qtmultimedia/qtmultimedia-6.7.2-r2.ebuild @@ -0,0 +1,121 @@ +# 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 +) + +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.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild index 3b8589664575..f92c651b8b19 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild @@ -15,7 +15,7 @@ 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 ) + eglfs? ( ffmpeg opengl qml ) vaapi? ( ffmpeg opengl ) test? ( qml ) " diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild index fe60a09af174..41486d108f30 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild @@ -18,7 +18,7 @@ IUSE=" # tst_qmediaplayerbackend hard requires qml, review in case becomes optional REQUIRED_USE=" || ( ffmpeg gstreamer ) - eglfs? ( ffmpeg opengl ) + eglfs? ( ffmpeg opengl qml ) screencast? ( ffmpeg ) test? ( qml ) vaapi? ( ffmpeg opengl ) diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild index fe60a09af174..41486d108f30 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild @@ -18,7 +18,7 @@ IUSE=" # tst_qmediaplayerbackend hard requires qml, review in case becomes optional REQUIRED_USE=" || ( ffmpeg gstreamer ) - eglfs? ( ffmpeg opengl ) + eglfs? ( ffmpeg opengl qml ) screencast? ( ffmpeg ) test? ( qml ) vaapi? ( ffmpeg opengl ) -- cgit v1.2.3