# HG changeset patch # User Nathan Phillip Brink # Date 2010-03-07 20:28:51 # Node ID 6424c64f7f8ce285ecee2eb1b797f23bc912ebb1 # Parent d1a1af703944512c63d4bde600be940a8238abaf games-action/supertuxkart: Patch to use SDL.h instead of SDL/SDL.h for multilib-portage. diff --git a/games-action/supertuxkart/ChangeLog b/games-action/supertuxkart/ChangeLog --- a/games-action/supertuxkart/ChangeLog +++ b/games-action/supertuxkart/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/games-action/supertuxkart/ChangeLog,v 1.17 2010/01/03 21:57:03 mr_bones_ Exp $ + 08 Mar 2010; Nathan Phillip Brink (ohnobinki) + supertuxkart-0.6.2.ebuild, + +files/supertuxkart-0.6.2-SDL.h-portage-multilib.patch: + Patch to use SDL.h instead of SDL/SDL.h by using AM_PATH_SDL from libsdl. + Now should work with multilib-portage. + 03 Jan 2010; Michael Sterrett supertuxkart-0.6.2.ebuild: add USE=nls support (bug #299446) diff --git a/games-action/supertuxkart/Manifest b/games-action/supertuxkart/Manifest --- a/games-action/supertuxkart/Manifest +++ b/games-action/supertuxkart/Manifest @@ -1,5 +1,6 @@ +AUX supertuxkart-0.6.2-SDL.h-portage-multilib.patch 9089 RMD160 7a982c0c7d6147e34540c96c69c18099cf62f887 SHA1 5e7632d04582f42ebcc4b9d0a87690b61bbefcce SHA256 3c0ddbb16dc318eda374d35c840b6075305b8f1d679839594f8d133e3d06289e DIST supertuxkart-0.6.2-src.tar.bz2 96469878 RMD160 c4946c1ae4df7254a49d218fc39b2dde8b7cfad5 SHA1 58ee28a74540f81649274147f657a23caf0acaab SHA256 081286efecdda07aab5b567728ef70188fe15f4cef174c785f76045d48394a34 DIST supertuxkart.png 4435 RMD160 9b20e00cc1f4c2d50f6ec192881a672d95189099 SHA1 0f97ba6cdf0b8abffb39a44e5e654c76848fe366 SHA256 99bc1801cb0514946cb0171d6d5a84484b6dc881edfa7f096b6eb5fea2f28828 -EBUILD supertuxkart-0.6.2.ebuild 1776 RMD160 8cc0b008f3a899a718c5df62a98484b6c1d94ae7 SHA1 87628912c68cbae2cdc80390c49d05857c9fb945 SHA256 b74e9e1bd87f3a82ac129ccdef7ade2eed7151e38e91d0d2e89567e15992d4af +EBUILD supertuxkart-0.6.2.ebuild 1836 RMD160 aaeeaa9cc39b5decf18d25bef18bb9773053a265 SHA1 900fee1a33b906e83979af6a3528467f99391c7d SHA256 0829bc43881d83cbb1f5c2c7a6ae90b39681a73276cc5dfe56f026d7689e3278 MISC ChangeLog 2296 RMD160 28f2aaac4a3fca5ff8b3859c4498dd3be4d49e59 SHA1 24cbb3e7a769f0f569a44a7a1902d6019f9e7bff SHA256 394ca8e1f316d21dda1938992d1cb50b9b147e21f4db9212103757cc33cf4876 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 diff --git a/games-action/supertuxkart/files/supertuxkart-0.6.2-SDL.h-portage-multilib.patch b/games-action/supertuxkart/files/supertuxkart-0.6.2-SDL.h-portage-multilib.patch new file mode 100644 --- /dev/null +++ b/games-action/supertuxkart/files/supertuxkart-0.6.2-SDL.h-portage-multilib.patch @@ -0,0 +1,319 @@ +Patch against https://supertuxkart.svn.sourceforge.net/svnroot/supertuxkart/main/branches/0.6.2a +Author: Nathan Phillip Brink +Purpose: Replaces #include with #include . Also uses AM_PATH_SDL instead of cusom autoconf stuff. Mostly hacky as this isn't the trunk of supertuxkart's repository. Fixes a compilation on portage-multilib because of how 32-bit vs. 64-bit headers are handled. + +Index: src/audio/sfx_openal.cpp +=================================================================== +--- src/audio/sfx_openal.cpp (revision 4954) ++++ src/audio/sfx_openal.cpp (working copy) +@@ -31,8 +31,8 @@ + # include + #endif + +-#include +-#include ++#include ++#include + + #include "file_manager.hpp" + #include "user_config.hpp" +Index: src/audio/sfx_manager.hpp +=================================================================== +--- src/audio/sfx_manager.hpp (revision 4954) ++++ src/audio/sfx_manager.hpp (working copy) +@@ -26,8 +26,8 @@ + #else + # include + #endif +-#include +-#include ++#include ++#include + + #include "lisp/lisp.hpp" + #include "utils/vec3.hpp" +Index: src/audio/music_ogg.cpp +=================================================================== +--- src/audio/music_ogg.cpp (revision 4954) ++++ src/audio/music_ogg.cpp (working copy) +@@ -29,7 +29,7 @@ + #endif + // This include is important, otherwise SDL_BYTEORDER is undefined, and as a + // result big endian will be used! +-#include ++#include + + #include "user_config.hpp" + +Index: src/sdldrv.cpp +=================================================================== +--- src/sdldrv.cpp (revision 4954) ++++ src/sdldrv.cpp (working copy) +@@ -26,7 +26,7 @@ + #include + #include + +-#include ++#include + + #include "input.hpp" + #include "actionmap.hpp" +Index: src/gui/race_menu.cpp +=================================================================== +--- src/gui/race_menu.cpp (revision 4954) ++++ src/gui/race_menu.cpp (working copy) +@@ -19,7 +19,7 @@ + + #include "gui/race_menu.hpp" + +-#include ++#include + + #include "user_config.hpp" + +Index: src/gui/base_gui.cpp +=================================================================== +--- src/gui/base_gui.cpp (revision 4954) ++++ src/gui/base_gui.cpp (working copy) +@@ -17,7 +17,7 @@ + // along with this program; if not, write to the Free Software + // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +-#include ++#include + + #include "base_gui.hpp" + #include "widget_manager.hpp" +Index: src/gui/player_controls.cpp +=================================================================== +--- src/gui/player_controls.cpp (revision 4954) ++++ src/gui/player_controls.cpp (working copy) +@@ -19,7 +19,7 @@ + + #include "gui/player_controls.hpp" + +-#include ++#include + #if defined(WIN32) && !defined(__CYGWIN__) + # define snprintf _snprintf + #endif +Index: src/gui/base_gui.hpp +=================================================================== +--- src/gui/base_gui.hpp (revision 4954) ++++ src/gui/base_gui.hpp (working copy) +@@ -20,7 +20,7 @@ + #ifndef HEADER_BASE_GUI_HPP + #define HEADER_BASE_GUI_HPP + +-#include ++#include + #include "input.hpp" + + class BaseGUI +Index: src/gui/player_controls.hpp +=================================================================== +--- src/gui/player_controls.hpp (revision 4954) ++++ src/gui/player_controls.hpp (working copy) +@@ -21,7 +21,7 @@ + #define HEADER_PLAYER_CONTROLS_HPP + + #include +-#include ++#include + #include "base_gui.hpp" + #include "player.hpp" + +Index: src/gui/network_gui.cpp +=================================================================== +--- src/gui/network_gui.cpp (revision 4954) ++++ src/gui/network_gui.cpp (working copy) +@@ -21,7 +21,7 @@ + #include "gui/network_gui.hpp" + + #include +-#include ++#include + + #include "sdldrv.hpp" + #include "user_config.hpp" +Index: src/gui/race_results_gui.cpp +=================================================================== +--- src/gui/race_results_gui.cpp (revision 4954) ++++ src/gui/race_results_gui.cpp (working copy) +@@ -19,7 +19,7 @@ + + #include "gui/race_results_gui.hpp" + +-#include ++#include + + #include "race_manager.hpp" + #include "highscore_manager.hpp" +Index: src/gui/display_res_confirm.hpp +=================================================================== +--- src/gui/display_res_confirm.hpp (revision 4954) ++++ src/gui/display_res_confirm.hpp (working copy) +@@ -22,7 +22,7 @@ + + #include "base_gui.hpp" + +-#include ++#include + + class DisplayResConfirm: public BaseGUI + { +Index: src/gui/network_gui.hpp +=================================================================== +--- src/gui/network_gui.hpp (revision 4954) ++++ src/gui/network_gui.hpp (working copy) +@@ -21,7 +21,7 @@ + #define HEADER_NETWORK_GUI_H + + #include +-#include ++#include + #include "base_gui.hpp" + #include "player.hpp" + +Index: src/gui/main_menu.cpp +=================================================================== +--- src/gui/main_menu.cpp (revision 4954) ++++ src/gui/main_menu.cpp (working copy) +@@ -19,7 +19,7 @@ + + #include "gui/main_menu.hpp" + +-#include ++#include + + #include "race_manager.hpp" + #include "user_config.hpp" +Index: src/gui/grand_prix_ending.cpp +=================================================================== +--- src/gui/grand_prix_ending.cpp (revision 4954) ++++ src/gui/grand_prix_ending.cpp (working copy) +@@ -25,7 +25,7 @@ + # define snprintf _snprintf + #endif + +-#include ++#include + + #include "loader.hpp" + #include "race_manager.hpp" +Index: src/main_loop.cpp +=================================================================== +--- src/main_loop.cpp (revision 4954) ++++ src/main_loop.cpp (working copy) +@@ -19,7 +19,7 @@ + + #include "main_loop.hpp" + +-#include ++#include + #include + #include "sdldrv.hpp" + #include "material_manager.hpp" +Index: src/main.cpp +=================================================================== +--- src/main.cpp (revision 4954) ++++ src/main.cpp (working copy) +@@ -22,7 +22,7 @@ + // Necessary for Macs when using SDL without Xwindows: this include + // will rename main to SDLmain, and a new main program will be linked + // in from the library, causing a correct framework to be set up +-# include "SDL/SDL.h" ++# include "SDL.h" + #endif + + #ifdef WIN32 +Index: src/sdldrv.hpp +=================================================================== +--- src/sdldrv.hpp (revision 4954) ++++ src/sdldrv.hpp (working copy) +@@ -23,7 +23,7 @@ + #include + #include + +-#include ++#include + + #include "input.hpp" + +Index: src/user_config.cpp +=================================================================== +--- src/user_config.cpp (revision 4954) ++++ src/user_config.cpp (working copy) +@@ -36,7 +36,7 @@ + # define snprintf _snprintf + #endif + +-#include ++#include + #define _WINSOCKAPI_ + #include + +Index: src/main_loop.hpp +=================================================================== +--- src/main_loop.hpp (revision 4954) ++++ src/main_loop.hpp (working copy) +@@ -29,7 +29,7 @@ + # include + #endif + +-#include ++#include + + /** Management class for the whole gameflow, this is where the + main-loop is */ +Index: configure.ac +=================================================================== +--- configure.ac (revision 4954) ++++ configure.ac (working copy) +@@ -223,43 +223,11 @@ + dnl ======================= + dnl check for SDL libraries + dnl ======================= +-dnl Potentially sdl-config could be used, but apparently that might not +-dnl exist on all platforms, so doing the 'classical' test is safer :( +-case "${host}" in +-*) +- dnl default unix style machines ++AM_PATH_SDL([], [:], [ AC_MSG_ERROR([I need SDL]) ]) ++CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" ++sdl_LIBS="$SDL_LIBS" + +- dnl check for libraries +- save_LIBS=$LIBS +- AC_SEARCH_LIBS(SDL_Init, SDL, have_SDL_lib=yes) +- sdl_LIBS="$LIBS" +- LIBS=$save_LIBS + +- dnl check for header files +- AC_CHECK_HEADER(SDL/SDL.h, have_SDL_hdr=yes) +- +- if test x$have_SDL_hdr != xyes -o x$have_SDL_lib != xyes; then +- AC_MSG_ERROR([Install SDL first...]) +- fi +- +- AC_TRY_RUN([ +- # include +- int main() { +- if ( SDL_VERSION_ATLEAST(1,2,10)) { +- return 0; +- } +- return -1; +- } +- ], +- :, +- AC_MSG_WARN([Your SDL version uses deprecated +- headers. Please update to version 1.2.10 or higher if possible. +- Currently this doesn't affects the game at all.]) +- ) +- +-esac +- +- + dnl ====================================================== + dnl Try to supply the SVN revision number for the compiler + dnl ====================================================== diff --git a/games-action/supertuxkart/supertuxkart-0.6.2.ebuild b/games-action/supertuxkart/supertuxkart-0.6.2.ebuild --- a/games-action/supertuxkart/supertuxkart-0.6.2.ebuild +++ b/games-action/supertuxkart/supertuxkart-0.6.2.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/supertuxka LICENSE="GPL-3 CCPL-Attribution-ShareAlike-3.0 CCPL-Attribution-2.0 CCPL-Sampling-Plus-1.0 public-domain as-is" SLOT="0" -KEYWORDS="amd64 ~ppc x86" +KEYWORDS="~amd64 ~ppc ~x86" IUSE="nls" RDEPEND=">=media-libs/plib-1.8.4 @@ -52,6 +52,9 @@ src_prepare() { -e '/AM_CPPFLAGS/s:/games::' \ src/Makefile.am \ || die "sed failed" + + epatch "${FILESDIR}"/${P}-SDL.h-portage-multilib.patch + rm -rf src/enet eautoreconf }