* [gentoo-commits] repo/gentoo:master commit in: games-sports/torcs/, games-sports/torcs/files/, profiles/
@ 2022-11-01 4:48 Jakov Smolić
0 siblings, 0 replies; only message in thread
From: Jakov Smolić @ 2022-11-01 4:48 UTC (permalink / raw
To: gentoo-commits
commit: 97caaf827ca530c3b8dcb7b1377bb403cac9b632
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 1 04:37:21 2022 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Tue Nov 1 04:37:21 2022 +0000
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ć <jsmolic <AT> 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..000000000000
--- a/games-sports/torcs/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST torcs-1.3.6.tar.bz2 477954437 BLAKE2B 294e2775f9d7a88b1781139793fedf1f5e79238ed46ffcda22188bdf9f991180b161ab1057fcfe72205033db43b7a134b9568055e62f2152462de4436b454726 SHA512 4116c920b92ecbf5dcd3f14a137e86685651167f68725f2ad4549b2d3d20e3dc54569685925e08ffff6e7e19e532ecb1a95ec77dfe22a542a26c9e006b0c8c0d
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..000000000000
--- 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-users@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-users@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-users@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",
-- LDFLAGS="$LDFLAGS")
--AC_CHECK_LIB(vorbisfile, ov_fopen, LDFLAGS="$LDFLAGS -lvorbisfile", AC_MSG_ERROR([Can't find libvorbis.]))
-+ LIBS="$LIBS -lalut", )
-+AC_CHECK_LIB(vorbisfile, ov_fopen, LIBS="$LIBS -lvorbisfile", AC_MSG_ERROR([Can't find libvorbis.]))
-+
-
- AC_CHECK_LIB(dl, dlopen)
- AC_CHECK_FUNC(dlopen,,AC_MSG_ERROR([Can't find dlopen function. 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\"]))
---- torcs-1.3.6.orig/src/libs/Makefile
-+++ torcs-1.3.6/src/libs/Makefile
-@@ -23,7 +23,7 @@
-
- TOOLSUBDIRS = txml
-
--SUBDIRS = confscreens racescreens robottools txml tgf tgfclient client raceengineclient learning \
-+SUBDIRS = confscreens racescreens robottools txml tgf tgfclient raceengineclient client learning \
- portability math musicplayer
-
- PKGSUBDIRS = $(SUBDIRS)
---- torcs-1.3.6.orig/src/libs/client/Makefile
-+++ torcs-1.3.6/src/libs/client/Makefile
-@@ -23,6 +23,8 @@
- SOURCES = entry.cpp mainmenu.cpp splash.cpp exitmenu.cpp \
- optionmenu.cpp
-
-+SOLIBS = -lconfscreens -lraceengine
-+
- LIBS = -lplibssg -lplibsg -lplibul
-
- EXPDIR = include
---- torcs-1.3.6.orig/src/libs/tgf/Makefile
-+++ torcs-1.3.6/src/libs/tgf/Makefile
-@@ -29,6 +29,7 @@
- profiler.cpp \
- hash.cpp
-
-+SOLIBS = -ltxml
-
- EXPDIR = include
-
diff --git a/games-sports/torcs/files/torcs-1.3.6-flags.patch b/games-sports/torcs/files/torcs-1.3.6-flags.patch
deleted file mode 100644
index 5f11fd270ef1..000000000000
--- a/games-sports/torcs/files/torcs-1.3.6-flags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-respect cflags
-
---- torcs-1.3.6/configure.in
-+++ torcs-1.3.6/configure.in
-@@ -50,8 +50,7 @@
- ADDCFLAGS="-Wall -fPIC -fno-strict-aliasing"
- AC_ARG_ENABLE(debug,
- [ --enable-debug set the debug mode],
-- ADDCFLAGS="$ADDCFLAGS -g -DDEBUG -DDEBUG_OUT",
-- ADDCFLAGS="$ADDCFLAGS -O2")
-+ ADDCFLAGS="$ADDCFLAGS -g -DDEBUG -DDEBUG_OUT")
-
- AC_ARG_ENABLE(xrandr,
- [ --disable-xrandr reset the XRANDR mode],
diff --git a/games-sports/torcs/files/torcs-1.3.6-format.patch b/games-sports/torcs/files/torcs-1.3.6-format.patch
deleted file mode 100644
index da59c4da4fa0..000000000000
--- a/games-sports/torcs/files/torcs-1.3.6-format.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- 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;
-
-- printf(title);
-+ printf("%s", title);
- for (j = 0; j < 4; j ++){
- for (i = 0; i < 4; i ++) {
- printf("%.6f ", m[i][j]);
---- 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;
- 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/files/torcs-1.3.6-gcc6.patch b/games-sports/torcs/files/torcs-1.3.6-gcc6.patch
deleted file mode 100644
index 6daf22a81b11..000000000000
--- a/games-sports/torcs/files/torcs-1.3.6-gcc6.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/drivers/olethros/geometry.cpp
-+++ b/src/drivers/olethros/geometry.cpp
-@@ -27,6 +27,8 @@
- #ifdef WIN32
- #include <float.h>
- #define isnan _isnan
-+#elif __cplusplus >= 201103L
-+using std::isnan;
- #endif
-
-
diff --git a/games-sports/torcs/files/torcs-1.3.6-gcc7.patch b/games-sports/torcs/files/torcs-1.3.6-gcc7.patch
deleted file mode 100644
index af139ad509de..000000000000
--- a/games-sports/torcs/files/torcs-1.3.6-gcc7.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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, &size, &error)) {
- GfError("OpenALMusicPlayer: Stream read error: %s\n", error);
diff --git a/games-sports/torcs/files/torcs-1.3.6-no-automake.patch b/games-sports/torcs/files/torcs-1.3.6-no-automake.patch
deleted file mode 100644
index 9b47bfb9a64c..000000000000
--- a/games-sports/torcs/files/torcs-1.3.6-no-automake.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-torcs doesn't use automake, so it shouldn't be calling the macro
-
-http://bugs.gentoo.org/408473
-
---- torcs-1.3.6.orig/configure.in
-+++ torcs-1.3.6/configure.in
-@@ -15,9 +15,12 @@
- #
- ##############################################################################
-
--AC_INIT(Make-config.in)
-+AC_INIT(torcs, 1.3.6)
- AC_CONFIG_HEADERS(config.h)
--AM_INIT_AUTOMAKE(torcs, 1.3.6)
-+dnl Workaround code using old VERSION instead of new PACKAGE_VERSION
-+VERSION=$PACKAGE_VERSION
-+AC_DEFINE_UNQUOTED([VERSION], "$VERSION", [old VERSION workaround])
-+AC_SUBST(VERSION)
-
- dnl Checks for programs.
- AC_PROG_CC
diff --git a/games-sports/torcs/files/torcs-1.3.6-noXmuXt.patch b/games-sports/torcs/files/torcs-1.3.6-noXmuXt.patch
deleted file mode 100644
index f87fb750d199..000000000000
--- a/games-sports/torcs/files/torcs-1.3.6-noXmuXt.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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:
- AC_CHECK_LIB(SM, SmsSetErrorHandler,,AC_MSG_ERROR([Can't find libSM. 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 -lXt:
--AC_CHECK_LIB(Xt, XtDisplay,,AC_MSG_ERROR([Can't find libXt. 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 -lXi:
- AC_CHECK_LIB(Xi, XOpenDevice,,AC_MSG_ERROR([Can't find libXi. 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 -lXmu:
--AC_CHECK_LIB(Xmu, XmuSimpleErrorHandler,,AC_MSG_ERROR([Can't find libXmu. 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\"]))
- 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-users@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-users@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-users@lists.sourceforge.net with the subject \"torcs compilation problem\"]))
diff --git a/games-sports/torcs/metadata.xml b/games-sports/torcs/metadata.xml
deleted file mode 100644
index d676ee2e4e32..000000000000
--- a/games-sports/torcs/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>games@gentoo.org</email>
- <name>Gentoo Games Project</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">torcs</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/games-sports/torcs/torcs-1.3.6-r2.ebuild b/games-sports/torcs/torcs-1.3.6-r2.ebuild
deleted file mode 100644
index 00ec9f2fc5d5..000000000000
--- a/games-sports/torcs/torcs-1.3.6-r2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools desktop vcs-clean
-
-DESCRIPTION="The Open Racing Car Simulator"
-HOMEPAGE="http://torcs.sourceforge.net/"
-SRC_URI="mirror://sourceforge/torcs/${P}.tar.bz2"
-
-LICENSE="GPL-2+ Free-Art-1.2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-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-base/xorg-proto"
-
-PATCHES=(
- "${FILESDIR}"/${P}-no-automake.patch
- "${FILESDIR}"/${P}-as-needed.patch
- "${FILESDIR}"/${P}-flags.patch
- "${FILESDIR}"/${P}-format.patch
- "${FILESDIR}"/${P}-noXmuXt.patch
- "${FILESDIR}"/${P}-gcc6.patch
- "${FILESDIR}"/${P}-gcc7.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
-}
diff --git a/profiles/package.mask b/profiles/package.mask
index 7df7cb3be0fc..1804812f2ec4 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -376,13 +376,6 @@ games-simulation/bcs-demo
=app-shells/bash-5.2*
=sys-libs/readline-8.2*
-# Michał Górny <mgorny@gentoo.org> (2022-09-26)
-# Bundles a vulnerable version of dev-libs/expat. The current Gentoo
-# version is from 2014, pending bump to the last upstream release
-# from 2016. Effectively unmaintained. EAPI 6.
-# Removal on 2022-10-26. Bug #253517.
-games-sports/torcs
-
# John Helmert III <ajak@gentoo.org> (2022-09-18)
# Unfixed root privilege escalation, bug #631552
sys-cluster/slurm
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2022-11-01 4:48 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-11-01 4:48 [gentoo-commits] repo/gentoo:master commit in: games-sports/torcs/, games-sports/torcs/files/, profiles/ Jakov Smolić
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox