pioneer: update to 20200203.
This commit is contained in:
parent
5994789061
commit
63f5cc4227
3 changed files with 3 additions and 47 deletions
|
@ -1,22 +0,0 @@
|
||||||
--- CMakeLists.txt 2019-02-03 11:56:16.000000000 +0100
|
|
||||||
+++ - 2019-02-03 19:12:47.221852468 +0100
|
|
||||||
@@ -241,11 +241,19 @@
|
|
||||||
|
|
||||||
# Optimize the models after the modelcompiler is built.
|
|
||||||
# This really shouldn't be done inside the source tree...
|
|
||||||
+if(CMAKE_CROSSCOMPILING)
|
|
||||||
+add_custom_command(TARGET modelcompiler POST_BUILD
|
|
||||||
+ COMMAND ${CMAKE_COMMAND} -E env SDL_VIDEODRIVER=dummy modelcompiler -b inplace
|
|
||||||
+ WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
|
|
||||||
+ COMMENT "Optimizing models" VERBATIM
|
|
||||||
+)
|
|
||||||
+else()
|
|
||||||
add_custom_command(TARGET modelcompiler POST_BUILD
|
|
||||||
COMMAND ${CMAKE_COMMAND} -E env SDL_VIDEODRIVER=dummy $<TARGET_FILE:modelcompiler> -b inplace
|
|
||||||
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
|
|
||||||
COMMENT "Optimizing models" VERBATIM
|
|
||||||
)
|
|
||||||
+endif()
|
|
||||||
|
|
||||||
install(TARGETS ${PROJECT_NAME} modelcompiler savegamedump
|
|
||||||
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
|
|
@ -1,20 +0,0 @@
|
||||||
--- src/posix/OSPosix.cpp 2019-02-03 11:56:16.000000000 +0100
|
|
||||||
+++ - 2019-02-03 17:32:45.957535773 +0100
|
|
||||||
@@ -48,7 +48,7 @@
|
|
||||||
|
|
||||||
void EnableFPE()
|
|
||||||
{
|
|
||||||
-#if defined(_GNU_SOURCE) && !defined(__APPLE__)
|
|
||||||
+#if defined(_GNU_SOURCE) && !defined(__APPLE__) && defined(__GLIBC__)
|
|
||||||
// clear any outstanding exceptions before enabling, otherwise they'll
|
|
||||||
// trip immediately
|
|
||||||
feclearexcept(FE_DIVBYZERO | FE_INVALID | FE_OVERFLOW);
|
|
||||||
@@ -58,7 +58,7 @@
|
|
||||||
|
|
||||||
void DisableFPE()
|
|
||||||
{
|
|
||||||
-#if defined(_GNU_SOURCE) && !defined(__APPLE__)
|
|
||||||
+#if defined(_GNU_SOURCE) && !defined(__APPLE__) && defined(__GLIBC__)
|
|
||||||
fedisableexcept(FE_DIVBYZERO | FE_INVALID | FE_OVERFLOW);
|
|
||||||
#endif
|
|
||||||
}
|
|
|
@ -1,8 +1,7 @@
|
||||||
# Template file for 'pioneer'
|
# Template file for 'pioneer'
|
||||||
pkgname=pioneer
|
pkgname=pioneer
|
||||||
reverts="20191009_1"
|
version=20200203
|
||||||
version=20190203
|
revision=1
|
||||||
revision=3
|
|
||||||
build_style=cmake
|
build_style=cmake
|
||||||
configure_args="-DPIONEER_DATA_DIR=/usr/share/pioneer
|
configure_args="-DPIONEER_DATA_DIR=/usr/share/pioneer
|
||||||
-DUSE_SYSTEM_LIBLUA=ON -DUSE_SYSTEM_LIBGLEW=ON"
|
-DUSE_SYSTEM_LIBLUA=ON -DUSE_SYSTEM_LIBGLEW=ON"
|
||||||
|
@ -15,8 +14,7 @@ maintainer="John <johnz@posteo.net>"
|
||||||
license="GPL-3.0-or-later"
|
license="GPL-3.0-or-later"
|
||||||
homepage="https://pioneerspacesim.net"
|
homepage="https://pioneerspacesim.net"
|
||||||
distfiles="https://github.com/pioneerspacesim/pioneer/archive/${version}.tar.gz"
|
distfiles="https://github.com/pioneerspacesim/pioneer/archive/${version}.tar.gz"
|
||||||
checksum=e526f1659ae321f45b997c0245acecbf9c4cf2122b025ab8db1090f1b9804f5e
|
checksum=3055d63c1bd3377c3794eee830a8adbd650b178bad9e927531e38cb5d5838694
|
||||||
disable_parallel_build=yes
|
|
||||||
|
|
||||||
if [ "$CROSS_BUILD" ]; then
|
if [ "$CROSS_BUILD" ]; then
|
||||||
hostmakedepends+=" pioneer-modelcompiler"
|
hostmakedepends+=" pioneer-modelcompiler"
|
||||||
|
|
Loading…
Reference in a new issue