summaryrefslogtreecommitdiff
path: root/community/critter
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2012-02-06 23:14:50 +0000
committerroot <root@rshg054.dnsready.net>2012-02-06 23:14:50 +0000
commit1fa6edfba8d1e31ca1c0d59e8202cd3c62ccf393 (patch)
tree8d7ccc2dc9d08a4c3cde26aa01c887e9a0fc2fa1 /community/critter
parentbdb5b3e66f6afa586ea147f69af5e4ba388f7615 (diff)
Mon Feb 6 23:14:50 UTC 2012
Diffstat (limited to 'community/critter')
-rw-r--r--community/critter/PKGBUILD9
-rw-r--r--community/critter/criticalmass-1.0.2-libpng15.patch31
2 files changed, 37 insertions, 3 deletions
diff --git a/community/critter/PKGBUILD b/community/critter/PKGBUILD
index 56769ac4f..1c01a5742 100644
--- a/community/critter/PKGBUILD
+++ b/community/critter/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 57886 2011-11-04 08:24:44Z lcarlier $
+# $Id: PKGBUILD 63520 2012-02-05 11:53:03Z ibiru $
# Contributor: Allan McRae <mcrae_allan@hotmail.com>
# Maintainer: Daniel J Griffiths <griffithsdj@archlinux.us>
pkgname=critter
_origname=CriticalMass
pkgver=1.0.2
-pkgrel=5
+pkgrel=6
pkgdesc="Critical Mass (aka Critter) is an SDL/OpenGL space shoot'em up game"
arch=('i686' 'x86_64')
url="http://sourceforge.net/projects/criticalmass"
@@ -13,16 +13,19 @@ license=('GPL')
depends=('sdl_image' 'sdl_mixer' 'mesa')
source=(http://downloads.sourceforge.net/sourceforge/criticalmass/$_origname-${pkgver}.tar.bz2
critter-gcc43.patch
+ criticalmass-1.0.2-libpng15.patch
critter.desktop)
md5sums=('e2aff114bffa717fb79c82e1dc473ebe'
'e936920acce56bfa3b0123ca8b1193a6'
+ '76448ba5b7a42aec8fd2a5d1bc31b8e2'
'98c17809aed964c445adad09827035df')
build() {
cd ${srcdir}/$_origname-${pkgver}
patch -Np1 -i ../critter-gcc43.patch
- sed -i 's|-lpng12|-lpng|g' configure
+ patch -Np0 -i ../criticalmass-1.0.2-libpng15.patch
+ sed -i 's|-lpng12|-lpng15|g' configure
./configure --prefix=/usr --mandir=/usr/share/man
make
diff --git a/community/critter/criticalmass-1.0.2-libpng15.patch b/community/critter/criticalmass-1.0.2-libpng15.patch
new file mode 100644
index 000000000..ac1b8c0c6
--- /dev/null
+++ b/community/critter/criticalmass-1.0.2-libpng15.patch
@@ -0,0 +1,31 @@
+--- game/main.cpp
++++ game/main.cpp
+@@ -28,6 +28,8 @@
+ #include <sys/stat.h>
+ #include <sys/types.h>
+
++#include <zlib.h>
++
+ void migrateConfig( void)
+ {
+ //if onlineCheck is not set, default it to true
+--- utilssdl/PNG.cpp
++++ utilssdl/PNG.cpp
+@@ -45,7 +45,7 @@
+ {
+ png_size_t check;
+
+- check = fwrite( data, 1, length, (FILE *)(png->io_ptr));
++ check = fwrite( data, 1, length, (FILE *)(png_get_io_ptr(png)));
+ if( check != length)
+ {
+ png_error( png, "Write Error");
+@@ -72,7 +72,7 @@
+ return false;
+ }
+
+- if( setjmp(_png->jmpbuf))
++ if( setjmp(png_jmpbuf(_png)))
+ {
+ fclose( fp);
+ png_destroy_write_struct(&_png, (png_infopp)NULL);