Build also with mapnik2.0.

(Portage version: 2.2.0_alpha108/cvs/Linux x86_64)

3 files changed, 86 insertions, 4 deletions

diff --git a/app-misc/gpsdrive/ChangeLog b/app-misc/gpsdrive/ChangeLog
index 80715c99ae6e..f048145ee083 100644
--- a/app-misc/gpsdrive/ChangeLog
+++ b/app-misc/gpsdrive/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/gpsdrive
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gpsdrive/ChangeLog,v 1.51 2012/05/03 19:41:33 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gpsdrive/ChangeLog,v 1.52 2012/05/26 08:37:45 scarabeus Exp $
+
+  26 May 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/gpsdrive-2.11-mapnik-2.0api.patch, gpsdrive-2.11-r3.ebuild:
+  Build also with mapnik2.0.
 
   03 May 2012; Jeff Horelick <jdhore@gentoo.org> gpsdrive-2.11-r3.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/app-misc/gpsdrive/files/gpsdrive-2.11-mapnik-2.0api.patch b/app-misc/gpsdrive/files/gpsdrive-2.11-mapnik-2.0api.patch
new file mode 100644
index 000000000000..1eed7b3bb58f
--- /dev/null
+++ b/app-misc/gpsdrive/files/gpsdrive-2.11-mapnik-2.0api.patch
@@ -0,0 +1,77 @@
+--- trunk/src/mapnik.cpp	2010/07/28 13:39:38	2586
++++ trunk/src/mapnik.cpp	2012/05/19 10:04:16	2605
+@@ -22,6 +22,7 @@
+ #include <mapnik/font_engine_freetype.hpp>
+ #include <mapnik/config_error.hpp>
+ #include <mapnik/image_util.hpp>
++#include <mapnik/version.hpp>
+ #include <fstream>
+ #include <sys/stat.h>
+ 
+@@ -29,10 +30,17 @@
+ #include "config.h"
+ #include "gpsdrive_config.h"
+ 
++
++#if MAPNIK_VERSION < 200000
+ using mapnik::Image32;
+-using mapnik::Map;
+ using mapnik::Layer;
+ using mapnik::Envelope;
++#else
++using mapnik::image_32;
++using mapnik::layer;
++using mapnik::box2d;
++#endif
++using mapnik::Map;
+ using mapnik::coord2d;
+ using mapnik::feature_ptr;
+ using mapnik::geometry_ptr;
+@@ -491,7 +499,7 @@
+             double res = scale_denom * 0.00028;
+ 		
+             /* render image */
+-	
++#if MAPNIK_VERSION < 200000
+             Envelope<double> box = Envelope<double>(MapnikMap.NewCenterPt.x - 0.5 * MapnikMap.WidthInt * res,
+                                                     MapnikMap.NewCenterPt.y - 0.5 * MapnikMap.HeightInt * res,
+                                                     MapnikMap.NewCenterPt.x + 0.5 * MapnikMap.WidthInt * res,
+@@ -504,16 +512,36 @@
+             ren.apply();
+ 
+             if (mydebug > 0) std::cout << MapnikMap.MapPtr->getCurrentExtent() << "\n";
++#else
++	    box2d<double> box = box2d<double>(MapnikMap.NewCenterPt.x - 0.5 * MapnikMap.WidthInt * res,
++                                              MapnikMap.NewCenterPt.y - 0.5 * MapnikMap.HeightInt * res,
++                                              MapnikMap.NewCenterPt.x + 0.5 * MapnikMap.WidthInt * res,
++                                              MapnikMap.NewCenterPt.y + 0.5 * MapnikMap.HeightInt * res);
+ 
++            MapnikMap.MapPtr->zoom_to_box(box);
++
++            image_32 buf(MapnikMap.WidthInt, MapnikMap.HeightInt);
++            mapnik::agg_renderer<image_32> ren(*MapnikMap.MapPtr,buf);
++            ren.apply();
++
++            if (mydebug > 0) std::cout << MapnikMap.MapPtr->get_current_extent() << "\n";
++#endif
+             /* get raw data for gpsdrives pixbuf */
+             convert_argb32_to_gdkpixbuf_data(buf.raw_data(), MapnikMap.ImageRawDataPtr);
+ 
+             /* create pixbuf data before check to unref */
+-            if (MapnikMap.GdkPixbufPtr) gdk_pixbuf_unref(MapnikMap.GdkPixbufPtr);
+-            MapnikMap.GdkPixbufPtr = gdk_pixbuf_new_from_data(MapnikMap.ImageRawDataPtr, GDK_COLORSPACE_RGB, FALSE, 8, 1280, 1024, 1280 * 3, NULL, NULL);
++            if (MapnikMap.GdkPixbufPtr)
++		gdk_pixbuf_unref(MapnikMap.GdkPixbufPtr);
++
++            MapnikMap.GdkPixbufPtr = gdk_pixbuf_new_from_data(MapnikMap.ImageRawDataPtr,
++				GDK_COLORSPACE_RGB, FALSE, 8, 1280, 1024, 1280 * 3, NULL, NULL);
+ 
+             /* ok we have a map set default values */
++#if MAPNIK_VERSION < 200000
+             mapnik::Envelope<double> ext = MapnikMap.MapPtr->getCurrentExtent();
++#else
++            mapnik::box2d<double> ext = MapnikMap.MapPtr->get_current_extent();
++#endif
+             mapnik::coord2d pt = ext.center();
+             MapnikMap.CenterPt.x = pt.x;
+             MapnikMap.CenterPt.y = pt.y;
diff --git a/app-misc/gpsdrive/gpsdrive-2.11-r3.ebuild b/app-misc/gpsdrive/gpsdrive-2.11-r3.ebuild
index cbe7e6cefeac..bc25b57c5e4e 100644
--- a/app-misc/gpsdrive/gpsdrive-2.11-r3.ebuild
+++ b/app-misc/gpsdrive/gpsdrive-2.11-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gpsdrive/gpsdrive-2.11-r3.ebuild,v 1.3 2012/05/03 19:41:33 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gpsdrive/gpsdrive-2.11-r3.ebuild,v 1.4 2012/05/26 08:37:45 scarabeus Exp $
 
 EAPI=4
 
@@ -15,7 +15,7 @@ SLOT="0"
 
 KEYWORDS="~amd64 ~ppc ~x86"
 
-IUSE="dbus -debug -kismet gdal mapnik scripts -speech"
+IUSE="dbus debug kismet gdal mapnik scripts -speech"
 
 COMMON_DEP="
 	dev-db/sqlite:3
@@ -75,7 +75,8 @@ src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}_DefineOptions_gpsd.patch \
 		"${FILESDIR}"/${P}-add-gdk-pixbuf2.patch \
-		"${FILESDIR}"/${P}-gpsd-2.96.patch
+		"${FILESDIR}"/${P}-gpsd-2.96.patch \
+		"${FILESDIR}"/${P}-mapnik-2.0api.patch
 }
 
 src_configure() {