Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/3] package/stellarium: disable telescopecontrol plugin
@ 2023-08-04 18:33 Bernd Kuhls
  2023-08-04 18:33 ` [Buildroot] [PATCH 2/3] package/stellarium: disable xlsx support Bernd Kuhls
                   ` (3 more replies)
  0 siblings, 4 replies; 7+ messages in thread
From: Bernd Kuhls @ 2023-08-04 18:33 UTC (permalink / raw)
  To: buildroot

Buildroot commit 319c56dfe3309dbf24be01fed3afff6259a2c5dd bumped
stellarium which included this commit
https://github.com/Stellarium/stellarium/commit/186b06fa215bd28ea03cc291dc861b552af8d99a

It removed the previously bundled libindi source and lets stellarium
download the sourcecode of the indiclient package (not present in
buildroot) during the build:

$ find output/build/stellarium-23.2/ -iname *.zip
output/build/stellarium-23.2/_deps/indiclient-subbuild/indiclient-populate-prefix/src/v1.8.5.zip

which breaks offline builds.

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
 package/stellarium/stellarium.mk | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/package/stellarium/stellarium.mk b/package/stellarium/stellarium.mk
index 4dc5692d79..cc25f91063 100644
--- a/package/stellarium/stellarium.mk
+++ b/package/stellarium/stellarium.mk
@@ -20,6 +20,7 @@ STELLARIUM_CONF_OPTS = \
 	-DENABLE_NLS=OFF \
 	-DENABLE_QTWEBENGINE=OFF \
 	-DENABLE_QT6=OFF \
+	-DUSE_PLUGIN_TELESCOPECONTROL=OFF \
 	-DUSE_SYSTEM_ZLIB=ON
 
 ifeq ($(BR2_PACKAGE_QT5SCRIPT),y)
@@ -34,13 +35,9 @@ STELLARIUM_DEPENDENCIES += qt5serialport
 ifeq ($(BR2_PACKAGE_GPSD),y)
 STELLARIUM_DEPENDENCIES += gpsd
 endif
-STELLARIUM_CONF_OPTS += \
-	-DENABLE_GPS=ON \
-	-DUSE_PLUGIN_TELESCOPECONTROL=ON
+STELLARIUM_CONF_OPTS += -DENABLE_GPS=ON
 else
-STELLARIUM_CONF_OPTS += \
-	-DENABLE_GPS=OFF \
-	-DUSE_PLUGIN_TELESCOPECONTROL=OFF
+STELLARIUM_CONF_OPTS += -DENABLE_GPS=OFF
 endif
 
 $(eval $(cmake-package))
-- 
2.39.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [Buildroot] [PATCH 2/3] package/stellarium: disable xlsx support
  2023-08-04 18:33 [Buildroot] [PATCH 1/3] package/stellarium: disable telescopecontrol plugin Bernd Kuhls
@ 2023-08-04 18:33 ` Bernd Kuhls
  2023-09-10 21:29   ` Peter Korsgaard
  2023-08-04 18:33 ` [Buildroot] [PATCH 3/3] package/stellarium: disable ShowMySky atmosphere model Bernd Kuhls
                   ` (2 subsequent siblings)
  3 siblings, 1 reply; 7+ messages in thread
From: Bernd Kuhls @ 2023-08-04 18:33 UTC (permalink / raw)
  To: buildroot

Buildroot commit 319c56dfe3309dbf24be01fed3afff6259a2c5dd bumped
stellarium which included this commit
https://github.com/Stellarium/stellarium/commit/186b06fa215bd28ea03cc291dc861b552af8d99a

It removed the previously bundled QXlsx source and lets stellarium
git-clone the sourcecode of the QXlsx package (not present in buildroot)
during the build:

$ find output/build/stellarium-23.2/ -iname .gitignore | grep qxl
output/build/stellarium-23.2/_deps/qxlsxqt5-src/.gitignore

which breaks offline builds.

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
 package/stellarium/stellarium.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/stellarium/stellarium.mk b/package/stellarium/stellarium.mk
index cc25f91063..7ee19c8b18 100644
--- a/package/stellarium/stellarium.mk
+++ b/package/stellarium/stellarium.mk
@@ -20,6 +20,7 @@ STELLARIUM_CONF_OPTS = \
 	-DENABLE_NLS=OFF \
 	-DENABLE_QTWEBENGINE=OFF \
 	-DENABLE_QT6=OFF \
+	-DENABLE_XLSX=OFF \
 	-DUSE_PLUGIN_TELESCOPECONTROL=OFF \
 	-DUSE_SYSTEM_ZLIB=ON
 
