diff options
-rw-r--r-- | .SRCINFO | 6 | ||||
-rw-r--r-- | PKGBUILD | 7 | ||||
-rw-r--r-- | format-argument.patch | 43 | ||||
-rw-r--r-- | format-argument.patch.gz | bin | 0 -> 600 bytes |
4 files changed, 7 insertions, 49 deletions
@@ -1,7 +1,7 @@ pkgbase = torcs pkgdesc = A 3D racing cars simulator using OpenGL pkgver = 1.3.7 - pkgrel = 5 + pkgrel = 6 url = http://torcs.sourceforge.net arch = x86_64 arch = i686 @@ -21,10 +21,10 @@ pkgbase = torcs source = http://downloads.sourceforge.net/sourceforge/torcs/torcs-1.3.7.tar.bz2 source = gcc7.patch source = gcc6-isnan.patch - source = format-argument.patch + source = format-argument.patch.gz md5sums = de314c3e421e8d7d4323d819c5010d23 md5sums = 64216e9dba6cc030c38cde8efea3e59d md5sums = e84edaa1660f55fd980136f70e6471e6 - md5sums = 435f63506e8f18a06f119a64d60dd281 + md5sums = 626695efb84fb1a4d59dc8be4ac9c047 pkgname = torcs @@ -5,7 +5,7 @@ pkgname=torcs pkgver=1.3.7 -pkgrel=5 +pkgrel=6 pkgdesc="A 3D racing cars simulator using OpenGL" url="http://torcs.sourceforge.net" license=("GPL") @@ -16,11 +16,11 @@ options=('!makeflags') source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver/_/-}.tar.bz2 gcc7.patch gcc6-isnan.patch - format-argument.patch) + format-argument.patch.gz) md5sums=('de314c3e421e8d7d4323d819c5010d23' '64216e9dba6cc030c38cde8efea3e59d' 'e84edaa1660f55fd980136f70e6471e6' - '435f63506e8f18a06f119a64d60dd281') + '626695efb84fb1a4d59dc8be4ac9c047') prepare() { cd "$srcdir"/$pkgname-${pkgver/_/-} @@ -28,6 +28,7 @@ prepare() { do patch -p1 -i "$p" done + gunzip -c format-argument.patch.gz | patch -p1 } build() { diff --git a/format-argument.patch b/format-argument.patch deleted file mode 100644 index b2d8c2665168..000000000000 --- a/format-argument.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -aur src.orig/torcs-1.3.7/src/drivers/olethros/geometry.cpp src/torcs-1.3.7/src/drivers/olethros/geometry.cpp ---- src.orig/torcs-1.3.7/src/drivers/olethros/geometry.cpp 2021-06-29 20:35:16.127232867 +0200 -+++ src/torcs-1.3.7/src/drivers/olethros/geometry.cpp 2021-06-29 20:36:07.637478329 +0200 -@@ -370,7 +370,7 @@ - } - delta_total += delta; - } -- if (isnan(r)) { -+ if (std::isnan(r)) { - for (i=0; i<d; i++) { - center[i] = ((*(sphere->C))[i] - mean[i]) / scale; - } -diff -aur src.orig/torcs-1.3.7/src/libs/musicplayer/OpenALMusicPlayer.cpp src/torcs-1.3.7/src/libs/musicplayer/OpenALMusicPlayer.cpp ---- src.orig/torcs-1.3.7/src/libs/musicplayer/OpenALMusicPlayer.cpp 2021-06-29 20:35:16.133899565 +0200 -+++ src/torcs-1.3.7/src/libs/musicplayer/OpenALMusicPlayer.cpp 2021-06-29 20:36:07.760812253 +0200 -@@ -161,7 +161,7 @@ - { - char pcm[BUFFERSIZE]; - int size = 0; -- const char* error = '\0'; -+ const char* error = nullptr; - - if (!stream->read(pcm, BUFFERSIZE, &size, &error)) { - GfError("OpenALMusicPlayer: Stream read error: %s\n", error); -@@ -268,4 +268,4 @@ - alSourcePlay(source); - - return true; --} -\ No newline at end of file -+} -diff -aur src.orig/torcs-1.3.7/src/tools/trackgen/objects.cpp src/torcs-1.3.7/src/tools/trackgen/objects.cpp ---- src.orig/torcs-1.3.7/src/tools/trackgen/objects.cpp 2021-06-29 20:35:16.103899423 +0200 -+++ src/torcs-1.3.7/src/tools/trackgen/objects.cpp 2021-06-29 20:36:07.510811054 +0200 -@@ -304,7 +304,7 @@ - fprintf (save_fd, "numsurf %d\n", num_tris); - - for (i = 0; i < num_tris; i++) { -- fprintf (save_fd, surf); -+ fprintf (save_fd, "%s", surf); - fprintf (save_fd, "mat 0\n"); - fprintf (save_fd, "refs 3\n"); - fprintf (save_fd, "%d %g %g\n", diff --git a/format-argument.patch.gz b/format-argument.patch.gz Binary files differnew file mode 100644 index 000000000000..b0f2907e0e11 --- /dev/null +++ b/format-argument.patch.gz |