rpms/player/devel player-2.1.1-gcc44.patch, NONE, 1.1 player-2.1.1-serialtypes.patch, NONE, 1.1 player.spec, 1.4, 1.5

[Tim Niemueller]

Author: timn

Update of /cvs/pkgs/rpms/player/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24311

Modified Files:
	player.spec 
Added Files:
	player-2.1.1-gcc44.patch player-2.1.1-serialtypes.patch 
Log Message:
* Sun Dec 21 2008 Tim Niemueller <tim at niemueller.de> - 2.1.1-8
+- Add patch for broken linux/serial.h (thanks to Caolán McNamara)
+- Add patch for GCC 4.4 (thanks to Caolán McNamara)
+- Rebuild for Python 2.6


player-2.1.1-gcc44.patch:

--- NEW FILE player-2.1.1-gcc44.patch ---
diff -ru player-2.1.1.orig/server/drivers/vectormap/dbconn.cc player-2.1.1/server/drivers/vectormap/dbconn.cc
--- player-2.1.1.orig/server/drivers/vectormap/dbconn.cc	2008-04-12 23:15:43.000000000 +0100
+++ player-2.1.1/server/drivers/vectormap/dbconn.cc	2008-12-17 10:57:27.000000000 +0000
@@ -314,13 +314,13 @@
     printf("GEOSGeomFromWKB_buf returned NULL!\n");
     return res;
   }
-  GEOSGeom linestring = GEOSGetExteriorRing(polygon);
+  const GEOSGeometry* linestring = GEOSGetExteriorRing(polygon);
   if (linestring == NULL)
   {
     printf("GEOSGetExteriorRing returned NULL!\n");
     return res;
   }
-  GEOSCoordSeq coords = GEOSGeom_getCoordSeq(linestring);
+  const GEOSCoordSequence* coords = GEOSGeom_getCoordSeq(linestring);
   if (coords == NULL)
   {
     printf("GEOSGeom_getCoordSeq returned NULL!\n");
diff -ru player-2.1.1.orig/server/drivers/vectormap/vec2map.cc player-2.1.1/server/drivers/vectormap/vec2map.cc
--- player-2.1.1.orig/server/drivers/vectormap/vec2map.cc	2008-04-16 03:40:20.000000000 +0100
+++ player-2.1.1/server/drivers/vectormap/vec2map.cc	2008-12-17 11:00:16.000000000 +0000
@@ -285,7 +286,7 @@
 #ifdef HAVE_GEOS
 void Vec2Map::dumpFeature(GEOSGeom geom, vector<player_segment_t> & segments)
 {
-    GEOSCoordSeq seq;
+    const GEOSCoordSequence* seq;
     double x0, y0, x1, y1;
     unsigned int numcoords;
     player_segment_t segment;
@@ -338,16 +339,16 @@
 	}
 	break;
     case GEOS_POLYGON:
-	this->dumpFeature(GEOSGetExteriorRing(geom), segments);
+	this->dumpFeature(const_cast<GEOSGeometry*>(GEOSGetExteriorRing(geom)), segments);
 	numcoords = GEOSGetNumInteriorRings(geom);
-	for (i = 0; i < (signed)numcoords; i++) this->dumpFeature(GEOSGetInteriorRingN(geom, i), segments);
+	for (i = 0; i < (signed)numcoords; i++) this->dumpFeature(const_cast<GEOSGeometry*>(GEOSGetInteriorRingN(geom, i)), segments);
 	break;
     case GEOS_MULTIPOINT:
     case GEOS_MULTILINESTRING:
     case GEOS_MULTIPOLYGON:
     case GEOS_GEOMETRYCOLLECTION:
 	numcoords = GEOSGetNumGeometries(geom);
-	for (i = 0; i < (signed)numcoords; i++) this->dumpFeature(GEOSGetGeometryN(geom, i), segments);
+	for (i = 0; i < (signed)numcoords; i++) this->dumpFeature(const_cast<GEOSGeometry*>(GEOSGetGeometryN(geom, i)), segments);
 	break;
     default:
 	PLAYER_WARN("unknown feature type!");

player-2.1.1-serialtypes.patch:

--- NEW FILE player-2.1.1-serialtypes.patch ---
diff -ru player-2.1.1.orig/server/drivers/laser/sicklms200.cc player-2.1.1/server/drivers/laser/sicklms200.cc
--- player-2.1.1.orig/server/drivers/laser/sicklms200.cc	2008-12-17 10:41:52.000000000 +0000
+++ player-2.1.1/server/drivers/laser/sicklms200.cc	2008-12-17 10:42:57.000000000 +0000
@@ -203,6 +203,7 @@
 #undef HAVE_HI_SPEED_SERIAL
 #ifdef HAVE_LINUX_SERIAL_H
   #ifndef DISABLE_HIGHSPEEDSICK
+    #include <linux/types.h>
     #include <linux/serial.h>
     #define HAVE_HI_SPEED_SERIAL
   #endif
diff -ru player-2.1.1.orig/server/drivers/mixed/wbr/914/wbr914.cc player-2.1.1/server/drivers/mixed/wbr/914/wbr914.cc
--- player-2.1.1.orig/server/drivers/mixed/wbr/914/wbr914.cc	2008-12-17 10:41:52.000000000 +0000
+++ player-2.1.1/server/drivers/mixed/wbr/914/wbr914.cc	2008-12-17 10:43:10.000000000 +0000
@@ -113,6 +113,7 @@
 #include <stdlib.h>  /* for abs() */
 
 #include <fcntl.h>
+#include <linux/types.h>
 #include <linux/serial.h>
 #include <signal.h>
 #include <sys/stat.h>


Index: player.spec
===================================================================
RCS file: /cvs/pkgs/rpms/player/devel/player.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- player.spec	6 Dec 2008 08:23:50 -0000	1.4
+++ player.spec	21 Dec 2008 17:54:13 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:           player
 Version:        2.1.1
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Cross-platform robot device interface and server
 
 Group:          Applications/System
@@ -16,6 +16,8 @@
 Patch1:         %{name}-2.1.1-norpath.patch
 Patch2:         %{name}-2.1.0rc2-paths.patch
 Patch3:         %{name}-2.1.1-plugindir.patch
+Patch4:         %{name}-2.1.1-serialtypes.patch
+Patch5:         %{name}-2.1.1-gcc44.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  autoconf, automake
@@ -102,7 +104,8 @@
 %patch1 -p1 -b .norpath
 %patch2 -p1 -b .paths
 %patch3 -p1 -b .plugindir
-
+%patch4 -p1 -b .serialtypes
+%patch5 -p1 -b .gcc44
 
 %build
 # Required because patches modify .am files
@@ -196,6 +199,11 @@
 %{_libdir}/*.a
 
 %changelog
+* Sun Dec 21 2008 Tim Niemueller <tim at niemueller.de> - 2.1.1-8
+- Add patch for broken linux/serial.h (thanks to Caolán McNamara)
+- Add patch for GCC 4.4 (thanks to Caolán McNamara)
+- Rebuild for Python 2.6
+
 * Sat Dec  6 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 2.1.1-7
 - Fix libtool issue