[gentoo-commits] repo/gentoo:master commit in: games-sports/torcs/, games-sports/torcs/files/, profiles/

2022-10-31 Thread Jakov Smolić
commit: 97caaf827ca530c3b8dcb7b1377bb403cac9b632
Author: Jakov Smolić  gentoo  org>
AuthorDate: Tue Nov  1 04:37:21 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Tue Nov  1 04:37:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97caaf82

games-sports/torcs: treeclean

Closes: https://bugs.gentoo.org/253517
Closes: https://bugs.gentoo.org/479698
Closes: https://bugs.gentoo.org/601636
Closes: https://bugs.gentoo.org/711644
Closes: https://bugs.gentoo.org/846671
Signed-off-by: Jakov Smolić  gentoo.org>

 games-sports/torcs/Manifest|  1 -
 .../torcs/files/torcs-1.3.6-as-needed.patch| 96 --
 games-sports/torcs/files/torcs-1.3.6-flags.patch   | 14 
 games-sports/torcs/files/torcs-1.3.6-format.patch  | 34 
 games-sports/torcs/files/torcs-1.3.6-gcc6.patch| 11 ---
 games-sports/torcs/files/torcs-1.3.6-gcc7.patch| 11 ---
 .../torcs/files/torcs-1.3.6-no-automake.patch  | 21 -
 games-sports/torcs/files/torcs-1.3.6-noXmuXt.patch | 15 
 games-sports/torcs/metadata.xml| 11 ---
 games-sports/torcs/torcs-1.3.6-r2.ebuild   | 68 ---
 profiles/package.mask  |  7 --
 11 files changed, 289 deletions(-)

diff --git a/games-sports/torcs/Manifest b/games-sports/torcs/Manifest
deleted file mode 100644
index 0e8af9340f57..
--- a/games-sports/torcs/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST torcs-1.3.6.tar.bz2 477954437 BLAKE2B 
294e2775f9d7a88b1781139793fedf1f5e79238ed46ffcda22188bdf9f991180b161ab1057fcfe72205033db43b7a134b9568055e62f2152462de4436b454726
 SHA512 
4116c920b92ecbf5dcd3f14a137e86685651167f68725f2ad4549b2d3d20e3dc54569685925e086e7e19e532ecb1a95ec77dfe22a542a26c9e006b0c8c0d

diff --git a/games-sports/torcs/files/torcs-1.3.6-as-needed.patch 
b/games-sports/torcs/files/torcs-1.3.6-as-needed.patch
deleted file mode 100644
index d848538c07ea..
--- a/games-sports/torcs/files/torcs-1.3.6-as-needed.patch
+++ /dev/null
@@ -1,96 +0,0 @@
 torcs-1.3.6.orig/Make-default.mk
