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

[Eric Bélanger]

    Date: Wednesday, January 18, 2012 @ 22:40:26
  Author: eric
Revision: 146884

upgpkg: neverball 1.5.4-4

Rebuild against libpng 1.5 and libtiff 4.0, Add patch to fix underlinking

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

---------------------------------+
 PKGBUILD                        |    9 +++++----
 neverball-1.5.4-underlink.patch |   22 ++++++++++++++++++++++
 2 files changed, 27 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-01-19 03:24:07 UTC (rev 146883)
+++ PKGBUILD	2012-01-19 03:40:26 UTC (rev 146884)
@@ -3,20 +3,21 @@
 
 pkgname=neverball
 pkgver=1.5.4
-pkgrel=3
+pkgrel=4
 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')
 makedepends=('mesa')
-source=(http://neverball.org/${pkgname}-${pkgver}.tar.gz)
-md5sums=('c523b0f72c2035831310e821162f7bd7')
-sha1sums=('619c227e1958bd60738f12dbbde9b30c91dd79a7')
+source=(http://neverball.org/${pkgname}-${pkgver}.tar.gz neverball-1.5.4-underlink.patch)
+sha1sums=('619c227e1958bd60738f12dbbde9b30c91dd79a7'
+          'f71982b7187d569c57b30c4c40fedd6c0e72baca')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   sed -i 's|#define CONFIG_LOCALE "./locale"|#define CONFIG_LOCALE "/usr/share/locale"|' share/base_config.h
+  patch -p0 -i ../neverball-1.5.4-underlink.patch
 
   if [ "${CARCH}" = "i686" ] ;then
     make ENABLE_NLS=1 DATADIR=/usr/share/neverball SSE_CFLAGS=""

Added: neverball-1.5.4-underlink.patch
===================================================================
--- neverball-1.5.4-underlink.patch	                        (rev 0)
+++ neverball-1.5.4-underlink.patch	2012-01-19 03:40:26 UTC (rev 146884)
@@ -0,0 +1,22 @@
+--- 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