diff options
author | Daniel Nagy <danielnagy@posteo.de> | 2023-05-02 16:30:00 +0200 |
---|---|---|
committer | Daniel Nagy <danielnagy@posteo.de> | 2023-05-02 16:45:00 +0200 |
commit | 8372789e47ceb405fbf7e1b44c878df7575b9e19 (patch) | |
tree | 89a552582d848022f420dbe554253671e99986c5 /pkgs/applications/science | |
parent | 2816ca91e19b935ded8f5b563c1c187d66c9deb1 (diff) |
qgroundcontrol: 4.2.4 -> 4.2.6
Diff: https://github.com/mavlink/qgroundcontrol/compare/v4.2.4...v4.2.6
Diffstat (limited to 'pkgs/applications/science')
-rw-r--r-- | pkgs/applications/science/robotics/qgroundcontrol/default.nix | 23 | ||||
-rw-r--r-- | pkgs/applications/science/robotics/qgroundcontrol/fix-10132.patch | 62 |
2 files changed, 8 insertions, 77 deletions
diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix index 7942c2b41b4fd..385944bc5be90 100644 --- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -1,12 +1,10 @@ -{ lib, mkDerivation, fetchFromGitHub, SDL2 -, qtbase, qtcharts, qtlocation, qtserialport, qtsvg, qtquickcontrols2 -, qtgraphicaleffects, qtspeech, qtx11extras, qmake, qttools -, gst_all_1, wayland, pkg-config -}: +{ lib, stdenv, fetchFromGitHub, SDL2, qtbase, qtcharts, qtlocation, qtserialport +, qtsvg, qtquickcontrols2, qtgraphicaleffects, qtspeech, qtx11extras, qmake +, qttools, gst_all_1, wayland, pkg-config, wrapQtAppsHook }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "qgroundcontrol"; - version = "4.2.4"; + version = "4.2.6"; qtInputs = [ qtbase qtcharts qtlocation qtserialport qtsvg qtquickcontrols2 @@ -23,7 +21,7 @@ mkDerivation rec { ]; buildInputs = [ SDL2 ] ++ gstInputs ++ qtInputs; - nativeBuildInputs = [ pkg-config qmake qttools ]; + nativeBuildInputs = [ pkg-config qmake qttools wrapQtAppsHook ]; preConfigure = '' mkdir build @@ -69,21 +67,16 @@ mkDerivation rec { owner = "mavlink"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pPxqYxBlw9re1rlUU2qz0gFRmT+PmslrcBv97VEG84k="; + sha256 = "sha256-mMeKDfylVEqLo1i2ucUBu287Og4472Ecp7Cge9Cw3kE="; fetchSubmodules = true; }; - patches = [ - # fix build problems caused by https://github.com/mavlink/qgroundcontrol/pull/10132 - # remove once updated past 4.2.0 - ./fix-10132.patch - ]; - meta = with lib; { description = "Provides full ground station support and configuration for the PX4 and APM Flight Stacks"; homepage = "http://qgroundcontrol.com/"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ lopsided98 ]; + mainProgram = "QGroundControl"; }; } diff --git a/pkgs/applications/science/robotics/qgroundcontrol/fix-10132.patch b/pkgs/applications/science/robotics/qgroundcontrol/fix-10132.patch deleted file mode 100644 index 0a666132f9319..0000000000000 --- a/pkgs/applications/science/robotics/qgroundcontrol/fix-10132.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff --git a/libs/qmlglsink/gst-plugins-good/ext/qt/gstqsgtexture.cc b/libs/qmlglsink/gst-plugins-good/ext/qt/gstqsgtexture.cc -index 2b314e0..ad1425e 100644 ---- a/libs/qmlglsink/gst-plugins-good/ext/qt/gstqsgtexture.cc -+++ b/libs/qmlglsink/gst-plugins-good/ext/qt/gstqsgtexture.cc -@@ -35,7 +35,7 @@ GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT); - - GstQSGTexture::GstQSGTexture () - { -- static volatile gsize _debug; -+ static gsize _debug; - - initializeOpenGLFunctions(); - -diff --git a/libs/qmlglsink/gst-plugins-good/ext/qt/gstqtglutility.cc b/libs/qmlglsink/gst-plugins-good/ext/qt/gstqtglutility.cc -index 3a68576..5203d13 100644 ---- a/libs/qmlglsink/gst-plugins-good/ext/qt/gstqtglutility.cc -+++ b/libs/qmlglsink/gst-plugins-good/ext/qt/gstqtglutility.cc -@@ -58,7 +58,7 @@ gst_qt_get_gl_display () - { - GstGLDisplay *display = NULL; - QGuiApplication *app = static_cast<QGuiApplication *> (QCoreApplication::instance ()); -- static volatile gsize _debug; -+ static gsize _debug; - - g_assert (app != NULL); - -diff --git a/libs/qmlglsink/gst-plugins-good/ext/qt/qtitem.cc b/libs/qmlglsink/gst-plugins-good/ext/qt/qtitem.cc -index f031b36..3c6722a 100644 ---- a/libs/qmlglsink/gst-plugins-good/ext/qt/qtitem.cc -+++ b/libs/qmlglsink/gst-plugins-good/ext/qt/qtitem.cc -@@ -106,7 +106,7 @@ void InitializeSceneGraph::run() - - QtGLVideoItem::QtGLVideoItem() - { -- static volatile gsize _debug; -+ static gsize _debug; - - if (g_once_init_enter (&_debug)) { - GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "qtglwidget", 0, "Qt GL Widget"); -diff --git a/libs/qmlglsink/gst-plugins-good/ext/qt/qtwindow.cc b/libs/qmlglsink/gst-plugins-good/ext/qt/qtwindow.cc -index 8bf14ae..2f88aa9 100644 ---- a/libs/qmlglsink/gst-plugins-good/ext/qt/qtwindow.cc -+++ b/libs/qmlglsink/gst-plugins-good/ext/qt/qtwindow.cc -@@ -107,7 +107,7 @@ QtGLWindow::QtGLWindow ( QWindow * parent, QQuickWindow *src ) : - QQuickWindow( parent ), source (src) - { - QGuiApplication *app = static_cast<QGuiApplication *> (QCoreApplication::instance ()); -- static volatile gsize _debug; -+ static gsize _debug; - - g_assert (app != NULL); - -@@ -156,7 +156,7 @@ QtGLWindow::beforeRendering() - - g_mutex_lock (&this->priv->lock); - -- static volatile gsize once = 0; -+ static gsize once = 0; - if (g_once_init_enter(&once)) { - this->priv->start = QDateTime::currentDateTime().toMSecsSinceEpoch(); - g_once_init_leave(&once,1); - |