diff --git a/package/stellarium/Config.in b/package/stellarium/Config.in index 20f32e747a..e39454c079 100644 --- a/package/stellarium/Config.in +++ b/package/stellarium/Config.in @@ -1,18 +1,28 @@ config BR2_PACKAGE_STELLARIUM bool "stellarium" - depends on BR2_PACKAGE_QT5 - depends on BR2_PACKAGE_QT5_GL_AVAILABLE + depends on BR2_PACKAGE_QT5 || BR2_PACKAGE_QT6 + depends on BR2_PACKAGE_QT5_GL_AVAILABLE || BR2_PACKAGE_QT6_GL_SUPPORTS depends on BR2_PACKAGE_HAS_LIBGL # does not support OpenGL ES - 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_QT5CHARTS - select BR2_PACKAGE_QT5LOCATION - select BR2_PACKAGE_QT5MULTIMEDIA - select BR2_PACKAGE_QT5SVG + select BR2_PACKAGE_QT5BASE_CONCURRENT if BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT5BASE_GUI if BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT5BASE_NETWORK if BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT5BASE_OPENGL if BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT5BASE_PRINTSUPPORT if BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT5BASE_WIDGETS if BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT5CHARTS if BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT5LOCATION if BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT5MULTIMEDIA if BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT5SVG if BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT6BASE_CONCURRENT if BR2_PACKAGE_QT6 + select BR2_PACKAGE_QT6BASE_GUI if BR2_PACKAGE_QT6 + select BR2_PACKAGE_QT6BASE_NETWORK if BR2_PACKAGE_QT6 + select BR2_PACKAGE_QT6BASE_OPENGL if BR2_PACKAGE_QT6 + select BR2_PACKAGE_QT6BASE_PRINTSUPPORT if BR2_PACKAGE_QT6 + select BR2_PACKAGE_QT6BASE_WIDGETS if BR2_PACKAGE_QT6 + select BR2_PACKAGE_QT6CHARTS if BR2_PACKAGE_QT6 + select BR2_PACKAGE_QT6MULTIMEDIA if BR2_PACKAGE_QT6 + select BR2_PACKAGE_QT6POSITIONING if BR2_PACKAGE_QT6 + select BR2_PACKAGE_QT6SVG if BR2_PACKAGE_QT6 select BR2_PACKAGE_ZLIB help Stellarium is a free open source planetarium for your @@ -21,5 +31,5 @@ config BR2_PACKAGE_STELLARIUM https://stellarium.org -comment "stellarium needs Qt5 and an OpenGL provider" - depends on !BR2_PACKAGE_QT5 || !BR2_PACKAGE_HAS_LIBGL +comment "stellarium needs Qt5/6 and an OpenGL provider" + depends on (!BR2_PACKAGE_QT5 && !BR2_PACKAGE_QT6) || !BR2_PACKAGE_HAS_LIBGL diff --git a/package/stellarium/stellarium.mk b/package/stellarium/stellarium.mk index ab689bcf72..f36a3a14df 100644 --- a/package/stellarium/stellarium.mk +++ b/package/stellarium/stellarium.mk @@ -24,22 +24,35 @@ endef STELLARIUM_POST_EXTRACT_HOOKS += STELLARIUM_COPY_EXTRA_DOWNLOADS STELLARIUM_DEPENDENCIES = \ - qt5base \ - qt5charts \ - qt5location \ - qt5multimedia \ - qt5svg \ zlib + STELLARIUM_CONF_OPTS = \ -DENABLE_MEDIA=ON \ -DENABLE_NLS=OFF \ -DENABLE_SHOWMYSKY=OFF \ -DENABLE_QTWEBENGINE=OFF \ - -DENABLE_QT6=OFF \ -DENABLE_XLSX=OFF \ -DUSE_PLUGIN_TELESCOPECONTROL=OFF \ -DUSE_SYSTEM_ZLIB=ON +ifeq ($(BR2_PACKAGE_QT5),y) +STELLARIUM_DEPENDENCIES += \ + qt5base \ + qt5charts \ + qt5location \ + qt5multimedia \ + qt5svg +STELLARIUM_CONF_OPTS += -DENABLE_QT6=OFF +else +STELLARIUM_DEPENDENCIES += \ + qt6base \ + qt6charts \ + qt6multimedia \ + qt6positioning \ + qt6svg +STELLARIUM_CONF_OPTS += -DENABLE_QT6=ON +endif + ifeq ($(BR2_PACKAGE_QT5SCRIPT),y) STELLARIUM_DEPENDENCIES += qt5script STELLARIUM_CONF_OPTS += -DENABLE_SCRIPTING=ON @@ -47,8 +60,13 @@ else STELLARIUM_CONF_OPTS += -DENABLE_SCRIPTING=OFF endif -ifeq ($(BR2_PACKAGE_GPSD)$(BR2_PACKAGE_QT5SERIALPORT),yy) -STELLARIUM_DEPENDENCIES += gpsd qt5serialport +ifeq ($(BR2_PACKAGE_GPSD)$(BR2_PACKAGE_QT5SERIALPORT)$(BR2_PACKAGE_QT6SERIALPORT),yy) +STELLARIUM_DEPENDENCIES += gpsd +ifeq ($(BR2_PACKAGE_QT5SERIALPORT),y) +STELLARIUM_DEPENDENCIES += qt5serialport +else +STELLARIUM_DEPENDENCIES += qt6serialport +endif STELLARIUM_CONF_OPTS += -DENABLE_GPS=ON else STELLARIUM_CONF_OPTS += -DENABLE_GPS=OFF