pyrox.dev
Merge pull request #171479 from tpwrules/fix-qgroundcontrol-build
qgroundcontrol: fix build
authored by Bobby Rong and committed by GitHub 0542fa89 7e3457e2
+6
pkgs/applications/science/robotics/qgroundcontrol/default.nix
+6
pkgs/applications/science/robotics/qgroundcontrol/default.nix
···
68
68
fetchSubmodules = true;
69
69
};
70
70
71
+
patches = [
72
+
# fix build problems caused by https://github.com/mavlink/qgroundcontrol/pull/10132
73
+
# remove once updated past 4.2.0
74
+
./fix-10132.patch
75
+
];
76
+
71
77
meta = with lib; {
72
78
description = "Provides full ground station support and configuration for the PX4 and APM Flight Stacks";
73
79
homepage = "http://qgroundcontrol.com/";
+62
pkgs/applications/science/robotics/qgroundcontrol/fix-10132.patch
+62
pkgs/applications/science/robotics/qgroundcontrol/fix-10132.patch
···
1
+
diff --git a/libs/qmlglsink/gst-plugins-good/ext/qt/gstqsgtexture.cc b/libs/qmlglsink/gst-plugins-good/ext/qt/gstqsgtexture.cc
2
+
index 2b314e0..ad1425e 100644
3
+
--- a/libs/qmlglsink/gst-plugins-good/ext/qt/gstqsgtexture.cc
4
+
+++ b/libs/qmlglsink/gst-plugins-good/ext/qt/gstqsgtexture.cc
5
+
@@ -35,7 +35,7 @@ GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);
6
+
7
+
GstQSGTexture::GstQSGTexture ()
8
+
{
9
+
- static volatile gsize _debug;
10
+
+ static gsize _debug;
11
+
12
+
initializeOpenGLFunctions();
13
+
14
+
diff --git a/libs/qmlglsink/gst-plugins-good/ext/qt/gstqtglutility.cc b/libs/qmlglsink/gst-plugins-good/ext/qt/gstqtglutility.cc
15
+
index 3a68576..5203d13 100644
16
+
--- a/libs/qmlglsink/gst-plugins-good/ext/qt/gstqtglutility.cc
17
+
+++ b/libs/qmlglsink/gst-plugins-good/ext/qt/gstqtglutility.cc
18
+
@@ -58,7 +58,7 @@ gst_qt_get_gl_display ()
19
+
{
20
+
GstGLDisplay *display = NULL;
21
+
QGuiApplication *app = static_cast<QGuiApplication *> (QCoreApplication::instance ());
22
+
- static volatile gsize _debug;
23
+
+ static gsize _debug;
24
+
25
+
g_assert (app != NULL);
26
+
27
+
diff --git a/libs/qmlglsink/gst-plugins-good/ext/qt/qtitem.cc b/libs/qmlglsink/gst-plugins-good/ext/qt/qtitem.cc
28
+
index f031b36..3c6722a 100644
29
+
--- a/libs/qmlglsink/gst-plugins-good/ext/qt/qtitem.cc
30
+
+++ b/libs/qmlglsink/gst-plugins-good/ext/qt/qtitem.cc
31
+
@@ -106,7 +106,7 @@ void InitializeSceneGraph::run()
32
+
33
+
QtGLVideoItem::QtGLVideoItem()
34
+
{
35
+
- static volatile gsize _debug;
36
+
+ static gsize _debug;
37
+
38
+
if (g_once_init_enter (&_debug)) {
39
+
GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "qtglwidget", 0, "Qt GL Widget");
40
+
diff --git a/libs/qmlglsink/gst-plugins-good/ext/qt/qtwindow.cc b/libs/qmlglsink/gst-plugins-good/ext/qt/qtwindow.cc
41
+
index 8bf14ae..2f88aa9 100644
42
+
--- a/libs/qmlglsink/gst-plugins-good/ext/qt/qtwindow.cc
43
+
+++ b/libs/qmlglsink/gst-plugins-good/ext/qt/qtwindow.cc
44
+
@@ -107,7 +107,7 @@ QtGLWindow::QtGLWindow ( QWindow * parent, QQuickWindow *src ) :
45
+
QQuickWindow( parent ), source (src)
46
+
{
47
+
QGuiApplication *app = static_cast<QGuiApplication *> (QCoreApplication::instance ());
48
+
- static volatile gsize _debug;
49
+
+ static gsize _debug;
50
+
51
+
g_assert (app != NULL);
52
+
53
+
@@ -156,7 +156,7 @@ QtGLWindow::beforeRendering()
54
+
55
+
g_mutex_lock (&this->priv->lock);
56
+
57
+
- static volatile gsize once = 0;
58
+
+ static gsize once = 0;
59
+
if (g_once_init_enter(&once)) {
60
+
this->priv->start = QDateTime::currentDateTime().toMSecsSinceEpoch();
61
+
g_once_init_leave(&once,1);
62
+