diff options
| author | Alexey Dokuchaev <danfe@FreeBSD.org> | 2015-01-14 08:51:31 +0000 |
|---|---|---|
| committer | Alexey Dokuchaev <danfe@FreeBSD.org> | 2015-01-14 08:51:31 +0000 |
| commit | 99e812ed9362deb76b0b2a783a33ced9315ce3d5 (patch) | |
| tree | aa0b2818c7f241f12d2a28b964fe2ffae2bc86c8 /astro | |
| parent | 7483da328d17b5d766e5b026b06266e1ac09a580 (diff) | |
| download | ports-99e812ed9362deb76b0b2a783a33ced9315ce3d5.tar.gz ports-99e812ed9362deb76b0b2a783a33ced9315ce3d5.zip | |
Improve the way we use optional high-resolution textures:
- Forget about Milky Way texture for now as it causes rendering artifacts;
- While most of those textures are indeed better than the ones provided by
default (e.g., Jupiter and Ganymede), some of those are actually worse
(e.g. Venus). Use simple file size-based logic to decide if a texture
is worth a replacement.
Notes
Notes:
svn path=/head/; revision=377001
Diffstat (limited to 'astro')
| -rw-r--r-- | astro/stellarium-qt4/Makefile | 15 | ||||
| -rw-r--r-- | astro/stellarium-qt4/distinfo | 2 | ||||
| -rw-r--r-- | astro/stellarium/Makefile | 12 | ||||
| -rw-r--r-- | astro/stellarium/distinfo | 2 |
4 files changed, 23 insertions, 8 deletions
diff --git a/astro/stellarium-qt4/Makefile b/astro/stellarium-qt4/Makefile index 09fd84837480..78492c92b9c8 100644 --- a/astro/stellarium-qt4/Makefile +++ b/astro/stellarium-qt4/Makefile @@ -45,7 +45,7 @@ PLIST_SUB+= MORE_STARS="@comment " .if ${PORT_OPTIONS:MHR_TEXTURES} MASTER_SITES+= SF/${PORTNAME}/textures:gfx -DISTFILES+= textures-1K.zip:gfx milkyway.zip:gfx # yes, in this order +DISTFILES+= textures-1K.zip:gfx PLIST_SUB+= TEXTURES="" .else PLIST_SUB+= TEXTURES="@comment " @@ -79,7 +79,18 @@ post-install: ${STAGEDIR}${DATADIR}/stars/default .endif .if ${PORT_OPTIONS:MHR_TEXTURES} - ${INSTALL_DATA} ${WRKDIR}/*.png ${STAGEDIR}${DATADIR}/textures + (cd ${WRKDIR} && for f in *.png; do \ + new=`${STAT} -f '%z' $$f` ; \ + existing=`${STAT} -qf '%z' \ + ${STAGEDIR}${DATADIR}/textures/$$f || \ + ${ECHO_CMD} 0` ; \ + ${TEST} $$new -gt $$existing && \ + ${ECHO_CMD} "-- Replacing texture: $$f\ + (has larger file size or missing)" ; \ + ${INSTALL_DATA} $$f ${STAGEDIR}${DATADIR}/textures ; \ + done) + @${REINPLACE_CMD} -e '1410s|nomap|vesta|' \ + ${STAGEDIR}${DATADIR}/data/ssystem.ini .endif @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} diff --git a/astro/stellarium-qt4/distinfo b/astro/stellarium-qt4/distinfo index fabb9ec3fc31..f932093f1256 100644 --- a/astro/stellarium-qt4/distinfo +++ b/astro/stellarium-qt4/distinfo @@ -12,5 +12,3 @@ SHA256 (stars_8_2v0_1.cat) = f1c0b3f25737f405ed4a2a045091d348885ffceb47258c3e32a SIZE (stars_8_2v0_1.cat) = 559068934 SHA256 (textures-1K.zip) = 3622b73e9cfb65ba537072b0ed3b5ef92951e70878ace7557931d841c5bb3bec SIZE (textures-1K.zip) = 20216182 -SHA256 (milkyway.zip) = cffc11d22a1e0596e8d01800f54627a67a3ebcc745e5d138819e40d247aaa0d1 -SIZE (milkyway.zip) = 6389431 diff --git a/astro/stellarium/Makefile b/astro/stellarium/Makefile index 45dce670ceae..4147c50787d5 100644 --- a/astro/stellarium/Makefile +++ b/astro/stellarium/Makefile @@ -42,7 +42,7 @@ PLIST_SUB+= MORE_STARS="@comment " .if ${PORT_OPTIONS:MHR_TEXTURES} MASTER_SITES+= SF/${PORTNAME}/textures:gfx -DISTFILES+= textures-1K.zip:gfx milkyway.zip:gfx # yes, in this order +DISTFILES+= textures-1K.zip:gfx .endif .if ${PORT_OPTIONS:MMULTIMEDIA} @@ -60,7 +60,15 @@ post-install: ${STAGEDIR}${DATADIR}/stars/default .endif .if ${PORT_OPTIONS:MHR_TEXTURES} - ${INSTALL_DATA} ${WRKDIR}/*.png ${STAGEDIR}${DATADIR}/textures + (cd ${WRKDIR} && for f in *.png; do \ + new=`${STAT} -f '%z' $$f` ; \ + existing=`${STAT} -f '%z' \ + ${STAGEDIR}${DATADIR}/textures/$$f` ; \ + ${TEST} $$new -gt $$existing && \ + ${ECHO_CMD} "-- Replacing texture: $$f\ + (has larger file size)" ; \ + ${INSTALL_DATA} $$f ${STAGEDIR}${DATADIR}/textures ; \ + done) .endif @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} diff --git a/astro/stellarium/distinfo b/astro/stellarium/distinfo index cfb40cc47ff7..8ede5cac232c 100644 --- a/astro/stellarium/distinfo +++ b/astro/stellarium/distinfo @@ -12,5 +12,3 @@ SHA256 (stars_8_2v0_1.cat) = f1c0b3f25737f405ed4a2a045091d348885ffceb47258c3e32a SIZE (stars_8_2v0_1.cat) = 559068934 SHA256 (textures-1K.zip) = 3622b73e9cfb65ba537072b0ed3b5ef92951e70878ace7557931d841c5bb3bec SIZE (textures-1K.zip) = 20216182 -SHA256 (milkyway.zip) = cffc11d22a1e0596e8d01800f54627a67a3ebcc745e5d138819e40d247aaa0d1 -SIZE (milkyway.zip) = 6389431 |