Date: Friday, May 23, 2014 @ 04:44:53 Author: eric Revision: 213404 upgpkg: neverball 1.6.0-1
Upstream update, Update depends, Remove old patches Modified: neverball/trunk/PKGBUILD Deleted: neverball/trunk/neverball-1.5.4-libpng.patch neverball/trunk/neverball-1.5.4-underlink.patch ---------------------------------+ PKGBUILD | 23 +++++++---------------- neverball-1.5.4-libpng.patch | 21 --------------------- neverball-1.5.4-underlink.patch | 22 ---------------------- 3 files changed, 7 insertions(+), 59 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-05-23 00:00:17 UTC (rev 213403) +++ PKGBUILD 2014-05-23 02:44:53 UTC (rev 213404) @@ -2,28 +2,19 @@ # Maintainer: Eric Bélanger <[email protected]> pkgname=neverball -pkgver=1.5.4 -pkgrel=6 +pkgver=1.6.0 +pkgrel=1 pkgdesc="3D game similar to Super Monkey Ball or Marble Madness" arch=('i686' 'x86_64') url="http://neverball.org/"; license=('GPL') -depends=('sdl_ttf' 'libgl' 'libpng' 'libjpeg' 'libvorbis' 'physfs' \ +depends=('sdl2_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 neverball-1.5.4-libpng.patch) -sha1sums=('619c227e1958bd60738f12dbbde9b30c91dd79a7' - 'f71982b7187d569c57b30c4c40fedd6c0e72baca' - '02e68c17e851e85414ce5649b6b77273846bdb67') +source=(http://neverball.org/${pkgname}-${pkgver}.tar.gz) +sha1sums=('3faebf15fea9361358a416176b9689f966c456ea') -prepare() { - cd ${pkgname}-${pkgver} - patch -p0 -i ../neverball-1.5.4-underlink.patch - patch -p1 -i ../neverball-1.5.4-libpng.patch -} - build() { cd ${pkgname}-${pkgver} make DATADIR=/usr/share/neverball LOCALEDIR=/usr/share/locale \ @@ -39,12 +30,12 @@ install -m755 neverball neverputt mapc "${pkgdir}/usr/bin" cp -r locale/* "${pkgdir}/usr/share/locale/" cp -r data/* "${pkgdir}/usr/share/neverball/" - install -m644 doc/* "${pkgdir}/usr/share/doc/neverball/" + cp -r doc/* "${pkgdir}/usr/share/doc/neverball/" install -m644 dist/*.desktop "${pkgdir}/usr/share/applications/" install -m644 dist/mapc.1 "${pkgdir}/usr/share/man/man1" install -m644 dist/{neverball.6,neverputt.6} "${pkgdir}/usr/share/man/man6" - for i in 16 24 32 48 64 128 256; do + for i in 16 24 32 48 64 128 256 512; do install -D -m644 dist/neverball_$i.png "${pkgdir}/usr/share/icons/hicolor/${i}x$i/apps/neverball.png" install -D -m644 dist/neverputt_$i.png "${pkgdir}/usr/share/icons/hicolor/${i}x$i/apps/neverputt.png" done Deleted: neverball-1.5.4-libpng.patch =================================================================== --- neverball-1.5.4-libpng.patch 2014-05-23 00:00:17 UTC (rev 213403) +++ neverball-1.5.4-libpng.patch 2014-05-23 02:44:53 UTC (rev 213404) @@ -1,21 +0,0 @@ -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. */ Deleted: neverball-1.5.4-underlink.patch =================================================================== --- neverball-1.5.4-underlink.patch 2014-05-23 00:00:17 UTC (rev 213403) +++ neverball-1.5.4-underlink.patch 2014-05-23 02:44:53 UTC (rev 213404) @@ -1,22 +0,0 @@ ---- Makefile.old 2011-06-22 06:30:52.441788160 +0200 -+++ Makefile 2011-06-22 06:31:59.754087534 +0200 -@@ -138,7 +138,7 @@ - endif - - ALL_LIBS := $(SDL_LIBS) $(BASE_LIBS) $(TILT_LIBS) $(INTL_LIBS) -lSDL_ttf \ -- -lvorbisfile $(OGL_LIBS) -+ -lvorbisfile $(OGL_LIBS) -lX11 - - #------------------------------------------------------------------------------ - ---- Makefile.old 2012-01-18 21:28:23.000000000 -0500 -+++ Makefile 2012-01-18 21:28:55.000000000 -0500 -@@ -131,7 +131,7 @@ - OGL_LIBS := -framework OpenGL - endif - --BASE_LIBS := -ljpeg $(PNG_LIBS) $(FS_LIBS) -+BASE_LIBS := -ljpeg $(PNG_LIBS) $(FS_LIBS) -lm - - ifdef DARWIN - BASE_LIBS += -L/opt/local/lib
