[gentoo-commits] gentoo-x86 commit in games-sports/torcs/files: torcs-1.3.6-flags.patch torcs-1.3.6-as-needed.patch torcs-1.3.6-noXmuXt.patch torcs-1.3.4-noXmuXt.patch torcs-1.3.6-no-automake.patch

[Michael Sterrett (mr_bones_)]

mr_bones_    14/09/02 00:53:59

  Modified:             torcs-1.3.4-noXmuXt.patch
  Added:                torcs-1.3.6-flags.patch torcs-1.3.6-as-needed.patch
                        torcs-1.3.6-noXmuXt.patch
                        torcs-1.3.6-no-automake.patch
  Log:
  version bump
  
  (Portage version: 2.2.8-r1/cvs/Linux x86_64, unsigned Manifest commit)

Revision  Changes    Path
1.2                  games-sports/torcs/files/torcs-1.3.4-noXmuXt.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-sports/torcs/files/torcs-1.3.4-noXmuXt.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-sports/torcs/files/torcs-1.3.4-noXmuXt.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-sports/torcs/files/torcs-1.3.4-noXmuXt.patch?r1=1.1&r2=1.2

Index: torcs-1.3.4-noXmuXt.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/games-sports/torcs/files/torcs-1.3.4-noXmuXt.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- torcs-1.3.4-noXmuXt.patch	19 Jul 2014 13:55:10 -0000	1.1
+++ torcs-1.3.4-noXmuXt.patch	2 Sep 2014 00:53:59 -0000	1.2
@@ -1,5 +1,5 @@
---- configure.in.old	2014-07-19 15:43:50.480681694 +0200
-+++ configure.in	2014-07-19 15:44:12.487294592 +0200
+--- configure.in.old
++++ 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@×××××××××××××××××.net with the subject \"torcs compilation problem\"]))
  dnl Replace `main' with a function in -lSM:



1.1                  games-sports/torcs/files/torcs-1.3.6-flags.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-sports/torcs/files/torcs-1.3.6-flags.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-sports/torcs/files/torcs-1.3.6-flags.patch?rev=1.1&content-type=text/plain

Index: torcs-1.3.6-flags.patch
===================================================================
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],



1.1                  games-sports/torcs/files/torcs-1.3.6-as-needed.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-sports/torcs/files/torcs-1.3.6-as-needed.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-sports/torcs/files/torcs-1.3.6-as-needed.patch?rev=1.1&content-type=text/plain

Index: torcs-1.3.6-as-needed.patch
===================================================================
--- 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@×××××××××××××××××.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@×××××××××××××××××.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@×××××××××××××××××.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@×××××××××××××××××.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
 



1.1                  games-sports/torcs/files/torcs-1.3.6-noXmuXt.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-sports/torcs/files/torcs-1.3.6-noXmuXt.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-sports/torcs/files/torcs-1.3.6-noXmuXt.patch?rev=1.1&content-type=text/plain

Index: torcs-1.3.6-noXmuXt.patch
===================================================================
--- configure.in.old
+++ 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@×××××××××××××××××.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@×××××××××××××××××.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@×××××××××××××××××.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@×××××××××××××××××.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@×××××××××××××××××.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@×××××××××××××××××.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@×××××××××××××××××.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@×××××××××××××××××.net with the subject \"torcs compilation problem\"]))



1.1                  games-sports/torcs/files/torcs-1.3.6-no-automake.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-sports/torcs/files/torcs-1.3.6-no-automake.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-sports/torcs/files/torcs-1.3.6-no-automake.patch?rev=1.1&content-type=text/plain

Index: torcs-1.3.6-no-automake.patch
===================================================================
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