Source: supertuxkart
Version: 0.7+dfsg1-1
Severity: important

supertuxkart fails to build with enet 1.3.1-1 from experimental:

x86_64-linux-gnu-g++ -DPACKAGE_NAME=\"supertuxkart\" 
-DPACKAGE_TARNAME=\"supertuxkart\" -DPACKAGE_VERSION=\"0.7\" 
-DPACKAGE_STRING=\"supertuxkart\ 0.7\" -DPACKAGE_BUGREPORT=\"\" 
-DPACKAGE_URL=\"\" -DPACKAGE=\"supertuxkart\" -DVERSION=\"0.7\" 
-DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 
-DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 
-DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_AL_AL_H=1 -DHAVE_OGGVORBIS=1 
-DBT_NO_PROFILE=/\*\*/ -DENABLE_NLS=1 -DHAVE_GETTEXT=1 -DHAVE_DCGETTEXT=1 -I.  
-DSUPERTUXKART_DATADIR="\"/usr/share/games/supertuxkart/\"" -I./bullet/src/ 
-I/usr/local/include -I /usr/include/irrlicht -I/usr/local/include  -g -O2 
-Wall -Wall -DNDEBUG -O2 -MT network_manager.o -MD -MP -MF 
.deps/network_manager.Tpo -c -o network_manager.o `test -f 
'network/network_manager.cpp' || echo './'`network/network_manager.cpp
network/network_manager.cpp: In member function 'bool 
NetworkManager::initServer()':
network/network_manager.cpp:86:76: error: too few arguments to function 
'ENetHost* enet_host_create(const ENetAddress*, size_t, size_t, enet_uint32, 
enet_uint32)'
/usr/include/enet/enet.h:498:21: note: declared here
network/network_manager.cpp: In member function 'bool 
NetworkManager::initClient()':
network/network_manager.cpp:111:76: error: too few arguments to function 
'ENetHost* enet_host_create(const ENetAddress*, size_t, size_t, enet_uint32, 
enet_uint32)'
/usr/include/enet/enet.h:498:21: note: declared here
network/network_manager.cpp:128:50: error: too few arguments to function 
'ENetPeer* enet_host_connect(ENetHost*, const ENetAddress*, size_t, 
enet_uint32)'
/usr/include/enet/enet.h:500:21: note: declared here
make[3]: *** [network_manager.o] Error 1

The attached patch allows to build supertuxkart with enet 1.3.1, but I did not
do any further testing.

Regards,
Ansgar
diff -u supertuxkart-0.7+dfsg1/debian/control supertuxkart-0.7+dfsg1/debian/control
--- supertuxkart-0.7+dfsg1/debian/control
+++ supertuxkart-0.7+dfsg1/debian/control
@@ -17,7 +17,7 @@
  libmikmod2-dev,
  libvorbis-dev,
  automake,
- libenet-dev
+ libenet-dev (>= 1.3.1)
 Standards-Version: 3.8.4
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/supertuxkart/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/supertuxkart/?op=log
--- supertuxkart-0.7+dfsg1.orig/src/network/network_manager.cpp
+++ supertuxkart-0.7+dfsg1/src/network/network_manager.cpp
@@ -82,6 +82,7 @@
 
      m_host = enet_host_create (& address     /* the address to bind the server host to */, 
                                 stk_config->m_max_karts /* number of connections */,
+				0             /* channel limit */,
                                 0             /* incoming bandwidth */,
                                 0             /* outgoing bandwidth */     );
     if (m_host == NULL)
@@ -107,6 +108,7 @@
 {
     m_host = enet_host_create (NULL /* create a client host */,
                                1    /* only allow 1 outgoing connection */,
+			       0    /* channel limit */,
                                0    /* downstream bandwidth unlimited   */,
                                0    /*  upstream bandwidth unlimited    */ );
     
@@ -125,7 +127,7 @@
     address.port = UserConfigParams::m_server_port;
 
     /* Initiate the connection, allocating the two channels 0 and 1. */
-    peer = enet_host_connect (m_host, &address, 2);    
+    peer = enet_host_connect (m_host, &address, 2, 0);
     
     if (peer == NULL)
     {

Reply via email to