[arch-commits] Commit in neverball/repos (10 files)
Eric Bélanger
eric at nymeria.archlinux.org
Sat Apr 27 23:53:30 UTC 2013
Date: Sunday, April 28, 2013 @ 01:53:30
Author: eric
Revision: 183793
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
neverball/repos/staging-i686/
neverball/repos/staging-i686/PKGBUILD
(from rev 183792, neverball/trunk/PKGBUILD)
neverball/repos/staging-i686/neverball-1.5.4-libpng.patch
(from rev 183792, neverball/trunk/neverball-1.5.4-libpng.patch)
neverball/repos/staging-i686/neverball-1.5.4-underlink.patch
(from rev 183792, neverball/trunk/neverball-1.5.4-underlink.patch)
neverball/repos/staging-i686/neverball.install
(from rev 183792, neverball/trunk/neverball.install)
neverball/repos/staging-x86_64/
neverball/repos/staging-x86_64/PKGBUILD
(from rev 183792, neverball/trunk/PKGBUILD)
neverball/repos/staging-x86_64/neverball-1.5.4-libpng.patch
(from rev 183792, neverball/trunk/neverball-1.5.4-libpng.patch)
neverball/repos/staging-x86_64/neverball-1.5.4-underlink.patch
(from rev 183792, neverball/trunk/neverball-1.5.4-underlink.patch)
neverball/repos/staging-x86_64/neverball.install
(from rev 183792, neverball/trunk/neverball.install)
------------------------------------------------+
staging-i686/PKGBUILD | 53 +++++++++++++++++++++++
staging-i686/neverball-1.5.4-libpng.patch | 21 +++++++++
staging-i686/neverball-1.5.4-underlink.patch | 22 +++++++++
staging-i686/neverball.install | 11 ++++
staging-x86_64/PKGBUILD | 53 +++++++++++++++++++++++
staging-x86_64/neverball-1.5.4-libpng.patch | 21 +++++++++
staging-x86_64/neverball-1.5.4-underlink.patch | 22 +++++++++
staging-x86_64/neverball.install | 11 ++++
8 files changed, 214 insertions(+)
Copied: neverball/repos/staging-i686/PKGBUILD (from rev 183792, neverball/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2013-04-27 23:53:30 UTC (rev 183793)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=neverball
+pkgver=1.5.4
+pkgrel=6
+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' \
+ '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
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ make DATADIR=/usr/share/neverball LOCALEDIR=/usr/share/locale \
+ CPPFLAGS="$CPPFLAGS -DNDEBUG" CFLAGS="$CFLAGS"
+}
+
+package(){
+ cd ${pkgname}-${pkgver}
+ install -d "${pkgdir}/usr/bin"
+ install -d "${pkgdir}"/usr/share/{neverball,locale,applications,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/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
+ 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
+
+ chmod -R u=rwX,go=rX "${pkgdir}/usr/share/neverball"
+}
Copied: neverball/repos/staging-i686/neverball-1.5.4-libpng.patch (from rev 183792, neverball/trunk/neverball-1.5.4-libpng.patch)
===================================================================
--- staging-i686/neverball-1.5.4-libpng.patch (rev 0)
+++ staging-i686/neverball-1.5.4-libpng.patch 2013-04-27 23:53:30 UTC (rev 183793)
@@ -0,0 +1,21 @@
+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. */
Copied: neverball/repos/staging-i686/neverball-1.5.4-underlink.patch (from rev 183792, neverball/trunk/neverball-1.5.4-underlink.patch)
===================================================================
--- staging-i686/neverball-1.5.4-underlink.patch (rev 0)
+++ staging-i686/neverball-1.5.4-underlink.patch 2013-04-27 23:53:30 UTC (rev 183793)
@@ -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
Copied: neverball/repos/staging-i686/neverball.install (from rev 183792, neverball/trunk/neverball.install)
===================================================================
--- staging-i686/neverball.install (rev 0)
+++ staging-i686/neverball.install 2013-04-27 23:53:30 UTC (rev 183793)
@@ -0,0 +1,11 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: neverball/repos/staging-x86_64/PKGBUILD (from rev 183792, neverball/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2013-04-27 23:53:30 UTC (rev 183793)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=neverball
+pkgver=1.5.4
+pkgrel=6
+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' \
+ '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
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ make DATADIR=/usr/share/neverball LOCALEDIR=/usr/share/locale \
+ CPPFLAGS="$CPPFLAGS -DNDEBUG" CFLAGS="$CFLAGS"
+}
+
+package(){
+ cd ${pkgname}-${pkgver}
+ install -d "${pkgdir}/usr/bin"
+ install -d "${pkgdir}"/usr/share/{neverball,locale,applications,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/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
+ 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
+
+ chmod -R u=rwX,go=rX "${pkgdir}/usr/share/neverball"
+}
Copied: neverball/repos/staging-x86_64/neverball-1.5.4-libpng.patch (from rev 183792, neverball/trunk/neverball-1.5.4-libpng.patch)
===================================================================
--- staging-x86_64/neverball-1.5.4-libpng.patch (rev 0)
+++ staging-x86_64/neverball-1.5.4-libpng.patch 2013-04-27 23:53:30 UTC (rev 183793)
@@ -0,0 +1,21 @@
+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. */
Copied: neverball/repos/staging-x86_64/neverball-1.5.4-underlink.patch (from rev 183792, neverball/trunk/neverball-1.5.4-underlink.patch)
===================================================================
--- staging-x86_64/neverball-1.5.4-underlink.patch (rev 0)
+++ staging-x86_64/neverball-1.5.4-underlink.patch 2013-04-27 23:53:30 UTC (rev 183793)
@@ -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
Copied: neverball/repos/staging-x86_64/neverball.install (from rev 183792, neverball/trunk/neverball.install)
===================================================================
--- staging-x86_64/neverball.install (rev 0)
+++ staging-x86_64/neverball.install 2013-04-27 23:53:30 UTC (rev 183793)
@@ -0,0 +1,11 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
More information about the arch-commits
mailing list