diff --git a/srcpkgs/pioneer/patches/cross.patch b/srcpkgs/pioneer/patches/cross.patch deleted file mode 100644 index ec716da96d..0000000000 --- a/srcpkgs/pioneer/patches/cross.patch +++ /dev/null @@ -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 $ -b inplace - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} - COMMENT "Optimizing models" VERBATIM - ) -+endif() - - install(TARGETS ${PROJECT_NAME} modelcompiler savegamedump - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} diff --git a/srcpkgs/pioneer/patches/musl.patch b/srcpkgs/pioneer/patches/musl.patch deleted file mode 100644 index 2341d9cf9f..0000000000 --- a/srcpkgs/pioneer/patches/musl.patch +++ /dev/null @@ -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 - } diff --git a/srcpkgs/pioneer/template b/srcpkgs/pioneer/template index 176f51cf5a..eb64c8353c 100644 --- a/srcpkgs/pioneer/template +++ b/srcpkgs/pioneer/template @@ -1,7 +1,7 @@ # Template file for 'pioneer' pkgname=pioneer -version=20190203 -revision=2 +version=20191009 +revision=1 build_style=cmake configure_args="-DPIONEER_DATA_DIR=/usr/share/pioneer -DUSE_SYSTEM_LIBLUA=ON -DUSE_SYSTEM_LIBGLEW=ON" @@ -14,7 +14,7 @@ maintainer="John " license="GPL-3.0-or-later" homepage="https://pioneerspacesim.net" distfiles="https://github.com/pioneerspacesim/pioneer/archive/${version}.tar.gz" -checksum=e526f1659ae321f45b997c0245acecbf9c4cf2122b025ab8db1090f1b9804f5e +checksum=54ffa99b5dad6334e75f21deab6e9afa48164d5ea474753c6ccda1a742c22cd6 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" pioneer-modelcompiler"