[gentoo-commits] repo/gentoo:master commit in: media-libs/libv4l/

[James Le Cuirot]

commit:     83c14b46f1b562da994100ad01bf7ed124bb2891
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 30 22:00:27 2024 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Jul 30 22:00:27 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83c14b46

media-libs/libv4l: Allow Qt5 to be chosen over Qt6

Blocking Qt6 was too disruptive.

Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 media-libs/libv4l/libv4l-1.28.1.ebuild | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/media-libs/libv4l/libv4l-1.28.1.ebuild 
b/media-libs/libv4l/libv4l-1.28.1.ebuild
index 4a917d98578e..7f11f9769139 100644
--- a/media-libs/libv4l/libv4l-1.28.1.ebuild
+++ b/media-libs/libv4l/libv4l-1.28.1.ebuild
@@ -39,7 +39,6 @@ RDEPEND="
                        virtual/opengl
                )
                !qt6? ( qt5? (
-                       !dev-qt/qtbase:6
                        dev-qt/qtcore:5
                        dev-qt/qtgui:5
                        dev-qt/qtopengl:5[-gles2-only(-),-gles2(-)]
@@ -89,6 +88,11 @@ pkg_setup() {
        CONFIG_CHECK="~SHMEM" linux-info_pkg_setup
 }
 
+src_prepare() {
+       default
+       use qt6 || sed -i "/^dep_qt6/s/'qt6/&DiSaBlEd/" meson.build || die
+}
+
 multilib_src_configure() {
        local emesonargs=(
                $(meson_native_use_feature bpf)