ArmagetronAd: bump version

games-action/armagetronad/armagetronad-0.2.9.1.0.recipe

@@ -6,11 +6,11 @@ playing arena, HUD, unique graphics, and AI bots. For the more advanced player \
 there are new game modes and a wide variety of physics 	settings to tweak as \
 well."
 HOMEPAGE="http://www.armagetronad.org/"
-COPYRIGHT="2007-2020 OSS Armagetronad Team"
+COPYRIGHT="2007-2021 OSS Armagetronad Team"
 LICENSE="GNU GPL v2"
 REVISION="1"
-SOURCE_URI="https://launchpad.net/armagetronad/0.2.8/$portVersion/+download/armagetronad-$portVersion.src.tar.gz"
-CHECKSUM_SHA256="b4c993558c08806c40e3c7095437451ffe9bc3d3f8c0310e58c50a81153446fc"
+SOURCE_URI="https://launchpad.net/armagetronad/0.2.9/$portVersion/+download/armagetronad-$portVersion.tbz"
+CHECKSUM_SHA256="59b6c7c01ce3f8cca5437e33f974a637529541a11aa4f52c1a5c17499e26f6a1"
 PATCHES="armagetronad-$portVersion.patchset"
 ADDITIONAL_FILES="armagetronad.rdef.in"
 
@@ -37,6 +37,12 @@ GLOBAL_WRITABLE_FILES="
 	settings/armagetronad/settings_dedicated.cfg keep-old
 	settings/armagetronad/settings_visual.cfg keep-old
 	settings/armagetronad/subcultures.srv keep-old
+	settings/armagetronad/keys_cursor.cfg keep-old
+	settings/armagetronad/keys_cursor_single.cfg keep-old
+	settings/armagetronad/keys_twohand.cfg keep-old
+	settings/armagetronad/keys_wasd.cfg keep-old
+	settings/armagetronad/keys_x.cfg keep-old
+	settings/armagetronad/keys_zqsd.cfg keep-old
 	"
 
 PROVIDES="

games-action/armagetronad/patches/armagetronad-0.2.9.1.0.patchset

@@ -1,11 +1,11 @@
-From 1deebdc4bb229200b5723f56d5f8076e659c7660 Mon Sep 17 00:00:00 2001
+From d9aacb37055de77c7a1d10cc9874caec4b59d1f7 Mon Sep 17 00:00:00 2001
 From: Sergei Reznikov <diver@gelios.net>
 Date: Fri, 23 Nov 2018 15:17:26 +0300
 Subject: Add missing include
 
 
 diff --git a/src/network/nSocket.cpp b/src/network/nSocket.cpp
-index 29228fb..4434281 100644
+index d80f908..cad1c6e 100644
 --- a/src/network/nSocket.cpp
 +++ b/src/network/nSocket.cpp
 @@ -45,7 +45,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -18,20 +18,20 @@ index 29228fb..4434281 100644
  #include <arpa/inet.h> 
  #include <netinet/in_systm.h>
 -- 
-2.26.0
+2.30.2
 
 
-From 930bc4c4bf6983a12e0c181e3918fa7eb2531774 Mon Sep 17 00:00:00 2001
+From ecca5b573275ae093f7ba7823d254b2dcc86d9e1 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Tue, 19 May 2020 21:03:46 +1000
 Subject: Fix build
 
 
 diff --git a/src/network/nSocket.cpp b/src/network/nSocket.cpp
-index 4434281..d9fc609 100644
+index cad1c6e..72862c8 100644
 --- a/src/network/nSocket.cpp
 +++ b/src/network/nSocket.cpp
-@@ -2151,7 +2151,7 @@ int nSocket::Write( const int8 * buf, int len, const nAddress & addr ) const
+@@ -2155,7 +2155,7 @@ int nSocket::Write( const int8 * buf, int len, const nAddress & addr ) const
  //!
  // *******************************************************************************************
  
