summaryrefslogtreecommitdiff
path: root/extra/neverball
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2013-05-07 00:36:35 -0700
committerroot <root@rshg054.dnsready.net>2013-05-07 00:36:35 -0700
commitda0a0d88caa1bf934ebf314ef86e15928dbb027b (patch)
treeb7c57ac9667de10c72390e0d81654fffbe47c42d /extra/neverball
parentffb692bf2696e7ebedd19bcd55ba253e21cb732d (diff)
Tue May 7 00:36:35 PDT 2013
Diffstat (limited to 'extra/neverball')
-rw-r--r--extra/neverball/PKGBUILD11
-rw-r--r--extra/neverball/neverball-1.5.4-libpng.patch21
2 files changed, 28 insertions, 4 deletions
diff --git a/extra/neverball/PKGBUILD b/extra/neverball/PKGBUILD
index 82116ab17..f0ad79476 100644
--- a/extra/neverball/PKGBUILD
+++ b/extra/neverball/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 183160 2013-04-18 02:16:47Z eric $
+# $Id: PKGBUILD 184414 2013-05-06 19:38:55Z foutrelis $
# Maintainer: Eric BĂ©langer <eric@archlinux.org>
pkgname=neverball
pkgver=1.5.4
-pkgrel=5
+pkgrel=6
pkgdesc="3D game similar to Super Monkey Ball or Marble Madness"
arch=('i686' 'x86_64')
url="http://neverball.org/"
@@ -12,13 +12,16 @@ depends=('sdl_ttf' 'libgl' 'libpng' 'libjpeg' 'libvorbis' 'physfs' \
'hicolor-icon-theme' 'xdg-utils')
makedepends=('mesa')
install=neverball.install
-source=(http://neverball.org/${pkgname}-${pkgver}.tar.gz neverball-1.5.4-underlink.patch)
+source=(http://neverball.org/${pkgname}-${pkgver}.tar.gz \
+ neverball-1.5.4-underlink.patch neverball-1.5.4-libpng.patch)
sha1sums=('619c227e1958bd60738f12dbbde9b30c91dd79a7'
- 'f71982b7187d569c57b30c4c40fedd6c0e72baca')
+ 'f71982b7187d569c57b30c4c40fedd6c0e72baca'
+ '02e68c17e851e85414ce5649b6b77273846bdb67')
prepare() {
cd ${pkgname}-${pkgver}
patch -p0 -i ../neverball-1.5.4-underlink.patch
+ patch -p1 -i ../neverball-1.5.4-libpng.patch
}
build() {
diff --git a/extra/neverball/neverball-1.5.4-libpng.patch b/extra/neverball/neverball-1.5.4-libpng.patch
new file mode 100644
index 000000000..d7b224673
--- /dev/null
+++ b/extra/neverball/neverball-1.5.4-libpng.patch
@@ -0,0 +1,21 @@
+Index: neverball-1.5.4/share/base_image.c
+===================================================================
+--- neverball-1.5.4.orig/share/base_image.c
++++ neverball-1.5.4/share/base_image.c
+@@ -15,6 +15,7 @@
+ #include <png.h>
+ #include <jpeglib.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <assert.h>
+
+ #include "glext.h"
+@@ -94,7 +95,7 @@ static void *image_load_png(const char *
+ default: longjmp(png_jmpbuf(readp), -1);
+ }
+
+- if (!(bytep = png_malloc(readp, h * png_sizeof(png_bytep))))
++ if (!(bytep = png_malloc(readp, h * sizeof(png_bytep))))
+ longjmp(png_jmpbuf(readp), -1);
+
+ /* Allocate the final pixel buffer and read pixels there. */