Author: vincentc-guest Date: 2012-11-26 00:24:45 +0000 (Mon, 26 Nov 2012) New Revision: 13884
Added: packages/trunk/supertuxkart/debian/patches/build_with_irrlicht_1.8.patch Removed: packages/trunk/supertuxkart/debian/patches/build_with_irrlicht_1.7.3.patch Modified: packages/trunk/supertuxkart/debian/changelog packages/trunk/supertuxkart/debian/control packages/trunk/supertuxkart/debian/patches/build_against_system_enet.patch packages/trunk/supertuxkart/debian/patches/series packages/trunk/supertuxkart/debian/rules Log: supertuxkart: Update to version 0.7.3-2+exp1 Modified: packages/trunk/supertuxkart/debian/changelog =================================================================== --- packages/trunk/supertuxkart/debian/changelog 2012-11-25 12:54:36 UTC (rev 13883) +++ packages/trunk/supertuxkart/debian/changelog 2012-11-26 00:24:45 UTC (rev 13884) @@ -1,9 +1,18 @@ -supertuxkart (0.7.3-3) UNRELEASED; urgency=low +supertuxkart (0.7.3-2+exp1) experimental; urgency=low - * Hi-res png icon has been installed into /usr/share/pixmaps, so remove - duplicate xpm icons from the same directory. + * Upload to experimental. + * Build with irrlicht 1.8. + - This should fix segfaults related to irrlicht 1.7.3 in supertuxkart, + commonly triggered through the use of power-ups during races. + (Closes: #677609; LP: #1011180, LP: #1048284, LP: #1049398, LP: #1061436, + LP: #1064019, LP: #1069871) + - This also fixes incorrect rendering of Suzanne's kart. (Closes: #679837) + - Update build-depends on libirrlicht-dev (>= 1.8). + - Drop patch debian/patches/build_with_irrlicht_1.7.3.patch and add + debian/patches/build_with_irrlicht_1.8.patch. + * Add new package supertuxkart-dbg containing debugging symbols. - -- Vincent Cheng <[email protected]> Sun, 03 Jun 2012 19:19:07 -0700 + -- Vincent Cheng <[email protected]> Fri, 16 Nov 2012 08:22:15 -0800 supertuxkart (0.7.3-2) unstable; urgency=low Modified: packages/trunk/supertuxkart/debian/control =================================================================== --- packages/trunk/supertuxkart/debian/control 2012-11-25 12:54:36 UTC (rev 13883) +++ packages/trunk/supertuxkart/debian/control 2012-11-26 00:24:45 UTC (rev 13884) @@ -15,7 +15,7 @@ libcurl4-gnutls-dev | libcurl4-dev, libenet-dev (>= 1.3.1), libfribidi-dev, - libirrlicht-dev (>= 1.7.3), + libirrlicht-dev (>= 1.8), libopenal-dev, libsdl-image1.2-dev, libsdl-ttf2.0-dev, @@ -69,3 +69,29 @@ against your friends, and more! . This package contains data files for the game supertuxkart. + +Package: supertuxkart-dbg +Section: debug +Priority: extra +Architecture: any +Depends: + supertuxkart (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends} +Description: 3D kart racing game (debug) + SuperTuxKart is a free 3D kart racing game, with a focus on having fun over + realism. You can play with up to 4 friends on one PC, racing against each + other or just trying to beat the computer; single-player mode is also + available. + . + See the great lighthouse or drive through the sand and visit the pyramids. + Race underground or in space, watching the stars pass by. Or rest under the + palm trees on the beach, watching the other karts overtake you. But don't eat + the bananas! Watch for bowling balls, plungers, bubble gum and cakes thrown by + your opponents. + . + You can do a single race against other karts, compete in one of several Grand + Prix, try to beat the high score in time trials on your own, play battle mode + against your friends, and more! + . + This package contains debugging symbols for the game supertuxkart. Modified: packages/trunk/supertuxkart/debian/patches/build_against_system_enet.patch =================================================================== --- packages/trunk/supertuxkart/debian/patches/build_against_system_enet.patch 2012-11-25 12:54:36 UTC (rev 13883) +++ packages/trunk/supertuxkart/debian/patches/build_against_system_enet.patch 2012-11-26 00:24:45 UTC (rev 13884) @@ -28,15 +28,6 @@ # Build the Wiiuse library if(USE_WIIUSE) add_subdirectory("${STK_SOURCE_DIR}/wiiuse") -@@ -49,7 +45,7 @@ - endif() - - # Irrlicht --find_package(Irrlicht 1.8 REQUIRED) -+find_package(Irrlicht REQUIRED) - include_directories(${IRRLICHT_INCLUDE_DIRS}) - - # OpenAL @@ -64,6 +60,10 @@ find_package(CURL REQUIRED) include_directories(${CURL_INCLUDE_DIRS}) Deleted: packages/trunk/supertuxkart/debian/patches/build_with_irrlicht_1.7.3.patch =================================================================== --- packages/trunk/supertuxkart/debian/patches/build_with_irrlicht_1.7.3.patch 2012-11-25 12:54:36 UTC (rev 13883) +++ packages/trunk/supertuxkart/debian/patches/build_with_irrlicht_1.7.3.patch 2012-11-26 00:24:45 UTC (rev 13884) @@ -1,107 +0,0 @@ -Description: Fix build with irrlicht 1.7.3 - This patch enables supertuxkart to be built with the latest stable release - of irrlicht (1.7.3) rather than svn r3843. -Forwarded: http://sourceforge.net/apps/trac/supertuxkart/ticket/628 -Author: Vincent Cheng <[email protected]> -Last-Update: 2012-05-07 - ---- a/src/states_screens/dialogs/track_info_dialog.cpp -+++ b/src/states_screens/dialogs/track_info_dialog.cpp -@@ -199,7 +199,7 @@ - IGUIStaticText* hscores_header = GUIEngine::getGUIEnv()->addStaticText( text.c_str(), hiscores_title_area, - false , true , // border, word warp - m_irrlicht_window); -- hscores_header->setTextRestrainedInside(false); -+ //hscores_header->setTextRestrainedInside(false); - hscores_header->setTextAlignment(EGUIA_CENTER, EGUIA_CENTER); - - // fill highscore entries ---- a/src/states_screens/dialogs/add_device_dialog.cpp -+++ b/src/states_screens/dialogs/add_device_dialog.cpp -@@ -65,7 +65,7 @@ - /*word wrap*/true, - m_irrlicht_window); - b->setTabStop(false); -- b->setRightToLeft(translations->isRTLLanguage()); -+ //b->setRightToLeft(translations->isRTLLanguage()); - // because it looks like 'setRightToLeft' applies next time - // setText is called only - b->setText(msg.c_str()); ---- a/src/guiengine/skin.cpp -+++ b/src/guiengine/skin.cpp -@@ -853,7 +853,7 @@ - irr_driver->getVideoDriver()->getMaterial2D(); - for (unsigned int n=0; n<MATERIAL_MAX_TEXTURES; n++) - { -- material2D.UseMipMaps = false; -+ //material2D.UseMipMaps = false; - } - - const bool mouseIn = rect.isPointInside(irr_driver->getDevice() -@@ -892,7 +892,7 @@ - - for (unsigned int n=0; n<MATERIAL_MAX_TEXTURES; n++) - { -- material2D.UseMipMaps = true; -+ //material2D.UseMipMaps = true; - } - } - /* icon ribbons */ ---- a/src/guiengine/widgets/bubble_widget.cpp -+++ b/src/guiengine/widgets/bubble_widget.cpp -@@ -58,7 +58,7 @@ - irrwidget = GUIEngine::getGUIEnv()->addStaticText(message.c_str(), m_shrinked_size, - false, true /* word wrap */, m_parent, - (m_focusable ? getNewID() : getNewNoFocusID())); -- irrwidget->setTextRestrainedInside(false); -+ //irrwidget->setTextRestrainedInside(false); - - #if IRRLICHT_VERSION_MAJOR > 1 || (IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR >= 8) - irrwidget->setRightToLeft( translations->isRTLLanguage() ); ---- a/src/graphics/irr_driver.cpp -+++ b/src/graphics/irr_driver.cpp -@@ -267,7 +267,7 @@ - material2D.TextureLayer[n].TextureWrapV = ETC_CLAMP_TO_EDGE; - - //material2D.TextureLayer[n].LODBias = 16; -- material2D.UseMipMaps = true; -+ //material2D.UseMipMaps = true; - } - material2D.AntiAliasing=video::EAAM_FULL_BASIC; - //m_video_driver->enableMaterial2D(); ---- a/src/graphics/irr_driver.hpp -+++ b/src/graphics/irr_driver.hpp -@@ -39,7 +39,7 @@ - namespace irr - { - namespace scene { class ISceneManager; class IMesh; class IAnimatedMeshSceneNode; class IAnimatedMesh; -- class IMeshSceneNode; class IParticleSystemSceneNode; class ICameraSceneNode; class ILightSceneNode; } -+ class IMeshSceneNode; class IParticleSystemSceneNode; class ICameraSceneNode; class ILightSceneNode; class ISceneNode; } - namespace gui { class IGUIEnvironment; class IGUIFont; } - } - using namespace irr; ---- a/src/graphics/particle_emitter.cpp -+++ b/src/graphics/particle_emitter.cpp -@@ -291,7 +291,7 @@ - - void ParticleEmitter::clearParticles() - { -- m_node->clearParticles(); -+ //m_node->clearParticles(); - } - - //----------------------------------------------------------------------------- ---- a/src/guiengine/widgets/CGUIEditBox.cpp -+++ b/src/guiengine/widgets/CGUIEditBox.cpp -@@ -755,10 +755,7 @@ - - if (Border) - { -- EGUI_DEFAULT_COLOR col = EGDC_GRAY_EDITABLE; -- if ( isEnabled() ) -- col = focus ? EGDC_FOCUSED_EDITABLE : EGDC_EDITABLE; -- skin->draw3DSunkenPane(this, skin->getColor(col), -+ skin->draw3DSunkenPane(this, video::SColor(255, 0,0,0), - false, true, FrameRect, &AbsoluteClippingRect); - - FrameRect.UpperLeftCorner.X += skin->getSize(EGDS_TEXT_DISTANCE_X)+1; Added: packages/trunk/supertuxkart/debian/patches/build_with_irrlicht_1.8.patch =================================================================== --- packages/trunk/supertuxkart/debian/patches/build_with_irrlicht_1.8.patch (rev 0) +++ packages/trunk/supertuxkart/debian/patches/build_with_irrlicht_1.8.patch 2012-11-26 00:24:45 UTC (rev 13884) @@ -0,0 +1,51 @@ +Description: Fix build with irrlicht 1.8 + This patch enables supertuxkart to be built with the latest stable release + of irrlicht (1.8) rather than svn r3843. +Origin: upstream, see: + http://sourceforge.net/apps/trac/supertuxkart/changeset/10229 + https://bugs.launchpad.net/ubuntu/+source/supertuxkart/+bug/871630/comments/3 +Author: Auria <[email protected]> +Last-Update: 2012-11-16 + +--- a/src/graphics/material.cpp ++++ b/src/graphics/material.cpp +@@ -512,7 +512,7 @@ + // customizable EMT_ONETEXTURE_BLEND instead + m->MaterialType = video::EMT_ONETEXTURE_BLEND ; + m->MaterialTypeParam = +- pack_texureBlendFunc(video::EBF_SRC_ALPHA, ++ pack_textureBlendFunc(video::EBF_SRC_ALPHA, + video::EBF_ONE_MINUS_SRC_ALPHA, + video::EMFN_MODULATE_1X, + video::EAS_TEXTURE | video::EAS_VERTEX_COLOR); +@@ -539,7 +539,7 @@ + // account, which messes up fading in/out effects. So we use the + // more customizable EMT_ONETEXTURE_BLEND instead + m->MaterialType = video::EMT_ONETEXTURE_BLEND ; +- m->MaterialTypeParam = pack_texureBlendFunc(video::EBF_SRC_ALPHA, ++ m->MaterialTypeParam = pack_textureBlendFunc(video::EBF_SRC_ALPHA, + video::EBF_ONE, + video::EMFN_MODULATE_1X, + video::EAS_TEXTURE | +--- a/src/guiengine/widgets/CGUIEditBox.cpp ++++ b/src/guiengine/widgets/CGUIEditBox.cpp +@@ -115,7 +115,7 @@ + } + + +-video::SColor const& CGUIEditBox::getOverrideColor() const ++video::SColor CGUIEditBox::getOverrideColor() const + { + return OverrideColor; + } +--- a/src/guiengine/widgets/CGUIEditBox.h ++++ b/src/guiengine/widgets/CGUIEditBox.h +@@ -36,7 +36,7 @@ + virtual void setOverrideColor(video::SColor color); + + //! Gets the override color +- virtual video::SColor const & getOverrideColor() const; ++ virtual video::SColor getOverrideColor() const; + + //! Sets if the text should use the overide color or the + //! color in the gui skin. Modified: packages/trunk/supertuxkart/debian/patches/series =================================================================== --- packages/trunk/supertuxkart/debian/patches/series 2012-11-25 12:54:36 UTC (rev 13883) +++ packages/trunk/supertuxkart/debian/patches/series 2012-11-26 00:24:45 UTC (rev 13884) @@ -1,4 +1,4 @@ -build_with_irrlicht_1.7.3.patch +build_with_irrlicht_1.8.patch backport_cmake.patch build_against_system_enet.patch fix_desktop_file.patch Modified: packages/trunk/supertuxkart/debian/rules =================================================================== --- packages/trunk/supertuxkart/debian/rules 2012-11-25 12:54:36 UTC (rev 13883) +++ packages/trunk/supertuxkart/debian/rules 2012-11-26 00:24:45 UTC (rev 13884) @@ -33,15 +33,18 @@ # Remove unneeded launcher script in data directory find $(CURDIR)/debian/tmp \( -iname "run_me.sh" \) -delete - # Move xpm icons in /usr/share/pixmaps into /usr/share/icons/hicolor. - # Also install hi-res icon into /usr/share/pixmaps. LP: #937976 + # Install xpm icons in /usr/share/pixmaps into /usr/share/icons/hicolor as + # well. Also install hi-res icon into /usr/share/pixmaps. LP: #937976 install -m 644 $(CURDIR)/debian/tmp/usr/share/games/supertuxkart/data/gui/karts.png \ $(CURDIR)/debian/tmp/usr/share/pixmaps/supertuxkart.png mkdir -p $(CURDIR)/debian/tmp/usr/share/icons/hicolor/32x32/apps - mv -f $(CURDIR)/debian/tmp/usr/share/pixmaps/supertuxkart_32.xpm \ + install -m 644 $(CURDIR)/debian/tmp/usr/share/pixmaps/supertuxkart_32.xpm \ $(CURDIR)/debian/tmp/usr/share/icons/hicolor/32x32/apps/supertuxkart.xpm mkdir -p $(CURDIR)/debian/tmp/usr/share/icons/hicolor/64x64/apps - mv -f $(CURDIR)/debian/tmp/usr/share/pixmaps/supertuxkart_64.xpm \ + install -m 644 $(CURDIR)/debian/tmp/usr/share/pixmaps/supertuxkart_64.xpm \ $(CURDIR)/debian/tmp/usr/share/icons/hicolor/64x64/apps/supertuxkart.xpm dh_install + +override_dh_strip: + dh_strip --dbg-package=supertuxkart-dbg _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
