* [gentoo-commits] repo/gentoo:master commit in: games-sports/torcs/files/, games-sports/torcs/
@ 2015-12-23 20:12 Alfredo Tupone
0 siblings, 0 replies; 2+ messages in thread
From: Alfredo Tupone @ 2015-12-23 20:12 UTC (permalink / raw
To: gentoo-commits
commit: e417a0e5984a8f6d67adb4684590651052302ace
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 23 20:11:37 2015 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Wed Dec 23 20:12:13 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e417a0e5
games-sports/torcs: compile with format-security. Bug #539232
Package-Manager: portage-2.2.24
games-sports/torcs/files/torcs-1.3.6-format.patch | 34 +++++++++++++++++++++++
games-sports/torcs/torcs-1.3.6.ebuild | 1 +
2 files changed, 35 insertions(+)
diff --git a/games-sports/torcs/files/torcs-1.3.6-format.patch b/games-sports/torcs/files/torcs-1.3.6-format.patch
new file mode 100644
index 0000000..52e7db6
--- /dev/null
+++ b/games-sports/torcs/files/torcs-1.3.6-format.patch
@@ -0,0 +1,34 @@
+--- src/tools/texmapper/maintexmapper.cpp.old 2015-12-23 20:55:24.874102363 +0100
++++ src/tools/texmapper/maintexmapper.cpp 2015-12-23 20:55:55.071553325 +0100
+@@ -103,7 +103,7 @@
+ {
+ int i, j;
+
+- printf(title);
++ printf("%s", title);
+ for (j = 0; j < 4; j ++){
+ for (i = 0; i < 4; i ++) {
+ printf("%.6f ", m[i][j]);
+--- src/tools/trackgen/objects.cpp.old 2015-12-23 20:59:49.671287196 +0100
++++ src/tools/trackgen/objects.cpp 2015-12-23 21:02:21.639523189 +0100
+@@ -234,9 +234,9 @@
+
+ ssgLeaf *vt = (ssgLeaf *)ent;
+ if (vt->getCullFace() == TRUE) {
+- surf = "SURF 0x10\n";
++ surf = "0x10";
+ } else {
+- surf = "SURF 0x30\n";
++ surf = "0x30";
+ }
+
+ int num_verts = vt->getNumVertices();
+@@ -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, "SURF %s\n", surf);
+ fprintf (save_fd, "mat 0\n");
+ fprintf (save_fd, "refs 3\n");
+ fprintf (save_fd, "%d %g %g\n",
diff --git a/games-sports/torcs/torcs-1.3.6.ebuild b/games-sports/torcs/torcs-1.3.6.ebuild
index 4c01238..fdd634c 100644
--- a/games-sports/torcs/torcs-1.3.6.ebuild
+++ b/games-sports/torcs/torcs-1.3.6.ebuild
@@ -33,6 +33,7 @@ src_prepare() {
"${FILESDIR}"/${P}-no-automake.patch \
"${FILESDIR}"/${P}-as-needed.patch \
"${FILESDIR}"/${P}-flags.patch \
+ "${FILESDIR}"/${P}-format.patch \
"${FILESDIR}"/${P}-noXmuXt.patch
eautoreconf
ecvs_clean
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-sports/torcs/files/, games-sports/torcs/
@ 2016-10-03 19:12 Austin English
0 siblings, 0 replies; 2+ messages in thread
From: Austin English @ 2016-10-03 19:12 UTC (permalink / raw
To: gentoo-commits
commit: 322ca4a77a64118ce235bad1cf5b310bb72fc9b7
Author: Austin English <wizardedit <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 3 18:55:58 2016 +0000
Commit: Austin English <wizardedit <AT> gentoo <DOT> org>
CommitDate: Mon Oct 3 19:11:17 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=322ca4a7
games-sports/torcs: remove deprecated games eclass
Also update to EAPI 6
Gentoo-Bug: https://bugs.gentoo.org/574082
Package-Manager: portage-2.3.0
games-sports/torcs/files/torcs-1.3.6-format.patch | 8 +--
games-sports/torcs/files/torcs-1.3.6-noXmuXt.patch | 4 +-
games-sports/torcs/torcs-1.3.6-r1.ebuild | 67 ++++++++++++++++++++++
3 files changed, 73 insertions(+), 6 deletions(-)
diff --git a/games-sports/torcs/files/torcs-1.3.6-format.patch b/games-sports/torcs/files/torcs-1.3.6-format.patch
index 52e7db6..da59c4d 100644
--- a/games-sports/torcs/files/torcs-1.3.6-format.patch
+++ b/games-sports/torcs/files/torcs-1.3.6-format.patch
@@ -1,5 +1,5 @@
---- src/tools/texmapper/maintexmapper.cpp.old 2015-12-23 20:55:24.874102363 +0100
-+++ src/tools/texmapper/maintexmapper.cpp 2015-12-23 20:55:55.071553325 +0100
+--- a/src/tools/texmapper/maintexmapper.cpp 2015-12-23 20:55:24.874102363 +0100
++++ b/src/tools/texmapper/maintexmapper.cpp 2015-12-23 20:55:55.071553325 +0100
@@ -103,7 +103,7 @@
{
int i, j;
@@ -9,8 +9,8 @@
for (j = 0; j < 4; j ++){
for (i = 0; i < 4; i ++) {
printf("%.6f ", m[i][j]);
---- src/tools/trackgen/objects.cpp.old 2015-12-23 20:59:49.671287196 +0100
-+++ src/tools/trackgen/objects.cpp 2015-12-23 21:02:21.639523189 +0100
+--- a/src/tools/trackgen/objects.cpp 2015-12-23 20:59:49.671287196 +0100
++++ b/src/tools/trackgen/objects.cpp 2015-12-23 21:02:21.639523189 +0100
@@ -234,9 +234,9 @@
ssgLeaf *vt = (ssgLeaf *)ent;
diff --git a/games-sports/torcs/files/torcs-1.3.6-noXmuXt.patch b/games-sports/torcs/files/torcs-1.3.6-noXmuXt.patch
index 6f4a2e4..f87fb75 100644
--- a/games-sports/torcs/files/torcs-1.3.6-noXmuXt.patch
+++ b/games-sports/torcs/files/torcs-1.3.6-noXmuXt.patch
@@ -1,5 +1,5 @@
---- configure.in.old
-+++ configure.in
+--- a/configure.in
++++ b/configure.in
@@ -116,12 +116,8 @@
AC_CHECK_LIB(ICE, IceSetIOErrorHandler,,AC_MSG_ERROR([Can't find libICE. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"]))
dnl Replace `main' with a function in -lSM:
diff --git a/games-sports/torcs/torcs-1.3.6-r1.ebuild b/games-sports/torcs/torcs-1.3.6-r1.ebuild
new file mode 100644
index 00000000..16b587c
--- /dev/null
+++ b/games-sports/torcs/torcs-1.3.6-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit autotools eutils multilib
+
+DESCRIPTION="The Open Racing Car Simulator"
+HOMEPAGE="http://torcs.sourceforge.net/"
+SRC_URI="mirror://sourceforge/torcs/${P}.tar.bz2"
+
+LICENSE="GPL-2 FreeArt"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="media-libs/freealut
+ media-libs/freeglut
+ media-libs/libpng:0
+ media-libs/libvorbis:=
+ media-libs/openal
+ >=media-libs/plib-1.8.5
+ sys-libs/zlib:0=
+ virtual/opengl
+ virtual/glu
+ x11-libs/libX11
+ x11-libs/libXrandr"
+DEPEND="${RDEPEND}
+ x11-proto/xf86vidmodeproto"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-no-automake.patch
+ "${FILESDIR}"/${P}-as-needed.patch
+ "${FILESDIR}"/${P}-flags.patch
+ "${FILESDIR}"/${P}-format.patch
+ "${FILESDIR}"/${P}-noXmuXt.patch
+)
+
+src_prepare() {
+ default
+
+ eautoreconf
+ ecvs_clean
+}
+
+src_configure() {
+ addpredict $(echo /dev/snd/controlC? | sed 's/ /:/g')
+ [[ -e /dev/dsp ]] && addpredict /dev/dsp
+ econf \
+ --datadir=/usr/share \
+ --x-libraries=/usr/$(get_libdir) \
+ --enable-xrandr
+}
+
+src_compile() {
+ # So ugly... patches welcome.
+ emake -j1
+}
+
+src_install() {
+ emake -j1 DESTDIR="${D}" install datainstall
+ newicon Ticon.png ${PN}.png
+ make_desktop_entry ${PN} TORCS
+ dodoc README doc/history/history.txt
+ doman doc/man/*.6
+ dodoc -r doc/faq/faq.html doc/tutorials doc/userman
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-10-03 19:12 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-03 19:12 [gentoo-commits] repo/gentoo:master commit in: games-sports/torcs/files/, games-sports/torcs/ Austin English
-- strict thread matches above, loose matches on Subject: below --
2015-12-23 20:12 Alfredo Tupone
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox