Sat May 24 04:08:21 UTC 2014

3 files changed, 8 insertions, 60 deletions

diff --git a/extra/neverball/PKGBUILD b/extra/neverball/PKGBUILD
index f0ad79476..a13f344c7 100644
--- a/extra/neverball/PKGBUILD
+++ b/extra/neverball/PKGBUILD
@@ -1,28 +1,19 @@
-# $Id: PKGBUILD 184414 2013-05-06 19:38:55Z foutrelis $
+# $Id: PKGBUILD 213405 2014-05-23 02:47:32Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 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')
-
-prepare() {
-  cd ${pkgname}-${pkgver}
-  patch -p0 -i ../neverball-1.5.4-underlink.patch
-  patch -p1 -i ../neverball-1.5.4-libpng.patch
-}
+source=(http://neverball.org/${pkgname}-${pkgver}.tar.gz)
+sha1sums=('3faebf15fea9361358a416176b9689f966c456ea')
 
 build() {
   cd ${pkgname}-${pkgver}
@@ -39,12 +30,12 @@ package(){
   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
diff --git a/extra/neverball/neverball-1.5.4-libpng.patch b/extra/neverball/neverball-1.5.4-libpng.patch
deleted file mode 100644
index d7b224673..000000000
--- a/extra/neverball/neverball-1.5.4-libpng.patch
+++ /dev/null
@@ -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. */
diff --git a/extra/neverball/neverball-1.5.4-underlink.patch b/extra/neverball/neverball-1.5.4-underlink.patch
deleted file mode 100644
index 1a848cad3..000000000
--- a/extra/neverball/neverball-1.5.4-underlink.patch
+++ /dev/null
@@ -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