From 341050f3a722937d12b41bda05beb3231bbed9be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Fri, 20 Apr 2018 19:38:17 +0200 Subject: [PATCH] openlierox: update to 0.58.rc4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/openlierox/patches/fix-curl.patch | 22 ------------ .../openlierox/patches/musl-execinfo.patch | 13 ------- srcpkgs/openlierox/template | 34 ++++++------------- 3 files changed, 11 insertions(+), 58 deletions(-) delete mode 100644 srcpkgs/openlierox/patches/fix-curl.patch delete mode 100644 srcpkgs/openlierox/patches/musl-execinfo.patch diff --git a/srcpkgs/openlierox/patches/fix-curl.patch b/srcpkgs/openlierox/patches/fix-curl.patch deleted file mode 100644 index 8f2484bc5dc..00000000000 --- a/srcpkgs/openlierox/patches/fix-curl.patch +++ /dev/null @@ -1,22 +0,0 @@ -Remove include of obsolete curl header - ---- include/HTTP.h 2010-01-25 21:56:08.000000000 +0100 -+++ include/HTTP.h 2015-11-05 21:33:38.114448143 +0100 -@@ -21,7 +21,6 @@ - - #include - #include --#include - #include - - #include "Networking.h" ---- src/common/HTTP.cpp 2010-02-10 02:04:41.000000000 +0100 -+++ src/common/HTTP.cpp 2015-11-05 21:33:35.012447919 +0100 -@@ -25,7 +25,6 @@ - #include - #endif - #include --#include - #include - - #include "LieroX.h" diff --git a/srcpkgs/openlierox/patches/musl-execinfo.patch b/srcpkgs/openlierox/patches/musl-execinfo.patch deleted file mode 100644 index 1103227d2bc..00000000000 --- a/srcpkgs/openlierox/patches/musl-execinfo.patch +++ /dev/null @@ -1,13 +0,0 @@ -In musl libc there is no and backtrace(3) - ---- src/common/Debug.cpp 2010-02-05 19:22:18.000000000 +0100 -+++ src/common/Debug.cpp 2015-11-05 21:38:40.336469931 +0100 -@@ -407,7 +407,7 @@ - // --------------- backtrace stuff start -------------- - - #ifndef HAVE_EXECINFO --# if defined(__linux__) -+# if defined(__GLIBC__) - # define HAVE_EXECINFO 1 - # elif defined(__DARWIN_VERS_1050) - # define HAVE_EXECINFO 1 diff --git a/srcpkgs/openlierox/template b/srcpkgs/openlierox/template index 6288f27e267..4f1a55791d3 100644 --- a/srcpkgs/openlierox/template +++ b/srcpkgs/openlierox/template @@ -1,41 +1,29 @@ # Template file for 'openlierox' pkgname=openlierox -version=0.58.rc3 -revision=3 +version=0.58.rc4 +revision=1 wrksrc=OpenLieroX build_style=cmake -configure_args="-DSYSTEM_DATA_DIR=/usr/share -DDEBUG=OFF - -DBREAKPAD=OFF -DLINENOISE=OFF -DHASBFD=OFF -DLIBLUA_BUILTIN=OFF" +configure_args="-DSYSTEM_DATA_DIR=/usr/share -DDEBUG=OFF -DBREAKPAD=OFF" hostmakedepends="pkg-config python" -makedepends="boost-devel libcurl-devel readline-devel libxml2-devel lua51-devel - gd-devel freealut-devel libopenal-devel libvorbis-devel SDL_image-devel - SDL_mixer-devel libzip-devel" +makedepends="SDL_image-devel SDL_mixer-devel boost-devel freealut-devel + gd-devel libcurl-devel libvorbis-devel libxml2-devel libzip-devel" depends="openlierox-data libGL python" short_desc="Addictive real-time excessive Worms-clone" maintainer="Jürgen Buchmüller " license="GPL-2" homepage="http://www.openlierox.net/" distfiles="${SOURCEFORGE_SITE}/openlierox/OpenLieroX_${version/.rc/_rc}.src.tar.bz2" -checksum=9f246887d38c325e597373d9189990c9374c241cb807b4b5777844eceeed65cc +checksum=e1ec63751eaa7322d44cad6c012765745f834ccae92223478fa0354961899e73 -CXXFLAGS="-Wno-narrowing -Wno-unused-local-typedefs -Wno-unused-but-set-variable" -CXXFLAGS+=" -DBOOST_SIGNALS_NO_DEPRECATION_WARNING" -CXXFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/lua5.1" -CXXFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/libxml2" +CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/libxml2" +case "$XBPS_TARGET_MACHINE" in + *-musl) makedepends+=" libexecinfo-devel";; +esac pre_configure() { - # Rename C++11 reserved word static_assert - find src include -type f -exec sed -i "{}" -e "s;static_assert;olx_&;g" \; - # For newer boost link to boost_signals and boost_system libs - sed -i CMakeOlxCommon.cmake \ - -e '/SET(LIBS ${LIBS} boost_signals/s;-mt; boost_system;' case "$XBPS_TARGET_MACHINE" in - arm*) # Disable MMX blitter code for arm* (0.59beta10) - if [ -f src/gusanos/blitters/blitters.h ]; then - sed -i src/gusanos/blitters/blitters.h \ - -e 's;!defined(WIN32);(0) \&\& &;' - fi - ;; + *-musl) sed -i CMakeLists.txt -e "/^TARGET_LINK_LIBRARIES/s/)/ execinfo)/" ;; esac }