mirror of
https://github.com/MiyooCFW/buildroot.git
synced 2025-09-27 22:24:19 +03:00
Merge from bittboy/buildroot@26c91a9
This commit is contained in:
TriForceX
@@ -1,36 +0,0 @@
|
||||
From ce26d740db94a2ee4e88595cba0ea9c4cbde2dcb Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Wolf <alex.v.wolf@gmail.com>
|
||||
Date: Sun, 4 Aug 2019 22:33:46 +0700
|
||||
Subject: [PATCH] Fixed compiling with GPSD 3.19 (API 8.0; fix #733)
|
||||
|
||||
Downloaded from upstream commit
|
||||
https://github.com/Stellarium/stellarium/commit/ce26d740db94a2ee4e88595cba0ea9c4cbde2dcb
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
---
|
||||
src/core/StelLocationMgr.cpp | 8 ++++++++
|
||||
1 file changed, 8 insertions(+)
|
||||
|
||||
diff --git a/src/core/StelLocationMgr.cpp b/src/core/StelLocationMgr.cpp
|
||||
index c62bd868cd..20eddc8a61 100644
|
||||
--- a/src/core/StelLocationMgr.cpp
|
||||
+++ b/src/core/StelLocationMgr.cpp
|
||||
@@ -163,7 +163,15 @@ void LibGPSLookupHelper::query()
|
||||
qDebug() << " - xdop:" << dop.xdop << "ydop:" << dop.ydop;
|
||||
qDebug() << " - pdop:" << dop.pdop << "hdop:" << dop.hdop;
|
||||
qDebug() << " - vdop:" << dop.vdop << "tdop:" << dop.tdop << "gdop:" << dop.gdop;
|
||||
+ // GPSD API 8.0:
|
||||
+ // * Remove epe from gps_data_t, it duplicates gps_fix_t eph
|
||||
+ // * Added sep (estimated spherical error, 3D)
|
||||
+ // Details: https://github.com/Stellarium/stellarium/issues/733
|
||||
+ #if GPSD_API_MAJOR_VERSION >= 8
|
||||
+ qDebug() << "Spherical Position Error (sep):" << newdata->sep;
|
||||
+ #else
|
||||
qDebug() << "Spherical Position Error (epe):" << newdata->epe;
|
||||
+ #endif
|
||||
}
|
||||
loc.longitude=newdata->fix.longitude;
|
||||
loc.latitude=newdata->fix.latitude;
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
From 29336f899dec12d7583efb513e1477d4cfc9a621 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Wolf <alex.v.wolf@gmail.com>
|
||||
Date: Sun, 4 Aug 2019 22:51:52 +0700
|
||||
Subject: [PATCH] A tiny fix for previous commit
|
||||
|
||||
Downloaded from upstream commit
|
||||
https://github.com/Stellarium/stellarium/commit/29336f899dec12d7583efb513e1477d4cfc9a621
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
---
|
||||
src/core/StelLocationMgr.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/core/StelLocationMgr.cpp b/src/core/StelLocationMgr.cpp
|
||||
index 20eddc8a61..3c1b5fe4e4 100644
|
||||
--- a/src/core/StelLocationMgr.cpp
|
||||
+++ b/src/core/StelLocationMgr.cpp
|
||||
@@ -168,7 +168,7 @@ void LibGPSLookupHelper::query()
|
||||
// * Added sep (estimated spherical error, 3D)
|
||||
// Details: https://github.com/Stellarium/stellarium/issues/733
|
||||
#if GPSD_API_MAJOR_VERSION >= 8
|
||||
- qDebug() << "Spherical Position Error (sep):" << newdata->sep;
|
||||
+ qDebug() << "Spherical Position Error (sep):" << newdata->fix.sep;
|
||||
#else
|
||||
qDebug() << "Spherical Position Error (epe):" << newdata->epe;
|
||||
#endif
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@@ -1,39 +0,0 @@
|
||||
From 4b6c37bc4631244ecf4126d256d3c33e81bde656 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Wolf <alex.v.wolf@gmail.com>
|
||||
Date: Sun, 4 Aug 2019 23:19:54 +0700
|
||||
Subject: [PATCH] Comment code for get Spherical Position Error (issue
|
||||
#733)
|
||||
|
||||
Downloaded from upstream commit
|
||||
https://github.com/Stellarium/stellarium/commit/4b6c37bc4631244ecf4126d256d3c33e81bde656
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
---
|
||||
src/core/StelLocationMgr.cpp | 11 ++++++-----
|
||||
1 file changed, 6 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/src/core/StelLocationMgr.cpp b/src/core/StelLocationMgr.cpp
|
||||
index 3c1b5fe4e4..72d27b897f 100644
|
||||
--- a/src/core/StelLocationMgr.cpp
|
||||
+++ b/src/core/StelLocationMgr.cpp
|
||||
@@ -167,11 +167,12 @@ void LibGPSLookupHelper::query()
|
||||
// * Remove epe from gps_data_t, it duplicates gps_fix_t eph
|
||||
// * Added sep (estimated spherical error, 3D)
|
||||
// Details: https://github.com/Stellarium/stellarium/issues/733
|
||||
- #if GPSD_API_MAJOR_VERSION >= 8
|
||||
- qDebug() << "Spherical Position Error (sep):" << newdata->fix.sep;
|
||||
- #else
|
||||
- qDebug() << "Spherical Position Error (epe):" << newdata->epe;
|
||||
- #endif
|
||||
+ // #if GPSD_API_MAJOR_VERSION >= 8
|
||||
+ // qDebug() << "Spherical Position Error (sep):" << newdata->fix.sep;
|
||||
+ // #else
|
||||
+ // qDebug() << "Spherical Position Error (epe):" << newdata->epe;
|
||||
+ // #endif
|
||||
+
|
||||
}
|
||||
loc.longitude=newdata->fix.longitude;
|
||||
loc.latitude=newdata->fix.latitude;
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
# From https://github.com/Stellarium/stellarium/releases
|
||||
md5 a1a81b600822c5d85661b4dbe9d9bbcb stellarium-0.19.1.tar.gz
|
||||
sha1 ff344208d71e9f66bb3b893acf7d92358bed1760 stellarium-0.19.1.tar.gz
|
||||
sha1 a3de40d74b2dcf8c9a7c6220de3d9e951e5b06c8 stellarium-0.20.3.tar.gz
|
||||
sha256 2781a364d14c203c21a11ef528d541559ed749e1b6c3dbc1187410a6c23ab97c stellarium-0.20.3.tar.gz
|
||||
# Locally computed
|
||||
sha256 0f25ad2acb59b75a49568c82123219aed5a14252c2ef39d0444540057d2cfb68 stellarium-0.19.1.tar.gz
|
||||
sha256 3aeeb5bb98bf7041ab82cffe15efa28ac58ee2bdf162b71301f5c192be631259 COPYING
|
||||
sha256 3aeeb5bb98bf7041ab82cffe15efa28ac58ee2bdf162b71301f5c192be631259 COPYING
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
STELLARIUM_VERSION = 0.19.1
|
||||
STELLARIUM_VERSION = 0.20.3
|
||||
STELLARIUM_SITE = https://github.com/Stellarium/stellarium/releases/download/v$(STELLARIUM_VERSION)
|
||||
STELLARIUM_LICENSE = GPL-2.0+
|
||||
STELLARIUM_LICENSE_FILES = COPYING
|
||||
|
||||
Reference in New Issue
Block a user