jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

xmoto: update to 0.6.1.

Browse source
This commit is contained in:
Andrew Benson 2020-06-22 21:18:04 -05:00 committed by Andrew Benson
parent e06a586696
commit d191e6244a
5 changed files with 11 additions and 122 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
srcpkgs/xmoto/patches/fix-gcc7.patch
View file

@ -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);
}

25
srcpkgs/xmoto/patches/fix-include.patch
View file

@ -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 <sstream>
#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 <vector>
#include <string>

16
srcpkgs/xmoto/patches/modernize-configure_ac.patch
View file

@ -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

10
srcpkgs/xmoto/patches/musl-stdint_h.patch
View file

@ -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 <stdint.h>
#include <algorithm>
void DBuffer::_FreeDBuffer(void) {

35
srcpkgs/xmoto/template
View file

@ -1,38 +1,25 @@
# 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
SDL_net-devel SDL_ttf-devel lua52-devel libcurl-devel libode-devel bzip2-devel"
SDL_net-devel SDL_ttf-devel lua52-devel libcurl-devel libode-devel bzip2-devel
gettext-libs"
depends="${pkgname}-data"
short_desc="2D motocross platform game"
maintainer="Enno Boland <gottox@voidlinux.org>"
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() {