-- 
2.39.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [Buildroot] [PATCH 3/3] package/stellarium: disable ShowMySky atmosphere model
  2023-08-04 18:33 [Buildroot] [PATCH 1/3] package/stellarium: disable telescopecontrol plugin Bernd Kuhls
  2023-08-04 18:33 ` [Buildroot] [PATCH 2/3] package/stellarium: disable xlsx support Bernd Kuhls
@ 2023-08-04 18:33 ` Bernd Kuhls
  2023-09-10 21:30   ` Peter Korsgaard
  2023-08-06 11:48 ` [Buildroot] [PATCH 1/3] package/stellarium: disable telescopecontrol plugin Thomas Petazzoni via buildroot
  2023-09-10 21:29 ` Peter Korsgaard
  3 siblings, 1 reply; 7+ messages in thread
From: Bernd Kuhls @ 2023-08-04 18:33 UTC (permalink / raw)
  To: buildroot

Buildroot commit 319c56dfe3309dbf24be01fed3afff6259a2c5dd bumped
stellarium which included these commits
https://github.com/Stellarium/stellarium/commit/b3f02beaec2a285251db1e1707abe2e423803834
https://github.com/Stellarium/stellarium/commit/5d5edd0e5f5630872628a1525685b77854b6e4b4

It downloads external packages during the build:

$ find output/build/stellarium-23.2/ -iname *.tar.*
output/build/stellarium-23.2/_deps/eigen3-subbuild/eigen3-populate-prefix/src/eigen-3.4.0.tar.bz2
output/build/stellarium-23.2/_deps/showmysky-qt5-subbuild/showmysky-qt5-populate-prefix/src/v0.3.1.tar.gz

which breaks offline builds.

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
 package/stellarium/stellarium.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/stellarium/stellarium.mk b/package/stellarium/stellarium.mk
index 7ee19c8b18..43c99413dd 100644
--- a/package/stellarium/stellarium.mk
+++ b/package/stellarium/stellarium.mk
@@ -18,6 +18,7 @@ STELLARIUM_DEPENDENCIES = \
 STELLARIUM_CONF_OPTS = \
 	-DENABLE_MEDIA=ON \
 	-DENABLE_NLS=OFF \
+	-DENABLE_SHOWMYSKY=OFF \
 	-DENABLE_QTWEBENGINE=OFF \
 	-DENABLE_QT6=OFF \
 	-DENABLE_XLSX=OFF \
-- 
2.39.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [Buildroot] [PATCH 1/3] package/stellarium: disable telescopecontrol plugin
  2023-08-04 18:33 [Buildroot] [PATCH 1/3] package/stellarium: disable telescopecontrol plugin Bernd Kuhls
  2023-08-04 18:33 ` [Buildroot] [PATCH 2/3] package/stellarium: disable xlsx support Bernd Kuhls
  2023-08-04 18:33 ` [Buildroot] [PATCH 3/3] package/stellarium: disable ShowMySky atmosphere model Bernd Kuhls
@ 2023-08-06 11:48 ` Thomas Petazzoni via buildroot
  2023-09-10 21:29 ` Peter Korsgaard
  3 siblings, 0 replies; 7+ messages in thread
From: Thomas Petazzoni via buildroot @ 2023-08-06 11:48 UTC (permalink / raw)
  To: Bernd Kuhls; +Cc: buildroot

On Fri,  4 Aug 2023 20:33:19 +0200
Bernd Kuhls <bernd@kuhls.net> wrote:

> Buildroot commit 319c56dfe3309dbf24be01fed3afff6259a2c5dd bumped
> stellarium which included this commit
> https://github.com/Stellarium/stellarium/commit/186b06fa215bd28ea03cc291dc861b552af8d99a
> 
> It removed the previously bundled libindi source and lets stellarium
> download the sourcecode of the indiclient package (not present in
> buildroot) during the build:
> 
> $ find output/build/stellarium-23.2/ -iname *.zip
> output/build/stellarium-23.2/_deps/indiclient-subbuild/indiclient-populate-prefix/src/v1.8.5.zip
> 
> which breaks offline builds.
> 
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
> ---
>  package/stellarium/stellarium.mk | 9 +++------
>  1 file changed, 3 insertions(+), 6 deletions(-)

Series applied, thanks! Thanks for including directly in the first
iteration the details of which Buildroot commit introduced the issue,
this is *very* useful and allows such patches to be applied directly.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [Buildroot] [PATCH 1/3] package/stellarium: disable telescopecontrol plugin
  2023-08-04 18:33 [Buildroot] [PATCH 1/3] package/stellarium: disable telescopecontrol plugin Bernd Kuhls
                   ` (2 preceding siblings ...)
  2023-08-06 11:48 ` [Buildroot] [PATCH 1/3] package/stellarium: disable telescopecontrol plugin Thomas Petazzoni via buildroot
@ 2023-09-10 21:29 ` Peter Korsgaard
  3 siblings, 0 replies; 7+ messages in thread
