summaryrefslogtreecommitdiff
path: root/games-sports/speed-dreams/files
diff options
context:
space:
mode:
Diffstat (limited to 'games-sports/speed-dreams/files')
-rw-r--r--games-sports/speed-dreams/files/speed-dreams-1.4.0-asneeded.patch110
-rw-r--r--games-sports/speed-dreams/files/speed-dreams-1.4.0-automake.patch35
-rw-r--r--games-sports/speed-dreams/files/speed-dreams-1.4.0-libpng15.patch20
-rw-r--r--games-sports/speed-dreams/files/speed-dreams-1.4.0-math-hack.patch25
4 files changed, 0 insertions, 190 deletions
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 779119d995b1..000000000000
--- 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 speed-dreams-users@lists.sourceforge.net 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 speed-dreams-users@lists.sourceforge.net 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 72c755af9ebd..000000000000
--- 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 6b09ce2a41c8..000000000000
--- 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 32b4f85a2000..000000000000
--- 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;