* [Buildroot] [PATCH 1/1] package/stellarium: new package
@ 2019-08-04 16:04 Bernd Kuhls
2019-08-04 22:07 ` Thomas Petazzoni
0 siblings, 1 reply; 4+ messages in thread
From: Bernd Kuhls @ 2019-08-04 16:04 UTC (permalink / raw)
To: buildroot
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
DEVELOPERS | 1 +
package/Config.in | 1 +
...iling-with-GPSD-3.19-API-8.0-fix-733.patch | 36 ++++++++++++++++++
.../0002-A-tiny-fix-for-previous-commit.patch | 29 ++++++++++++++
package/stellarium/Config.in | 27 +++++++++++++
package/stellarium/stellarium.hash | 6 +++
package/stellarium/stellarium.mk | 38 +++++++++++++++++++
7 files changed, 138 insertions(+)
create mode 100644 package/stellarium/0001-Fixed-compiling-with-GPSD-3.19-API-8.0-fix-733.patch
create mode 100644 package/stellarium/0002-A-tiny-fix-for-previous-commit.patch
create mode 100644 package/stellarium/Config.in
create mode 100644 package/stellarium/stellarium.hash
create mode 100644 package/stellarium/stellarium.mk
diff --git a/DEVELOPERS b/DEVELOPERS
index fa8b89992a..a466e30434 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -410,6 +410,7 @@ F: package/samba4/
F: package/softether/
F: package/spandsp/
F: package/sqlite/
+F: package/stellarium/
F: package/taglib/
F: package/tinyxml2/
F: package/tor/
diff --git a/package/Config.in b/package/Config.in
index cd40e8fba2..4b7796d9c7 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -284,6 +284,7 @@ comment "Graphic applications"
source "package/pngquant/Config.in"
source "package/qt5cinex/Config.in"
source "package/rrdtool/Config.in"
+ source "package/stellarium/Config.in"
source "package/tesseract-ocr/Config.in"
comment "Graphic libraries"
diff --git a/package/stellarium/0001-Fixed-compiling-with-GPSD-3.19-API-8.0-fix-733.patch b/package/stellarium/0001-Fixed-compiling-with-GPSD-3.19-API-8.0-fix-733.patch
new file mode 100644
index 0000000000..126a25f922
--- /dev/null
+++ b/package/stellarium/0001-Fixed-compiling-with-GPSD-3.19-API-8.0-fix-733.patch
@@ -0,0 +1,36 @@
+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
+
diff --git a/package/stellarium/0002-A-tiny-fix-for-previous-commit.patch b/package/stellarium/0002-A-tiny-fix-for-previous-commit.patch
new file mode 100644
index 0000000000..d4c13cb34f
--- /dev/null
+++ b/package/stellarium/0002-A-tiny-fix-for-previous-commit.patch
@@ -0,0 +1,29 @@
+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
+
diff --git a/package/stellarium/Config.in b/package/stellarium/Config.in
new file mode 100644
index 0000000000..4232f9ed1a
--- /dev/null
+++ b/package/stellarium/Config.in
@@ -0,0 +1,27 @@
+config BR2_PACKAGE_STELLARIUM
+ bool "stellarium"
+ depends on BR2_PACKAGE_QT5
+ depends on BR2_PACKAGE_QT5_GL_AVAILABLE
+ depends on BR2_PACKAGE_HAS_LIBGL
+ select BR2_PACKAGE_QT5BASE_CONCURRENT
+ select BR2_PACKAGE_QT5BASE_GUI
+ select BR2_PACKAGE_QT5BASE_NETWORK
+ select BR2_PACKAGE_QT5BASE_OPENGL
+ select BR2_PACKAGE_QT5BASE_PRINTSUPPORT
+ select BR2_PACKAGE_QT5BASE_WIDGETS
+ select BR2_PACKAGE_QT5LOCATION
+ select BR2_PACKAGE_QT5MULTIMEDIA
+ select BR2_PACKAGE_QT5SCRIPT if BR2_PACKAGE_QT5_JSCORE_AVAILABLE
+ select BR2_PACKAGE_QT5SERIALPORT if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_6
+ select BR2_PACKAGE_ZLIB
+ help
+ Stellarium is a free open source planetarium for your
+ computer. It shows a realistic sky in 3D, just like what
+ you see with the naked eye, binoculars or a telescope.
+
+ https://stellarium.org
+
+comment "stellarium needs an OpenGL provider"
+ depends on BR2_PACKAGE_QT5
+ depends on !BR2_PACKAGE_QT5_GL_AVAILABLE || \
+ !BR2_PACKAGE_HAS_LIBGL
diff --git a/package/stellarium/stellarium.hash b/package/stellarium/stellarium.hash
new file mode 100644
index 0000000000..f016463d1a
--- /dev/null
+++ b/package/stellarium/stellarium.hash
@@ -0,0 +1,6 @@
+# From https://github.com/Stellarium/stellarium/releases
+md5 a1a81b600822c5d85661b4dbe9d9bbcb stellarium-0.19.1.tar.gz
+sha1 ff344208d71e9f66bb3b893acf7d92358bed1760 stellarium-0.19.1.tar.gz
+# Locally computed
+sha256 0f25ad2acb59b75a49568c82123219aed5a14252c2ef39d0444540057d2cfb68 stellarium-0.19.1.tar.gz
+sha256 3aeeb5bb98bf7041ab82cffe15efa28ac58ee2bdf162b71301f5c192be631259 COPYING
diff --git a/package/stellarium/stellarium.mk b/package/stellarium/stellarium.mk
new file mode 100644
index 0000000000..779355520c
--- /dev/null
+++ b/package/stellarium/stellarium.mk
@@ -0,0 +1,38 @@
+################################################################################
+#
+# stellarium
+#
+################################################################################
+
+STELLARIUM_VERSION = 0.19.1
+STELLARIUM_SITE = https://github.com/Stellarium/stellarium/releases/download/v$(STELLARIUM_VERSION)
+STELLARIUM_LICENSE = GPL-2.0+
+STELLARIUM_LICENSE_FILES = COPYING
+STELLARIUM_DEPENDENCIES = \
+ qt5base \
+ qt5location \
+ qt5multimedia \
+ zlib
+STELLARIUM_CONF_OPTS = \
+ -DENABLE_MEDIA=ON \
+ -DENABLE_NLS=OFF \
+ -DUSE_SYSTEM_ZLIB=ON
+
+ifeq ($(BR2_PACKAGE_QT5SCRIPT),y)
+STELLARIUM_DEPENDENCIES += qt5script
+STELLARIUM_CONF_OPTS += -DENABLE_SCRIPTING=ON
+else
+STELLARIUM_CONF_OPTS += -DENABLE_SCRIPTING=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_QT5SERIALPORT),y)
+STELLARIUM_DEPENDENCIES += qt5serialport
+ifeq ($(BR2_PACKAGE_GPSD),y)
+STELLARIUM_DEPENDENCIES += gpsd
+endif
+STELLARIUM_CONF_OPTS += -DENABLE_GPS=ON
+else
+STELLARIUM_CONF_OPTS += -DENABLE_GPS=OFF
+endif
+
+$(eval $(cmake-package))
--
2.20.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 1/1] package/stellarium: new package
2019-08-04 16:04 [Buildroot] [PATCH 1/1] package/stellarium: new package Bernd Kuhls
@ 2019-08-04 22:07 ` Thomas Petazzoni
2019-08-05 5:38 ` Bernd Kuhls
0 siblings, 1 reply; 4+ messages in thread
From: Thomas Petazzoni @ 2019-08-04 22:07 UTC (permalink / raw)
To: buildroot
Hello Bernd,
On Sun, 4 Aug 2019 18:04:32 +0200
Bernd Kuhls <bernd.kuhls@t-online.de> wrote:
> diff --git a/package/stellarium/Config.in b/package/stellarium/Config.in
> new file mode 100644
> index 0000000000..4232f9ed1a
> --- /dev/null
> +++ b/package/stellarium/Config.in
> @@ -0,0 +1,27 @@
> +config BR2_PACKAGE_STELLARIUM
> + bool "stellarium"
> + depends on BR2_PACKAGE_QT5
> + depends on BR2_PACKAGE_QT5_GL_AVAILABLE
> + depends on BR2_PACKAGE_HAS_LIBGL
Why do you have a depends on BR2_PACKAGE_HAS_LIBGL in addition to
BR2_PACKAGE_QT5_GL_AVAILABLE ? The Qt OpenGL support works with both
full OpenGL or OpenGL ES. Is there something in stellarium that limits
it to full OpenGL ?
> + select BR2_PACKAGE_QT5BASE_CONCURRENT
> + select BR2_PACKAGE_QT5BASE_GUI
> + select BR2_PACKAGE_QT5BASE_NETWORK
> + select BR2_PACKAGE_QT5BASE_OPENGL
> + select BR2_PACKAGE_QT5BASE_PRINTSUPPORT
> + select BR2_PACKAGE_QT5BASE_WIDGETS
> + select BR2_PACKAGE_QT5LOCATION
> + select BR2_PACKAGE_QT5MULTIMEDIA
> + select BR2_PACKAGE_QT5SCRIPT if BR2_PACKAGE_QT5_JSCORE_AVAILABLE
> + select BR2_PACKAGE_QT5SERIALPORT if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_6
So how does it work when BR2_PACKAGE_QT5_JSCORE_AVAILABLE or
BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_6 are not 'y' ?
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 1/1] package/stellarium: new package
2019-08-04 22:07 ` Thomas Petazzoni
@ 2019-08-05 5:38 ` Bernd Kuhls
2019-08-05 20:42 ` Thomas Petazzoni
0 siblings, 1 reply; 4+ messages in thread
From: Bernd Kuhls @ 2019-08-05 5:38 UTC (permalink / raw)
To: buildroot
Am Mon, 05 Aug 2019 00:07:52 +0200 schrieb Thomas Petazzoni:
>> + select BR2_PACKAGE_QT5SCRIPT if BR2_PACKAGE_QT5_JSCORE_AVAILABLE
>> + select BR2_PACKAGE_QT5SERIALPORT if
BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_6
>
> So how does it work when BR2_PACKAGE_QT5_JSCORE_AVAILABLE or
> BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_6 are not 'y' ?
Hi Thomas,
both BR2_PACKAGE_QT5SCRIPT and BR2_PACKAGE_QT5SERIALPORT are only
optional dependencies. My goal is to enable all available options in
Config.in.
Regarding OpenGL ES I need to test this option, for now I only did build-
tests using OpenGL so the package depends on BR2_PACKAGE_HAS_LIBGL for
now.
Regards, Bernd
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 1/1] package/stellarium: new package
2019-08-05 5:38 ` Bernd Kuhls
@ 2019-08-05 20:42 ` Thomas Petazzoni
0 siblings, 0 replies; 4+ messages in thread
From: Thomas Petazzoni @ 2019-08-05 20:42 UTC (permalink / raw)
To: buildroot
Hello Bernd,
Thanks for your feedback!
On Mon, 05 Aug 2019 07:38:00 +0200
Bernd Kuhls <bernd.kuhls@t-online.de> wrote:
> both BR2_PACKAGE_QT5SCRIPT and BR2_PACKAGE_QT5SERIALPORT are only
> optional dependencies. My goal is to enable all available options in
> Config.in.
Then, we should handle them like we normally do for optional
dependencies, with only the logic in the .mk file, and not selects in
the Config.in file.
> Regarding OpenGL ES I need to test this option, for now I only did build-
> tests using OpenGL so the package depends on BR2_PACKAGE_HAS_LIBGL for
Could you add a comment in Config.in about this ?
If you fix those two minor nits, and resend an updated version, I think
we should be good to go.
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-08-05 20:42 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-08-04 16:04 [Buildroot] [PATCH 1/1] package/stellarium: new package Bernd Kuhls
2019-08-04 22:07 ` Thomas Petazzoni
2019-08-05 5:38 ` Bernd Kuhls
2019-08-05 20:42 ` Thomas Petazzoni
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.