diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-17 10:20:19 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-17 10:20:19 -0300 |
| commit | 66e4c91d4531eef5adcd9dbe4a71e63c9b72cd7e (patch) | |
| tree | 19e3e26a15f15fc8405ba2016fe9d4cc19919833 /extra/celestia/PKGBUILD | |
| parent | c646bdd97c63b2d81bc27060203fabfebabda716 (diff) | |
| parent | c84b2cd310f86dc50c4f52a5907cb17652e8c87c (diff) | |
Merged upstream, mesa needs revision
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/gigi/PKGBUILD
community-staging/lxdm/PKGBUILD
community-staging/lxdm/lxdm-pam
community-staging/lxdm/lxdm.install
community-staging/lxdm/service
community-testing/gigi/PKGBUILD
community/calf/PKGBUILD
community/freedroidrpg/PKGBUILD
community/gmic/PKGBUILD
community/gnash/PKGBUILD
community/prboom/PKGBUILD
community/scorched3d/PKGBUILD
community/tmux/PKGBUILD
community/torcs/PKGBUILD
core/curl/PKGBUILD
core/systemd/PKGBUILD
core/sysvinit/PKGBUILD
extra/akonadi/PKGBUILD
extra/bzflag/PKGBUILD
extra/dhcp/PKGBUILD
extra/ftgl/PKGBUILD
extra/gcin/PKGBUILD
extra/imagemagick/PKGBUILD
extra/mesa/PKGBUILD
extra/python-telepathy/PKGBUILD
extra/qtiplot/PKGBUILD
extra/ruby/PKGBUILD
extra/wireshark/PKGBUILD
extra/xfce4-xkb-plugin/PKGBUILD
extra/xine-lib/PKGBUILD
extra/xorg-server/PKGBUILD
gnome-unstable/at-spi2-atk/PKGBUILD
gnome-unstable/at-spi2-core/PKGBUILD
gnome-unstable/baobab/PKGBUILD
gnome-unstable/epiphany/PKGBUILD
gnome-unstable/gdm/PKGBUILD
gnome-unstable/glib2/PKGBUILD
gnome-unstable/gnome-games/PKGBUILD
gnome-unstable/gnome-screensaver/PKGBUILD
gnome-unstable/gnome-session/PKGBUILD
gnome-unstable/gtk3/PKGBUILD
gnome-unstable/libpeas/PKGBUILD
gnome-unstable/libsoup/PKGBUILD
gnome-unstable/mutter/PKGBUILD
gnome-unstable/networkmanager/PKGBUILD
multilib/lib32-glew/PKGBUILD
multilib/lib32-gnutls/PKGBUILD
multilib/lib32-mesa/PKGBUILD
multilib/lib32-sqlite/PKGBUILD
multilib/wine/PKGBUILD
multilib/wine_gecko/PKGBUILD
staging/calligra/PKGBUILD
staging/inkscape/PKGBUILD
staging/kdebase-workspace/PKGBUILD
staging/kdebase-workspace/kde-np.pam
staging/kdebase-workspace/kde.pam
staging/kdebase-workspace/kdm.service
staging/libreoffice/PKGBUILD
staging/libreoffice/libreoffice-common.csh
staging/libreoffice/libreoffice-common.sh
staging/poppler/PKGBUILD
testing/dbus-python/PKGBUILD
testing/e2fsprogs/PKGBUILD
testing/iproute2/PKGBUILD
testing/iptables/PKGBUILD
testing/kdebase-workspace/PKGBUILD
testing/kdebase-workspace/kde-np.pam
testing/kdebase-workspace/kde.pam
testing/kdebindings-python/PKGBUILD
testing/lvm2/PKGBUILD
testing/lvm2/lvm-on-crypt.service
testing/lvm2/lvm.service
testing/miro/PKGBUILD
testing/postgresql/PKGBUILD
testing/postgresql/postgresql.install
testing/postgresql/postgresql.service
testing/ppp/PKGBUILD
testing/ppp/ip-down
testing/pyqt/PKGBUILD
testing/qscintilla/PKGBUILD
testing/sip/PKGBUILD
testing/systemd/PKGBUILD
testing/systemd/systemd.install
testing/util-linux/PKGBUILD
testing/wpa_supplicant/PKGBUILD
testing/wpa_supplicant/config
testing/xf86-video-intel/PKGBUILD
Diffstat (limited to 'extra/celestia/PKGBUILD')
| -rw-r--r-- | extra/celestia/PKGBUILD | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/extra/celestia/PKGBUILD b/extra/celestia/PKGBUILD index 2437b69f4..fb8887541 100644 --- a/extra/celestia/PKGBUILD +++ b/extra/celestia/PKGBUILD @@ -1,24 +1,26 @@ -# $Id: PKGBUILD 148690 2012-02-05 11:47:02Z ibiru $ +# $Id: PKGBUILD 168599 2012-10-13 11:46:55Z andyrtr $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor : Damir Perisa <damir.perisa@bluewin.ch> pkgname=celestia pkgver=1.6.1 -pkgrel=2 +pkgrel=3 pkgdesc="Real-time space simulation" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.shatters.net/celestia/" -depends=('gtk2' 'libtheora' 'lua' 'gtkglext' 'glut' 'libxmu' 'mesa' 'libjpeg') +depends=('gtk2' 'libtheora' 'lua' 'gtkglext' 'glut' 'libxmu' 'glu' 'libjpeg') options=('!makeflags') 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') + 'celestia-1.6.1-linking.patch' + 'gcc-4.7-fixes.diff') sha1sums=('1f0fdf4525a8b9d6c708e1f6383babed670d18e7' '7c08ca391603806d788cb8f3342acedafc924eef' '46ecc4e10b24191384bc848c206652498843adf0' - '534c8eee18d13a868c91f0b870ebecc05f3e7ae1') + '534c8eee18d13a868c91f0b870ebecc05f3e7ae1' + '582f9eed93eca02a16350f02c29e2ea6f69aa869') build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -27,6 +29,7 @@ build() { 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" + patch -Np1 -i "${srcdir}/gcc-4.7-fixes.diff" # This version of Celestia has a bug in the font rendering and requires -fsigned-char export CFLAGS="$CFLAGS -fsigned-char" |