[arch-commits] Commit in neverball/repos (12 files)
Eric Bélanger
eric at nymeria.archlinux.org
Fri May 23 02:47:33 UTC 2014
Date: Friday, May 23, 2014 @ 04:47:32
Author: eric
Revision: 213405
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
neverball/repos/extra-i686/PKGBUILD
(from rev 213404, neverball/trunk/PKGBUILD)
neverball/repos/extra-i686/neverball.install
(from rev 213404, neverball/trunk/neverball.install)
neverball/repos/extra-x86_64/PKGBUILD
(from rev 213404, neverball/trunk/PKGBUILD)
neverball/repos/extra-x86_64/neverball.install
(from rev 213404, neverball/trunk/neverball.install)
Deleted:
neverball/repos/extra-i686/PKGBUILD
neverball/repos/extra-i686/neverball-1.5.4-libpng.patch
neverball/repos/extra-i686/neverball-1.5.4-underlink.patch
neverball/repos/extra-i686/neverball.install
neverball/repos/extra-x86_64/PKGBUILD
neverball/repos/extra-x86_64/neverball-1.5.4-libpng.patch
neverball/repos/extra-x86_64/neverball-1.5.4-underlink.patch
neverball/repos/extra-x86_64/neverball.install
----------------------------------------------+
/PKGBUILD | 88 +++++++++++++++++++++++++
/neverball.install | 22 ++++++
extra-i686/PKGBUILD | 53 ---------------
extra-i686/neverball-1.5.4-libpng.patch | 21 -----
extra-i686/neverball-1.5.4-underlink.patch | 22 ------
extra-i686/neverball.install | 11 ---
extra-x86_64/PKGBUILD | 53 ---------------
extra-x86_64/neverball-1.5.4-libpng.patch | 21 -----
extra-x86_64/neverball-1.5.4-underlink.patch | 22 ------
extra-x86_64/neverball.install | 11 ---
10 files changed, 110 insertions(+), 214 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2014-05-23 02:44:53 UTC (rev 213404)
+++ extra-i686/PKGBUILD 2014-05-23 02:47:32 UTC (rev 213405)
@@ -1,53 +0,0 @@
-# $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/extra-i686/PKGBUILD (from rev 213404, neverball/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2014-05-23 02:47:32 UTC (rev 213405)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=neverball
+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=('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)
+sha1sums=('3faebf15fea9361358a416176b9689f966c456ea')
+
+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/"
+ 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 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
+
+ chmod -R u=rwX,go=rX "${pkgdir}/usr/share/neverball"
+}
Deleted: extra-i686/neverball-1.5.4-libpng.patch
===================================================================
--- extra-i686/neverball-1.5.4-libpng.patch 2014-05-23 02:44:53 UTC (rev 213404)
+++ extra-i686/neverball-1.5.4-libpng.patch 2014-05-23 02:47:32 UTC (rev 213405)
@@ -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. */
Deleted: extra-i686/neverball-1.5.4-underlink.patch
===================================================================
--- extra-i686/neverball-1.5.4-underlink.patch 2014-05-23 02:44:53 UTC (rev 213404)
+++ extra-i686/neverball-1.5.4-underlink.patch 2014-05-23 02:47:32 UTC (rev 213405)
@@ -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
Deleted: extra-i686/neverball.install
===================================================================
--- extra-i686/neverball.install 2014-05-23 02:44:53 UTC (rev 213404)
+++ extra-i686/neverball.install 2014-05-23 02:47:32 UTC (rev 213405)
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: neverball/repos/extra-i686/neverball.install (from rev 213404, neverball/trunk/neverball.install)
===================================================================
--- extra-i686/neverball.install (rev 0)
+++ extra-i686/neverball.install 2014-05-23 02:47:32 UTC (rev 213405)
@@ -0,0 +1,11 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2014-05-23 02:44:53 UTC (rev 213404)
+++ extra-x86_64/PKGBUILD 2014-05-23 02:47:32 UTC (rev 213405)
@@ -1,53 +0,0 @@
-# $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/extra-x86_64/PKGBUILD (from rev 213404, neverball/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2014-05-23 02:47:32 UTC (rev 213405)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=neverball
+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=('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)
+sha1sums=('3faebf15fea9361358a416176b9689f966c456ea')
+
+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/"
+ 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 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
+
+ chmod -R u=rwX,go=rX "${pkgdir}/usr/share/neverball"
+}
Deleted: extra-x86_64/neverball-1.5.4-libpng.patch
===================================================================
--- extra-x86_64/neverball-1.5.4-libpng.patch 2014-05-23 02:44:53 UTC (rev 213404)
+++ extra-x86_64/neverball-1.5.4-libpng.patch 2014-05-23 02:47:32 UTC (rev 213405)
@@ -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. */
Deleted: extra-x86_64/neverball-1.5.4-underlink.patch
===================================================================
--- extra-x86_64/neverball-1.5.4-underlink.patch 2014-05-23 02:44:53 UTC (rev 213404)
+++ extra-x86_64/neverball-1.5.4-underlink.patch 2014-05-23 02:47:32 UTC (rev 213405)
@@ -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
Deleted: extra-x86_64/neverball.install
===================================================================
--- extra-x86_64/neverball.install 2014-05-23 02:44:53 UTC (rev 213404)
+++ extra-x86_64/neverball.install 2014-05-23 02:47:32 UTC (rev 213405)
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: neverball/repos/extra-x86_64/neverball.install (from rev 213404, neverball/trunk/neverball.install)
===================================================================
--- extra-x86_64/neverball.install (rev 0)
+++ extra-x86_64/neverball.install 2014-05-23 02:47:32 UTC (rev 213405)
@@ -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