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

Ionut Biru ibiru at archlinux.org
Sun Feb 5 06:53:10 EST 2012


    Date: Sunday, February 5, 2012 @ 06:53:09
  Author: ibiru
Revision: 148859

db-move: moved neverball from [testing] to [extra] (i686)

Added:
  neverball/repos/extra-i686/PKGBUILD
    (from rev 148654, neverball/repos/testing-i686/PKGBUILD)
  neverball/repos/extra-i686/neverball-1.5.4-underlink.patch
    (from rev 148654, neverball/repos/testing-i686/neverball-1.5.4-underlink.patch)
Deleted:
  neverball/repos/extra-i686/PKGBUILD
  neverball/repos/testing-i686/

---------------------------------+
 PKGBUILD                        |   93 +++++++++++++++++++-------------------
 neverball-1.5.4-underlink.patch |   22 ++++++++
 2 files changed, 69 insertions(+), 46 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2012-02-05 11:53:06 UTC (rev 148858)
+++ extra-i686/PKGBUILD	2012-02-05 11:53:09 UTC (rev 148859)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgname=neverball
-pkgver=1.5.4
-pkgrel=3
-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')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's|#define CONFIG_LOCALE "./locale"|#define CONFIG_LOCALE "/usr/share/locale"|' share/base_config.h
-
-  if [ "${CARCH}" = "i686" ] ;then
-    make ENABLE_NLS=1 DATADIR=/usr/share/neverball SSE_CFLAGS=""
-  else
-    make ENABLE_NLS=1 DATADIR=/usr/share/neverball
-  fi
-}
-
-package(){
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  install -d "${pkgdir}/usr/bin"
-  install -d "${pkgdir}"/usr/share/{neverball,locale,applications,pixmaps,doc/neverball}
-  install -d "${pkgdir}"/usr/share/man/man{1,6}
-
-  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/"
-  install -m644 dist/*.desktop "${pkgdir}/usr/share/applications/"
-  install -m644 dist/*.png "${pkgdir}/usr/share/pixmaps/"
-  install -m644 dist/mapc.1 "${pkgdir}/usr/share/man/man1"
-  install -m644 dist/{neverball.6,neverputt.6} "${pkgdir}/usr/share/man/man6"
-
-  ln -s neverball_48.png "${pkgdir}/usr/share/pixmaps/neverball.png"
-  ln -s neverputt_48.png "${pkgdir}/usr/share/pixmaps/neverputt.png"
-  find "${pkgdir}/usr/share/neverball" -type f -exec chmod 0644 {} \;
-}

Copied: neverball/repos/extra-i686/PKGBUILD (from rev 148654, neverball/repos/testing-i686/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2012-02-05 11:53:09 UTC (rev 148859)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=neverball
+pkgver=1.5.4
+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 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=""
+  else
+    make ENABLE_NLS=1 DATADIR=/usr/share/neverball
+  fi
+}
+
+package(){
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  install -d "${pkgdir}/usr/bin"
+  install -d "${pkgdir}"/usr/share/{neverball,locale,applications,pixmaps,doc/neverball}
+  install -d "${pkgdir}"/usr/share/man/man{1,6}
+
+  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/"
+  install -m644 dist/*.desktop "${pkgdir}/usr/share/applications/"
+  install -m644 dist/*.png "${pkgdir}/usr/share/pixmaps/"
+  install -m644 dist/mapc.1 "${pkgdir}/usr/share/man/man1"
+  install -m644 dist/{neverball.6,neverputt.6} "${pkgdir}/usr/share/man/man6"
+
+  ln -s neverball_48.png "${pkgdir}/usr/share/pixmaps/neverball.png"
+  ln -s neverputt_48.png "${pkgdir}/usr/share/pixmaps/neverputt.png"
+  find "${pkgdir}/usr/share/neverball" -type f -exec chmod 0644 {} \;
+}

Copied: neverball/repos/extra-i686/neverball-1.5.4-underlink.patch (from rev 148654, neverball/repos/testing-i686/neverball-1.5.4-underlink.patch)
===================================================================
--- extra-i686/neverball-1.5.4-underlink.patch	                        (rev 0)
+++ extra-i686/neverball-1.5.4-underlink.patch	2012-02-05 11:53:09 UTC (rev 148859)
@@ -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



More information about the arch-commits mailing list