commit: 97b25755a4c5f5e19c7fb0b38c6f00638d40668a Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Tue Aug 24 16:50:36 2021 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Tue Aug 24 17:51:40 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97b25755
games-sports/speed-dreams: drop 1.4.0-r1 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> games-sports/speed-dreams/Manifest | 1 - .../files/speed-dreams-1.4.0-asneeded.patch | 110 --------------------- .../files/speed-dreams-1.4.0-automake.patch | 35 ------- .../files/speed-dreams-1.4.0-libpng15.patch | 20 ---- .../files/speed-dreams-1.4.0-math-hack.patch | 25 ----- games-sports/speed-dreams/metadata.xml | 1 - .../speed-dreams/speed-dreams-1.4.0-r1.ebuild | 85 ---------------- 7 files changed, 277 deletions(-) diff --git a/games-sports/speed-dreams/Manifest b/games-sports/speed-dreams/Manifest index cfdb3ed86f9..cbc10cc3761 100644 --- a/games-sports/speed-dreams/Manifest +++ b/games-sports/speed-dreams/Manifest @@ -1,4 +1,3 @@ -DIST speed-dreams-1.4.0-r2307-src.tar.bz2 332667666 BLAKE2B 17455c6fc6bbe0cb4b5e00d4217eb49e0f6e39a8aa389f304771e32429c48e2e6bc834d8d0c7a01927376c5b37ae8e7b27399da88784b5f46b9549d46d01222f SHA512 6ae88691f52480351825c20c8bfb3ff54783b84bfbbc385ae2c0578991fa9025b16dcdc4ce136b85246a2a479452f2b209ecbec2be0a7ae85818929ea5fa1195 DIST speed-dreams-src-base-2.2.3-r7616.tar.xz 238067340 BLAKE2B 5250a295fd077ab5c773bfb066416a2b0abfbd667e99c5c7a360898121af9dc757cf6afd003e220b9e76e687040d80687f8f78d445d6b98064efa396f5b1b4b7 SHA512 a98913625a78a67f7428649c6f3c426d32537b5f1b9331540bb32926568d281e1ec0e80bf45e5d847f43ee00b2d0c5945be96d86ac36d840b79dd3da82920960 DIST speed-dreams-src-hq-cars-and-tracks-2.2.3-r7616.tar.xz 578705056 BLAKE2B 8b354211686ca6183ada892c844fa0345f2b751b786194d2d52e37a25c8dcf048e91862f2964c337e02765fba4e7bafa81539355a2b00af68476704ddc85c817 SHA512 4a488daeb1161dbc61ca95c5152d38864f759bbc2d0d8cc4d4c4a258aa143dedab55f16ba3343657b2fe8544e1f33ee0bc82e2cdeda7a7087a283e2513a8b6c6 DIST speed-dreams-src-more-hq-cars-and-tracks-2.2.3-r7616.tar.xz 668751780 BLAKE2B f4c528eebdecc337394a08100e45eb66a8ad5e85164813a27a406d6b54089cd640874d37680588bfffcf3f1fdc274fd2329defb9d052ef2833c86dec8be21c9d SHA512 e8256c28697dd78794c41f2dc659d7aa455f0e5967b3178fbe17eb4adf6ef93ed719621f38afd78c8d0a548bcb7b61bb0859755b4867fee21096fe0925acfd89 diff --git a/games-sports/speed-dreams/files/speed-dreams-1.4.0-asneeded.patch b/games-sports/speed-dreams/files/speed-dreams-1.4.0-asneeded.patch deleted file mode 100644 index 779119d995b..00000000000 --- a/games-sports/speed-dreams/files/speed-dreams-1.4.0-asneeded.patch +++ /dev/null @@ -1,110 +0,0 @@ ---- a/configure.in -+++ b/configure.in -@@ -123,8 +123,7 @@ - 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 [email protected] with the subject \"Speed Dreams compilation problem\"])) - AC_CHECK_LIB(openal, alEnable,, 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") -+ LIBS="$LIBS -lalut", ) - - 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 [email protected] with the subject \"Speed Dreams compilation problem\"])) -@@ -141,7 +140,7 @@ - AC_CHECK_LIB(glut, glutSwapBuffers,,AC_MSG_ERROR([Can't find libglut. freeglut can be found on http://freeglut.sourceforge.net/])) - - dnl Checks for plib libraries. --LDFLAGS="$LDFLAGS -lplibjs" -+AC_CHECK_LIB(plibjs, main,,AC_MSG_ERROR([Can't find libplibjs. PLIB can be found on http://plib.sourceforge.net/])) - AC_CHECK_LIB(plibul, main,,AC_MSG_ERROR([Can't find libplibul. PLIB can be found on http://plib.sourceforge.net/])) - AC_CHECK_LIB(plibsg, main,,AC_MSG_ERROR([Can't find libplibsg. PLIB can be found on http://plib.sourceforge.net/])) - AC_CHECK_LIB(plibsl, main,,AC_MSG_ERROR([Can't find libplibsl. PLIB can be found on http://plib.sourceforge.net/])) ---- a/Make-default.mk -+++ b/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} ${CXXFLAGS} ${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} ${CXXFLAGS} ${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} ${CXXFLAGS} ${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} ${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 ; \ ---- a/src/libs/client/Makefile -+++ b/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 ---- a/src/libs/Makefile -+++ b/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 - - PKGSUBDIRS = $(SUBDIRS) ---- a/src/libs/raceengineclient/Makefile -+++ b/src/libs/raceengineclient/Makefile -@@ -23,6 +23,8 @@ - SOURCES = singleplayer.cpp raceinit.cpp racemain.cpp racemanmenu.cpp racestate.cpp racegl.cpp \ - raceengine.cpp raceresults.cpp - -+SOLIBS = -lconfscreens -lrobottools -lracescreens -+ - EXPDIR = include - - EXPORTS = singleplayer.h raceinit.h ---- a/src/libs/tgf/Makefile -+++ b/src/libs/tgf/Makefile -@@ -29,6 +29,7 @@ - profiler.cpp \ - hash.cpp - -+SOLIBS = -ltxml - - EXPDIR = include - diff --git a/games-sports/speed-dreams/files/speed-dreams-1.4.0-automake.patch b/games-sports/speed-dreams/files/speed-dreams-1.4.0-automake.patch deleted file mode 100644 index 72c755af9eb..00000000000 --- a/games-sports/speed-dreams/files/speed-dreams-1.4.0-automake.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- a/configure.in 2012-03-13 08:15:34.891163505 +0100 -+++ b/configure.in 2012-03-13 08:18:40.154092687 +0100 -@@ -14,9 +14,10 @@ - # - ############################################################################## - --AC_INIT(Make-config.in) -+AC_INIT([speed-dreams], [1.4.0-r2307]) -+AC_CONFIG_SRCDIR([Make-config.in]) - AC_CONFIG_HEADERS(config.h) --AM_INIT_AUTOMAKE(speed-dreams, 1.4.0-r2307) -+AC_DEFINE(VERSION, ["1.4.0-r2307"], [Version]) - - dnl Checks for programs. - AC_PROG_CC ---- a/Makefile 2012-03-13 10:43:30.563720337 +0100 -+++ b/Makefile 2012-03-13 10:44:26.339794119 +0100 -@@ -88,17 +88,7 @@ - -include ${MAKE_DEFAULT} - - Make-config: configure Make-config.in -- rm -f config.status config.log config.cache - ./configure -- rm -f config.status config.log config.cache -- --configure: configure.in config.h.in aclocal.m4 -- rm -f config.status config.log config.cache -- autoheader -- autoconf -- --aclocal.m4: acinclude.m4 -- aclocal - - distclean: clean - rm -f config.status config.log config.cache diff --git a/games-sports/speed-dreams/files/speed-dreams-1.4.0-libpng15.patch b/games-sports/speed-dreams/files/speed-dreams-1.4.0-libpng15.patch deleted file mode 100644 index 6b09ce2a41c..00000000000 --- a/games-sports/speed-dreams/files/speed-dreams-1.4.0-libpng15.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/src/libs/tgfclient/img.cpp -+++ b/src/libs/tgfclient/img.cpp -@@ -98,7 +98,7 @@ - return (unsigned char *)NULL; - } - -- if (setjmp(png_ptr->jmpbuf)) -+ if (setjmp(png_jmpbuf(png_ptr))) - { - /* Free all of the memory associated with the png_ptr and info_ptr */ - png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); -@@ -229,7 +229,7 @@ - return -1; - } - -- if (setjmp(png_ptr->jmpbuf)) { -+ if (setjmp(png_jmpbuf(png_ptr))) { - png_destroy_write_struct(&png_ptr, &info_ptr); - fclose(fp); - return -1; diff --git a/games-sports/speed-dreams/files/speed-dreams-1.4.0-math-hack.patch b/games-sports/speed-dreams/files/speed-dreams-1.4.0-math-hack.patch deleted file mode 100644 index 32b4f85a200..00000000000 --- a/games-sports/speed-dreams/files/speed-dreams-1.4.0-math-hack.patch +++ /dev/null @@ -1,25 +0,0 @@ -https://sourceforge.net/p/speed-dreams/tickets/952/ -https://bugs.gentoo.org/580054 - ---- a/src/modules/simu/simuv2/simu.cpp -+++ b/src/modules/simu/simuv2/simu.cpp -@@ -61,7 +61,7 @@ - if (isnan(car->ctrl->brakeCmd) || isinf(car->ctrl->brakeCmd)) car->ctrl->brakeCmd = 0; - if (isnan(car->ctrl->clutchCmd) || isinf(car->ctrl->clutchCmd)) car->ctrl->clutchCmd = 0; - if (isnan(car->ctrl->steer) || isinf(car->ctrl->steer)) car->ctrl->steer = 0; -- if (isnan(car->ctrl->gear) || isinf(car->ctrl->gear)) car->ctrl->gear = 0; -+ if (isnan((float)car->ctrl->gear) || isinf((float)car->ctrl->gear)) car->ctrl->gear = 0; - #else - if (isnan(car->ctrl->accelCmd)) car->ctrl->accelCmd = 0; - if (isnan(car->ctrl->brakeCmd)) car->ctrl->brakeCmd = 0; ---- a/src/modules/simu/simuv3/simu.cpp -+++ b/src/modules/simu/simuv3/simu.cpp -@@ -61,7 +61,7 @@ - if (isnan(car->ctrl->brakeCmd) || isinf(car->ctrl->brakeCmd)) car->ctrl->brakeCmd = 0; - if (isnan(car->ctrl->clutchCmd) || isinf(car->ctrl->clutchCmd)) car->ctrl->clutchCmd = 0; - if (isnan(car->ctrl->steer) || isinf(car->ctrl->steer)) car->ctrl->steer = 0; -- if (isnan(car->ctrl->gear) || isinf(car->ctrl->gear)) car->ctrl->gear = 0; -+ if (isnan((float)car->ctrl->gear) || isinf((float)car->ctrl->gear)) car->ctrl->gear = 0; - #else - if (isnan(car->ctrl->accelCmd)) car->ctrl->accelCmd = 0; - if (isnan(car->ctrl->brakeCmd)) car->ctrl->brakeCmd = 0; diff --git a/games-sports/speed-dreams/metadata.xml b/games-sports/speed-dreams/metadata.xml index 98a79c4a7da..11c234f855b 100644 --- a/games-sports/speed-dreams/metadata.xml +++ b/games-sports/speed-dreams/metadata.xml @@ -8,7 +8,6 @@ <use> <flag name="osggraph">Enable the new work-in-progress 3D engine using <pkg>dev-games/openscenegraph</pkg></flag> <flag name="webstats">Enable support for sending racing statistics to a web server (experimental)</flag> - <flag name="xrandr">Enable support for the X xrandr extension</flag> </use> <upstream> <remote-id type="sourceforge">speed-dreams</remote-id> diff --git a/games-sports/speed-dreams/speed-dreams-1.4.0-r1.ebuild b/games-sports/speed-dreams/speed-dreams-1.4.0-r1.ebuild deleted file mode 100644 index d57867be7fb..00000000000 --- a/games-sports/speed-dreams/speed-dreams-1.4.0-r1.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools desktop versionator - -DESCRIPTION="A fork of the famous open racing car simulator TORCS" -HOMEPAGE="http://speed-dreams.sourceforge.net/"; -SRC_URI="mirror://sourceforge/speed-dreams/${P}-r2307-src.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="xrandr" - -RDEPEND="virtual/opengl - virtual/glu - media-libs/freealut - media-libs/freeglut - >=media-libs/libpng-1.2.40:0 - media-libs/openal - sys-libs/zlib - x11-libs/libX11 - x11-libs/libXxf86vm - xrandr? ( x11-libs/libXrandr )" -DEPEND="${RDEPEND} - >=media-libs/plib-1.8.3 - x11-libs/libICE - x11-libs/libSM - x11-libs/libXext - x11-libs/libXi - x11-libs/libXt - x11-libs/libXmu - x11-libs/libXrender - x11-base/xorg-proto" - -S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)-src - -PATCHES=( - "${FILESDIR}"/${P}-asneeded.patch - "${FILESDIR}"/${P}-automake.patch - "${FILESDIR}"/${P}-libpng15.patch - "${FILESDIR}"/${P}-math-hack.patch -) - -src_prepare() { - default - - # https://sourceforge.net/apps/trac/speed-dreams/ticket/111 - MAKEOPTS="${MAKEOPTS} -j1" - - sed -i \ - -e '/ADDCFLAGS/s: -O2::' \ - configure.in || die - sed -i \ - -e '/COPYING/s:=.*:= \\:' \ - Makefile || die - sed -i \ - -e '/LDFLAGS/s:-L/usr/lib::' \ - -e "/^datadir/s:=.*:= /usr/share/games/${PN}:" \ - Make-config.in || die - - eautoreconf -} - -src_configure() { - addpredict $(echo /dev/snd/controlC? | sed 's/ /:/g') - [[ -e /dev/dsp ]] && addpredict /dev/dsp - econf \ - --prefix=/usr \ - --bindir=/usr/bin \ - $(use_enable xrandr) -} - -src_install() { - emake DESTDIR="${ED}" install datainstall - - find "${ED}" -name Makefile -exec rm -f {} + || die - - dodoc CHANGES README TODO - - newicon icon.svg ${PN}.svg - make_desktop_entry ${PN} "Speed Dreams" -}