@@ -66,20 +66,20 @@ index 5d3dbb4..0c6b3f5 100644
      nAddress const &   GetAddress( void )                  const   ;	//!< Gets the address the socket is bound to
      nSocket const &    GetAddress( nAddress & address )    const   ;	//!< Gets the address the socket is bound to
 -- 
-2.26.0
+2.30.2
 
 
-From cce0ad65016865cf4be3adf938f3379191e0fda8 Mon Sep 17 00:00:00 2001
+From 2505997d76d19e6a28f67a6f7c619b90d5f68e8f Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Wed, 20 May 2020 08:44:37 +1000
 Subject: Fix argv[0] for launch from symlink
 
 
 diff --git a/src/tron/gArmagetron.cpp b/src/tron/gArmagetron.cpp
-index e0b5c4d..6236d84 100644
+index 34949f5..56c8f2a 100644
 --- a/src/tron/gArmagetron.cpp
 +++ b/src/tron/gArmagetron.cpp
-@@ -492,7 +492,11 @@ void sg_PutEnv( char const * s )
+@@ -607,7 +607,11 @@ tConfItem<tString> sn_configurationSavedInVersionConf("SAVED_IN_VERSION",sn_conf
  int main(int argc,char **argv){
      //std::cout << "enter\n";
      //  net_test();
@@ -93,5 +93,73 @@ index e0b5c4d..6236d84 100644
  
      //  std::cout << "Running " << argv[0] << "...\n";
 -- 
-2.26.0
+2.30.2
+
+
+From 240055e845167e96f23c2ebc6cded3700ce8cf9b Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Mon, 27 Sep 2021 11:09:57 +1000
+Subject: SOCK_CLOEXEC and IPTOS_LOWDELAY not supported
+
+
+diff --git a/src/network/nSocket.cpp b/src/network/nSocket.cpp
+index 72862c8..46d3cd4 100644
+--- a/src/network/nSocket.cpp
++++ b/src/network/nSocket.cpp
+@@ -1518,7 +1518,7 @@ int nSocket::Create( void )
+     sn_InitOSNetworking();
+ 
+     int socktype = socktype_;
+-#ifndef WIN32
++#if !defined(WIN32) && !defined(__HAIKU__)
+     socktype |= SOCK_CLOEXEC;
+ #endif
+ 
+@@ -1529,7 +1529,7 @@ int nSocket::Create( void )
+ 
+     // set TOS to low latency ( see manpages getsockopt(2), ip(7) and socket(7) )
+     // maybe this works for Windows, too?
+-#ifndef WIN32
++#if !defined(WIN32) && !defined(__HAIKU__)
+     char tos = IPTOS_LOWDELAY;
+ 
+     setsockopt( socket_, IPPROTO_IP, IP_TOS, &tos, sizeof(char) );
+-- 
+2.30.2
+
+
+From d8dd93a242fbd76f2b08ce425ad68712c771b302 Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Mon, 27 Sep 2021 12:13:07 +1000
+Subject: Fix crash on exit
+
+
+diff --git a/src/tron/gArmagetron.cpp b/src/tron/gArmagetron.cpp
+index 56c8f2a..fb48580 100644
+--- a/src/tron/gArmagetron.cpp
++++ b/src/tron/gArmagetron.cpp
+@@ -788,7 +788,7 @@ int main(int argc,char **argv){
+                 SDL_Init(SDL_INIT_VIDEO) < 0 )            {
+                 tERR_ERROR("Couldn't initialize SDL: " << SDL_GetError());
+             }
+-            atexit(SDL_Quit);
++            //atexit(SDL_Quit);
+ 
+             sr_glRendererInit();
+ 
+@@ -864,10 +864,10 @@ int main(int argc,char **argv){
+                 //std::cout << "saved\n";
+ 
+                 //    cleanup(grid);
+-                SDL_QuitSubSystem(SDL_INIT_VIDEO);
++                //SDL_QuitSubSystem(SDL_INIT_VIDEO);
+             }
+             se_SoundExit();
+-            SDL_Quit();
++            SDL_QuitSubSystem(SDL_INIT_AUDIO);
+ #else
+             sr_glOut=0;
+ 
+-- 
+2.30.2