diff --git a/game/sports/xmoto/actions.py b/game/sports/xmoto/actions.py index a9fc2f83df..7cd0aa0e4b 100644 --- a/game/sports/xmoto/actions.py +++ b/game/sports/xmoto/actions.py @@ -11,7 +11,7 @@ from pisi.actionsapi import get def setup(): shelltools.system("./bootstrap") - shelltools.system("rm -r src/ode") + #shelltools.system("rm -r src/ode") shelltools.export("CPPFLAGS", "-D_GLIBCXX_USE_CXX11_ABI=0") autotools.autoreconf("-vfi") autotools.configure("--prefix=/usr \ diff --git a/game/sports/xmoto/files/lua52_compat.patch b/game/sports/xmoto/files/lua52_compat.patch new file mode 100644 index 0000000000..54aaf20d6a --- /dev/null +++ b/game/sports/xmoto/files/lua52_compat.patch @@ -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 ++ #include ++ #include ++ #elif defined(HAVE_LUA52_LUA_H) ++ #include ++ #include ++ #include ++ #elif defined(HAVE_LUA5_1_LUA_H) + #include + #include + #include diff --git a/game/sports/xmoto/pspec.xml b/game/sports/xmoto/pspec.xml index 68b68ce696..3d627f0871 100644 --- a/game/sports/xmoto/pspec.xml +++ b/game/sports/xmoto/pspec.xml @@ -13,7 +13,7 @@ app:gui Motorcross game A motocross game with fancy effects like ghost replay. Requires a 3D accelerated video card. - http://download.tuxfamily.org/xmoto/xmoto/0.5.11/xmoto-0.5.11-src.tar.gz + http://download.tuxfamily.org/xmoto/xmoto/dev/xmoto-0.5.12-src-svn3427.tar.gz libxml2-devel curl-devel @@ -21,6 +21,8 @@ sdl-mixer-devel sdl-ttf-devel sdl-net-devel + lua52-devel + lua-devel lua51-devel zlib-devel libpng-devel @@ -31,7 +33,7 @@ libjpeg-turbo-devel - + lua52_compat.patch genericname_pl-tr.patch @@ -39,6 +41,7 @@ xmoto + lua curl zlib bzip2 @@ -67,6 +70,13 @@ + + 2018-04-22 + 0.5.12 + First release. + Alihan Öztürk + alihan@pisilinux.org + 2017-03-09 0.5.11 diff --git a/x11/driver/libva-intel-driver/pspec.xml b/x11/driver/libva-intel-driver/pspec.xml index dbf9ec0687..8fb932060a 100644 --- a/x11/driver/libva-intel-driver/pspec.xml +++ b/x11/driver/libva-intel-driver/pspec.xml @@ -12,7 +12,7 @@ driver VA-API implementation for Intel G45 and HD Graphics family libva-intel-driver, VA-API implementation for Intel G45 and HD Graphics family. - https://github.com/01org/intel-vaapi-driver/releases/download/2.1.0/intel-vaapi-driver-2.0.0.tar.bz2 + https://github.com/01org/intel-vaapi-driver/releases/download/2.1.0/intel-vaapi-driver-2.1.0.tar.bz2 libdrm-devel libX11-devel @@ -35,7 +35,7 @@ - 2018-02-16 + 2018-04-22 2.1.0 Version bump. Mustafa Cinasal diff --git a/x11/library/libva/pspec.xml b/x11/library/libva/pspec.xml index cb71ef2102..bdfc82ce45 100644 --- a/x11/library/libva/pspec.xml +++ b/x11/library/libva/pspec.xml @@ -13,7 +13,7 @@ library Video Acceleration (VA) API for Linux libva is a library providing the VA API video acceleration API. - https://github.com/01org/libva/releases/download/2.0.0/libva-2.0.0.tar.bz2 + https://github.com/01org/libva/releases/download/2.1.0/libva-2.1.0.tar.bz2 libdrm-devel libXext-devel @@ -82,6 +82,13 @@ + + 2018-04-22 + 2.1.0 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2017-02-15 2.0.0