From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- games-sports/Manifest.gz | Bin 2403 -> 2407 bytes games-sports/xmoto/Manifest | 7 +- .../xmoto/files/xmoto-0.6.1_lua_deprecated.patch | 79 +++++++++++++++++++++ games-sports/xmoto/metadata.xml | 3 + games-sports/xmoto/xmoto-0.6.0.ebuild | 62 ---------------- games-sports/xmoto/xmoto-0.6.1-r1.ebuild | 66 +++++++++++++++++ 6 files changed, 152 insertions(+), 65 deletions(-) create mode 100644 games-sports/xmoto/files/xmoto-0.6.1_lua_deprecated.patch delete mode 100644 games-sports/xmoto/xmoto-0.6.0.ebuild create mode 100644 games-sports/xmoto/xmoto-0.6.1-r1.ebuild (limited to 'games-sports') diff --git a/games-sports/Manifest.gz b/games-sports/Manifest.gz index 1e7ff0e3d897..bfedce3daf13 100644 Binary files a/games-sports/Manifest.gz and b/games-sports/Manifest.gz differ diff --git a/games-sports/xmoto/Manifest b/games-sports/xmoto/Manifest index 02d3f938402b..cd2ca32bee24 100644 --- a/games-sports/xmoto/Manifest +++ b/games-sports/xmoto/Manifest @@ -1,3 +1,4 @@ -DIST xmoto-0.6.0.tar.gz 41635478 BLAKE2B 26db7b5664ea5f999f8fe481f58aede57319a75f7d7c6e9eb74c6b8d058137b44e3d00621995d8ff05dfe8d18b25d9688d80a1f12b54cdaf19920684a23c5fa3 SHA512 dad5183dec547db60f65a6461b59373890d11a4d984b1bbabc560a1ee3b5fbcb0fc53a5f2f52a5bdc29144d65ffa194f395b4f47f593b81a87de807ff79ba9cc -EBUILD xmoto-0.6.0.ebuild 1565 BLAKE2B 9d1473210c81087cd8e4b38b776bf6db1637c45c585ccc49776310224df713cc7ea9394d98478990a0c58628d80f511c244082926eed575ca4b2dc4329603c49 SHA512 96cfe990e15a27af70c71502f8f3a3dbcc880ab6b399fc5e63bbd471bc4f4bed8566901fc2ae130a669d538f536fdd2a6f5fab108b5485601fbe907eb11801de -MISC metadata.xml 367 BLAKE2B 269dd3789a9d4f6e39eb22ffc8193ab01d0345336f524e78f6ee9ec8fddeeb2add7f4b0cd7185bb4aaff043cc2f815e532de9762e00abb6100e87a2de1d5610d SHA512 953abe473876ce33a963dfd9c6752982413d8e0c47f0895156d7428a3a9b4ebc271b9ef993f3e9b65e4cd083220d8d09175aa31c7d5de009a07a93c89554b026 +AUX xmoto-0.6.1_lua_deprecated.patch 2581 BLAKE2B c643744ba7a9ed53dcad90f2c30445ef0aa8a465bea02ec75c19596c3b8d6fbc8b53fb71c23d6bed11f49e9cf23ecd3749438c80e38570043e52e3fcfe348abb SHA512 e4f6ad1c791e27b9c4ceeaf9a282111a06cc8aaef6e33f6649dd8d78bf2fa6751f76ddee32ed0d3e0f1c5c738acedd898068a280cdd0dd9151c4a3e1358c0901 +DIST xmoto-0.6.1.tar.gz 41623870 BLAKE2B a26b89266b05513f2a48a2516ffdd39f05d584e70aa1fb18d463c754acd438cef0b0f1664cc577ebb89012f86dc37e2d52cd9d1310217941f16c9a4085dc3894 SHA512 809e5f149e5679adc2f82313afe654dbd027c0c10292c90e6c1982bdd3f7d0f1305e30b974bba94a92e18aeeff5faa6f0d24be225d4755ae73ad03274adaf60b +EBUILD xmoto-0.6.1-r1.ebuild 1607 BLAKE2B d5b198ab87ea9f0663c9c559c92f4ee33be0abb5d2d0ece2ae546c72b676dcb1e9b7ff948f73a56d47d87a137d5dc265cfa477435ff554703bc7650b44b8384b SHA512 835acdab73411a481d08765028b0cfea3375d8762f8155095529c37acc4a86169f09be07551f5a43678f4298da69727efbcdf8abf9c46319799a2e05b202c225 +MISC metadata.xml 447 BLAKE2B 39dc46e26dbcacafbdaaee5a45f19d3d8fcae0c24a3336938beb549bdc4c4ab8a8b4027f8b28fc62c2cf29c70b63ae9b39acb0241c0179a2adef346edac07695 SHA512 150597c0a53e42f1996ffbad3bf0d773a1a8a7028abc9ac5fedf1e2a5e076bc160d33dca327b05737678a388d6df0ddd200a30fa3e7d81238fd8749444e8c895 diff --git a/games-sports/xmoto/files/xmoto-0.6.1_lua_deprecated.patch b/games-sports/xmoto/files/xmoto-0.6.1_lua_deprecated.patch new file mode 100644 index 000000000000..078fa91aaab8 --- /dev/null +++ b/games-sports/xmoto/files/xmoto-0.6.1_lua_deprecated.patch @@ -0,0 +1,79 @@ +From fb004501a6387bb7ba5182b60ec305e9947dc545 Mon Sep 17 00:00:00 2001 +From: _yui +Date: Tue, 7 Jul 2020 21:44:49 +0300 +Subject: [PATCH 1/2] Fix building with Lua with deprecated functions removed + +--- + src/CMakeLists.txt | 5 +++++ + src/xmoto/LuaLibBase.cpp | 6 ++++++ + 2 files changed, 11 insertions(+) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index a3f328f9..3618360e 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -461,6 +461,11 @@ check_prototype_definition(mkdir + ) + target_compile_definitions(xmoto PUBLIC MS_MKDIR=$) + ++if(USE_SYSTEM_Lua) ++ check_symbol_exists(luaL_openlib lauxlib.h HAVE_LUAL_OPENLIB) ++ target_compile_definitions(xmoto PUBLIC HAVE_LUAL_OPENLIB=$) ++endif() ++ + target_compile_definitions(xmoto PUBLIC USE_OPENGL=$) + target_compile_definitions(xmoto PUBLIC USE_SDLGFX=$) + target_compile_definitions(xmoto PUBLIC USE_GETTEXT=$) +diff --git a/src/xmoto/LuaLibBase.cpp b/src/xmoto/LuaLibBase.cpp +index fed3c79e..62b690e1 100644 +--- a/src/xmoto/LuaLibBase.cpp ++++ b/src/xmoto/LuaLibBase.cpp +@@ -42,7 +42,13 @@ LuaLibBase::LuaLibBase(const std::string &i_libname, luaL_Reg i_reg[]) { + luaL_requiref(m_pL, LUA_TABLIBNAME, luaopen_table, 1); + #endif + ++#if HAVE_LUAL_OPENLIB + luaL_openlib(m_pL, i_libname.c_str(), i_reg, 0); ++#else ++ lua_newtable(m_pL); ++ luaL_register(m_pL, i_libname.c_str(), i_reg); ++ lua_setglobal(m_pL, i_libname.c_str()); ++#endif + } + + LuaLibBase::~LuaLibBase() { + +From 0a92ee4e8d6ffb88f137b74ba3e9a9b688ac50e6 Mon Sep 17 00:00:00 2001 +From: _yui +Date: Tue, 7 Jul 2020 23:01:38 +0300 +Subject: [PATCH 2/2] Change luaL_register to luaL_setfuncs for lua 5.2 and + newer + +--- + src/xmoto/LuaLibBase.cpp | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/src/xmoto/LuaLibBase.cpp b/src/xmoto/LuaLibBase.cpp +index 62b690e1..911c5698 100644 +--- a/src/xmoto/LuaLibBase.cpp ++++ b/src/xmoto/LuaLibBase.cpp +@@ -44,11 +44,17 @@ LuaLibBase::LuaLibBase(const std::string &i_libname, luaL_Reg i_reg[]) { + + #if HAVE_LUAL_OPENLIB + luaL_openlib(m_pL, i_libname.c_str(), i_reg, 0); +-#else ++#else // HAVE_LUAL_OPENLIB + lua_newtable(m_pL); ++ ++#if LUA_VERSION_NUM >= 502 ++ luaL_setfuncs(m_pL, i_reg, 0); ++#else // LUA_VERSION_NUM >= 502 + luaL_register(m_pL, i_libname.c_str(), i_reg); ++#endif // LUA_VERSION_NUM >= 502 ++ + lua_setglobal(m_pL, i_libname.c_str()); +-#endif ++#endif // HAVE_LUAL_OPENLIB + } + + LuaLibBase::~LuaLibBase() { diff --git a/games-sports/xmoto/metadata.xml b/games-sports/xmoto/metadata.xml index e62095b01817..fe3815850e58 100644 --- a/games-sports/xmoto/metadata.xml +++ b/games-sports/xmoto/metadata.xml @@ -8,4 +8,7 @@ more precise calculations at the expense of speed + + xmoto/xmoto + diff --git a/games-sports/xmoto/xmoto-0.6.0.ebuild b/games-sports/xmoto/xmoto-0.6.0.ebuild deleted file mode 100644 index c09b474d57ff..000000000000 --- a/games-sports/xmoto/xmoto-0.6.0.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="A challenging 2D motocross platform game, where physics play an important role" -HOMEPAGE="https://xmoto.tuxfamily.org" -SRC_URI="https://github.com/xmoto/xmoto/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="double-precision +nls" - -RDEPEND="app-arch/bzip2 - dev-db/sqlite:3 - dev-games/ode[double-precision=] - dev-lang/lua:0[deprecated] - dev-libs/libxdg-basedir - dev-libs/libxml2 - media-fonts/dejavu - media-libs/libpng:0= - media-libs/libsdl[joystick,opengl] - media-libs/sdl-mixer[vorbis] - media-libs/sdl-net - media-libs/sdl-ttf - net-misc/curl - sys-libs/zlib:= - virtual/jpeg:0 - virtual/glu - virtual/opengl - nls? ( virtual/libintl )" -DEPEND="${RDEPEND}" -BDEPEND="app-arch/xz-utils - nls? ( sys-devel/gettext )" - -src_prepare() { - sed -e "/^Icon/s/.xpm//" -i extra/xmoto.desktop || die - sed -e "/add_subdirectory.*\(bzip2\|libccd\|lua\|ode\|xdgbasedir\)/d" -i src/CMakeLists.txt || die - rm -rf vendor/{bzip2,lua,ode,xdgbasedir} || die - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DUSE_GETTEXT=$(usex nls) - -DOpenGL_GL_PREFERENCE=GLVND - ) - - cmake_src_configure -} - -src_install() { - cmake_src_install - - rm -f "${ED}/usr/share/xmoto"/Textures/Fonts/DejaVuSans{Mono,}.ttf || die - dosym ../../../fonts/dejavu/DejaVuSans.ttf /usr/share/xmoto/Textures/Fonts/DejaVuSans.ttf - dosym ../../../fonts/dejavu/DejaVuSansMono.ttf /usr/share/xmoto/Textures/Fonts/DejaVuSansMono.ttf -} diff --git a/games-sports/xmoto/xmoto-0.6.1-r1.ebuild b/games-sports/xmoto/xmoto-0.6.1-r1.ebuild new file mode 100644 index 000000000000..c8bbb19258ae --- /dev/null +++ b/games-sports/xmoto/xmoto-0.6.1-r1.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +DESCRIPTION="A challenging 2D motocross platform game, where physics play an important role" +HOMEPAGE="https://xmoto.tuxfamily.org" +SRC_URI="https://github.com/xmoto/xmoto/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="double-precision +nls" + +RDEPEND="app-arch/bzip2 + dev-db/sqlite:3 + dev-games/ode[double-precision=] + dev-lang/lua:0 + dev-libs/libxdg-basedir + dev-libs/libxml2 + media-fonts/dejavu + media-libs/libpng:0= + media-libs/libsdl[joystick,opengl] + media-libs/sdl-mixer[vorbis] + media-libs/sdl-net + media-libs/sdl-ttf + net-misc/curl + sys-libs/zlib:= + virtual/jpeg:0 + virtual/glu + virtual/opengl + nls? ( virtual/libintl )" +DEPEND="${RDEPEND}" +BDEPEND="app-arch/xz-utils + nls? ( sys-devel/gettext )" + +PATCHES=( + "${FILESDIR}/${P}_lua_deprecated.patch" +) + +src_prepare() { + sed -e "/^Icon/s/.xpm//" -i extra/xmoto.desktop || die + sed -e "/add_subdirectory.*\(bzip2\|libccd\|lua\|ode\|xdgbasedir\)/d" -i src/CMakeLists.txt || die + rm -rf vendor/{bzip2,lua,ode,xdgbasedir} || die + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DUSE_GETTEXT=$(usex nls) + -DOpenGL_GL_PREFERENCE=GLVND + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + + rm -f "${ED}/usr/share/xmoto"/Textures/Fonts/DejaVuSans{Mono,}.ttf || die + dosym ../../../fonts/dejavu/DejaVuSans.ttf /usr/share/xmoto/Textures/Fonts/DejaVuSans.ttf + dosym ../../../fonts/dejavu/DejaVuSansMono.ttf /usr/share/xmoto/Textures/Fonts/DejaVuSansMono.ttf +} -- cgit v1.2.3