[arch-commits] CVS update of extra/science/celestia (3 files)
Damir Perisa
damir at archlinux.org
Sat Jan 26 15:48:12 UTC 2008
Date: Saturday, January 26, 2008 @ 10:48:12
Author: damir
Path: /home/cvs-extra/extra/science/celestia
Modified: PKGBUILD (1.13 -> 1.14)
Removed: celestia-1.4.0-compile.patch (1.1) celestia-lua51.patch (1.1)
upgpkg: celestia 1.5.0-1
------------------------------+
PKGBUILD | 17 ++++-------
celestia-1.4.0-compile.patch | 28 -------------------
celestia-lua51.patch | 59 -----------------------------------------
3 files changed, 6 insertions(+), 98 deletions(-)
Index: extra/science/celestia/PKGBUILD
diff -u extra/science/celestia/PKGBUILD:1.13 extra/science/celestia/PKGBUILD:1.14
--- extra/science/celestia/PKGBUILD:1.13 Sun Sep 9 09:25:06 2007
+++ extra/science/celestia/PKGBUILD Sat Jan 26 10:48:12 2008
@@ -1,22 +1,19 @@
-# $Id: PKGBUILD,v 1.13 2007/09/09 13:25:06 damir Exp $
+# $Id: PKGBUILD,v 1.14 2008/01/26 15:48:12 damir Exp $
# Contributor : Damir Perisa <damir.perisa at bluewin.ch>
# Maintainer: damir <damir at archlinux.org>
pkgname=celestia
-pkgver=1.4.1
-pkgrel=3
+pkgver=1.5.0
+pkgrel=1
pkgdesc="Real-time space simulation"
arch=(i686 x86_64)
license=('GPL2')
url="http://www.shatters.net/celestia/"
-depends=('gtk2' 'lua' 'gtkglext' 'glut' 'libxmu' 'mesa')
-source=(http://puzzle.dl.sourceforge.net/sourceforge/celestia/$pkgname-$pkgver.tar.gz \
- celestia-lua51.patch celestia-1.4.0-compile.patch)
+depends=('gtk2' 'libtheora' 'lua' 'gtkglext' 'glut' 'libxmu' 'mesa')
+source=(http://puzzle.dl.sourceforge.net/sourceforge/celestia/$pkgname-$pkgver.tar.gz)
build() {
cd $startdir/src/$pkgname-$pkgver
- patch -Np1 -i $startdir/src/celestia-lua51.patch || return 1
- patch -Np0 -i $startdir/src/celestia-1.4.0-compile.patch || return 1
./configure --prefix=/usr \
--with-lua=/usr \
--datadir=/usr/share \
@@ -26,6 +23,4 @@
make DESTDIR=$startdir/pkg install
}
-
-md5sums=('be1d36fc97a13b9a276249dbc0efac41' 'ecc2e10ab99c5d026656b78c7602d31d'\
- '87d5e252bb171fb5e339a24c4dbda81a')
+md5sums=('156bc1080d27906122945a20d84d4a82')
Index: extra/science/celestia/celestia-1.4.0-compile.patch
diff -u extra/science/celestia/celestia-1.4.0-compile.patch:1.1 extra/science/celestia/celestia-1.4.0-compile.patch:removed
--- extra/science/celestia/celestia-1.4.0-compile.patch:1.1 Sat Jun 3 08:40:08 2006
+++ extra/science/celestia/celestia-1.4.0-compile.patch Sat Jan 26 10:48:12 2008
@@ -1,28 +0,0 @@
---- src/celengine/star.h.orig 2005-12-06 11:30:23.000000000 -0600
-+++ src/celengine/star.h 2006-02-10 15:21:49.000000000 -0600
-@@ -30,7 +30,7 @@
- // orbits and StarDetails objects. Currently, it's assumed that they
- // have lifetimes that continue until program termination.
- public:
-- StarDetails::StarDetails();
-+ StarDetails();
-
- inline float getRadius() const;
- inline float getTemperature() const;
---- src/celengine/command.h.orig 2004-12-22 16:07:15.000000000 -0600
-+++ src/celengine/command.h 2006-02-10 18:46:25.000000000 -0600
-@@ -94,10 +94,10 @@
- class CommandGotoLongLat : public InstantaneousCommand
- {
- public:
-- CommandGotoLongLat::CommandGotoLongLat(double t,
-- double dist,
-- float _longitude, float _latitude,
-- Vec3f _up);
-+ CommandGotoLongLat(double t,
-+ double dist,
-+ float _longitude, float _latitude,
-+ Vec3f _up);
- ~CommandGotoLongLat();
- void process(ExecutionEnvironment&);
-
Index: extra/science/celestia/celestia-lua51.patch
diff -u extra/science/celestia/celestia-lua51.patch:1.1 extra/science/celestia/celestia-lua51.patch:removed
--- extra/science/celestia/celestia-lua51.patch:1.1 Sat Jun 3 08:40:08 2006
+++ extra/science/celestia/celestia-lua51.patch Sat Jan 26 10:48:12 2008
@@ -1,59 +0,0 @@
-diff -wbBur celestia-1.4.1/configure celestia-1.4.1.my/configure
---- celestia-1.4.1/configure 2006-02-16 00:53:09.000000000 +0300
-+++ celestia-1.4.1.my/configure 2006-06-03 13:40:37.000000000 +0400
-@@ -39509,7 +39509,7 @@
- echo $ECHO_N "checking whether to enable Celestia Extension Language... $ECHO_C" >&6
- if (test "$enable_lua" != "no"); then
- CXXFLAGS="$CXXFLAGS -DCELX"
-- LDFLAGS="$LDFLAGS -llualib -llua"
-+ LDFLAGS="$LDFLAGS -llua"
-
- if (test "$lua_includes" != "no"); then
- CXXFLAGS="$CXXFLAGS -I$lua_includes"
-diff -wbBur celestia-1.4.1/configure.in celestia-1.4.1.my/configure.in
---- celestia-1.4.1/configure.in 2006-02-03 21:09:54.000000000 +0300
-+++ celestia-1.4.1.my/configure.in 2006-06-03 13:40:28.000000000 +0400
-@@ -383,7 +383,7 @@
- AC_MSG_CHECKING([whether to enable Celestia Extension Language])
- if (test "$enable_lua" != "no"); then
- CXXFLAGS="$CXXFLAGS -DCELX"
-- LDFLAGS="$LDFLAGS -llualib -llua"
-+ LDFLAGS="$LDFLAGS -llua"
-
- if (test "$lua_includes" != "no"); then
- CXXFLAGS="$CXXFLAGS -I$lua_includes"
-diff -wbBur celestia-1.4.1/src/celestia/celx.cpp celestia-1.4.1.my/src/celestia/celx.cpp
---- celestia-1.4.1/src/celestia/celx.cpp 2006-01-07 03:01:51.000000000 +0300
-+++ celestia-1.4.1.my/src/celestia/celx.cpp 2006-06-03 13:41:36.000000000 +0400
-@@ -32,9 +32,7 @@
-
- #include "celx.h"
- #include "celestiacore.h"
--extern "C" {
--#include "lualib.h"
--}
-+#include "lua.hpp"
-
- using namespace std;
-
-@@ -598,7 +596,7 @@
- int stackTop = lua_gettop(costate);
- if (strcmp(c_p, "y") == 0)
- {
-- lua_iolibopen(costate);
-+ luaL_openlibs(costate);
- ioMode = IOAllowed;
- }
- else
-@@ -4577,10 +4575,7 @@
- initMaps();
-
- // Import the base and math libraries
-- lua_baselibopen(state);
-- lua_mathlibopen(state);
-- lua_tablibopen(state);
-- lua_strlibopen(state);
-+ luaL_openlibs(state);
-
- // Add an easy to use wait function, so that script writers can
- // live in ignorance of coroutines. There will probably be a significant
More information about the arch-commits
mailing list