commit: 1aa6c225ced035135fe2ae8309965dc8659d63e0 Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org> AuthorDate: Sat Nov 14 03:52:04 2015 +0000 Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org> CommitDate: Sat Nov 14 04:03:05 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1aa6c225
patch to work with wxGTK:3.0 (bug #563964) Package-Manager: portage-2.2.20.1 .../scorched3d/files/scorched3d-44-wxgtk.patch | 161 +++++++++++++++++++++ games-strategy/scorched3d/scorched3d-44-r1.ebuild | 84 +++++++++++ 2 files changed, 245 insertions(+) diff --git a/games-strategy/scorched3d/files/scorched3d-44-wxgtk.patch b/games-strategy/scorched3d/files/scorched3d-44-wxgtk.patch new file mode 100644 index 0000000..ef2e27a --- /dev/null +++ b/games-strategy/scorched3d/files/scorched3d-44-wxgtk.patch @@ -0,0 +1,161 @@ +Description: Fix to build with wxWidgets 3.0 +Author: Olly Betts <[email protected]> +Last-Update: 2014-05-01 + +--- src/launcher/wxdialogs/Display.cpp ++++ src/launcher/wxdialogs/Display.cpp +@@ -26,7 +26,7 @@ + // Display settings + wxStaticBox *displayBox = new wxStaticBox(parent, -1, wxT("&Display")); + wxStaticBoxSizer *displaySizer = new wxStaticBoxSizer(displayBox, wxVERTICAL); +- wxFlexGridSizer *displaySizer2 = new wxFlexGridSizer(2, 3, 5, 5); ++ wxFlexGridSizer *displaySizer2 = new wxFlexGridSizer(0, 3, 5, 5); + wxStaticText *resText = new wxStaticText(parent, -1, wxT("&Resolution :")); + IDC_DISPLAY_CTRL = + new wxComboBox(parent, -1, +@@ -88,7 +88,7 @@ + // Sound settings + wxStaticBox *soundBox = new wxStaticBox(parent, -1, wxT("&Sound")); + wxStaticBoxSizer *soundSizerMain = new wxStaticBoxSizer(soundBox, wxVERTICAL); +- wxFlexGridSizer *soundSizer1 = new wxFlexGridSizer(4, 2); ++ wxFlexGridSizer *soundSizer1 = new wxFlexGridSizer(0, 4, 2, 0); + wxStaticText *volumeText = new wxStaticText(parent, -1, wxT("Sound Volume :")); + wxStaticText *musicVolumeText = new wxStaticText(parent, -1, wxT("Music Volume :")); + wxStaticText *ambientVolumeText = new wxStaticText(parent, -1, wxT("Ambient Volume :")); +@@ -137,7 +137,7 @@ + wxT("Game Detail Options")); + wxStaticBoxSizer *speedSizer = new wxStaticBoxSizer(speedBox, wxHORIZONTAL); + +- wxGridSizer *loadSizer = new wxFlexGridSizer(2, 2); ++ wxGridSizer *loadSizer = new wxFlexGridSizer(0, 2, 2, 0); + IDC_LOADULTRA_CTRL = new wxButton(parent, ID_LOADULTRA, wxT("&Ultra Detail"), wxDefaultPosition, wxSize(120,-1)); + IDC_LOADDEFAULTS_CTRL = new wxButton(parent, ID_LOADDEFAULTS, wxT("&Normal Detail"), wxDefaultPosition, wxSize(120,-1)); + IDC_LOADMEDIUM_CTRL = new wxButton(parent, ID_LOADMEDIUM, wxT("Faster Detail"), wxDefaultPosition, wxSize(120,-1)); +@@ -256,7 +256,7 @@ + wxStaticBox *waterDetailBox = new wxStaticBox(parent, -1, + wxT("Graphics Detail")); + wxStaticBoxSizer *waterDetailSizer = new wxStaticBoxSizer(waterDetailBox, wxHORIZONTAL); +- wxGridSizer *waterDetailSizer2 = new wxGridSizer(3, 1, 10, 10); ++ wxGridSizer *waterDetailSizer2 = new wxGridSizer(0, 1, 10, 10); + + IDC_NOWATERREF_CTRL = + new wxCheckBox(parent, -1, wxT("Don't draw water reflections - Large Framerate Improvement")); +@@ -471,7 +471,7 @@ + { + wxScrolledWindow *scrolledWindow = new wxScrolledWindow(parent, -1, + wxDefaultPosition, wxSize(480, 250)); +- wxSizer *sizer = new wxFlexGridSizer(5, 1); ++ wxSizer *sizer = new wxFlexGridSizer(0, 5, 1, 0); + + keyboardKeyList.clear(); + if (!Keyboard::instance()->loadKeyFile()) +--- src/launcher/wxdialogs/SettingsDialog.cpp ++++ src/launcher/wxdialogs/SettingsDialog.cpp +@@ -105,7 +105,7 @@ + mainPanel_ = new wxPanel(book_, -1); + book_->AddPage(mainPanel_, wxT("Main")); + wxSizer *mainPanelSizer = new wxBoxSizer(wxVERTICAL); +- wxSizer *sizer = new wxFlexGridSizer(2, 2); ++ wxSizer *sizer = new wxFlexGridSizer(0, 2, 2, 0); + mainPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10); + + setters_.push_back( +@@ -166,7 +166,7 @@ + { + moneyPanel_ = new wxPanel(book_, -1); + wxSizer *ecoPanelSizer = new wxBoxSizer(wxVERTICAL); +- wxSizer *sizer = new wxFlexGridSizer(2, 2); ++ wxSizer *sizer = new wxFlexGridSizer(0, 2, 2, 0); + ecoPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10); + + setters_.push_back( +@@ -215,7 +215,7 @@ + { + scorePanel_ = new wxPanel(book_, -1); + wxSizer *ecoPanelSizer = new wxBoxSizer(wxVERTICAL); +- wxSizer *sizer = new wxFlexGridSizer(2, 2); ++ wxSizer *sizer = new wxFlexGridSizer(0, 2, 2, 0); + ecoPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10); + + setters_.push_back( +@@ -249,7 +249,7 @@ + { + weaponsPanel_ = new wxPanel(book_, -1); + wxSizer *ecoPanelSizer = new wxBoxSizer(wxVERTICAL); +- wxSizer *sizer = new wxFlexGridSizer(2, 2); ++ wxSizer *sizer = new wxFlexGridSizer(0, 2, 2, 0); + ecoPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10); + + setters_.push_back( +@@ -286,7 +286,7 @@ + { + envPanel_ = new wxPanel(book_, -1); + wxSizer *envPanelSizer = new wxBoxSizer(wxVERTICAL); +- wxSizer *sizer = new wxFlexGridSizer(2, 2); ++ wxSizer *sizer = new wxFlexGridSizer(0, 2, 2, 0); + envPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10); + + setters_.push_back( +@@ -337,7 +337,7 @@ + wxScrolledWindow *scrolledWindow = new wxScrolledWindow(landPanel_, -1, + wxDefaultPosition, wxSize(225, 200)); + +- wxSizer *sizer = new wxFlexGridSizer(3, 3); ++ wxSizer *sizer = new wxFlexGridSizer(0, 3, 3, 0); + int i = 0; + std::list<LandscapeDefinitionsEntry> &defns = + landscapeDefinitions.getAllLandscapes(); +@@ -438,7 +438,7 @@ + wxT("Players are persistent for game")); + playersPanelSizer->Add(IDC_SERVER_RESIDUAL_CTRL, 0, wxALIGN_CENTER | wxTOP, 10); + +- wxSizer *sizer = new wxGridSizer(3, 3); ++ wxSizer *sizer = new wxGridSizer(0, 3, 3, 0); + playersPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10); + + for (int i=0; i<24; i++) +--- src/launcher/wxdialogs/DisplayDialog.cpp ++++ src/launcher/wxdialogs/DisplayDialog.cpp +@@ -449,15 +449,15 @@ + IDC_SLIDER1_CTRL->SetValue(OptionsDisplay::instance()->getBrightness()); + IDC_SLIDER1_CTRL->SetToolTip(wxString(OptionsDisplay::instance()->getBrightnessEntry().getDescription(), wxConvUTF8)); + IDC_VOLUME_CTRL->SetRange(0, 128); +- IDC_VOLUME_CTRL->SetTickFreq(4, 0); ++ IDC_VOLUME_CTRL->SetTickFreq(4); + IDC_VOLUME_CTRL->SetValue(OptionsDisplay::instance()->getSoundVolume()); + IDC_VOLUME_CTRL->SetToolTip(wxString(OptionsDisplay::instance()->getSoundVolumeEntry().getDescription(), wxConvUTF8)); + IDC_MUSICVOLUME_CTRL->SetRange(0, 128); +- IDC_MUSICVOLUME_CTRL->SetTickFreq(4, 0); ++ IDC_MUSICVOLUME_CTRL->SetTickFreq(4); + IDC_MUSICVOLUME_CTRL->SetValue(OptionsDisplay::instance()->getMusicVolume()); + IDC_MUSICVOLUME_CTRL->SetToolTip(wxString(OptionsDisplay::instance()->getMusicVolumeEntry().getDescription(), wxConvUTF8)); + IDC_AMBIENTVOLUME_CTRL->SetRange(0, 128); +- IDC_AMBIENTVOLUME_CTRL->SetTickFreq(4, 0); ++ IDC_AMBIENTVOLUME_CTRL->SetTickFreq(4); + IDC_AMBIENTVOLUME_CTRL->SetValue(OptionsDisplay::instance()->getAmbientSoundVolume()); + IDC_AMBIENTVOLUME_CTRL->SetToolTip(wxString(OptionsDisplay::instance()->getAmbientSoundVolumeEntry().getDescription(), wxConvUTF8)); + IDC_USERNAME_CTRL->SetValue(wxString(OptionsDisplay::instance()->getOnlineUserName(), wxConvUTF8)); +@@ -733,11 +733,7 @@ + convertString(S3D::formatStringBuffer("%s.s3m", (const char *) (selection.mb_str(wxConvUTF8)))), // default filename + wxT(""), // default extension + wxT("*.s3m"), +-#if wxCHECK_VERSION(2, 8, 0) + wxFD_SAVE); +-#else +- wxSAVE); +-#endif + if (file.empty()) return; + ModFiles files; + if (!files.loadModFiles(std::string(selection.mb_str(wxConvUTF8)), false)) +@@ -761,11 +757,7 @@ + wxT(""), // default filename + wxT(""), // default extension + wxT("*.s3m"), +-#if wxCHECK_VERSION(2, 8, 0) + wxFD_OPEN | wxFD_FILE_MUST_EXIST); +-#else +- wxOPEN | wxFILE_MUST_EXIST); +-#endif + if (file.empty()) return; + ModFiles files; + std::string mod; diff --git a/games-strategy/scorched3d/scorched3d-44-r1.ebuild b/games-strategy/scorched3d/scorched3d-44-r1.ebuild new file mode 100644 index 0000000..4314d1f --- /dev/null +++ b/games-strategy/scorched3d/scorched3d-44-r1.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +WX_GTK_VER=3.0 +inherit autotools eutils wxwidgets games + +DESCRIPTION="Multi-player tank battle in 3D (OpenGL)" +HOMEPAGE="http://www.scorched3d.co.uk/"; +SRC_URI="mirror://sourceforge/scorched3d/Scorched3D-${PV}-src.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +IUSE="dedicated mysql" + +RDEPEND="media-libs/libsdl[video] + media-libs/sdl-net + media-libs/libpng:0 + sys-libs/zlib + virtual/jpeg:0 + dev-libs/expat + media-fonts/dejavu + !dedicated? ( + virtual/opengl + virtual/glu + media-libs/glew + media-libs/libogg + media-libs/libvorbis + media-libs/openal + media-libs/freealut + x11-libs/wxGTK:${WX_GTK_VER}[X] + media-libs/freetype:2 + sci-libs/fftw:3.0 + ) + mysql? ( virtual/mysql )" +DEPEND="${RDEPEND} + !dedicated? ( virtual/pkgconfig )" + +S=${WORKDIR}/scorched + +src_prepare() { + edos2unix \ + src/launcher/wxdialogs/SettingsDialog.cpp \ + src/launcher/wxdialogs/DisplayDialog.cpp \ + src/launcher/wxdialogs/Display.cpp \ + src/launcher/wxdialogs/KeyDialog.cpp + epatch \ + "${FILESDIR}"/${P}-fixups.patch \ + "${FILESDIR}"/${P}-gcc43.patch \ + "${FILESDIR}"/${P}-odbc.patch \ + "${FILESDIR}"/${P}-win32.patch \ + "${FILESDIR}"/${P}-freetype.patch \ + "${FILESDIR}"/${P}-jpeg9.patch \ + "${FILESDIR}"/${P}-wxgtk.patch + eautoreconf +} + +src_configure() { + egamesconf \ + --with-fftw=/usr \ + --with-ogg=/usr \ + --with-vorbis=/usr \ + --datadir="${GAMES_DATADIR}/${PN}" \ + --with-docdir="/usr/share/doc/${PF}" \ + --with-wx-config="${WX_CONFIG}" \ + --without-pgsql \ + $(use_with mysql) \ + $(use_enable dedicated serveronly) +} + +src_install() { + default + rm "${ED}${GAMES_DATADIR}"/${PN}/data/fonts/* || die + dosym /usr/share/fonts/dejavu/DejaVuSans.ttf "${GAMES_DATADIR}/${PN}/data/fonts/dejavusans.ttf" + dosym /usr/share/fonts/dejavu/DejaVuSansCondensed-Bold.ttf "${GAMES_DATADIR}/${PN}/data/fonts/dejavusconbd.ttf" + dosym /usr/share/fonts/dejavu/DejaVuSansMono-Bold.ttf "${GAMES_DATADIR}/${PN}/data/fonts/dejavusmobd.ttf" + if ! use dedicated ; then + newicon data/images/tank-old.bmp ${PN}.bmp || die + make_desktop_entry ${PN} "Scorched 3D" /usr/share/pixmaps/${PN}.bmp + fi + prepgamesdirs +}
