diff options
| -rw-r--r-- | games/stuntrally/stuntrally-bullet-2.84+.patch | 62 | ||||
| -rw-r--r-- | games/stuntrally/stuntrally.SlackBuild | 5 | ||||
| -rw-r--r-- | games/stuntrally/stuntrally.info | 10 |
3 files changed, 6 insertions, 71 deletions
diff --git a/games/stuntrally/stuntrally-bullet-2.84+.patch b/games/stuntrally/stuntrally-bullet-2.84+.patch deleted file mode 100644 index b07b352eac..0000000000 --- a/games/stuntrally/stuntrally-bullet-2.84+.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff --git a/source/ogre/CHud.cpp b/source/ogre/CHud.cpp -index e3ae43f..037fa2e 100644 ---- a/source/ogre/CHud.cpp -+++ b/source/ogre/CHud.cpp -@@ -6,7 +6,9 @@ - #include "common/data/SceneXml.h" - #include "common/CScene.h" - #include "../vdrift/settings.h" -+#ifndef BT_NO_PROFILE - #include <LinearMath/btQuickprof.h> -+#endif // BT_NO_PROFILE - #include <OgreManualObject.h> - #include <OgreSceneManager.h> - #include <OgreSceneNode.h> -@@ -151,7 +153,7 @@ void CHud::UpdDbgTxtClr() - } - } - -- -+#ifndef BT_NO_PROFILE - /// Bullet profiling text - //-------------------------------------------------------------------------------------------------------------- - -@@ -214,3 +216,4 @@ void CHud::bltDumpAll(std::stringstream& os) - - CProfileManager::Release_Iterator(profileIterator); - } -+#endif // BT_NO_PROFILE -diff --git a/source/ogre/CHud.h b/source/ogre/CHud.h -index ace2ca0..86c6150 100644 ---- a/source/ogre/CHud.h -+++ b/source/ogre/CHud.h -@@ -154,7 +154,9 @@ public: - // string utils - Ogre::String StrClr(Ogre::ColourValue c); - -+#ifndef BT_NO_PROFILE - // bullet debug text - void bltDumpRecursive(class CProfileIterator* profileIterator, int spacing, std::stringstream& os); - void bltDumpAll(std::stringstream& os); -+#endif // BT_NO_PROFILE - }; -diff --git a/source/ogre/Hud_Update.cpp b/source/ogre/Hud_Update.cpp -index 18c650a..b33d808 100644 ---- a/source/ogre/Hud_Update.cpp -+++ b/source/ogre/Hud_Update.cpp -@@ -597,6 +597,7 @@ void CHud::Update(int carId, float time) - } - - -+#ifndef BT_NO_PROFILE - // bullet profiling text -------- - static bool oldBltTxt = false; - if (ov[1].oU) -@@ -616,6 +617,7 @@ void CHud::Update(int carId, float time) - ov[1].oU->setCaption(""); - } - oldBltTxt = pSet->bltProfilerTxt; -+#endif // BT_NO_PROFILE - - - // wheels slide, susp bars -------- diff --git a/games/stuntrally/stuntrally.SlackBuild b/games/stuntrally/stuntrally.SlackBuild index d858c5ceea..60d2a75f68 100644 --- a/games/stuntrally/stuntrally.SlackBuild +++ b/games/stuntrally/stuntrally.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=stuntrally -VERSION=${VERSION:-2.6} +VERSION=${VERSION:-2.6.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -71,9 +71,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# Fix compilation error with newer bullets. Thanks AUR. -patch -p1 < $CWD/stuntrally-bullet-2.84+.patch - mkdir -p build cd build cmake \ diff --git a/games/stuntrally/stuntrally.info b/games/stuntrally/stuntrally.info index 89715cbdfb..3b8f7ca2a4 100644 --- a/games/stuntrally/stuntrally.info +++ b/games/stuntrally/stuntrally.info @@ -1,10 +1,10 @@ PRGNAM="stuntrally" -VERSION="2.6" +VERSION="2.6.1" HOMEPAGE="http://stuntrally.tuxfamily.org/" -DOWNLOAD="https://github.com/stuntrally/stuntrally/archive/2.6/stuntrally-2.6.tar.gz \ - https://github.com/stuntrally/tracks/archive/2.6/tracks-2.6.tar.gz" -MD5SUM="652fca6a2f8ba43ac6525275806257c2 \ - f67d464b792e68966f0917f8f39f9e24" +DOWNLOAD="https://github.com/stuntrally/stuntrally/archive/2.6.1/stuntrally-2.6.1.tar.gz \ + https://github.com/stuntrally/tracks/archive/2.6.1/tracks-2.6.1.tar.gz" +MD5SUM="03f64cd2724d51888d42da3208710c65 \ + fc075a198ad2ec4bf4b4739010761a25" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="MyGUI SDL2 enet bullet OpenAL FreeImage" |