Build also with mapnik2.0.

Package-Manager: portage-2.2.0_alpha108/cvs/Linux x86_64

4 files changed, 109 insertions, 6 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/Manifest b/app-misc/gpsdrive/Manifest
index fff04190c52b..40ab2829f35c 100644
--- a/app-misc/gpsdrive/Manifest
+++ b/app-misc/gpsdrive/Manifest
@@ -1,7 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gpsdrive-2.11-add-gdk-pixbuf2.patch 1420 RMD160 4a39c4b3bac467b4750f24509c5191422168c27a SHA1 f2634985a24267918dd7903146618ffdb60ecd48 SHA256 b5fe834f172052765e20e232d9b37e44694f833e808a3493873201d274dc5b80
 AUX gpsdrive-2.11-gpsd-2.96.patch 1317 RMD160 96a0acbe6989ff3396cea7db260f1e2085cd62b4 SHA1 125542297378aee9c565ba722d33323444c590e7 SHA256 436eeb21a309c986dc35ea5e3ea23c349e92b104c41ffa69005dd3b5ff69df31
+AUX gpsdrive-2.11-mapnik-2.0api.patch 3128 RMD160 ca35baa68a382815203e6da2acfbd252356ecaa0 SHA1 e4bd633d17609cc81033a29d7c433b124428b56d SHA256 5c820be5c1227292da1e4c01a192f0ab48f148fda64142c6ec70383d3fad4b34
 AUX gpsdrive-2.11_DefineOptions_gpsd.patch 430 RMD160 d790fb0cb9faba0e4e8aa2201f7b494ea88ad78c SHA1 d9b81a0529259b2cb74d9da218242a7c64edf265 SHA256 4fc8e95d383eb9040e6301235226911c5aa4f735a715757aaf4ec900198f00d9
 DIST gpsdrive-2.11.tar.gz 5709822 RMD160 c5821c65e319dd60126e4df6965ccdc5d0b74978 SHA1 5bdb85fbb538b3c678975c896b16afc368161367 SHA256 57bb96f1c037c6a28dc3834777a4ec73fb35c03115d85d465d13a1ec1b35ae56
-EBUILD gpsdrive-2.11-r3.ebuild 4457 RMD160 afc34d7795e9e0cae3c31128f16c251701103642 SHA1 42c6ced1fcd714515e49fc452175f8141d112986 SHA256 5d6cb2ce9142c070584fd524ced54e5b3e9a327ed5bd62e304efafe3c8173219
-MISC ChangeLog 8520 RMD160 50a8621149c550edc50d079628bd7ecec5a24d7d SHA1 90451b7a3249db50415d315842434029b9b1da17 SHA256 aab282e1191cc9ebd72d6c9a3e2d467f61091c3db0119954892ad2145e5ba12d
+EBUILD gpsdrive-2.11-r3.ebuild 4501 RMD160 04d03ac704ab0756c22bbd24c5988b04444eaca7 SHA1 a5cb0c19fe050ae065feb7bd202eeb609b6f096f SHA256 f84582792d85e6201d39b7266ea855b8610e2cd84d76cc4fa521857250a1096e
+MISC ChangeLog 8677 RMD160 0240a67a9bd45724238b053dc4aa0d1ced8c7e47 SHA1 04bdde0d69909b03c00ff547a34c0ac2890f73c9 SHA256 268d1d670d2c57969545136b0813ee2c9ee06cee12d46b96865696b0971f2507
 MISC metadata.xml 620 RMD160 6e909b1372fd2ab61f9648879dd824bb14aecde3 SHA1 5eec4e94d142ff736b19e305b5595752ad894919 SHA256 8bd513bd76f969df6e441864df022fc9602ad86ed5b99a92fad28c49a2b2441f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBAgAGBQJPwJZfAAoJEOSiRoyO7jvo7cQP/jX/wjPKvxwud7F8nhR2Fvon
+PtZkQpkdZCH6IQE/ZXh7WKXwnaz0gJIn66KIEVpY7p+xs3qWiPabVswwPEDLxjbI
+UVV5jndY2CCduYDYqE3b1ozJj0uvz6cXVigM3xhnQca6OXIPeyz8U0MDr75qwN2X
+1EHabrx8QZNiUbzNlYf7lrsKlwSOPkvKUYlZBmEZW2ZsxGrlV6lDaEZaNysSq9hW
+hvbj9wK6oeewKzssqhU8anOTmtAp5yd+TJPSnAgBDf8vInGrApSqXc0Cb5mgB4O5
+IQUxdD9AqqO7d0/drb/r0KCgIE6Kn6FWQaIKMOiErgyALpfg8F64S+em8G1w+yUE
+0RDWJQc7BlX8wFz+9wUzagRxB/4MnlNsquZWG7GqTnzva2PVW5sEGnSOeW38f6pU
+gPNtjY6cN0vyXHjSmZBMesWc6gxqeZ3Cwl9u6WmpgaZ+MQWpeZVSzOKNLFfGSe+j
+1Plb7StgV3cG6EfQR7aTDCTO56CSfE7VLc2M146sH9IhiDDf5R/LscOYnq0ej+Qm
+bdP4/VqH8tETq4ggBkgAb2+Kreerx3yPd3PTBBYv6kWwS7s4u/j+vAf6JvBROiGU
+Ny+AHm+lXPtuYl0wTWzo/G2tUNeizZS8fX7JqoZRBHlMbzJTe3sXjZ7Pgu0LCP9x
+7ofz7WJrdrCWuGMxCgQ2
+=n98X
+-----END PGP SIGNATURE-----
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() {