academic/celestia: Updated for version 1.6.1.
Signed-off-by: Niels Horn <niels.horn@slackbuilds.org>
This commit is contained in:
parent
6b139e5d36
commit
135b7bcb28
|
@ -1,51 +0,0 @@
|
|||
Fixing build with GCC-4.5
|
||||
|
||||
http://bugs.gentoo.org/show_bug.cgi?id=317507
|
||||
|
||||
Patch written by Philipp <sefi@s-e-f-i.de>
|
||||
--- src/celengine/overlay.h
|
||||
+++ src/celengine/overlay.h
|
||||
@@ -12,6 +12,7 @@
|
||||
|
||||
#include <string>
|
||||
#include <iostream>
|
||||
+#include <cstdio>
|
||||
#include <celtxf/texturefont.h>
|
||||
|
||||
|
||||
--- src/celmath/mathlib.h
|
||||
+++ src/celmath/mathlib.h
|
||||
@@ -44,11 +44,6 @@
|
||||
template<class T> T radToDeg(T r)
|
||||
return r * 180 / static_cast<T>(PI);
|
||||
}
|
||||
|
||||
-template<class T> T abs(T x)
|
||||
-{
|
||||
- return (x < 0) ? -x : x;
|
||||
-}
|
||||
-
|
||||
template<class T> T square(T x)
|
||||
{
|
||||
return x * x;
|
||||
--- src/celengine/star.cpp
|
||||
+++ src/celengine/star.cpp
|
||||
@@ -10,6 +10,7 @@
|
||||
#include <celmath/mathlib.h>
|
||||
#include <cstring>
|
||||
#include <cassert>
|
||||
+#include <cstdio>
|
||||
#include "celestia.h"
|
||||
#include "astro.h"
|
||||
#include "orbit.h"
|
||||
--- src/celestia/celx_object.cpp
|
||||
+++ src/celestia/celx_object.cpp
|
||||
@@ -773,7 +773,7 @@ static int object_mark(lua_State* l)
|
||||
markAlpha = 1.0f;
|
||||
|
||||
Color markColorAlpha(0.0f, 1.0f, 0.0f, 0.9f);
|
||||
- markColorAlpha = Color::Color(markColor, markAlpha);
|
||||
+ markColorAlpha = Color(markColor, markAlpha);
|
||||
|
||||
const char* markLabel = celx.safeGetString(6, WrongType, "Fifth argument to object:mark must be a string");
|
||||
if (markLabel == NULL)
|
|
@ -1,14 +0,0 @@
|
|||
http://bugs.gentoo.org/show_bug.cgi?id=307429
|
||||
http://repos.archlinux.org/wsvn/packages/celestia/trunk/libpng14.patch
|
||||
|
||||
--- src/celengine/image.cpp
|
||||
+++ src/celengine/image.cpp
|
||||
@@ -737,7 +737,7 @@
|
||||
|
||||
if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
|
||||
{
|
||||
- png_set_gray_1_2_4_to_8(png_ptr);
|
||||
+ png_set_expand_gray_1_2_4_to_8(png_ptr);
|
||||
}
|
||||
|
||||
if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
# Slackware build script for celestia
|
||||
|
||||
# Copyright 2008-2009 Heinz Wiesinger <pprkut@liwjatan.at>
|
||||
# Copyright 2008-2011 Heinz Wiesinger <pprkut@liwjatan.at>
|
||||
# All rights reserved.
|
||||
#
|
||||
# Redistribution and use of this script, with or without modification, is
|
||||
|
@ -23,7 +23,7 @@
|
|||
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
PRGNAM=celestia
|
||||
VERSION=1.6.0
|
||||
VERSION=1.6.1
|
||||
BUILD=${BUILD:-1}
|
||||
TAG=${TAG:-_SBo}
|
||||
|
||||
|
@ -72,12 +72,6 @@ find . \
|
|||
# Note that the kde frontend will only build with kde3
|
||||
FRONTEND=${FRONTEND:-gtk}
|
||||
|
||||
# Fix detecting libpng 1.4
|
||||
patch -p0 -i $CWD/celestia-1.6.0-libpng14.patch
|
||||
|
||||
# Fix build errors for gcc 4.5
|
||||
patch -p0 -i $CWD/celestia-1.6.0-gcc45.patch
|
||||
|
||||
CFLAGS="$SLKCFLAGS" \
|
||||
CXXFLAGS="$SLKCFLAGS" \
|
||||
./configure \
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
PRGNAM="celestia"
|
||||
VERSION="1.6.0"
|
||||
VERSION="1.6.1"
|
||||
HOMEPAGE="http://www.shatters.net/celestia/"
|
||||
DOWNLOAD="http://downloads.sourceforge.net/celestia/celestia-1.6.0.tar.gz"
|
||||
DOWNLOAD="http://downloads.sourceforge.net/celestia/celestia-1.6.1.tar.gz"
|
||||
MD5SUM="02208982a431b984502fac909bf380f4"
|
||||
DOWNLOAD_x86_64=""
|
||||
MD5SUM="9b96a8e7666ab5a26f032b9d605e023d"
|
||||
MD5SUM_x86_64=""
|
||||
MAINTAINER="Heinz Wiesinger"
|
||||
EMAIL="pprkut@liwjatan.at"
|
||||
APPROVED="dsomero"
|
||||
APPROVED="Niels Horn"
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
# make exactly 11 lines for the formatting to be correct. It's also
|
||||
# customary to leave one space after the ':'.
|
||||
|
||||
|-----handy-ruler----------------------------------------------------|
|
||||
|-----handy-ruler------------------------------------------------------|
|
||||
celestia: celestia (Realtime Space Simulation)
|
||||
celestia:
|
||||
celestia: A real-time space simulation that lets you experience our universe
|
||||
|
|
Loading…
Reference in New Issue