On Wed, 2008-12-17 at 10:58 +0000, Caolán McNamara wrote:
> On Wed, 2008-12-17 at 11:21 +0100, Tim Niemueller wrote:
> > Hi Fedora.
> >
> > I'm trying to build the player package. It bails out with the following
> > error message:
> > /usr/include/linux/serial.h:164: error: '__u32' does not name a type
> > /usr/include/linux/serial.h:168: error: '__u32' does not name a type
> > /usr/include/linux/serial.h:169: error: '__u32' does not name a type
> > make[4]: *** [sicklms200.lo] Error 1
>
> Perhaps simply include linux/types.h before linux/serial.h, e.g. this
> attached patch.
After trying a test-build, you probably also need something like this to
get past the next set of errors.
C.
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!");
--
fedora-devel-list mailing list
fedora-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/fedora-devel-list