-+++ torcs-1.3.6/Make-default.mk
-@@ -402,7 +402,7 @@
- ifdef PROGRAM
- 
- ${PROGRAM}: ${OBJECTS} $(subst -l,${EXPORTBASE}/lib/lib, ${LIBS:=.a})
--  ${CXX} ${OBJECTS} ${LDFLAGS} ${LIBS} ${SOLIBS} ${EXT_LIBS} -o $@
-+  ${CXX} ${LDFLAGS} -o $@ ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS}
- 
- installprogram: ${PROGRAM}
-   @ createdir="${INSTLIBBASE}" ; \
-@@ -420,14 +420,14 @@
- ifdef LOCALTOOLS
- 
- ${LOCALTOOLS}: ${OBJECTS} $(subst -l,${EXPORTBASE}/lib/lib, ${LIBS:=.a})
--  ${CXX} ${OBJECTS} ${LDFLAGS} ${LIBS} ${EXT_LIBS} ${SOLIBS} -o $@
-+  ${CXX} ${LDFLAGS} -o $@ ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS}
- 
- endif
- 
- ifdef TOOLS
- 
- ${TOOLS}: ${OBJECTS} $(subst -l,${EXPORTBASE}/lib/lib, ${LIBS:=.a})
--  ${CXX} ${OBJECTS} ${LDFLAGS} ${LIBS} ${EXT_LIBS} ${SOLIBS} -o $@
-+  ${CXX} ${LDFLAGS} -o $@ ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS}
- 
- installtools: ${TOOLS}
-   @createdir="${INSTBINBASE}/${TOOLSDIR}" ; \
-@@ -478,7 +478,7 @@
- ifdef SOLIBRARY
- 
- ${SOLIBRARY}: ${OBJECTS}
--  ${CXX} -shared -o ${SOLIBRARY} ${OBJECTS} ${SOLIBS} ${LDFLAGS} 
${LIBSPATH} ${LIBS} ${DEBUG_LIBS}
-+  ${CXX} ${CXXFLAGS} ${LDFLAGS} -shared -o ${SOLIBRARY} ${OBJECTS} 
${SOLIBS} ${LIBS} ${EXT_LIBS}
-   @D=`pwd` ; \
-   createdir="${EXPORTBASE}/lib" ; \
-   $(mkinstalldirs) $$createdir ; \
-@@ -509,7 +509,7 @@
- ifdef MODULE
- 
- ${MODULE}: ${OBJECTS}
--  ${CXX} -shared -o ${MODULE} ${OBJECTS} ${LDFLAGS} ${LIBSPATH} ${LIBS} 
-+  ${CXX} ${CXXFLAGS} ${LDFLAGS} -shared -o ${MODULE} ${OBJECTS} ${SOLIBS} 
${LIBS} ${EXT_LIBS}
-   @D=`pwd` ; \
-   createdir="${EXPORTBASE}/${MODULEDIR}" ; \
-   $(mkinstalldirs) $$createdir ; \
 torcs-1.3.6.orig/configure.in
