[arch-commits] Commit in xmoto/repos (12 files)
Bartłomiej Piotrowski
bpiotrowski at archlinux.org
Sun Dec 6 22:55:24 UTC 2015
Date: Sunday, December 6, 2015 @ 23:55:23
Author: bpiotrowski
Revision: 149319
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
xmoto/repos/community-staging-i686/
xmoto/repos/community-staging-i686/PKGBUILD
(from rev 149318, xmoto/trunk/PKGBUILD)
xmoto/repos/community-staging-i686/lua52_compat.patch
(from rev 149318, xmoto/trunk/lua52_compat.patch)
xmoto/repos/community-staging-i686/system.cpp.patch
(from rev 149318, xmoto/trunk/system.cpp.patch)
xmoto/repos/community-staging-i686/xmoto-0.5.10-libpng15.patch
(from rev 149318, xmoto/trunk/xmoto-0.5.10-libpng15.patch)
xmoto/repos/community-staging-i686/xmoto.install
(from rev 149318, xmoto/trunk/xmoto.install)
xmoto/repos/community-staging-x86_64/
xmoto/repos/community-staging-x86_64/PKGBUILD
(from rev 149318, xmoto/trunk/PKGBUILD)
xmoto/repos/community-staging-x86_64/lua52_compat.patch
(from rev 149318, xmoto/trunk/lua52_compat.patch)
xmoto/repos/community-staging-x86_64/system.cpp.patch
(from rev 149318, xmoto/trunk/system.cpp.patch)
xmoto/repos/community-staging-x86_64/xmoto-0.5.10-libpng15.patch
(from rev 149318, xmoto/trunk/xmoto-0.5.10-libpng15.patch)
xmoto/repos/community-staging-x86_64/xmoto.install
(from rev 149318, xmoto/trunk/xmoto.install)
------------------------------------------------------+
community-staging-i686/PKGBUILD | 56 +++++++++++++++++
community-staging-i686/lua52_compat.patch | 45 +++++++++++++
community-staging-i686/system.cpp.patch | 10 +++
community-staging-i686/xmoto-0.5.10-libpng15.patch | 10 +++
community-staging-i686/xmoto.install | 11 +++
community-staging-x86_64/PKGBUILD | 56 +++++++++++++++++
community-staging-x86_64/lua52_compat.patch | 45 +++++++++++++
community-staging-x86_64/system.cpp.patch | 10 +++
community-staging-x86_64/xmoto-0.5.10-libpng15.patch | 10 +++
community-staging-x86_64/xmoto.install | 11 +++
10 files changed, 264 insertions(+)
Copied: xmoto/repos/community-staging-i686/PKGBUILD (from rev 149318, xmoto/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2015-12-06 22:55:23 UTC (rev 149319)
@@ -0,0 +1,56 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Travis Willard <travisw at wmpub.ca>
+# Contributor: Denis (dtonator at gmail.com)
+
+pkgname=xmoto
+pkgver=0.5.11
+pkgrel=3
+pkgdesc="A challenging 2D motocross platform game, where physics play an important role."
+arch=('i686' 'x86_64')
+url="http://xmoto.tuxfamily.org"
+license=('GPL')
+depends=('libjpeg' 'libpng' 'lua52' 'sdl_mixer' 'ode' 'curl' 'sqlite' 'sdl_ttf'
+ 'desktop-file-utils' 'sdl_net' 'glu' 'libxdg-basedir' 'libxml2')
+makedepends=('mesa')
+install=xmoto.install
+source=("http://download.tuxfamily.org/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}-src.tar.gz"
+ 'xmoto-0.5.10-libpng15.patch'
+ 'lua52_compat.patch'
+ 'system.cpp.patch')
+sha1sums=('a795616fb359e60be343e339f7acf5e95e0f1ce2'
+ '9d13fa09f1c558a0fc504f7e7b1ceac6b4b7b20d'
+ '104542546fbbd24172ddaa179f87e1b26df8b761'
+ 'e741f769d1fc5779a6688970ee97e2a61a50c7ae')
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ patch -Np1 -i "${srcdir}/xmoto-0.5.10-libpng15.patch"
+ patch -Np1 -i "${srcdir}/system.cpp.patch"
+ patch -Np1 -i "${srcdir}/lua52_compat.patch"
+
+ # Remove bundled ode library because its headers get picked up during build
+ rm -r src/ode
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ ./bootstrap # regenrate confif file because the lua patch modifies configure.in
+ ./configure --prefix=/usr --disable-sdltest
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" mangdir=/usr/share/man/man6 install
+
+ # install desktop file
+ install -Dm0644 "${srcdir}/${pkgname}-${pkgver}/extra/xmoto.desktop" \
+ "${pkgdir}/usr/share/applications/xmoto.desktop"
+
+ # install icon for desktop file
+ install -Dm0644 "${srcdir}/${pkgname}-${pkgver}/extra/xmoto.xpm" \
+ "${pkgdir}/usr/share/pixmaps/xmoto.xpm"
+}
Copied: xmoto/repos/community-staging-i686/lua52_compat.patch (from rev 149318, xmoto/trunk/lua52_compat.patch)
===================================================================
--- community-staging-i686/lua52_compat.patch (rev 0)
+++ community-staging-i686/lua52_compat.patch 2015-12-06 22:55:23 UTC (rev 149319)
@@ -0,0 +1,45 @@
+diff --git a/configure.in b/configure.in
+index 452f196..dbceb05 100644
+--- a/configure.in
++++ b/configure.in
+@@ -157,8 +157,8 @@ AM_CONDITIONAL([USE_SDLGFX], test "$USE_SDLGFX" = "1")
+ # m
+ AC_CHECK_LIB(m, floor, , AC_MSG_ERROR(No math library found))
+
+-AC_SEARCH_LIBS(lua_pushboolean,lua lua5.1 lua50, [], [AC_MSG_ERROR(liblua5.1, liblua50, or liblua required)])
+-AC_SEARCH_LIBS(luaopen_math,lualib lualib5.1 lualib50, [], [AC_MSG_ERROR(liblualib5.1, liblualib50, or liblualib required)])
++AC_SEARCH_LIBS(lua_pushboolean,lua lua5.2 lua5.1 lua50, [], [AC_MSG_ERROR(liblua5.2 liblua5.1, liblua50, or liblua required)])
++AC_SEARCH_LIBS(luaopen_math,lualib liblua5.2 lualib5.1 lualib50, [], [AC_MSG_ERROR(liblualib5.2 liblualib5.1, liblualib50, or liblualib required)])
+
+ dnl ***** Check lua headers, as they are prone to be located random places on random systems! *****
+ dnl The following three lines where suggested by Eric Piel, but they don't seem to work on my system
+@@ -174,6 +174,8 @@ AC_CHECK_HEADER(lua/lua.h, AC_DEFINE(HAVE_LUA_LUA_H) [USE_LUA_VERSION="unkn
+ AC_CHECK_HEADER(lua50/lua.h, AC_DEFINE(HAVE_LUA50_LUA_H) [USE_LUA_VERSION="5.0"])
+ AC_CHECK_HEADER(lua51/lua.h, AC_DEFINE(HAVE_LUA51_LUA_H) [USE_LUA_VERSION="5.1"])
+ AC_CHECK_HEADER(lua5.1/lua.h, AC_DEFINE(HAVE_LUA5_1_LUA_H)[USE_LUA_VERSION="5.1"])
++AC_CHECK_HEADER(lua52/lua.h, AC_DEFINE(HAVE_LUA52_LUA_H) [USE_LUA_VERSION="5.2"])
++AC_CHECK_HEADER(lua5.2/lua.h, AC_DEFINE(HAVE_LUA5_2_LUA_H)[USE_LUA_VERSION="5.2"])
+ AC_DEFINE(LUA_COMPAT_MODULE, 1)
+
+ AC_LANG_PUSH([C++])
+diff --git a/src/include/xm_lua.h b/src/include/xm_lua.h
+index 8a2cc17..f470de2 100644
+--- a/src/include/xm_lua.h
++++ b/src/include/xm_lua.h
+@@ -4,7 +4,15 @@ extern "C" {
+ #include "lauxlib.h"
+ #include "lualib.h"
+ #else
+- #if defined(HAVE_LUA5_1_LUA_H)
++ #if defined(HAVE_LUA5_2_LUA_H)
++ #include <lua5.2/lua.h>
++ #include <lua5.2/lauxlib.h>
++ #include <lua5.2/lualib.h>
++ #elif defined(HAVE_LUA52_LUA_H)
++ #include <lua52/lua.h>
++ #include <lua52/lauxlib.h>
++ #include <lua52/lualib.h>
++ #elif defined(HAVE_LUA5_1_LUA_H)
+ #include <lua5.1/lua.h>
+ #include <lua5.1/lauxlib.h>
+ #include <lua5.1/lualib.h>
Copied: xmoto/repos/community-staging-i686/system.cpp.patch (from rev 149318, xmoto/trunk/system.cpp.patch)
===================================================================
--- community-staging-i686/system.cpp.patch (rev 0)
+++ community-staging-i686/system.cpp.patch 2015-12-06 22:55:23 UTC (rev 149319)
@@ -0,0 +1,10 @@
+--- a/src/helpers/System.cpp 2011-10-11 22:18:14.000000000 +0200
++++ b/src/helpers/System.cpp 2012-07-21 21:28:40.000000000 +0200
+@@ -24,6 +24,7 @@
+ #include "Log.h"
+ #include "VExcept.h"
+ #include <sstream>
++#include <unistd.h>
+
+ std::vector<std::string>* System::getDisplayModes(int windowed) {
+ std::vector<std::string>* modes = new std::vector<std::string>;
Copied: xmoto/repos/community-staging-i686/xmoto-0.5.10-libpng15.patch (from rev 149318, xmoto/trunk/xmoto-0.5.10-libpng15.patch)
===================================================================
--- community-staging-i686/xmoto-0.5.10-libpng15.patch (rev 0)
+++ community-staging-i686/xmoto-0.5.10-libpng15.patch 2015-12-06 22:55:23 UTC (rev 149319)
@@ -0,0 +1,10 @@
+--- a/src/image/tim_png.cpp 2011-12-29 22:13:37.000000000 +0100
++++ b/src/image/tim_png.cpp 2012-07-21 21:36:34.000000000 +0200
+@@ -24,6 +24,7 @@
+ */
+ #include <stdio.h>
+ #include <string.h>
++#include <zlib.h>
+ #include "tim.h"
+ #include <png.h>
+ #include <zlib.h>
Copied: xmoto/repos/community-staging-i686/xmoto.install (from rev 149318, xmoto/trunk/xmoto.install)
===================================================================
--- community-staging-i686/xmoto.install (rev 0)
+++ community-staging-i686/xmoto.install 2015-12-06 22:55:23 UTC (rev 149319)
@@ -0,0 +1,11 @@
+post_install() {
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: xmoto/repos/community-staging-x86_64/PKGBUILD (from rev 149318, xmoto/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2015-12-06 22:55:23 UTC (rev 149319)
@@ -0,0 +1,56 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Travis Willard <travisw at wmpub.ca>
+# Contributor: Denis (dtonator at gmail.com)
+
+pkgname=xmoto
+pkgver=0.5.11
+pkgrel=3
+pkgdesc="A challenging 2D motocross platform game, where physics play an important role."
+arch=('i686' 'x86_64')
+url="http://xmoto.tuxfamily.org"
+license=('GPL')
+depends=('libjpeg' 'libpng' 'lua52' 'sdl_mixer' 'ode' 'curl' 'sqlite' 'sdl_ttf'
+ 'desktop-file-utils' 'sdl_net' 'glu' 'libxdg-basedir' 'libxml2')
+makedepends=('mesa')
+install=xmoto.install
+source=("http://download.tuxfamily.org/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}-src.tar.gz"
+ 'xmoto-0.5.10-libpng15.patch'
+ 'lua52_compat.patch'
+ 'system.cpp.patch')
+sha1sums=('a795616fb359e60be343e339f7acf5e95e0f1ce2'
+ '9d13fa09f1c558a0fc504f7e7b1ceac6b4b7b20d'
+ '104542546fbbd24172ddaa179f87e1b26df8b761'
+ 'e741f769d1fc5779a6688970ee97e2a61a50c7ae')
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ patch -Np1 -i "${srcdir}/xmoto-0.5.10-libpng15.patch"
+ patch -Np1 -i "${srcdir}/system.cpp.patch"
+ patch -Np1 -i "${srcdir}/lua52_compat.patch"
+
+ # Remove bundled ode library because its headers get picked up during build
+ rm -r src/ode
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ ./bootstrap # regenrate confif file because the lua patch modifies configure.in
+ ./configure --prefix=/usr --disable-sdltest
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" mangdir=/usr/share/man/man6 install
+
+ # install desktop file
+ install -Dm0644 "${srcdir}/${pkgname}-${pkgver}/extra/xmoto.desktop" \
+ "${pkgdir}/usr/share/applications/xmoto.desktop"
+
+ # install icon for desktop file
+ install -Dm0644 "${srcdir}/${pkgname}-${pkgver}/extra/xmoto.xpm" \
+ "${pkgdir}/usr/share/pixmaps/xmoto.xpm"
+}
Copied: xmoto/repos/community-staging-x86_64/lua52_compat.patch (from rev 149318, xmoto/trunk/lua52_compat.patch)
===================================================================
--- community-staging-x86_64/lua52_compat.patch (rev 0)
+++ community-staging-x86_64/lua52_compat.patch 2015-12-06 22:55:23 UTC (rev 149319)
@@ -0,0 +1,45 @@
+diff --git a/configure.in b/configure.in
+index 452f196..dbceb05 100644
+--- a/configure.in
++++ b/configure.in
+@@ -157,8 +157,8 @@ AM_CONDITIONAL([USE_SDLGFX], test "$USE_SDLGFX" = "1")
+ # m
+ AC_CHECK_LIB(m, floor, , AC_MSG_ERROR(No math library found))
+
+-AC_SEARCH_LIBS(lua_pushboolean,lua lua5.1 lua50, [], [AC_MSG_ERROR(liblua5.1, liblua50, or liblua required)])
+-AC_SEARCH_LIBS(luaopen_math,lualib lualib5.1 lualib50, [], [AC_MSG_ERROR(liblualib5.1, liblualib50, or liblualib required)])
++AC_SEARCH_LIBS(lua_pushboolean,lua lua5.2 lua5.1 lua50, [], [AC_MSG_ERROR(liblua5.2 liblua5.1, liblua50, or liblua required)])
++AC_SEARCH_LIBS(luaopen_math,lualib liblua5.2 lualib5.1 lualib50, [], [AC_MSG_ERROR(liblualib5.2 liblualib5.1, liblualib50, or liblualib required)])
+
+ dnl ***** Check lua headers, as they are prone to be located random places on random systems! *****
+ dnl The following three lines where suggested by Eric Piel, but they don't seem to work on my system
+@@ -174,6 +174,8 @@ AC_CHECK_HEADER(lua/lua.h, AC_DEFINE(HAVE_LUA_LUA_H) [USE_LUA_VERSION="unkn
+ AC_CHECK_HEADER(lua50/lua.h, AC_DEFINE(HAVE_LUA50_LUA_H) [USE_LUA_VERSION="5.0"])
+ AC_CHECK_HEADER(lua51/lua.h, AC_DEFINE(HAVE_LUA51_LUA_H) [USE_LUA_VERSION="5.1"])
+ AC_CHECK_HEADER(lua5.1/lua.h, AC_DEFINE(HAVE_LUA5_1_LUA_H)[USE_LUA_VERSION="5.1"])
++AC_CHECK_HEADER(lua52/lua.h, AC_DEFINE(HAVE_LUA52_LUA_H) [USE_LUA_VERSION="5.2"])
++AC_CHECK_HEADER(lua5.2/lua.h, AC_DEFINE(HAVE_LUA5_2_LUA_H)[USE_LUA_VERSION="5.2"])
+ AC_DEFINE(LUA_COMPAT_MODULE, 1)
+
+ AC_LANG_PUSH([C++])
+diff --git a/src/include/xm_lua.h b/src/include/xm_lua.h
+index 8a2cc17..f470de2 100644
+--- a/src/include/xm_lua.h
++++ b/src/include/xm_lua.h
+@@ -4,7 +4,15 @@ extern "C" {
+ #include "lauxlib.h"
+ #include "lualib.h"
+ #else
+- #if defined(HAVE_LUA5_1_LUA_H)
++ #if defined(HAVE_LUA5_2_LUA_H)
++ #include <lua5.2/lua.h>
++ #include <lua5.2/lauxlib.h>
++ #include <lua5.2/lualib.h>
++ #elif defined(HAVE_LUA52_LUA_H)
++ #include <lua52/lua.h>
++ #include <lua52/lauxlib.h>
++ #include <lua52/lualib.h>
++ #elif defined(HAVE_LUA5_1_LUA_H)
+ #include <lua5.1/lua.h>
+ #include <lua5.1/lauxlib.h>
+ #include <lua5.1/lualib.h>
Copied: xmoto/repos/community-staging-x86_64/system.cpp.patch (from rev 149318, xmoto/trunk/system.cpp.patch)
===================================================================
--- community-staging-x86_64/system.cpp.patch (rev 0)
+++ community-staging-x86_64/system.cpp.patch 2015-12-06 22:55:23 UTC (rev 149319)
@@ -0,0 +1,10 @@
+--- a/src/helpers/System.cpp 2011-10-11 22:18:14.000000000 +0200
++++ b/src/helpers/System.cpp 2012-07-21 21:28:40.000000000 +0200
+@@ -24,6 +24,7 @@
+ #include "Log.h"
+ #include "VExcept.h"
+ #include <sstream>
++#include <unistd.h>
+
+ std::vector<std::string>* System::getDisplayModes(int windowed) {
+ std::vector<std::string>* modes = new std::vector<std::string>;
Copied: xmoto/repos/community-staging-x86_64/xmoto-0.5.10-libpng15.patch (from rev 149318, xmoto/trunk/xmoto-0.5.10-libpng15.patch)
===================================================================
--- community-staging-x86_64/xmoto-0.5.10-libpng15.patch (rev 0)
+++ community-staging-x86_64/xmoto-0.5.10-libpng15.patch 2015-12-06 22:55:23 UTC (rev 149319)
@@ -0,0 +1,10 @@
+--- a/src/image/tim_png.cpp 2011-12-29 22:13:37.000000000 +0100
++++ b/src/image/tim_png.cpp 2012-07-21 21:36:34.000000000 +0200
+@@ -24,6 +24,7 @@
+ */
+ #include <stdio.h>
+ #include <string.h>
++#include <zlib.h>
+ #include "tim.h"
+ #include <png.h>
+ #include <zlib.h>
Copied: xmoto/repos/community-staging-x86_64/xmoto.install (from rev 149318, xmoto/trunk/xmoto.install)
===================================================================
--- community-staging-x86_64/xmoto.install (rev 0)
+++ community-staging-x86_64/xmoto.install 2015-12-06 22:55:23 UTC (rev 149319)
@@ -0,0 +1,11 @@
+post_install() {
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
More information about the arch-commits
mailing list