diff options
| author | Guido Falsi <madpilot@FreeBSD.org> | 2018-02-24 00:28:10 +0000 |
|---|---|---|
| committer | Guido Falsi <madpilot@FreeBSD.org> | 2018-02-24 00:28:10 +0000 |
| commit | bd53ea2c205f8cb52a48ebf4f5bcb28e70b51205 (patch) | |
| tree | 80f451d6de8f8bb8442e70a03af2b799e23652af /games/torcs | |
| parent | ebd70d6e46b292ebf52a91df0a081f4dfd80b905 (diff) | |
| download | ports-bd53ea2c205f8cb52a48ebf4f5bcb28e70b51205.tar.gz ports-bd53ea2c205f8cb52a48ebf4f5bcb28e70b51205.zip | |
Notes
Diffstat (limited to 'games/torcs')
| -rw-r--r-- | games/torcs/Makefile | 3 | ||||
| -rw-r--r-- | games/torcs/files/patch-Make-default.mk | 9 | ||||
| -rw-r--r-- | games/torcs/files/patch-src_drivers_olethros_driver.cpp | 11 | ||||
| -rw-r--r-- | games/torcs/files/patch-src_libs_musicplayer_OpenALMusicPlayer.cpp | 18 |
4 files changed, 40 insertions, 1 deletions
diff --git a/games/torcs/Makefile b/games/torcs/Makefile index e32d230a45d8..63b696af61bf 100644 --- a/games/torcs/Makefile +++ b/games/torcs/Makefile @@ -19,12 +19,13 @@ RUN_DEPENDS= bash:shells/bash MAKE_JOBS_UNSAFE= yes -USES= cpe gmake openal:al,alut shebangfix tar:bzip2 +USES= compiler:c++11-lang cpe gmake openal:al,alut shebangfix tar:bzip2 CPE_VENDOR= bernhard_wymann SHEBANG_FILES= src/tools/accc/accc.in src/tools/nfsperf/nfsperf.in \ src/tools/texmapper/texmapper.in src/tools/nfs2ac/nfs2ac.in \ src/tools/trackgen/trackgen.in \ src/modules/telemetry/telemetry.sh robotgen +USE_CXXSTD= c++11 USE_XORG= xrender xmu ice xext x11 xxf86vm xrandr xi xt sm USE_GL= glut glu gl GNU_CONFIGURE= yes diff --git a/games/torcs/files/patch-Make-default.mk b/games/torcs/files/patch-Make-default.mk index d1c2dcefe13f..f752c6b42235 100644 --- a/games/torcs/files/patch-Make-default.mk +++ b/games/torcs/files/patch-Make-default.mk @@ -9,3 +9,12 @@ dep: .depend +@@ -181,7 +181,7 @@ win32setup: win32start exportswin32 installshipswin32 + + linuxconfstart: + @rm -f ${SETUP_LINUX} +- @echo '#! /bin/bash' >> ${SETUP_LINUX} ++ @echo '#! /usr/local/bin/bash' >> ${SETUP_LINUX} + @echo '' >> ${SETUP_LINUX} + @echo '[ -z "$$1" ] && exit 1' >> ${SETUP_LINUX} + @echo '[ ! -d "$$1" ] && exit 1' >> ${SETUP_LINUX} diff --git a/games/torcs/files/patch-src_drivers_olethros_driver.cpp b/games/torcs/files/patch-src_drivers_olethros_driver.cpp new file mode 100644 index 000000000000..7e355ff08f97 --- /dev/null +++ b/games/torcs/files/patch-src_drivers_olethros_driver.cpp @@ -0,0 +1,11 @@ +--- src/drivers/olethros/driver.cpp.orig 2018-02-11 21:23:59 UTC ++++ src/drivers/olethros/driver.cpp +@@ -802,7 +802,7 @@ namespace olethros { + rpmMaxTq, + rpmMaxPw, + rpmMax, +- rpmMax*2.0 ++ rpmMax*2.0f + }; + int N = 5; + for (int i=0; i<N - 1; i++) { diff --git a/games/torcs/files/patch-src_libs_musicplayer_OpenALMusicPlayer.cpp b/games/torcs/files/patch-src_libs_musicplayer_OpenALMusicPlayer.cpp new file mode 100644 index 000000000000..8153f2479739 --- /dev/null +++ b/games/torcs/files/patch-src_libs_musicplayer_OpenALMusicPlayer.cpp @@ -0,0 +1,18 @@ +--- src/libs/musicplayer/OpenALMusicPlayer.cpp.orig 2018-02-11 19:14:32 UTC ++++ src/libs/musicplayer/OpenALMusicPlayer.cpp +@@ -161,7 +161,7 @@ bool OpenALMusicPlayer::streamBuffer(ALuint buffer) + { + 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 @@ bool OpenALMusicPlayer::startPlayback() + alSourcePlay(source); + + return true; +-} +\ No newline at end of file ++} |