[arch-commits] Commit in celestia/trunk (4 files)
Giovanni Scafora
giovanni at archlinux.org
Thu Jan 19 21:56:40 UTC 2012
Date: Thursday, January 19, 2012 @ 16:56:40
Author: giovanni
Revision: 146980
upgpkg: celestia 1.6.1-2
libpng 1.5 rebuild
Added:
celestia/trunk/celestia-1.6.1-gcc46.patch
celestia/trunk/celestia-1.6.1-libpng15.patch
celestia/trunk/celestia-1.6.1-linking.patch
Modified:
celestia/trunk/PKGBUILD
-------------------------------+
PKGBUILD | 28 ++++++++++++++------
celestia-1.6.1-gcc46.patch | 13 +++++++++
celestia-1.6.1-libpng15.patch | 14 ++++++++++
celestia-1.6.1-linking.patch | 54 ++++++++++++++++++++++++++++++++++++++++
4 files changed, 101 insertions(+), 8 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2012-01-19 21:29:09 UTC (rev 146979)
+++ PKGBUILD 2012-01-19 21:56:40 UTC (rev 146980)
@@ -4,35 +4,47 @@
pkgname=celestia
pkgver=1.6.1
-pkgrel=1
+pkgrel=2
pkgdesc="Real-time space simulation"
arch=('i686' 'x86_64')
license=('GPL')
url="http://www.shatters.net/celestia/"
depends=('gtk2' 'libtheora' 'lua' 'gtkglext' 'glut' 'libxmu' 'mesa' 'libjpeg')
options=('!makeflags')
-source=(http://downloads.sourceforge.net/sourceforge/celestia/${pkgname}-${pkgver}.tar.gz
- celestia-1.5.1-gcc44.patch celestia-1.6.1-gentoo.patch)
+source=("http://downloads.sourceforge.net/sourceforge/celestia/${pkgname}-${pkgver}.tar.gz"
+ 'celestia-1.6.1-gcc46.patch'
+ 'celestia-1.6.1-libpng15.patch'
+ 'celestia-1.6.1-linking.patch')
sha1sums=('1f0fdf4525a8b9d6c708e1f6383babed670d18e7'
- '5ab2769e239a89468bb8ffb5740cbeec6018143c'
- 'aebf894630fdba4c4d429622f5e2b8da56d8b61e')
+ '7c08ca391603806d788cb8f3342acedafc924eef'
+ '46ecc4e10b24191384bc848c206652498843adf0'
+ '534c8eee18d13a868c91f0b870ebecc05f3e7ae1')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
# build patch
- patch -Np0 < ${srcdir}/celestia-1.5.1-gcc44.patch
- patch -Np0 -i ${srcdir}/celestia-1.6.1-gentoo.patch
+ patch -Np0 -i "${srcdir}/celestia-1.6.1-gcc46.patch"
+ patch -Np0 -i "${srcdir}/celestia-1.6.1-libpng15.patch"
+ patch -Np1 -i "${srcdir}/celestia-1.6.1-linking.patch"
+ # This version of Celestia has a bug in the font rendering and requires -fsigned-char
+ export CFLAGS="$CFLAGS -fsigned-char"
+ export CXXFLAGS="$CXXFLAGS -fsigned-char"
+
+ autoreconf
./configure --prefix=/usr \
--with-lua=/usr \
--datadir=/usr/share \
- --with-gtk
+ --with-gtk \
+ --disable-rpath \
+ --with-lua
make
}
package() {
cd ${srcdir}/${pkgname}-${pkgver}
+
make DESTDIR=${pkgdir} install
}
Added: celestia-1.6.1-gcc46.patch
===================================================================
--- celestia-1.6.1-gcc46.patch (rev 0)
+++ celestia-1.6.1-gcc46.patch 2012-01-19 21:56:40 UTC (rev 146980)
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/show_bug.cgi?id=366073
+
+Patch written by Nils Larsson <ni1s at nerdshack.com>
+--- src/celengine/frametree.h
++++ src/celengine/frametree.h
+@@ -14,6 +14,7 @@
+ #define _CELENGINE_FRAMETREE_H_
+
+ #include <vector>
++#include <cstddef>
+
+ class Star;
+ class Body;
Added: celestia-1.6.1-libpng15.patch
===================================================================
--- celestia-1.6.1-libpng15.patch (rev 0)
+++ celestia-1.6.1-libpng15.patch 2012-01-19 21:56:40 UTC (rev 146980)
@@ -0,0 +1,14 @@
+imagecapture.cpp:184:40: error: ‘Z_BEST_COMPRESSION’ was not declared in this scope
+
+--- src/celestia/imagecapture.cpp
++++ 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
Added: celestia-1.6.1-linking.patch
===================================================================
--- celestia-1.6.1-linking.patch (rev 0)
+++ celestia-1.6.1-linking.patch 2012-01-19 21:56:40 UTC (rev 146980)
@@ -0,0 +1,54 @@
+Fix linking issues:
+ * underlinking GLUT (bug #372123, #387609)
+ * as-needed (bug #281258)
+
+--- 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
More information about the arch-commits
mailing list