From 96a8fe2d0ba01585b4671e775431b901f402d3d0 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Mon, 22 Jun 2020 21:18:04 -0500 Subject: [PATCH] xmoto: update to 0.6.1. --- srcpkgs/xmoto/patches/fix-gcc7.patch | 47 ------------------- srcpkgs/xmoto/patches/fix-include.patch | 25 ---------- .../patches/modernize-configure_ac.patch | 16 ------- srcpkgs/xmoto/patches/musl-stdint_h.patch | 10 ---- srcpkgs/xmoto/template | 32 ++++--------- 5 files changed, 9 insertions(+), 121 deletions(-) delete mode 100644 srcpkgs/xmoto/patches/fix-gcc7.patch delete mode 100644 srcpkgs/xmoto/patches/fix-include.patch delete mode 100644 srcpkgs/xmoto/patches/modernize-configure_ac.patch delete mode 100644 srcpkgs/xmoto/patches/musl-stdint_h.patch diff --git a/srcpkgs/xmoto/patches/fix-gcc7.patch b/srcpkgs/xmoto/patches/fix-gcc7.patch deleted file mode 100644 index bf8b1cba1f3..00000000000 --- a/srcpkgs/xmoto/patches/fix-gcc7.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- ./src/WWW.cpp.orig 2018-01-16 10:53:58.725405426 +0100 -+++ ./src/WWW.cpp 2018-01-16 10:55:14.802101942 +0100 -@@ -206,7 +206,7 @@ void FSWeb::downloadFile(const std::stri - std::string v_www_agent = WWW_AGENT; - - /* open the file */ -- if( (v_destinationFile = fopen(v_local_file_tmp.c_str(), "wb")) == false) { -+ if( !(v_destinationFile = fopen(v_local_file_tmp.c_str(), "wb")) ) { - throw Exception("error : unable to open output file " - + v_local_file_tmp); - } -@@ -320,7 +320,7 @@ void FSWeb::uploadReplay(const std::stri - LogInfo(std::string("Uploading replay " + p_replayFilename).c_str()); - - /* open the file */ -- if( (v_destinationFile = fopen(v_local_file.c_str(), "wb")) == false) { -+ if( !(v_destinationFile = fopen(v_local_file.c_str(), "wb")) ) { - throw Exception("error : unable to open output file " DEFAULT_WWW_MSGFILE("UR")); - } - -@@ -478,7 +478,7 @@ void FSWeb::sendVote(const std::string& - LogInfo("Sending vote"); - - /* open the file */ -- if( (v_destinationFile = fopen(v_local_file.c_str(), "wb")) == false) { -+ if( !(v_destinationFile = fopen(v_local_file.c_str(), "wb")) ) { - throw Exception("error : unable to open output file " DEFAULT_WWW_MSGFILE("SV")); - } - -@@ -562,7 +562,7 @@ void FSWeb::sendReport(const std::string - LogInfo("Sending report"); - - /* open the file */ -- if( (v_destinationFile = fopen(v_local_file.c_str(), "wb")) == false) { -+ if( !(v_destinationFile = fopen(v_local_file.c_str(), "wb")) ) { - throw Exception("error : unable to open output file " DEFAULT_WWW_MSGFILE("SR")); - } - -@@ -677,7 +677,7 @@ void FSWeb::uploadDbSync(const std::stri - LogInfo(std::string("Uploading dbsync " + p_dbSyncFilename + " to " + p_url_to_transfert).c_str()); - - /* open the file */ -- if( (v_destinationFile = fopen(p_answerFile.c_str(), "wb")) == false) { -+ if( !(v_destinationFile = fopen(p_answerFile.c_str(), "wb")) ) { - throw Exception("error : unable to open output file " + p_answerFile); - } - diff --git a/srcpkgs/xmoto/patches/fix-include.patch b/srcpkgs/xmoto/patches/fix-include.patch deleted file mode 100644 index 4bc2179e376..00000000000 --- a/srcpkgs/xmoto/patches/fix-include.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- src/net/NetActions.cpp.orig 2018-01-16 11:03:55.152026167 +0100 -+++ src/net/NetActions.cpp 2018-01-16 11:03:59.910007186 +0100 -@@ -30,7 +30,7 @@ Foundation, Inc., 59 Temple Place, Suite - #include - #include "../helpers/SwapEndian.h" - #include "helpers/Net.h" --#include "helpers/utf8.h" -+#include "../helpers/utf8.h" - - char NetAction::m_buffer[NETACTION_MAX_PACKET_SIZE]; - unsigned int NetAction::m_biggestTCPPacketSent = 0; ---- src/helpers/utf8.h.orig 2018-01-16 11:08:10.042009362 +0100 -+++ src/helpers/utf8.h 2018-01-16 11:08:17.306980381 +0100 -@@ -18,8 +18,8 @@ along with XMOTO; if not, write to the F - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - =============================================================================*/ - --#ifndef __UTF8_H__ --#define __UTF8_H__ -+#ifndef __MYUTF8_H__ -+#define __MYUTF8_H__ - - #include - #include - diff --git a/srcpkgs/xmoto/patches/modernize-configure_ac.patch b/srcpkgs/xmoto/patches/modernize-configure_ac.patch deleted file mode 100644 index be88ff4c6b5..00000000000 --- a/srcpkgs/xmoto/patches/modernize-configure_ac.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- configure.in 2014-03-29 11:35:24.000000000 +0100 -+++ configure.in 2015-11-03 13:02:49.686607352 +0100 -@@ -1,8 +1,8 @@ --AC_INIT(src/GameInit.cpp) -- --AC_CANONICAL_TARGET() --AM_INIT_AUTOMAKE(xmoto,0.5.11) --AC_GNU_SOURCE -+AC_PREREQ([2.69]) -+AC_INIT([xmoto],[0.5.11]) -+AC_CONFIG_SRCDIR(src/GameInit.cpp) -+AM_INIT_AUTOMAKE([1.15 foreign gnu subdir-objects]) -+LT_INIT - - AC_PROG_CXX - AC_PROG_CPP diff --git a/srcpkgs/xmoto/patches/musl-stdint_h.patch b/srcpkgs/xmoto/patches/musl-stdint_h.patch deleted file mode 100644 index 03684b56923..00000000000 --- a/srcpkgs/xmoto/patches/musl-stdint_h.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- src/DBuffer.cpp 2011-10-11 22:18:35.000000000 +0200 -+++ src/DBuffer.cpp 2015-10-01 22:28:36.654255001 +0200 -@@ -23,6 +23,7 @@ - */ - #include "DBuffer.h" - #include "helpers/SwapEndian.h" -+#include - #include - - void DBuffer::_FreeDBuffer(void) { diff --git a/srcpkgs/xmoto/template b/srcpkgs/xmoto/template index 70803d714f2..441fa69edcf 100644 --- a/srcpkgs/xmoto/template +++ b/srcpkgs/xmoto/template @@ -1,9 +1,10 @@ # Template file for 'xmoto' pkgname=xmoto -version=0.5.11 -revision=11 -build_style=gnu-configure -configure_args="--disable-sdltest CPPFLAGS=-DdDOUBLE" +version=0.6.1 +revision=1 +build_style=cmake +build_helper="qemu" +configure_args="-DOpenGL_GL_PREFERENCE=GLVND -DXMOTO_PACK=manual" hostmakedepends="automake libtool gettext-devel intltool desktop-file-utils" makedepends="sqlite-devel zlib-devel libjpeg-turbo-devel libpng-devel libxml2-devel libxdg-basedir-devel glu-devel SDL-devel SDL_mixer-devel @@ -13,26 +14,11 @@ short_desc="2D motocross platform game" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="http://xmoto.tuxfamily.org/" -distfiles="http://download.tuxfamily.org/xmoto/xmoto/${version}/xmoto-${version}-src.tar.gz" -checksum=a584a6f9292b184686b72c78f16de4b82d5c5b72ad89e41912ff50d03eca26b2 +distfiles="https://github.com/xmoto/xmoto/archive/${version}/${version}.tar.gz" +checksum=209c8c38b1742d0620d40f90365c7a56f67c86da826c80a76d37fa46ee9c9b66 -# Build using the old C++ ABI to fix issue with missing text; the issue -# should be fixed in the next stable release (if that ever does happen) -CPPFLAGS+=" -D_GLIBCXX_USE_CXX11_ABI=0" - -if [ "$CROSS_BUILD" ]; then - # configure can't test this when cross compiling - export ac_cv_lib_GLU_gluBuild2DMipmaps=yes - LDFLAGS="-L${XBPS_CROSS_BASE}/usr/lib" - hostmakedepends+=" SDL_mixer-devel libxml2-devel" -fi - -pre_configure() { - # remove old ode version - rm -r src/ode - mv configure.{in,ac} - libtoolize - ./bootstrap +pre_install() { + vtargetrun build/src/xmoto --pack build/bin/xmoto.bin bin/ } post_install() {