diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-09 16:24:38 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-09 16:24:38 +0200 |
| commit | cdbd7308d16cb249715cce9bedf8b809f2576804 (patch) | |
| tree | bfdb3a816cf96988dc788e2678acdb294b032811 /extra/neverball | |
| parent | a86ff663185661ee304bb1f6d00d982102dd706d (diff) | |
| parent | 648599b08776ea788a3ddb0365eb30fda03efe7b (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/bwbar/PKGBUILD
community/dosbox/PKGBUILD
community/extremetuxracer/PKGBUILD
community/fbgrab/PKGBUILD
community/fbv/PKGBUILD
community/flam3/PKGBUILD
community/freedroidrpg/PKGBUILD
community/gdk-pixbuf/PKGBUILD
community/ghemical/PKGBUILD
community/gmic/PKGBUILD
community/gnash/PKGBUILD
community/gnustep-base/PKGBUILD
community/guvcview/PKGBUILD
community/keepassx/PKGBUILD
community/kvpnc/PKGBUILD
community/libghemical/PKGBUILD
community/liboglappth/PKGBUILD
community/png2ico/PKGBUILD
community/shapelib/PKGBUILD
community/sloccount/PKGBUILD
community/tmw/PKGBUILD
community/xmoto/PKGBUILD
core/links/PKGBUILD
extra/amule/PKGBUILD
extra/cairomm/PKGBUILD
extra/calligra/PKGBUILD
extra/evas/PKGBUILD
extra/fltk/PKGBUILD
extra/gd/PKGBUILD
extra/gif2png/PKGBUILD
extra/glhack/PKGBUILD
extra/graphviz/PKGBUILD
extra/gstreamer0.10-good/PKGBUILD
extra/imlib/PKGBUILD
extra/imlib2/PKGBUILD
extra/lbreakout2/PKGBUILD
extra/libgdiplus/PKGBUILD
extra/libkate/PKGBUILD
extra/libpano13/PKGBUILD
extra/libwebp/PKGBUILD
extra/libwmf/PKGBUILD
extra/libxslt/PKGBUILD
extra/mjpegtools/PKGBUILD
extra/ntp/PKGBUILD
extra/nx/PKGBUILD
extra/openjpeg/PKGBUILD
extra/php/PKGBUILD
extra/plotutils/PKGBUILD
extra/poppler/PKGBUILD
extra/qrencode/PKGBUILD
extra/qt4/PKGBUILD
extra/qt5/PKGBUILD
extra/qtiplot/PKGBUILD
extra/qtwebkit/PKGBUILD
extra/samba/PKGBUILD
extra/sdl_image/PKGBUILD
extra/vice/PKGBUILD
extra/vigra/PKGBUILD
extra/vlc/PKGBUILD
extra/webkitgtk/PKGBUILD
extra/webkitgtk2/PKGBUILD
extra/wv/PKGBUILD
extra/wxgtk/PKGBUILD
extra/xaos/PKGBUILD
extra/xsane/PKGBUILD
extra/zvbi/PKGBUILD
Diffstat (limited to 'extra/neverball')
| -rw-r--r-- | extra/neverball/PKGBUILD | 11 | ||||
| -rw-r--r-- | extra/neverball/neverball-1.5.4-libpng.patch | 21 |
2 files changed, 28 insertions, 4 deletions
diff --git a/extra/neverball/PKGBUILD b/extra/neverball/PKGBUILD index a2c8d0df7..9c0612f0f 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' 'mips64el') 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. */ |