[arch-commits] Commit in neverball/trunk (PKGBUILD neverball-1.5.4-libpng.patch)

[Eric Bélanger]

    Date: Sunday, April 28, 2013 @ 01:52:56
  Author: eric
Revision: 183792

upgpkg: neverball 1.5.4-6

Rebuild against libpng 1.6

Added:
  neverball/trunk/neverball-1.5.4-libpng.patch
Modified:
  neverball/trunk/PKGBUILD

------------------------------+
 PKGBUILD                     |    9 ++++++---
 neverball-1.5.4-libpng.patch |   21 +++++++++++++++++++++
 2 files changed, 27 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-04-27 23:43:12 UTC (rev 183791)
+++ PKGBUILD	2013-04-27 23:52:56 UTC (rev 183792)
@@ -3,7 +3,7 @@
 
 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 @@
          '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() {

Added: neverball-1.5.4-libpng.patch
===================================================================
--- neverball-1.5.4-libpng.patch	                        (rev 0)
+++ neverball-1.5.4-libpng.patch	2013-04-27 23:52:56 UTC (rev 183792)
@@ -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. */