r11963 - in packages/trunk/supertuxkart/debian: . patches

[Christoph Egger]

Author: christoph
Date: 2011-03-17 22:46:13 +0000 (Thu, 17 Mar 2011)
New Revision: 11963

Added:
   packages/trunk/supertuxkart/debian/patches/enet1.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
Log:
Include enet patch by ansgar and refresh + apply system enet patch again

Modified: packages/trunk/supertuxkart/debian/changelog
===================================================================
--- packages/trunk/supertuxkart/debian/changelog	2011-03-17 22:41:56 UTC (rev 11962)
+++ packages/trunk/supertuxkart/debian/changelog	2011-03-17 22:46:13 UTC (rev 11963)
@@ -1,8 +1,10 @@
 supertuxkart (0.7+dfsg1-2) unstable; urgency=low
 
   * drop 3DGraphics from desktop file (LP: #532065)
+  * Apply patch by Ansgar Burchardt to build against enet 1.3 (Closes:
+    #617783)
 
- -- Christoph Egger <christoph at debian.org>  Fri, 25 Feb 2011 01:03:45 +0100
+ -- Christoph Egger <christoph at debian.org>  Thu, 17 Mar 2011 21:08:17 +0100
 
 supertuxkart (0.7+dfsg1-1) unstable; urgency=low
 

Modified: packages/trunk/supertuxkart/debian/control
===================================================================
--- packages/trunk/supertuxkart/debian/control	2011-03-17 22:41:56 UTC (rev 11962)
+++ packages/trunk/supertuxkart/debian/control	2011-03-17 22:46:13 UTC (rev 11963)
@@ -13,10 +13,9 @@
  docbook-to-man,
  libopenal-dev,
  libalut-dev,
- 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

Modified: packages/trunk/supertuxkart/debian/patches/build-against-system-enet.patch
===================================================================
--- packages/trunk/supertuxkart/debian/patches/build-against-system-enet.patch	2011-03-17 22:41:56 UTC (rev 11962)
+++ packages/trunk/supertuxkart/debian/patches/build-against-system-enet.patch	2011-03-17 22:46:13 UTC (rev 11963)
@@ -1,25 +1,19 @@
---- supertuxkart-0.6.2+dfsg1.orig/Makefile.am
-+++ supertuxkart-0.6.2+dfsg1/Makefile.am
+Index: supertuxkart-0.7+dfsg1/Makefile.am
+===================================================================
+--- supertuxkart-0.7+dfsg1.orig/Makefile.am	2011-03-17 21:33:33.217430007 +0100
++++ supertuxkart-0.7+dfsg1/Makefile.am	2011-03-17 21:38:27.493430007 +0100
 @@ -1,6 +1,6 @@
  ACLOCAL_AMFLAGS = -I m4
  
 -SUBDIRS = $(BULLETTREE) $(ENETTREE) src doc data
 +SUBDIRS = $(BULLETTREE) src doc data
  
- EXTRA_DIST = \
-  README.cygwin \
---- supertuxkart-0.6.2+dfsg1.orig/data/Makefile.am
-+++ supertuxkart-0.6.2+dfsg1/data/Makefile.am
-@@ -6,7 +6,6 @@
- dist_pkgdata_DATA = \
-  $(shell find $(srcdir) -name "*.data") \
-  $(shell find $(srcdir) -name "*.items") \
-- $(shell find $(srcdir) -name "*.projectile") \
-  $(shell find $(srcdir) -name "*.cup") \
-  $(shell find $(srcdir) -maxdepth 1 -name "*.challenge") \
-  $(shell find $(srcdir) -name "*.collectable") \
---- supertuxkart-0.6.2+dfsg1.orig/src/Makefile.am
-+++ supertuxkart-0.6.2+dfsg1/src/Makefile.am
+ pkgdatadir=$(datadir)/doc/$(PACKAGE)
+ dist_pkgdata_DATA=AUTHORS ChangeLog COPYING README
+Index: supertuxkart-0.7+dfsg1/src/Makefile.am
+===================================================================
+--- supertuxkart-0.7+dfsg1.orig/src/Makefile.am	2011-03-17 21:33:33.205430007 +0100
++++ supertuxkart-0.7+dfsg1/src/Makefile.am	2011-03-17 21:38:27.493430007 +0100
 @@ -6,7 +6,7 @@
  bin_PROGRAMS = supertuxkart
  
@@ -29,12 +23,24 @@
  
  supertuxkart_SOURCES = \
   main.cpp \
-@@ -300,7 +300,7 @@
+@@ -395,7 +395,7 @@
+ 
  # Link in the specific gcc 4.1 bug work around
- supertuxkart_LDADD = libstatic_ssg.a \
-         -lplibjs -lplibsl -lplibssg -lplibpu -lplibfnt -lplibsg \
--        -lplibul -lplibssgaux $(bullet_LIBS) $(enet_LIBS) $(glut_LIBS) \
-+        -lplibul -lplibssgaux -lenet $(bullet_LIBS)  $(glut_LIBS) \
-         $(opengl_LIBS) $(sdl_LIBS) $(openal_LIBS) $(oggvorbis_LIBS) \
-         $(INTLLIBS)
+ supertuxkart_LDADD = \
+-        $(irrlicht_LIBS) $(fribidi_LIBS) $(bullet_LIBS) $(enet_LIBS) \
++        $(irrlicht_LIBS) $(fribidi_LIBS) $(bullet_LIBS) -lenet \
+         $(opengl_LIBS) $(openal_LIBS) $(oggvorbis_LIBS) \
+         $(INTLLIBS) $(LIBCURL_LIBS) $(LIBCURL_CFLAGS)
  
+Index: supertuxkart-0.7+dfsg1/configure.ac
+===================================================================
+--- supertuxkart-0.7+dfsg1.orig/configure.ac	2011-03-17 21:38:37.269430007 +0100
++++ supertuxkart-0.7+dfsg1/configure.ac	2011-03-17 21:38:52.289430007 +0100
+@@ -460,7 +460,6 @@
+  src/ide/Makefile                   \
+  src/bullet/Makefile                \
+  src/bullet/src/Makefile            \
+- src/enet/Makefile                  \
+ ])
+ AC_OUTPUT
+ echo -e $SUMMARY

Added: packages/trunk/supertuxkart/debian/patches/enet1.3.patch
===================================================================
--- packages/trunk/supertuxkart/debian/patches/enet1.3.patch	                        (rev 0)
+++ packages/trunk/supertuxkart/debian/patches/enet1.3.patch	2011-03-17 22:46:13 UTC (rev 11963)
@@ -0,0 +1,27 @@
+--- 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)
+     {

Modified: packages/trunk/supertuxkart/debian/patches/series
===================================================================
--- packages/trunk/supertuxkart/debian/patches/series	2011-03-17 22:41:56 UTC (rev 11962)
+++ packages/trunk/supertuxkart/debian/patches/series	2011-03-17 22:46:13 UTC (rev 11963)
@@ -1,2 +1,2 @@
-# Nothing to do right now
 build-against-system-enet.patch
+enet1.3.patch