diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-02-29 18:01:47 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-02-29 18:01:47 +0000 |
commit | ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (patch) | |
tree | 9f47ee47c31a0f13f9496879cd88a1042550aa81 /sci-astronomy/celestia | |
parent | 53cba99042fa967e2a93da9f8db806fe2d035543 (diff) |
gentoo (leap year) resync : 29.02.2020
Diffstat (limited to 'sci-astronomy/celestia')
8 files changed, 0 insertions, 279 deletions
diff --git a/sci-astronomy/celestia/Manifest b/sci-astronomy/celestia/Manifest index e8320c6656a4..f0cbd70b3b67 100644 --- a/sci-astronomy/celestia/Manifest +++ b/sci-astronomy/celestia/Manifest @@ -1,12 +1,4 @@ AUX celestia-1.5.0-desktop.patch 1371 BLAKE2B f4964ea5794b6fa7eff49cb4d9879226e83739dfe877f055f1cbff25562f324e30af3ef4ee68897324504b06a6a6c84c2cee4caf78914792a4c89e54ed580b14 SHA512 937d3a733ec679ed4fb7644b2ae0bf780972dce7ac7d6e30dfbd7cad3e90354460a3e1c3df268514048e53979d22b1bdee70dd340f8c9977e7a0749c65a24bf7 -AUX celestia-1.6.0-cfg.patch 388 BLAKE2B 2f409272fa10d7282a59fb3d20191daf511cc8f10375852d55d869df871a147ca64a497ae3c447bacea287f60bfabf8037c824de0defd327cdd42211d3e6070a SHA512 6442c499d0a57edb5e81fc64b5ba2d1aa5b2d44e91bb3353f485a2f0e9a91c060977cef5136b477d1300c394f9c42a0c73e62563fbaa2e56db587bdc35aac81c -AUX celestia-1.6.1-gcc46.patch 362 BLAKE2B d40f9f9ccd99de30edb6f3071a38245accd154f75a434a0d13edc43f04554de0cf3563a2c400df53a31adf8f0a7ecc32ba92a35fe62332bec58ae0107a0758d0 SHA512 3a51a47265ff6de5771b9abc4c1f25128d54a05f41c8758fb004ce4a7fb790ad062f1b67070c1ee6aa001de3db45bd73ec4bc8a2cbb6e114ab34c5a12ca677c2 -AUX celestia-1.6.1-gcc47.patch 846 BLAKE2B 26a88bdf055014c2d2419fdde5e8e6667e9c15d8a09301a13a22eceb8a11e65c61e6483296e5bac58e3432635d319bd64df822aa12f1f8cc7b3aeb8b598933a9 SHA512 365d9c7a29d9593804b0278b7296f12df56585612b13f7f380f62aa84c36b863f560b5a2c50f53c30ecb9622590f156eac8cbd64d283f0accf0cd79f83647f56 -AUX celestia-1.6.1-libpng15.patch 391 BLAKE2B 6114b4b82a92dd572c3b13ecae23118fb25b1a0a3903b15a4675cae56b0233834d391ec47b4ed23473a6ddb82b07c9103f9459e00587b1aafebf256c02f44137 SHA512 d9d79a31d5ace5938fb419511f730d1a4c56d1d4cb3bac043ec52d63a2172e4c3788dcc272b36247c09571b8f851984fcf99f523184c2c61b6fb6a4178996f7f -AUX celestia-1.6.1-libpng16.patch 570 BLAKE2B 52710f0e34f8ca6364c2938f3b6839581a25b5e5637382f6995b96cb88b08330a2f46a8e150303d0bb902e6fdeb4755c4cb62499eb3f2435413a0052e6dfe5f7 SHA512 e9721364ec43eb5a1a73ee02553e81e340d56fdca94c8f7ec2825082487422772070f486bf23d2fb11e5e9bc09405e95ae9c73ff136ea7ad3c5c6a7f508e29a1 -AUX celestia-1.6.1-linking.patch 1526 BLAKE2B 8244fa0dcd7771887c2bd09e5ac2c8abba2f5882fbce6205b0180d42c34899b88fd19df92b1b96eed45d3ca3931c289e3f8ea96a71fb3a8de0d68266136e4587 SHA512 31ef6c716486ddada988c2ac34e553cd5f928735454e3b74f4a2b0fa15a9b6594c87e40bf1345acc52cdc20d27bb35714fc633c9952a403146cb09966babe26b AUX celestia-1.6.99-cfg.patch 781 BLAKE2B 04ff4f7c5159eee81479ed588d302fa6a97475955af733e013fcafb2b37975fb1f2215afe61a715b5ec7716dbd75b5915dd4a5031255adb8fde5f6e64d9b71a5 SHA512 50cce63a701da85b52bee5db5b34eed77118c7c847612b4bc7ae82c80b198c718b4adbf0f21cc82e4afbafe20f53dda191285095d6ee5e796ce7f6c94388b832 -DIST celestia-1.6.1.tar.gz 52600436 BLAKE2B aa5b515a75b0344f6e5d59bf385bf1c368e3c38098a1bb9c273fd87ae34a7c8e88a4bf789935bb35ee16f2037004c8f54e21592023a0675766cb4ce005c704f4 SHA512 5b1221e97ee03f7def317e5e29c5100ebe714a4a3aeb8b9818dc9445e4282b6f87026ab35c7b3d5eb02fa6dbb33693977999d14d9648fc4e6d1947abe32a413f -EBUILD celestia-1.6.1-r1.ebuild 3062 BLAKE2B b5c913e509ce0706219d93350b5f5657fb9b871fa93604eb493ab496926d5c19bd0afecc448ff1c2bed0fe9098bafd9080a816acdaa5802b25812bd3ff921d3d SHA512 84f0c7f6dc6ec27cf1659178a71b1a936d4d2155530dc51fc457aa08cfe02c89a967f8e169d56d9aa2179265153fe0c998f18e0240255c3dadc5b386f915e6f6 EBUILD celestia-9999.ebuild 2317 BLAKE2B 096a8110ee248bf732b7862a17f2f2ac30f780e295f67f6e30d2a4c5fc7d36196b53172a567c8860efa1d5d9241366eed07dda5e9b2b6316fbbcf25225cfde10 SHA512 933533e727691fe7c5fb6b969bd940babb206780b9c4675297f44d4d38c2313628e66a170b8af28785c7e8620b16ac67727e156ac7b3de4093df0ba2b4238e4e MISC metadata.xml 892 BLAKE2B e5bc4a09a9e495bcecf9bc2f5e0c60e7aee0b7c65071ac1636416368a1fc9c49057a23127a964c0cbb9a42c6a679cfed5c8d0511c88c67808f5078cfb3ad04c0 SHA512 f222c4e816f2684d8d8de5d456e81b6f6a9b92f3d3996137ddd371a9934793beeda6d1611e8f510f35eafdbe83837007fbae897efcebd47a6bf00e8b3ae159f9 diff --git a/sci-astronomy/celestia/celestia-1.6.1-r1.ebuild b/sci-astronomy/celestia/celestia-1.6.1-r1.ebuild deleted file mode 100644 index 99276ceb7056..000000000000 --- a/sci-astronomy/celestia/celestia-1.6.1-r1.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -WANT_AUTOMAKE="1.11" - -inherit eutils flag-o-matic gnome2 autotools - -DESCRIPTION="OpenGL 3D space simulator" -HOMEPAGE="http://www.shatters.net/celestia/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux" -IUSE="cairo gnome gtk nls pch theora threads" - -RDEPEND=" - virtual/opengl - virtual/jpeg:0 - media-libs/libpng:0= - <dev-lang/lua-5.2:* - gtk? ( !gnome? ( x11-libs/gtk+:2 >=x11-libs/gtkglext-1.0 ) ) - gnome? ( - x11-libs/gtk+:2 - >=x11-libs/gtkglext-1.0 - >=gnome-base/libgnomeui-2.0 - ) - !gtk? ( !gnome? ( media-libs/freeglut ) ) - cairo? ( x11-libs/cairo ) - theora? ( media-libs/libtheora )" - -DEPEND="${RDEPEND} - virtual/pkgconfig" - -pkg_setup() { - # Check for one for the following use flags to be set. - if use gnome; then - einfo "USE=\"gnome\" detected." - USE_DESTDIR="1" - CELESTIA_GUI="gnome" - elif use gtk; then - einfo "USE=\"gtk\" detected." - CELESTIA_GUI="gtk" - else - ewarn "If you want to use the full gui, set USE=\"{gnome|gtk}\"" - ewarn "Defaulting to glut support (no GUI)." - CELESTIA_GUI="glut" - fi -} - -src_prepare() { - # make better desktop files - epatch "${FILESDIR}"/${PN}-1.5.0-desktop.patch - # add a ~/.celestia for extra directories - epatch "${FILESDIR}"/${PN}-1.6.0-cfg.patch - # fix missing includes for gcc-4.6 - epatch "${FILESDIR}"/${P}-gcc46.patch - # missing zlib.h include with libpng15 - epatch "${FILESDIR}"/${P}-libpng15.patch \ - "${FILESDIR}"/${P}-linking.patch - - # gcc-47, #414015 - epatch "${FILESDIR}"/${P}-gcc47.patch - - # libpng16 #464764 - epatch "${FILESDIR}"/${P}-libpng16.patch - - # remove flags to let the user decide - local - for cf in -O2 -ffast-math \ - -fexpensive-optimizations \ - -fomit-frame-pointer; do - sed -i \ - -e "s/${cf}//g" \ - configure.in admin/* || die "sed failed" - done - # remove an unused gconf macro killing autoconf when no gnome - # (not needed without eautoreconf) - if ! use gnome; then - sed -i \ - -e '/AM_GCONF_SOURCE_2/d' \ - configure.in || die "sed failed" - fi - eautoreconf - filter-flags "-funroll-loops -frerun-loop-opt" - - ### This version of Celestia has a bug in the font rendering and - ### requires -fsigned-char. We should be able to force this flag - ### on all architectures. See bug #316573. - append-flags "-fsigned-char" -} - -src_configure() { - # force lua in 1.6.1. seems to be inevitable - econf \ - --disable-rpath \ - --with-${CELESTIA_GUI} \ - --with-lua \ - $(use_enable cairo) \ - $(use_enable threads threading) \ - $(use_enable nls) \ - $(use_enable pch) \ - $(use_enable theora) -} - -src_install() { - if [[ ${CELESTIA_GUI} == gnome ]]; then - gnome2_src_install - else - emake DESTDIR="${D}" install - local size - for size in 16 22 32 48 ; do - insinto /usr/share/icons/hicolor/${size}x${size}/apps - newins "${S}"/src/celestia/kde/data/hi${size}-app-${PN}.png ${PN}.png - done - fi - [[ ${CELESTIA_GUI} == glut ]] && domenu celestia.desktop - dodoc AUTHORS README TRANSLATORS *.txt -} diff --git a/sci-astronomy/celestia/files/celestia-1.6.0-cfg.patch b/sci-astronomy/celestia/files/celestia-1.6.0-cfg.patch deleted file mode 100644 index 2319c255b2b5..000000000000 --- a/sci-astronomy/celestia/files/celestia-1.6.0-cfg.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/celestia.cfg -+++ b/celestia.cfg -@@ -195,7 +195,7 @@ - # or - # ExtrasDirectories [ "D:\\celestia-extras" ] - #------------------------------------------------------------------------ -- ExtrasDirectories [ "extras-standard" "extras" ] -+ ExtrasDirectories [ "extras-standard" "extras" "~/.celestia" ] - - - #------------------------------------------------------------------------ diff --git a/sci-astronomy/celestia/files/celestia-1.6.1-gcc46.patch b/sci-astronomy/celestia/files/celestia-1.6.1-gcc46.patch deleted file mode 100644 index 757cd6c5d407..000000000000 --- a/sci-astronomy/celestia/files/celestia-1.6.1-gcc46.patch +++ /dev/null @@ -1,14 +0,0 @@ -http://bugs.gentoo.org/show_bug.cgi?id=366073 -http://celestia.svn.sourceforge.net/viewvc/celestia?view=revision&revision=5178 - -Patch written by Nils Larsson <ni1s@nerdshack.com> ---- a/src/celengine/frametree.h -+++ b/src/celengine/frametree.h -@@ -14,6 +14,7 @@ - #define _CELENGINE_FRAMETREE_H_ - - #include <vector> -+#include <cstddef> - - class Star; - class Body; diff --git a/sci-astronomy/celestia/files/celestia-1.6.1-gcc47.patch b/sci-astronomy/celestia/files/celestia-1.6.1-gcc47.patch deleted file mode 100644 index 385f39a20511..000000000000 --- a/sci-astronomy/celestia/files/celestia-1.6.1-gcc47.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up celestia-1.6.1/src/celengine/frametree.h.gcc47 celestia-1.6.1/src/celengine/frametree.h ---- celestia-1.6.1/src/celengine/frametree.h.gcc47 2012-03-22 12:56:56.096087430 -0400 -+++ celestia-1.6.1/src/celengine/frametree.h 2012-03-22 12:57:04.333022427 -0400 -@@ -13,6 +13,7 @@ - #ifndef _CELENGINE_FRAMETREE_H_ - #define _CELENGINE_FRAMETREE_H_ - -+#include <unistd.h> - #include <vector> - - class Star; -diff -up celestia-1.6.1/src/celengine/planetgrid.cpp.gcc47 celestia-1.6.1/src/celengine/planetgrid.cpp ---- celestia-1.6.1/src/celengine/planetgrid.cpp.gcc47 2012-03-22 12:53:01.496950513 -0400 -+++ celestia-1.6.1/src/celengine/planetgrid.cpp 2012-03-22 12:53:08.812891865 -0400 -@@ -12,6 +12,7 @@ - - #include <cstdio> - #include <cmath> -+#include <celmath/mathlib.h> - #include <celmath/intersect.h> - #include "planetgrid.h" - #include "body.h" diff --git a/sci-astronomy/celestia/files/celestia-1.6.1-libpng15.patch b/sci-astronomy/celestia/files/celestia-1.6.1-libpng15.patch deleted file mode 100644 index 0a772ffdf6ac..000000000000 --- a/sci-astronomy/celestia/files/celestia-1.6.1-libpng15.patch +++ /dev/null @@ -1,14 +0,0 @@ -imagecapture.cpp:184:40: error: ‘Z_BEST_COMPRESSION’ was not declared in this scope - ---- a/src/celestia/imagecapture.cpp -+++ b/src/celestia/imagecapture.cpp -@@ -31,6 +31,9 @@ - #include "png.h" - #endif - -+// Z_BEST_COMPRESSION -+#include <zlib.h> -+ - // Define png_jmpbuf() in case we are using a pre-1.0.6 version of libpng - #ifndef png_jmpbuf - #define png_jmpbuf(png_ptr) png_ptr->jmpbuf diff --git a/sci-astronomy/celestia/files/celestia-1.6.1-libpng16.patch b/sci-astronomy/celestia/files/celestia-1.6.1-libpng16.patch deleted file mode 100644 index 0905be66b6b6..000000000000 --- a/sci-astronomy/celestia/files/celestia-1.6.1-libpng16.patch +++ /dev/null @@ -1,25 +0,0 @@ -image.cpp:530:61: error: ‘memcpy’ was not declared in this scope - -https://bugs.gentoo.org/show_bug.cgi?id=464764 - -Patch written by Lars Wendler <polynomial-c@gentoo.org> ---- a/src/celengine/image.cpp -+++ b/src/celengine/image.cpp -@@ -42,6 +42,7 @@ extern "C" { - #include "jpeglib.h" - #else - #include <cstdio> -+#include <string.h> - #include <jpeglib.h> - #endif - } ---- a/src/celengine/texture.cpp -+++ b/src/celengine/texture.cpp -@@ -28,6 +28,7 @@ - #include <cstdlib> - #include <cstdio> - #include <cassert> -+#include <string.h> - - #ifndef _WIN32 - #ifndef TARGET_OS_MAC diff --git a/sci-astronomy/celestia/files/celestia-1.6.1-linking.patch b/sci-astronomy/celestia/files/celestia-1.6.1-linking.patch deleted file mode 100644 index dd5f93e609a6..000000000000 --- a/sci-astronomy/celestia/files/celestia-1.6.1-linking.patch +++ /dev/null @@ -1,65 +0,0 @@ -Fix linking issues: - * underlinking GLUT (bug #372123, #387609) - * as-needed (bug #281258) - * theora with glut (bug #399237) - ---- a/src/celestia/Makefile.am -+++ b/src/celestia/Makefile.am -@@ -7,14 +7,15 @@ - - if ENABLE_KDE - SUBDIRS += kde --celestiaKDELIBS = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) \ -- $(LIBSOCKET) -lDCOP kde/libkdegui.a -+celestiaKDELIBS = kde/libkdegui.a - celestia_LDFLAGS = $(all_libraries) $(KDE_RPATH) -+LIBS += $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) $(LIBSOCKET) -lDCOP - endif - - if ENABLE_GTK - SUBDIRS += gtk --celestiaGTKLIBS = $(GTK_LIBS) gtk/libgtkgui.a -+celestiaGTKLIBS = gtk/libgtkgui.a -+LIBS += $(GTK_LIBS) - endif - - COMMONSOURCES = \ -@@ -62,6 +63,7 @@ - - if ENABLE_GLUT - GLUTSOURCES = glutmain.cpp -+GLUTLIBS = -lGL - endif - - if ENABLE_THEORA -@@ -80,15 +82,16 @@ - celestia_LDADD = \ - $(celestiaKDELIBS) \ - $(celestiaGTKLIBS) \ -- $(DL_LIBS) \ -- $(LUA_LIBS) \ -- $(THEORA_LIBS) \ - ../celengine/libcelengine.a \ - ../celtxf/libceltxf.a \ - ../cel3ds/libcel3ds.a \ - ../celmath/libcelmath.a \ - ../celutil/libcelutil.a \ -- $(SPICE_LIBS) -+ $(LUA_LIBS) \ -+ $(THEORA_LIBS) \ -+ $(GLUTLIBS) \ -+ $(SPICE_LIBS) \ -+ $(DL_LIBS) - - noinst_HEADERS = $(wildcard *.h) - noinst_DATA = ../../celestia ---- a/configure.in -+++ b/configure.in -@@ -252,6 +252,7 @@ - dnl Check for GLUT. - AC_CHECK_LIB(glut, glutKeyboardUpFunc, , - [AC_MSG_ERROR([GLUT library version >= 3.7 not found])]) -+ check_theora="yes" - fi - AM_CONDITIONAL(ENABLE_GLUT, test "$ui_glut" = "yes") - |