-+++ torcs-1.3.6/configure.in
-@@ -123,11 +123,11 @@
- AC_CHECK_LIB(Xxf86vm, XF86VidModeSetViewPort,,AC_MSG_ERROR([Can't find 
libXxf86vm. Please check config.log and if you can't solve the problem send the 
file to torcs-us...@lists.sourceforge.net with the subject \"torcs compilation 
problem\"]))
- AC_CHECK_LIB(Xrender, XRenderSetSubpixelOrder,,AC_MSG_ERROR([Can't find 
libXrender. Please check config.log and if you can't solve the problem send the 
file to torcs-us...@lists.sourceforge.net with the subject \"torcs compilation 
problem\"]))
- AC_CHECK_LIB(Xrandr, XRRQueryVersion,,AC_MSG_ERROR([Can't find libXrandr. 
Please check config.log and if you can't solve the problem send the file to 
torcs-us...@lists.sourceforge.net with the subject \"torcs compilation 
problem\"]))
--AC_CHECK_LIB(openal, alEnable, LDFLAGS="$LDFLAGS -lopenal", 
AC_MSG_ERROR([Can't find AL/al.h. OpenAL can be found on 
http://www.openal.org/]))
-+AC_CHECK_LIB(openal, alEnable, LIBS="$LIBS -lopenal", AC_MSG_ERROR([Can't 
find AL/al.h. OpenAL can be found on http://www.openal.org/]))
- AC_CHECK_LIB(alut, alutLoadWAVFile,
--  LDFLAGS="$LDFLAGS -lalut",

[gentoo-commits] repo/gentoo:master commit in: games-sports/torcs/, games-sports/torcs/files/

2018-04-04 Thread Andreas Sturmlechner
commit: 12df4e984cec6f375feacf528c44ae00c4c4e6b2
Author: Peter Levine  gmail  com>
AuthorDate: Sat Mar 31 00:25:35 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Apr  4 21:33:40 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12df4e98

games-sports/torcs: Fix building with GCC-7

Closes: https://bugs.gentoo.org/631542
Package-Manager: Portage-2.3.16, Repoman-2.3.6
Closes: https://github.com/gentoo/gentoo/pull/7728

 games-sports/torcs/files/torcs-1.3.6-gcc7.patch | 11 +++
 games-sports/torcs/torcs-1.3.6-r1.ebuild|  3 ++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/games-sports/torcs/files/torcs-1.3.6-gcc7.patch 
b/games-sports/torcs/files/torcs-1.3.6-gcc7.patch
new file mode 100644
index 000..af139ad509d
--- /dev/null
+++ b/games-sports/torcs/files/torcs-1.3.6-gcc7.patch
@@ -0,0 +1,11 @@
+--- a/src/libs/musicplayer/OpenALMusicPlayer.cpp
 b/src/libs/musicplayer/OpenALMusicPlayer.cpp
+@@ -161,7 +161,7 @@
+ {
+   char pcm[BUFFERSIZE];
+   int size = 0;
+-  const char* error = '\0';
++  const char* error = "";
+   
+   if (!stream->read(pcm, BUFFERSIZE, , )) {
+   GfError("OpenALMusicPlayer: Stream read error: %s\n", error);

diff --git a/games-sports/torcs/torcs-1.3.6-r1.ebuild 
b/games-sports/torcs/torcs-1.3.6-r1.ebuild
index c92083f6cbc..6b7ba9ad578 100644
--- a/games-sports/torcs/torcs-1.3.6-r1.ebuild
+++ b/games-sports/torcs/torcs-1.3.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -34,6 +34,7 @@ PATCHES=(
"${FILESDIR}"/${P}-format.patch
"${FILESDIR}"/${P}-noXmuXt.patch
"${FILESDIR}"/${P}-gcc6.patch
+   "${FILESDIR}"/${P}-gcc7.patch
 )
 
 src_prepare() {



[gentoo-commits] repo/gentoo:master commit in: games-sports/torcs/, games-sports/torcs/files/

2017-06-02 Thread David Seifert
commit: 1b99de510adbadfd03778f8cdf753ffd1b1e24db
Author: Peter Levine  gmail  com>
AuthorDate: Sat May 27 21:05:20 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Fri Jun  2 06:56:49 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b99de51

games-sports/torcs: Fix building with GCC-6

Bug: https://bugs.gentoo.org/show_bug.cgi?id=594670
Package-Manager: Portage-2.3.6, Repoman-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/4780

 games-sports/torcs/files/torcs-1.3.6-gcc6.patch | 11 +++
 games-sports/torcs/torcs-1.3.6-r1.ebuild|  3 ++-
 games-sports/torcs/torcs-1.3.6.ebuild   |  5 +++--
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/games-sports/torcs/files/torcs-1.3.6-gcc6.patch 
b/games-sports/torcs/files/torcs-1.3.6-gcc6.patch
new file mode 100644
index 000..6daf22a81b1
--- /dev/null
+++ b/games-sports/torcs/files/torcs-1.3.6-gcc6.patch
@@ -0,0 +1,11 @@
+--- a/src/drivers/olethros/geometry.cpp
 b/src/drivers/olethros/geometry.cpp
+@@ -27,6 +27,8 @@
+ #ifdef WIN32
+ #include 
+ #define isnan _isnan
++#elif __cplusplus >= 201103L
++using std::isnan;
+ #endif
+ 
+ 

diff --git a/games-sports/torcs/torcs-1.3.6-r1.ebuild 
b/games-sports/torcs/torcs-1.3.6-r1.ebuild
index da2ecb7763b..c92083f6cbc 100644
--- a/games-sports/torcs/torcs-1.3.6-r1.ebuild
+++ b/games-sports/torcs/torcs-1.3.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,6 +33,7 @@ PATCHES=(
"${FILESDIR}"/${P}-flags.patch
"${FILESDIR}"/${P}-format.patch
"${FILESDIR}"/${P}-noXmuXt.patch
+   "${FILESDIR}"/${P}-gcc6.patch
 )
 
 src_prepare() {

diff --git a/games-sports/torcs/torcs-1.3.6.ebuild 
b/games-sports/torcs/torcs-1.3.6.ebuild
index e447c13937a..c3716983355 100644
--- a/games-sports/torcs/torcs-1.3.6.ebuild
+++ b/games-sports/torcs/torcs-1.3.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -33,7 +33,8 @@ src_prepare() {
"${FILESDIR}"/${P}-as-needed.patch \
"${FILESDIR}"/${P}-flags.patch \
"${FILESDIR}"/${P}-format.patch \
-   "${FILESDIR}"/${P}-noXmuXt.patch
+   "${FILESDIR}"/${P}-noXmuXt.patch \
+   "${FILESDIR}"/${P}-gcc6.patch
eautoreconf
ecvs_clean
 }