Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:pisilinux/main

Browse Source
This commit is contained in:
Ertuğrul Erata
2018-04-23 09:37:23 +03:00
parent 0b52472efa 944252e11f
commit ca0bf40805
5 changed files with 68 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game/sports/xmoto/actions.py
+1 -1
View File
@@ -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 \
game/sports/xmoto/files/lua52_compat.patch
+45
View File
@@ -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>
game/sports/xmoto/pspec.xml
+12 -2
View File
@@ -13,7 +13,7 @@
<IsA>app:gui</IsA>
<Summary>Motorcross game</Summary>
<Description>A motocross game with fancy effects like ghost replay. Requires a 3D accelerated video card.</Description>
<Archive sha1sum="a795616fb359e60be343e339f7acf5e95e0f1ce2" type="targz">http://download.tuxfamily.org/xmoto/xmoto/0.5.11/xmoto-0.5.11-src.tar.gz</Archive>
<Archive sha1sum="a654a7f409918d3c81f4b834837cfc59e79f90d0" type="targz">http://download.tuxfamily.org/xmoto/xmoto/dev/xmoto-0.5.12-src-svn3427.tar.gz</Archive>
<BuildDependencies>
<Dependency>libxml2-devel</Dependency>
<Dependency>curl-devel</Dependency>
@@ -21,6 +21,8 @@
<Dependency>sdl-mixer-devel</Dependency>
<Dependency>sdl-ttf-devel</Dependency>
<Dependency>sdl-net-devel</Dependency>
<Dependency>lua52-devel</Dependency>
<Dependency>lua-devel</Dependency>
<Dependency>lua51-devel</Dependency>
<Dependency>zlib-devel</Dependency>
<Dependency>libpng-devel</Dependency>
@@ -31,7 +33,7 @@
<Dependency>libjpeg-turbo-devel</Dependency>
</BuildDependencies>
<Patches>
<!-- <Patch level="0">xmoto-0.5.10-gcc47.patch</Patch> -->
<Patch level="1">lua52_compat.patch</Patch>
<Patch level="0">genericname_pl-tr.patch</Patch>
</Patches>
</Source>
@@ -39,6 +41,7 @@
<Package>
<Name>xmoto</Name>
<RuntimeDependencies>
<Dependency>lua</Dependency>
<Dependency>curl</Dependency>
<Dependency>zlib</Dependency>
<Dependency>bzip2</Dependency>
@@ -67,6 +70,13 @@
</Package>
<History>
<Update release="2">
<Date>2018-04-22</Date>
<Version>0.5.12</Version>
<Comment>First release.</Comment>
<Name>Alihan Öztürk</Name>
<Email>alihan@pisilinux.org</Email>
</Update>
<Update release="1">
<Date>2017-03-09</Date>
<Version>0.5.11</Version>
x11/driver/libva-intel-driver/pspec.xml
+2 -2
View File
@@ -12,7 +12,7 @@
<IsA>driver</IsA>
<Summary>VA-API implementation for Intel G45 and HD Graphics family</Summary>
<Description>libva-intel-driver, VA-API implementation for Intel G45 and HD Graphics family.</Description>
<Archive sha1sum="19e83c084a404817263c04371c42345b617900ff" type="tarbz2">https://github.com/01org/intel-vaapi-driver/releases/download/2.1.0/intel-vaapi-driver-2.0.0.tar.bz2</Archive>
<Archive sha1sum="a40c6bd89b71b547986bf9f9fa2533bb50cf269e" type="tarbz2">https://github.com/01org/intel-vaapi-driver/releases/download/2.1.0/intel-vaapi-driver-2.1.0.tar.bz2</Archive>
<BuildDependencies>
<Dependency>libdrm-devel</Dependency>
<Dependency>libX11-devel</Dependency>
@@ -35,7 +35,7 @@
<History>
<Update release="7">
<Date>2018-02-16</Date>
<Date>2018-04-22</Date>
<Version>2.1.0</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
x11/library/libva/pspec.xml
+8 -1
View File
@@ -13,7 +13,7 @@
<IsA>library</IsA>
<Summary>Video Acceleration (VA) API for Linux</Summary>
<Description>libva is a library providing the VA API video acceleration API.</Description>
<Archive sha1sum="762a49f8925ca1d0531c5071afbd629ffea93b90" type="tarbz2">https://github.com/01org/libva/releases/download/2.0.0/libva-2.0.0.tar.bz2</Archive>
<Archive sha1sum="9ecde2b6c9deda16e895a0b00b8aef3a765acb4c" type="tarbz2">https://github.com/01org/libva/releases/download/2.1.0/libva-2.1.0.tar.bz2</Archive>
<BuildDependencies>
<Dependency>libdrm-devel</Dependency>
<Dependency>libXext-devel</Dependency>
@@ -82,6 +82,13 @@
</Package>
<History>
<Update release="6">
<Date>2018-04-22</Date>
<Version>2.1.0</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="5">
<Date>2017-02-15</Date>
<Version>2.0.0</Version>