mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-25 07:08:13 -07:00
media-video/avidemux: force the xcb platform plugin
align the qt platform plugin with the decision to disable wayland for now Closes: https://bugs.gentoo.org/935624 Signed-off-by: Nicolas PARLANT <nicolas.parlant@parhuet.fr> Part-of: https://github.com/gentoo/gentoo/pull/45279 Closes: https://github.com/gentoo/gentoo/pull/45279 Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
committed by
Sam James
parent
7b5a693417
commit
02a8bf1f0c
@@ -1,4 +1,4 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Copyright 1999-2026 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
@@ -1,4 +1,5 @@
|
||||
avoid deps for both X11 and Wayland
|
||||
force xcb platform if wayland is not enabled, see https://bugs.gentoo.org/935624
|
||||
--- a/avidemux/qt4/ADM_qt/src/ADM_qtx.cpp
|
||||
+++ b/avidemux/qt4/ADM_qt/src/ADM_qtx.cpp
|
||||
@@ -24,21 +24,29 @@ QT_LINUX_WINDOW_ENGINE admDetectQtEngine()
|
||||
@@ -58,3 +59,16 @@ avoid deps for both X11 and Wayland
|
||||
default:
|
||||
ADM_warning("Cannot get qt engine infos\n");
|
||||
myDisplay = NULL;
|
||||
--- a/avidemux/common/main.cpp
|
||||
+++ b/avidemux/common/main.cpp
|
||||
@@ -151,6 +151,10 @@ int main(int _argc, char *_argv[])
|
||||
}
|
||||
#endif
|
||||
|
||||
+#if ADM_UI_TYPE_BUILD == ADM_UI_QT4 && defined USE_X11 && !defined USE_WAYLAND
|
||||
+ qputenv("QT_QPA_PLATFORM", "xcb");
|
||||
+#endif
|
||||
+
|
||||
installSigHandler();
|
||||
|
||||
char **argv;
|
||||
|
||||
Reference in New Issue
Block a user