From 070f4ed351d28f204db99fe40bbc03cb312f2622 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Sun, 6 Aug 2006 21:47:20 +0000 Subject: [PATCH] Version bump. Ebuild by Tristan Heaven as well as patches. Closing bug #140643. Package-Manager: portage-2.1.1_pre4-r1 --- games-strategy/scorched3d/ChangeLog | 10 ++- games-strategy/scorched3d/Manifest | 44 ++++++++--- .../scorched3d/files/digest-scorched3d-40 | 3 + .../files/scorched3d-40-freealut.patch | 79 +++++++++++++++++++ .../files/scorched3d-40-unicode.patch | 39 +++++++++ .../scorched3d/scorched3d-40.ebuild | 59 ++++++++++++++ 6 files changed, 224 insertions(+), 10 deletions(-) create mode 100644 games-strategy/scorched3d/files/digest-scorched3d-40 create mode 100644 games-strategy/scorched3d/files/scorched3d-40-freealut.patch create mode 100644 games-strategy/scorched3d/files/scorched3d-40-unicode.patch create mode 100644 games-strategy/scorched3d/scorched3d-40.ebuild diff --git a/games-strategy/scorched3d/ChangeLog b/games-strategy/scorched3d/ChangeLog index e129509cb0d6..810ba005850a 100644 --- a/games-strategy/scorched3d/ChangeLog +++ b/games-strategy/scorched3d/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for games-strategy/scorched3d # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/ChangeLog,v 1.30 2006/05/12 18:40:23 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/ChangeLog,v 1.31 2006/08/06 21:47:20 wolf31o2 Exp $ + +*scorched3d-40 (06 Aug 2006) + + 06 Aug 2006; Chris Gianelloni + +files/scorched3d-40-freealut.patch, +files/scorched3d-40-unicode.patch, + +scorched3d-40.ebuild: + Version bump. Ebuild by Tristan Heaven as well as + patches. Closing bug #140643. *scorched3d-39.1-r1 (12 May 2006) diff --git a/games-strategy/scorched3d/Manifest b/games-strategy/scorched3d/Manifest index 897115493913..349c1e9d3b9b 100644 --- a/games-strategy/scorched3d/Manifest +++ b/games-strategy/scorched3d/Manifest @@ -1,21 +1,37 @@ -AUX smoke-orange.bmp 12342 RMD160 54aa24974bfbda42f8f912645711418a82277e9a SHA1 be58f0574fa998349d63309ef08c441f5690c4a9 SHA256 4e773f51779344b2eb9ccb7b3626dca2b9c0c56f3d65fca4f3a3c16945c920f3 size 12342 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX scorched3d-40-freealut.patch 1642 RMD160 f1b34457eb557593c9d41227353cd0d44d7e1737 SHA1 ea6eabe5a8d79f31e67b8cf2827ecbadf67789a6 SHA256 65bb549d836d2cd724cb1ab2ce41b57696f2ac0ae3ba5b9457acab57e04c039f +MD5 8fa3a944a0ab30b2ca9ce943f979ae20 files/scorched3d-40-freealut.patch 1642 +RMD160 f1b34457eb557593c9d41227353cd0d44d7e1737 files/scorched3d-40-freealut.patch 1642 +SHA256 65bb549d836d2cd724cb1ab2ce41b57696f2ac0ae3ba5b9457acab57e04c039f files/scorched3d-40-freealut.patch 1642 +AUX scorched3d-40-unicode.patch 1759 RMD160 89b0ce779ad07ad8dcb4252be3029e8251e94c0e SHA1 3cb5b91921633217be19adb1720419737a27bd56 SHA256 c84ef2cd1f60bba076ab44f8ee4417476dfd0969da0136b2c6a98727c6efbb3a +MD5 dad88edac755cb2ed6d706d2688823a3 files/scorched3d-40-unicode.patch 1759 +RMD160 89b0ce779ad07ad8dcb4252be3029e8251e94c0e files/scorched3d-40-unicode.patch 1759 +SHA256 c84ef2cd1f60bba076ab44f8ee4417476dfd0969da0136b2c6a98727c6efbb3a files/scorched3d-40-unicode.patch 1759 +AUX smoke-orange.bmp 12342 RMD160 54aa24974bfbda42f8f912645711418a82277e9a SHA1 be58f0574fa998349d63309ef08c441f5690c4a9 SHA256 4e773f51779344b2eb9ccb7b3626dca2b9c0c56f3d65fca4f3a3c16945c920f3 MD5 0b9eb4edfdc09aeaa2ea34752ac22e78 files/smoke-orange.bmp 12342 RMD160 54aa24974bfbda42f8f912645711418a82277e9a files/smoke-orange.bmp 12342 SHA256 4e773f51779344b2eb9ccb7b3626dca2b9c0c56f3d65fca4f3a3c16945c920f3 files/smoke-orange.bmp 12342 -DIST Scorched3D-39.1-src.tar.gz 36475992 RMD160 77b844660bf969032dfa1ac11b380fd891b334ef SHA256 327443aa67dfeaae61f3b05695215b35171ca977988f0db983e655192c1c5e51 size 36475992 -EBUILD scorched3d-39.1-r1.ebuild 1508 RMD160 889e80b9ab6fccaf0094b3a8b09e053e6aab49f5 SHA1 91b6592866210a0672a8272f282d7c99d7706356 SHA256 95ee0f2d2d1da67bf16f602b7049c7c9cb7d9eeda9b846c1fa65b6d8b886024c size 1508 +DIST Scorched3D-39.1-src.tar.gz 36475992 RMD160 77b844660bf969032dfa1ac11b380fd891b334ef SHA256 327443aa67dfeaae61f3b05695215b35171ca977988f0db983e655192c1c5e51 +DIST Scorched3D-40-src.tar.gz 55427740 RMD160 2e900986a8a9262d3ffb85d1f6e6bfd4b4d9b9a6 SHA1 91a80b8a968532b505082d477c646b3a8e805ecd SHA256 8722d1f06e50f25f8e373f4388668a8b056e978dba8b86f197a45c3fa1f9008b +EBUILD scorched3d-39.1-r1.ebuild 1508 RMD160 889e80b9ab6fccaf0094b3a8b09e053e6aab49f5 SHA1 91b6592866210a0672a8272f282d7c99d7706356 SHA256 95ee0f2d2d1da67bf16f602b7049c7c9cb7d9eeda9b846c1fa65b6d8b886024c MD5 08fbad0b09faf72fb88aede32cd15ab0 scorched3d-39.1-r1.ebuild 1508 RMD160 889e80b9ab6fccaf0094b3a8b09e053e6aab49f5 scorched3d-39.1-r1.ebuild 1508 SHA256 95ee0f2d2d1da67bf16f602b7049c7c9cb7d9eeda9b846c1fa65b6d8b886024c scorched3d-39.1-r1.ebuild 1508 -EBUILD scorched3d-39.1.ebuild 1412 RMD160 b6844765f5910662a72d6fe7555c21559784a22f SHA1 7ace3dcc5a434bde66bcb24b9fa3ba793b7e6169 SHA256 48ca01637a106e55490ccfa7bb4b5d8ad980bd5b37c33f2bd98c5102efc2ebef size 1412 +EBUILD scorched3d-39.1.ebuild 1412 RMD160 b6844765f5910662a72d6fe7555c21559784a22f SHA1 7ace3dcc5a434bde66bcb24b9fa3ba793b7e6169 SHA256 48ca01637a106e55490ccfa7bb4b5d8ad980bd5b37c33f2bd98c5102efc2ebef MD5 94d73600a99c73be04a7fc2e6f70c220 scorched3d-39.1.ebuild 1412 RMD160 b6844765f5910662a72d6fe7555c21559784a22f scorched3d-39.1.ebuild 1412 SHA256 48ca01637a106e55490ccfa7bb4b5d8ad980bd5b37c33f2bd98c5102efc2ebef scorched3d-39.1.ebuild 1412 -MISC ChangeLog 3892 RMD160 080b3a5f81eaf902328c0ebedd357b4d4c8e387b SHA1 7458a9afb8c87576e7ec93f0a1d9779b6c04f144 SHA256 56b36239c275c9d3b86c486eedb239500b0c15a65d98f311ce6f2a835ebc0f6e size 3892 -MD5 7c09cc36c6552b284096f88030049050 ChangeLog 3892 -RMD160 080b3a5f81eaf902328c0ebedd357b4d4c8e387b ChangeLog 3892 -SHA256 56b36239c275c9d3b86c486eedb239500b0c15a65d98f311ce6f2a835ebc0f6e ChangeLog 3892 -MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 size 158 +EBUILD scorched3d-40.ebuild 1402 RMD160 388fabc0a59464e886e5d7dd76bd349292c148ef SHA1 2a018b12b04292ea7f0af5a90e5190b7407e904c SHA256 b5019703bc0a3882de9d895157d05a6b4e80b44b283e5fd09c371f2fbef5cb92 +MD5 5921d06febb4d2619a0c414f8d95d1fd scorched3d-40.ebuild 1402 +RMD160 388fabc0a59464e886e5d7dd76bd349292c148ef scorched3d-40.ebuild 1402 +SHA256 b5019703bc0a3882de9d895157d05a6b4e80b44b283e5fd09c371f2fbef5cb92 scorched3d-40.ebuild 1402 +MISC ChangeLog 4187 RMD160 5ed100070dbaf3acdf7308acdb81ca60cd3aa2d0 SHA1 3fe3cd7c879d296dc3d3272049bab3b197b46767 SHA256 942ea835a4f56315a063c3c8c428f7443e97dc3ff94defd8f5b3e5fc8ff938b5 +MD5 ef63dbb03a2797b5fb8d78d920b1588f ChangeLog 4187 +RMD160 5ed100070dbaf3acdf7308acdb81ca60cd3aa2d0 ChangeLog 4187 +SHA256 942ea835a4f56315a063c3c8c428f7443e97dc3ff94defd8f5b3e5fc8ff938b5 ChangeLog 4187 +MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158 @@ -25,3 +41,13 @@ SHA256 b3ac72fadd9778d69209cc9ce0d8cf1a7efc94126b6c668b44a7cb83e19904f9 files/di MD5 eaa02900ebceeb27b4af3e70a057fe6b files/digest-scorched3d-39.1-r1 265 RMD160 be9c6b7671f0f6924a927f767ae5cd00671c439f files/digest-scorched3d-39.1-r1 265 SHA256 b3ac72fadd9778d69209cc9ce0d8cf1a7efc94126b6c668b44a7cb83e19904f9 files/digest-scorched3d-39.1-r1 265 +MD5 46acb721ced930a58d0ec5e4cdd7dbf8 files/digest-scorched3d-40 259 +RMD160 e66449962fd7234ee9774d1f5d46c13af5ecd6ac files/digest-scorched3d-40 259 +SHA256 b892449b76a28869efd1fbd3df0537f743f17a82493c3c9094ee923a8eea2ddc files/digest-scorched3d-40 259 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.5 (GNU/Linux) + +iD8DBQFE1mNykT4lNIS36YERAiNIAJ9oIK7gv3jB48XIwC/kAvAwt9DvBQCeJb8O +pS9ask8wIdIopfYHbc1Hmrg= +=Z/me +-----END PGP SIGNATURE----- diff --git a/games-strategy/scorched3d/files/digest-scorched3d-40 b/games-strategy/scorched3d/files/digest-scorched3d-40 new file mode 100644 index 000000000000..d39cf837f2eb --- /dev/null +++ b/games-strategy/scorched3d/files/digest-scorched3d-40 @@ -0,0 +1,3 @@ +MD5 76b60b9f73d2c971d86bfac761989cf4 Scorched3D-40-src.tar.gz 55427740 +RMD160 2e900986a8a9262d3ffb85d1f6e6bfd4b4d9b9a6 Scorched3D-40-src.tar.gz 55427740 +SHA256 8722d1f06e50f25f8e373f4388668a8b056e978dba8b86f197a45c3fa1f9008b Scorched3D-40-src.tar.gz 55427740 diff --git a/games-strategy/scorched3d/files/scorched3d-40-freealut.patch b/games-strategy/scorched3d/files/scorched3d-40-freealut.patch new file mode 100644 index 000000000000..8fe0706cac81 --- /dev/null +++ b/games-strategy/scorched3d/files/scorched3d-40-freealut.patch @@ -0,0 +1,79 @@ +--- configure ++++ configure +@@ -3946,7 +3946,7 @@ + if test x"$use_static_openal" = x"yes"; then + LIBS="$LIBS /usr/local/lib/libopenal.a" + else +- LIBS="$LIBS `$OPENAL_CONFIG --libs`" ++ LIBS="$LIBS `$OPENAL_CONFIG --libs` -lalut" + fi + + CFLAGS="$CFLAGS `$OPENAL_CONFIG --cflags`" + +--- src/sound/SoundBufferStaticWav.cpp ++++ src/sound/SoundBufferStaticWav.cpp +@@ -57,44 +57,7 @@ + SoundBuffer(fileName), + buffer_(0) + { +- unsigned int error; +- +- // Create a buffer +- alGetError(); +- alGenBuffers(1, &buffer_); +- if ((error = alGetError()) != AL_NO_ERROR) +- { +- return; +- } +- +- // Load WAV +- void *data; +- ALenum format; +- ALsizei size; +- ALsizei freq; +- ALboolean loop; +- +-#ifdef __DARWIN__ +- alutLoadWAVFile((ALbyte*) fileName,&format,&data,&size,&freq); +-#else +- alutLoadWAVFile((ALbyte*) fileName,&format,&data,&size,&freq,&loop); +-#endif +- +- if ((error = alGetError()) != AL_NO_ERROR) +- { +- return; +- } +- +- // Load WAV into buffer +- alBufferData(buffer_,format,data,size,freq); +- if ((error = alGetError()) != AL_NO_ERROR) +- { +- return; +- } +- +- // Delete WAV memory +- alutUnloadWAV(format,data,size,freq); +- if ((error = alGetError()) != AL_NO_ERROR) ++ if ((buffer_ = alutCreateBufferFromFile(fileName)) == AL_NONE) + { + return; + } + +--- src/sound/Sound.cpp ++++ src/sound/Sound.cpp +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + #include + + Sound *Sound::instance_ = 0; +@@ -150,6 +151,7 @@ + totalSources_.push_back(source); + availableSources_.push_back(source); + } ++ alutInitWithoutContext(NULL, NULL); + + init_ = true; + return init_; diff --git a/games-strategy/scorched3d/files/scorched3d-40-unicode.patch b/games-strategy/scorched3d/files/scorched3d-40-unicode.patch new file mode 100644 index 000000000000..0e71268fcfa5 --- /dev/null +++ b/games-strategy/scorched3d/files/scorched3d-40-unicode.patch @@ -0,0 +1,39 @@ +diff -urN scorched.orig/configure scorched/configure +--- scorched.orig/configure 2006-07-15 11:15:30.000000000 -0400 ++++ scorched/configure 2006-08-02 17:05:08.000000000 -0400 +@@ -5159,7 +5159,7 @@ + # Check for extra functions + + +-for ac_func in vsnprintf snprintf ++for ac_func in vsnprintf snprintf vasprintf asprintf + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` + echo "$as_me:$LINENO: checking for $ac_func" >&5 +diff -urN scorched.orig/src/scorched/NetLan.cpp scorched/src/scorched/NetLan.cpp +--- scorched.orig/src/scorched/NetLan.cpp 2006-07-05 13:16:14.000000000 -0400 ++++ scorched/src/scorched/NetLan.cpp 2006-08-02 17:05:08.000000000 -0400 +@@ -96,9 +96,9 @@ + // Radio Buttons + wxFlexGridSizer *radioSizer = new wxFlexGridSizer(1, 8, 5, 5); + IDC_RADIO_NET_CTRL = new wxRadioButton(parent, IDC_RADIO_NET, +- "Internet", wxDefaultPosition, wxDefaultSize, wxRB_GROUP); ++ wxT("Internet"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP); + IDC_RADIO_LAN_CTRL = new wxRadioButton(parent, IDC_RADIO_LAN, +- "LAN", wxDefaultPosition, wxDefaultSize, 0); ++ wxT("LAN"), wxDefaultPosition, wxDefaultSize, 0); + radioSizer->Add(IDC_RADIO_NET_CTRL, 0, wxRIGHT, 10); + radioSizer->Add(IDC_RADIO_LAN_CTRL, 0, wxRIGHT, 0); + sizer->Add(radioSizer, 0, wxALIGN_CENTER | wxALL, 5); +diff -urN scorched.orig/src/scorched/OptionEntrySetter.cpp scorched/src/scorched/OptionEntrySetter.cpp +--- scorched.orig/src/scorched/OptionEntrySetter.cpp 2006-07-11 10:35:32.000000000 -0400 ++++ scorched/src/scorched/OptionEntrySetter.cpp 2006-08-02 17:05:08.000000000 -0400 +@@ -122,7 +122,7 @@ + { + sizer->Add(control = + new wxCheckBox(parent, -1, +- "", ++ wxT(""), + wxDefaultPosition, wxDefaultSize), + 0, wxALIGN_LEFT); + control->SetToolTip( diff --git a/games-strategy/scorched3d/scorched3d-40.ebuild b/games-strategy/scorched3d/scorched3d-40.ebuild new file mode 100644 index 000000000000..34df79a02020 --- /dev/null +++ b/games-strategy/scorched3d/scorched3d-40.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/scorched3d-40.ebuild,v 1.1 2006/08/06 21:47:20 wolf31o2 Exp $ + +inherit wxwidgets games + +DESCRIPTION="Multi-player tank battle in 3D (OpenGL)" +HOMEPAGE="http://www.scorched3d.co.uk/" +SRC_URI="mirror://sourceforge/${PN}/Scorched3D-${PV}-src.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="mysql" + +DEPEND="virtual/opengl + virtual/glu + media-libs/libogg + media-libs/libvorbis + ~media-libs/openal-0.0.8 + media-libs/freealut + media-libs/libsdl + media-libs/sdl-net + >=x11-libs/wxGTK-2.6 + >=media-libs/freetype-2 + mysql? ( dev-db/mysql )" +RDEPEND="${DEPEND}" + +S=${WORKDIR}/scorched + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-freealut.patch + epatch "${FILESDIR}"/${P}-unicode.patch +} + +pkg_setup() { + games_pkg_setup + WX_GTK_VER="2.6" \ + need-wxwidgets gtk2 || die "You need to emerge wxGTK with USE='X'" +} + +src_compile() { + egamesconf \ + --disable-dependency-tracking \ + --exec_prefix="${GAMES_PREFIX}" \ + --datadir="${GAMES_DATADIR}/${PN}" \ + --with-docdir="/usr/share/doc/${PF}" \ + --with-wx-config="${WX_CONFIG}" \ + $(use_with mysql) \ + || die "egamesconf failed" + emake || die "emake failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + prepgamesdirs +} -- 2.26.2