[arch-commits] Commit in neverball/repos (3 files)

[Eric Bélanger]

    Date: Monday, August 17, 2009 @ 01:17:59
  Author: eric
Revision: 49945

Merged revisions 49442,49944 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/neverball/trunk

........
  r49442 | eric | 2009-08-08 01:54:19 -0400 (Sat, 08 Aug 2009) | 2 lines
  
  upgpkg: neverball 1.5.1-2.1
      Built i686 package without sse (close FS#15849)
........
  r49944 | eric | 2009-08-17 01:17:40 -0400 (Mon, 17 Aug 2009) | 2 lines
  
  upgpkg: neverball 1.5.2-1
      Upstream update, Added physfs depends, Fixed file permissions
........

Modified:
  neverball/repos/extra-x86_64/	(properties)
  neverball/repos/extra-x86_64/ChangeLog
  neverball/repos/extra-x86_64/PKGBUILD

-----------+
 ChangeLog |   12 ++++++++++++
 PKGBUILD  |   18 +++++++++++-------
 2 files changed, 23 insertions(+), 7 deletions(-)


Property changes on: neverball/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /neverball/trunk:1-44406
   + /neverball/trunk:1-49944

Modified: extra-x86_64/ChangeLog
===================================================================
--- extra-x86_64/ChangeLog	2009-08-17 05:17:40 UTC (rev 49944)
+++ extra-x86_64/ChangeLog	2009-08-17 05:17:59 UTC (rev 49945)
@@ -1,3 +1,15 @@
+2009-08-16  Eric Belanger  <eric at archlinux.org>
+
+	* neverball 1.5.2-1
+	* Upstream update
+	* Added physfs depends
+	* Fixed file permissions
+
+2009-08-08  Eric Belanger  <eric at archlinux.org>
+
+	* neverball 1.5.1-2.1
+	* Built i686 package without sse (close FS#15849)
+
 2009-07-01  Eric Belanger  <eric at archlinux.org>
 
 	* neverball 1.5.1-2

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-08-17 05:17:40 UTC (rev 49944)
+++ extra-x86_64/PKGBUILD	2009-08-17 05:17:59 UTC (rev 49945)
@@ -3,24 +3,27 @@
 # Contributor: Ben <contrasutra at myrealbox.com>
 
 pkgname=neverball
-pkgver=1.5.1
-pkgrel=2
+pkgver=1.5.2
+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>=7' 'libvorbis')
+depends=('sdl_ttf' 'libgl' 'libpng' 'libjpeg>=7' 'libvorbis' 'physfs')
 makedepends=('mesa')
 source=(http://neverball.org/${pkgname}-${pkgver}.tar.gz)
-md5sums=('ebb0bda6914a7d1b2038bd03f4eb40eb')
-sha1sums=('de313befcceb3bd4c0275bb0b1b23f8e0f3080c5')
+md5sums=('d9105d6b1b524629d91ed7dca554c7c8')
+sha1sums=('d40e76eec51c4fe59b4fe9a542d698669b555386')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's|#define CONFIG_DATA   "./data"|#define CONFIG_DATA   "/usr/share/neverball"|' share/base_config.h || return 1
   sed -i 's|#define CONFIG_LOCALE "./locale"|#define CONFIG_LOCALE "/usr/share/locale"|' share/base_config.h || return 1
 
-  make ENABLE_NLS=1 || return 1
+  if [ "${CARCH}" = "i686" ] ;then
+    make ENABLE_NLS=1 DATADIR=/usr/share/neverball SSE_CFLAGS="" || return 1
+  else
+    make ENABLE_NLS=1 DATADIR=/usr/share/neverball || return 1
+  fi
 
   install -D -m755 neverball "${pkgdir}/usr/bin/neverball" || return 1
   install -D -m755 neverputt "${pkgdir}/usr/bin/neverputt" || return 1
@@ -28,6 +31,7 @@
 
   install -d "${pkgdir}/usr/share/neverball"
   cp -r data/* "${pkgdir}/usr/share/neverball/" || return 1
+  find "${pkgdir}/usr/share/neverball" -type f -exec chmod 0644 {} \;
 
   install -d "${pkgdir}/usr/share/locale"
   cp -r locale/* "${pkgdir}/usr/share/locale/" || return 1