Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 27 Jun 2023 13:15:36 GMT
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 195c60823a48 - main - astro/stellarium: update Stellarium to version 23.1
Message-ID:  <202306271315.35RDFaxS005526@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by danfe:

URL: https://cgit.FreeBSD.org/ports/commit/?id=195c60823a48e51358e3c75fda91204b710122f3

commit 195c60823a48e51358e3c75fda91204b710122f3
Author:     Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2023-06-27 13:14:36 +0000
Commit:     Alexey Dokuchaev <danfe@FreeBSD.org>
CommitDate: 2023-06-27 13:14:36 +0000

    astro/stellarium: update Stellarium to version 23.1
    
    - Unfortunately, upstream had decided to switch from sane
      version numbers to abominable "year.release" scheme :(
    - Disable new fragment-shader-based direction computation
      as it can make the program inoperable (hang) on FreeBSD
    
    Reported by:    portscout
    Security:       CVE-2023-28371
---
 astro/stellarium/Makefile                          |  4 +--
 astro/stellarium/distinfo                          | 10 +++---
 .../files/patch-src_core_modules_Landscape.cpp     | 14 ++++++++
 astro/stellarium/pkg-plist                         | 39 ++++++++++++++++++++++
 4 files changed, 60 insertions(+), 7 deletions(-)

diff --git a/astro/stellarium/Makefile b/astro/stellarium/Makefile
index 812422158369..4d52a8299cfa 100644
--- a/astro/stellarium/Makefile
+++ b/astro/stellarium/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	stellarium
-PORTVERSION=	1.2
-PORTREVISION=	1
+PORTVERSION=	23.1
 CATEGORIES=	astro
 MASTER_SITES=	https://github.com/Stellarium/stellarium/releases/download/v${PORTVERSION}/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
@@ -93,6 +92,7 @@ post-extract-DOCS-on:
 		${WRKSRC}
 
 post-install:
+	@${RM} -r ${STAGEDIR}${DATADIR}/guide
 	@${RMDIR} ${STAGEDIR}${DATADIR}/skycultures/greek_almagest/almstars
 
 post-install-MORE_STARS-on:
diff --git a/astro/stellarium/distinfo b/astro/stellarium/distinfo
index 02fbd1b7681c..2e099693d272 100644
--- a/astro/stellarium/distinfo
+++ b/astro/stellarium/distinfo
@@ -1,8 +1,8 @@
-TIMESTAMP = 1671980951
-SHA256 (stellarium-1.2.tar.xz) = 802a0e8231cae41ec04f697f70105c291d9719aa6e7fd8cbe1f15068c3324e09
-SIZE (stellarium-1.2.tar.xz) = 344579192
-SHA256 (stellarium_user_guide-1.2-1.pdf) = 794ec659ee84b5757918ae566505b3e9cd6c4169840129bfe1a9c88808e3e625
-SIZE (stellarium_user_guide-1.2-1.pdf) = 36821463
+TIMESTAMP = 1679895568
+SHA256 (stellarium-23.1.tar.xz) = f8e305f41c8e8c21c90b803189e5ef34e5c5f516ab714f35a50a76e536a8fe17
+SIZE (stellarium-23.1.tar.xz) = 347455652
+SHA256 (stellarium_user_guide-23.1-1.pdf) = e385ffb624af3eeabe2b31210d4288e33ea48e2fcdfc9a3a14ff96442cd9951c
+SIZE (stellarium_user_guide-23.1-1.pdf) = 32513574
 SHA256 (stars_4_1v0_2.cat) = 15589d9193b850cac68a031bd02dcb59da36c03946ca1be373fbabdb6b1edd63
 SIZE (stars_4_1v0_2.cat) = 16948302
 SHA256 (stars_5_2v0_1.cat) = c4ebd18d05a805308cfac85fe224e3f0a75db6579cae65c935a0954da13f4164
diff --git a/astro/stellarium/files/patch-src_core_modules_Landscape.cpp b/astro/stellarium/files/patch-src_core_modules_Landscape.cpp
new file mode 100644
index 000000000000..ca408c1f5c14
--- /dev/null
+++ b/astro/stellarium/files/patch-src_core_modules_Landscape.cpp
@@ -0,0 +1,14 @@
+--- src/core/modules/Landscape.cpp.orig	2023-03-12 18:30:15 UTC
++++ src/core/modules/Landscape.cpp
+@@ -721,7 +721,10 @@ void LandscapeOldStyle::load(const QSettings& landscap
+ 
+ void LandscapeOldStyle::draw(StelCore* core, bool onlyPolygon)
+ {
+-	if(!StelOpenGL::globalShaderPrefix(StelOpenGL::FRAGMENT_SHADER).contains("textureGrad_SUPPORTED"))
++	// Resort to drawLowGL() on FreeBSD until these bugs are fixed:
++	// https://github.com/Stellarium/stellarium/issues/3145
++	// https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=271995
++	if(true)
+ 	{
+ 		drawLowGL(core, onlyPolygon);
+ 		return;
diff --git a/astro/stellarium/pkg-plist b/astro/stellarium/pkg-plist
index 857d3e3a310a..a8b7cdd9b63e 100644
--- a/astro/stellarium/pkg-plist
+++ b/astro/stellarium/pkg-plist
@@ -379,6 +379,7 @@ share/mime/packages/stellarium.xml
 %%DATADIR%%/landscapes/garching/description.ja.utf8
 %%DATADIR%%/landscapes/garching/description.ko.utf8
 %%DATADIR%%/landscapes/garching/description.lb.utf8
+%%DATADIR%%/landscapes/garching/description.ne.utf8
 %%DATADIR%%/landscapes/garching/description.nl.utf8
 %%DATADIR%%/landscapes/garching/description.pl.utf8
 %%DATADIR%%/landscapes/garching/description.pt_BR.utf8
@@ -404,6 +405,7 @@ share/mime/packages/stellarium.xml
 %%DATADIR%%/landscapes/geneva/description.be.utf8
 %%DATADIR%%/landscapes/geneva/description.bg.utf8
 %%DATADIR%%/landscapes/geneva/description.bn.utf8
+%%DATADIR%%/landscapes/geneva/description.ca.utf8
 %%DATADIR%%/landscapes/geneva/description.cs.utf8
 %%DATADIR%%/landscapes/geneva/description.de.utf8
 %%DATADIR%%/landscapes/geneva/description.en.utf8
@@ -439,6 +441,7 @@ share/mime/packages/stellarium.xml
 %%DATADIR%%/landscapes/grossmugl/description.be.utf8
 %%DATADIR%%/landscapes/grossmugl/description.bg.utf8
 %%DATADIR%%/landscapes/grossmugl/description.bn.utf8
+%%DATADIR%%/landscapes/grossmugl/description.ca.utf8
 %%DATADIR%%/landscapes/grossmugl/description.cs.utf8
 %%DATADIR%%/landscapes/grossmugl/description.de.utf8
 %%DATADIR%%/landscapes/grossmugl/description.en.utf8
@@ -483,6 +486,7 @@ share/mime/packages/stellarium.xml
 %%DATADIR%%/landscapes/guereins/description.be.utf8
 %%DATADIR%%/landscapes/guereins/description.bg.utf8
 %%DATADIR%%/landscapes/guereins/description.bn.utf8
+%%DATADIR%%/landscapes/guereins/description.ca.utf8
 %%DATADIR%%/landscapes/guereins/description.cs.utf8
 %%DATADIR%%/landscapes/guereins/description.de.utf8
 %%DATADIR%%/landscapes/guereins/description.en.utf8
@@ -531,6 +535,7 @@ share/mime/packages/stellarium.xml
 %%DATADIR%%/landscapes/hurricane/description.be.utf8
 %%DATADIR%%/landscapes/hurricane/description.bg.utf8
 %%DATADIR%%/landscapes/hurricane/description.bn.utf8
+%%DATADIR%%/landscapes/hurricane/description.ca.utf8
 %%DATADIR%%/landscapes/hurricane/description.cs.utf8
 %%DATADIR%%/landscapes/hurricane/description.de.utf8
 %%DATADIR%%/landscapes/hurricane/description.en.utf8
@@ -548,6 +553,7 @@ share/mime/packages/stellarium.xml
 %%DATADIR%%/landscapes/hurricane/description.ja.utf8
 %%DATADIR%%/landscapes/hurricane/description.ko.utf8
 %%DATADIR%%/landscapes/hurricane/description.nb.utf8
+%%DATADIR%%/landscapes/hurricane/description.ne.utf8
 %%DATADIR%%/landscapes/hurricane/description.nl.utf8
 %%DATADIR%%/landscapes/hurricane/description.pt_BR.utf8
 %%DATADIR%%/landscapes/hurricane/description.ro.utf8
@@ -577,6 +583,7 @@ share/mime/packages/stellarium.xml
 %%DATADIR%%/landscapes/jupiter/description.be.utf8
 %%DATADIR%%/landscapes/jupiter/description.bg.utf8
 %%DATADIR%%/landscapes/jupiter/description.bn.utf8
+%%DATADIR%%/landscapes/jupiter/description.ca.utf8
 %%DATADIR%%/landscapes/jupiter/description.cs.utf8
 %%DATADIR%%/landscapes/jupiter/description.de.utf8
 %%DATADIR%%/landscapes/jupiter/description.en.utf8
@@ -593,6 +600,7 @@ share/mime/packages/stellarium.xml
 %%DATADIR%%/landscapes/jupiter/description.it.utf8
 %%DATADIR%%/landscapes/jupiter/description.ja.utf8
 %%DATADIR%%/landscapes/jupiter/description.ko.utf8
+%%DATADIR%%/landscapes/jupiter/description.ne.utf8
 %%DATADIR%%/landscapes/jupiter/description.nl.utf8
 %%DATADIR%%/landscapes/jupiter/description.pt_BR.utf8
 %%DATADIR%%/landscapes/jupiter/description.ro.utf8
@@ -613,6 +621,7 @@ share/mime/packages/stellarium.xml
 %%DATADIR%%/landscapes/mars/description.be.utf8
 %%DATADIR%%/landscapes/mars/description.bg.utf8
 %%DATADIR%%/landscapes/mars/description.bn.utf8
+%%DATADIR%%/landscapes/mars/description.ca.utf8
 %%DATADIR%%/landscapes/mars/description.cs.utf8
 %%DATADIR%%/landscapes/mars/description.de.utf8
 %%DATADIR%%/landscapes/mars/description.en.utf8
@@ -672,6 +681,7 @@ share/mime/packages/stellarium.xml
 %%DATADIR%%/landscapes/moon/description.ko.utf8
 %%DATADIR%%/landscapes/moon/description.lb.utf8
 %%DATADIR%%/landscapes/moon/description.nb.utf8
+%%DATADIR%%/landscapes/moon/description.ne.utf8
 %%DATADIR%%/landscapes/moon/description.nl.utf8
 %%DATADIR%%/landscapes/moon/description.pt_BR.utf8
 %%DATADIR%%/landscapes/moon/description.ro.utf8
@@ -691,6 +701,7 @@ share/mime/packages/stellarium.xml
 %%DATADIR%%/landscapes/neptune/description.be.utf8
 %%DATADIR%%/landscapes/neptune/description.bg.utf8
 %%DATADIR%%/landscapes/neptune/description.bn.utf8
+%%DATADIR%%/landscapes/neptune/description.ca.utf8
 %%DATADIR%%/landscapes/neptune/description.cs.utf8
 %%DATADIR%%/landscapes/neptune/description.de.utf8
 %%DATADIR%%/landscapes/neptune/description.en.utf8
@@ -748,6 +759,7 @@ share/mime/packages/stellarium.xml
 %%DATADIR%%/landscapes/ocean/description.ko.utf8
 %%DATADIR%%/landscapes/ocean/description.lb.utf8
 %%DATADIR%%/landscapes/ocean/description.nb.utf8
+%%DATADIR%%/landscapes/ocean/description.ne.utf8
 %%DATADIR%%/landscapes/ocean/description.nl.utf8
 %%DATADIR%%/landscapes/ocean/description.pt_BR.utf8
 %%DATADIR%%/landscapes/ocean/description.ro.utf8
@@ -777,6 +789,7 @@ share/mime/packages/stellarium.xml
 %%DATADIR%%/landscapes/saturn/description.be.utf8
 %%DATADIR%%/landscapes/saturn/description.bg.utf8
 %%DATADIR%%/landscapes/saturn/description.bn.utf8
+%%DATADIR%%/landscapes/saturn/description.ca.utf8
 %%DATADIR%%/landscapes/saturn/description.cs.utf8
 %%DATADIR%%/landscapes/saturn/description.de.utf8
 %%DATADIR%%/landscapes/saturn/description.en.utf8
@@ -813,6 +826,7 @@ share/mime/packages/stellarium.xml
 %%DATADIR%%/landscapes/sun/description.ar.utf8
 %%DATADIR%%/landscapes/sun/description.bg.utf8
 %%DATADIR%%/landscapes/sun/description.bn.utf8
+%%DATADIR%%/landscapes/sun/description.ca.utf8
 %%DATADIR%%/landscapes/sun/description.cs.utf8
 %%DATADIR%%/landscapes/sun/description.de.utf8
 %%DATADIR%%/landscapes/sun/description.en.utf8
@@ -870,6 +884,7 @@ share/mime/packages/stellarium.xml
 %%DATADIR%%/landscapes/trees/description.la.utf8
 %%DATADIR%%/landscapes/trees/description.lb.utf8
 %%DATADIR%%/landscapes/trees/description.nb.utf8
+%%DATADIR%%/landscapes/trees/description.ne.utf8
 %%DATADIR%%/landscapes/trees/description.nl.utf8
 %%DATADIR%%/landscapes/trees/description.pl.utf8
 %%DATADIR%%/landscapes/trees/description.pt_BR.utf8
@@ -893,6 +908,7 @@ share/mime/packages/stellarium.xml
 %%DATADIR%%/landscapes/uranus/description.be.utf8
 %%DATADIR%%/landscapes/uranus/description.bg.utf8
 %%DATADIR%%/landscapes/uranus/description.bn.utf8
+%%DATADIR%%/landscapes/uranus/description.ca.utf8
 %%DATADIR%%/landscapes/uranus/description.cs.utf8
 %%DATADIR%%/landscapes/uranus/description.de.utf8
 %%DATADIR%%/landscapes/uranus/description.en.utf8
@@ -930,6 +946,7 @@ share/mime/packages/stellarium.xml
 %%DATADIR%%/landscapes/zero/description.be.utf8
 %%DATADIR%%/landscapes/zero/description.bg.utf8
 %%DATADIR%%/landscapes/zero/description.bn.utf8
+%%DATADIR%%/landscapes/zero/description.ca.utf8
 %%DATADIR%%/landscapes/zero/description.cs.utf8
 %%DATADIR%%/landscapes/zero/description.de.utf8
 %%DATADIR%%/landscapes/zero/description.en.utf8
@@ -948,6 +965,7 @@ share/mime/packages/stellarium.xml
 %%DATADIR%%/landscapes/zero/description.ja.utf8
 %%DATADIR%%/landscapes/zero/description.ko.utf8
 %%DATADIR%%/landscapes/zero/description.lb.utf8
+%%DATADIR%%/landscapes/zero/description.ne.utf8
 %%DATADIR%%/landscapes/zero/description.nl.utf8
 %%DATADIR%%/landscapes/zero/description.pt_BR.utf8
 %%DATADIR%%/landscapes/zero/description.ro.utf8
@@ -1030,6 +1048,7 @@ share/mime/packages/stellarium.xml
 %%DATADIR%%/nebulae/default/catalog.dat
 %%DATADIR%%/nebulae/default/coma_cluster.png
 %%DATADIR%%/nebulae/default/darkshark-vasey.png
+%%DATADIR%%/nebulae/default/discovery.dat
 %%DATADIR%%/nebulae/default/etaCarinae.png
 %%DATADIR%%/nebulae/default/fornax_cluster.png
 %%DATADIR%%/nebulae/default/hercules_cluster.png
@@ -1591,6 +1610,7 @@ share/mime/packages/stellarium.xml
 %%DATADIR%%/scenery3d/Sterngarten/description.ar.utf8
 %%DATADIR%%/scenery3d/Sterngarten/description.bg.utf8
 %%DATADIR%%/scenery3d/Sterngarten/description.bn.utf8
+%%DATADIR%%/scenery3d/Sterngarten/description.ca.utf8
 %%DATADIR%%/scenery3d/Sterngarten/description.de.utf8
 %%DATADIR%%/scenery3d/Sterngarten/description.en.utf8
 %%DATADIR%%/scenery3d/Sterngarten/description.en_GB.utf8
@@ -1649,6 +1669,7 @@ share/mime/packages/stellarium.xml
 %%DATADIR%%/scenery3d/Testscene/description.ar.utf8
 %%DATADIR%%/scenery3d/Testscene/description.bg.utf8
 %%DATADIR%%/scenery3d/Testscene/description.bn.utf8
+%%DATADIR%%/scenery3d/Testscene/description.ca.utf8
 %%DATADIR%%/scenery3d/Testscene/description.de.utf8
 %%DATADIR%%/scenery3d/Testscene/description.en.utf8
 %%DATADIR%%/scenery3d/Testscene/description.en_GB.utf8
@@ -1999,6 +2020,7 @@ share/mime/packages/stellarium.xml
 %%DATADIR%%/skycultures/babylonian_seleucid/info.ini
 %%DATADIR%%/skycultures/babylonian_seleucid/planet_names.fab
 %%DATADIR%%/skycultures/babylonian_seleucid/star_names.fab
+%%DATADIR%%/skycultures/babylonian_seleucid/virgo_4plani_1024.png
 %%DATADIR%%/skycultures/belarusian/constellation_names.eng.fab
 %%DATADIR%%/skycultures/belarusian/constellationsart.fab
 %%DATADIR%%/skycultures/belarusian/constellationship.fab
@@ -2261,6 +2283,8 @@ share/mime/packages/stellarium.xml
 %%DATADIR%%/skycultures/greek_dante/description.es.utf8
 %%DATADIR%%/skycultures/greek_dante/description.fi.utf8
 %%DATADIR%%/skycultures/greek_dante/description.gl.utf8
+%%DATADIR%%/skycultures/greek_dante/description.nl.utf8
+%%DATADIR%%/skycultures/greek_dante/description.ru.utf8
 %%DATADIR%%/skycultures/greek_dante/description.sk.utf8
 %%DATADIR%%/skycultures/greek_dante/description.uk.utf8
 %%DATADIR%%/skycultures/greek_dante/gem_scotus_bg_1024.jpg
@@ -2842,6 +2866,7 @@ share/mime/packages/stellarium.xml
 %%DATADIR%%/skycultures/modern/description.es.utf8
 %%DATADIR%%/skycultures/modern/description.fi.utf8
 %%DATADIR%%/skycultures/modern/description.gl.utf8
+%%DATADIR%%/skycultures/modern/description.nl.utf8
 %%DATADIR%%/skycultures/modern/description.ru.utf8
 %%DATADIR%%/skycultures/modern/description.sk.utf8
 %%DATADIR%%/skycultures/modern/description.uk.utf8
@@ -3036,6 +3061,7 @@ share/mime/packages/stellarium.xml
 %%DATADIR%%/skycultures/modern_iau/description.es.utf8
 %%DATADIR%%/skycultures/modern_iau/description.fi.utf8
 %%DATADIR%%/skycultures/modern_iau/description.gl.utf8
+%%DATADIR%%/skycultures/modern_iau/description.nl.utf8
 %%DATADIR%%/skycultures/modern_iau/description.ru.utf8
 %%DATADIR%%/skycultures/modern_iau/description.sk.utf8
 %%DATADIR%%/skycultures/modern_iau/description.uk.utf8
@@ -3336,6 +3362,8 @@ share/mime/packages/stellarium.xml
 %%DATADIR%%/skycultures/seri/description.es.utf8
 %%DATADIR%%/skycultures/seri/description.fi.utf8
 %%DATADIR%%/skycultures/seri/description.gl.utf8
+%%DATADIR%%/skycultures/seri/description.nl.utf8
+%%DATADIR%%/skycultures/seri/description.ru.utf8
 %%DATADIR%%/skycultures/seri/description.sk.utf8
 %%DATADIR%%/skycultures/seri/description.uk.utf8
 %%DATADIR%%/skycultures/seri/haapjc.png
@@ -3361,9 +3389,12 @@ share/mime/packages/stellarium.xml
 %%DATADIR%%/skycultures/tikuna/constellationsart.fab
 %%DATADIR%%/skycultures/tikuna/constellationship.fab
 %%DATADIR%%/skycultures/tikuna/description.en.utf8
+%%DATADIR%%/skycultures/tikuna/description.es.utf8
 %%DATADIR%%/skycultures/tikuna/description.fi.utf8
 %%DATADIR%%/skycultures/tikuna/description.gl.utf8
+%%DATADIR%%/skycultures/tikuna/description.nl.utf8
 %%DATADIR%%/skycultures/tikuna/description.pt_BR.utf8
+%%DATADIR%%/skycultures/tikuna/description.ru.utf8
 %%DATADIR%%/skycultures/tikuna/description.sk.utf8
 %%DATADIR%%/skycultures/tikuna/description.uk.utf8
 %%DATADIR%%/skycultures/tikuna/info.ini
@@ -3597,6 +3628,13 @@ share/mime/packages/stellarium.xml
 %%DATADIR%%/textures/nereid.png
 %%DATADIR%%/textures/nomap.png
 %%DATADIR%%/textures/oberon.png
+%%DATADIR%%/textures/obs_earth.jpg
+%%DATADIR%%/textures/obs_jupiter.jpg
+%%DATADIR%%/textures/obs_mars.jpg
+%%DATADIR%%/textures/obs_neptune.jpg
+%%DATADIR%%/textures/obs_saturn.jpg
+%%DATADIR%%/textures/obs_sun.jpg
+%%DATADIR%%/textures/obs_uranus.jpg
 %%DATADIR%%/textures/phobos.png
 %%DATADIR%%/textures/phoebe.png
 %%DATADIR%%/textures/planet-indicator.png
@@ -3675,6 +3713,7 @@ share/mime/packages/stellarium.xml
 %%NLS%%%%DATADIR%%/translations/stellarium-planetary-features/ku.qm
 %%NLS%%%%DATADIR%%/translations/stellarium-planetary-features/la.qm
 %%NLS%%%%DATADIR%%/translations/stellarium-planetary-features/lb.qm
+%%NLS%%%%DATADIR%%/translations/stellarium-planetary-features/lt.qm
 %%NLS%%%%DATADIR%%/translations/stellarium-planetary-features/lv.qm
 %%NLS%%%%DATADIR%%/translations/stellarium-planetary-features/ml.qm
 %%NLS%%%%DATADIR%%/translations/stellarium-planetary-features/mn.qm



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202306271315.35RDFaxS005526>