From: Peter Korsgaard @ 2023-09-10 21:29 UTC (permalink / raw)
  To: Bernd Kuhls; +Cc: buildroot

>>>>> "Bernd" == Bernd Kuhls <bernd@kuhls.net> writes:

 > Buildroot commit 319c56dfe3309dbf24be01fed3afff6259a2c5dd bumped
 > stellarium which included this commit
 > https://github.com/Stellarium/stellarium/commit/186b06fa215bd28ea03cc291dc861b552af8d99a

 > It removed the previously bundled libindi source and lets stellarium
 > download the sourcecode of the indiclient package (not present in
 > buildroot) during the build:

 > $ find output/build/stellarium-23.2/ -iname *.zip
 > output/build/stellarium-23.2/_deps/indiclient-subbuild/indiclient-populate-prefix/src/v1.8.5.zip

 > which breaks offline builds.

 > Signed-off-by: Bernd Kuhls <bernd@kuhls.net>

Committed to 2023.02.x and 2023.05.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [Buildroot] [PATCH 2/3] package/stellarium: disable xlsx support
  2023-08-04 18:33 ` [Buildroot] [PATCH 2/3] package/stellarium: disable xlsx support Bernd Kuhls
@ 2023-09-10 21:29   ` Peter Korsgaard
  0 siblings, 0 replies; 7+ messages in thread
From: Peter Korsgaard @ 2023-09-10 21:29 UTC (permalink / raw)
  To: Bernd Kuhls; +Cc: buildroot

>>>>> "Bernd" == Bernd Kuhls <bernd@kuhls.net> writes:

 > Buildroot commit 319c56dfe3309dbf24be01fed3afff6259a2c5dd bumped
 > stellarium which included this commit
 > https://github.com/Stellarium/stellarium/commit/186b06fa215bd28ea03cc291dc861b552af8d99a

 > It removed the previously bundled QXlsx source and lets stellarium
 > git-clone the sourcecode of the QXlsx package (not present in buildroot)
 > during the build:

 > $ find output/build/stellarium-23.2/ -iname .gitignore | grep qxl
 > output/build/stellarium-23.2/_deps/qxlsxqt5-src/.gitignore

 > which breaks offline builds.

 > Signed-off-by: Bernd Kuhls <bernd@kuhls.net>

Committed to 2023.02.x and 2023.05.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [Buildroot] [PATCH 3/3] package/stellarium: disable ShowMySky atmosphere model
  2023-08-04 18:33 ` [Buildroot] [PATCH 3/3] package/stellarium: disable ShowMySky atmosphere model Bernd Kuhls
@ 2023-09-10 21:30   ` Peter Korsgaard
  0 siblings, 0 replies; 7+ messages in thread
From: Peter Korsgaard @ 2023-09-10 21:30 UTC (permalink / raw)
  To: Bernd Kuhls; +Cc: buildroot

>>>>> "Bernd" == Bernd Kuhls <bernd@kuhls.net> writes:

 > Buildroot commit 319c56dfe3309dbf24be01fed3afff6259a2c5dd bumped
 > stellarium which included these commits
 > https://github.com/Stellarium/stellarium/commit/b3f02beaec2a285251db1e1707abe2e423803834
 > https://github.com/Stellarium/stellarium/commit/5d5edd0e5f5630872628a1525685b77854b6e4b4

 > It downloads external packages during the build:

 > $ find output/build/stellarium-23.2/ -iname *.tar.*
 > output/build/stellarium-23.2/_deps/eigen3-subbuild/eigen3-populate-prefix/src/eigen-3.4.0.tar.bz2
 > output/build/stellarium-23.2/_deps/showmysky-qt5-subbuild/showmysky-qt5-populate-prefix/src/v0.3.1.tar.gz

 > which breaks offline builds.

 > Signed-off-by: Bernd Kuhls <bernd@kuhls.net>

Committed to 2023.02.x and 2023.05.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2023-09-10 21:30 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-08-04 18:33 [Buildroot] [PATCH 1/3] package/stellarium: disable telescopecontrol plugin Bernd Kuhls
2023-08-04 18:33 ` [Buildroot] [PATCH 2/3] package/stellarium: disable xlsx support Bernd Kuhls
2023-09-10 21:29   ` Peter Korsgaard
2023-08-04 18:33 ` [Buildroot] [PATCH 3/3] package/stellarium: disable ShowMySky atmosphere model Bernd Kuhls
2023-09-10 21:30   ` Peter Korsgaard
2023-08-06 11:48 ` [Buildroot] [PATCH 1/3] package/stellarium: disable telescopecontrol plugin Thomas Petazzoni via buildroot
2023-09-10 21:29 ` Peter Korsgaard

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox