[gentoo-commits] proj/kde:master commit in: sci-geosciences/monav/files/, sci-geosciences/monav/

[Dennis Schridde]

commit:     53afd4d8f27aac9d434102d73171afc64adbd5cc
Author:     Dennis Schridde <devurandom <AT> gmx <DOT> net>
AuthorDate: Wed Jun  6 11:02:43 2012 +0000
Commit:     Dennis Schridde <devurandom <AT> gmx <DOT> net>
CommitDate: Wed Jun  6 11:02:43 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=53afd4d8

[sci-geosciences/monav-0.3] New ebuild (bug #376803)

Committed here, because it is useful to kde-base/marble (maybe add iuse/rdep there?).

(Portage version: 2.2.0_alpha110/git/Linux x86_64, unsigned Manifest commit)

---
 .../monav/files/monav-0.3-mapnik2.patch            |   45 +++++++++++
 sci-geosciences/monav/files/monav-0.3-qmake.patch  |   11 +++
 sci-geosciences/monav/metadata.xml                 |   13 +++
 sci-geosciences/monav/monav-0.3-r1.ebuild          |   81 ++++++++++++++++++++
 4 files changed, 150 insertions(+), 0 deletions(-)

diff --git a/sci-geosciences/monav/files/monav-0.3-mapnik2.patch b/sci-geosciences/monav/files/monav-0.3-mapnik2.patch
new file mode 100644
index 0000000..448a0cb
--- /dev/null
+++ b/sci-geosciences/monav/files/monav-0.3-mapnik2.patch
@@ -0,0 +1,45 @@
+From: David Paleino <dapal@××××××.org>
+Subject: port code to Mapnik2
+Origin: vendor
+Forwarded: no
+
+---
+ plugins/osmrenderer/mapnikrenderer.cpp |   10 +++++-----
+ plugins/osmrenderer/mapnikrenderer.pro |    2 +-
+ preprocessor/preprocessor-gui.pro      |    2 +-
+ preprocessor/preprocessor.pro          |    2 +-
+ 4 files changed, 8 insertions(+), 8 deletions(-)
+
+--- monav.orig/plugins/osmrenderer/mapnikrenderer.cpp
++++ monav/plugins/osmrenderer/mapnikrenderer.cpp
+@@ -264,7 +264,7 @@ bool MapnikRenderer::Preprocess( IImport
+ 			const int metaTileSize = m_settings.metaTileSize * m_settings.tileSize + 2 * m_settings.margin;
+ 
+ 			mapnik::Map map;
+-			mapnik::Image32 image( metaTileSize, metaTileSize );
++			mapnik::image_32 image( metaTileSize, metaTileSize );
+ 			QTemporaryFile tempOut;
+ 			QTemporaryFile tempIn;
+ 			mapnik::load_map( map, m_settings.theme.toLocal8Bit().constData() );
+@@ -288,9 +288,9 @@ bool MapnikRenderer::Preprocess( IImport
+ 				GPSCoordinate drawBottomRightGPS = drawBottomRight.ToGPSCoordinate();
+ 				projection.forward( drawTopLeftGPS.longitude, drawBottomRightGPS.latitude );
+ 				projection.forward( drawBottomRightGPS.longitude, drawTopLeftGPS.latitude );
+-				mapnik::Envelope<double> boundingBox( drawTopLeftGPS.longitude, drawTopLeftGPS.latitude, drawBottomRightGPS.longitude, drawBottomRightGPS.latitude );
+-				map.zoomToBox( boundingBox );
+-				mapnik::agg_renderer<mapnik::Image32> renderer( map, image );
++				mapnik::box2d<double> boundingBox( drawTopLeftGPS.longitude, drawTopLeftGPS.latitude, drawBottomRightGPS.longitude, drawBottomRightGPS.latitude );
++				map.zoom_to_box( boundingBox );
++				mapnik::agg_renderer<mapnik::image_32> renderer( map, image );
+ 				renderer.apply();
+ 
+ 				std::string data;
+@@ -299,7 +299,7 @@ bool MapnikRenderer::Preprocess( IImport
+ 				for ( int subX = 0; subX < metaTileSizeX; ++subX ) {
+ 					for ( int subY = 0; subY < metaTileSizeY; ++subY ) {
+ 						int indexNumber = ( y + subY - info.minY ) * ( info.maxX - info.minX ) + x + subX - info.minX;
+-						mapnik::image_view<mapnik::ImageData32> view = image.get_view( subX * m_settings.tileSize + m_settings.margin, subY * m_settings.tileSize + m_settings.margin, m_settings.tileSize, m_settings.tileSize );
++						mapnik::image_view<mapnik::image_data_32> view = image.get_view( subX * m_settings.tileSize + m_settings.margin, subY * m_settings.tileSize + m_settings.margin, m_settings.tileSize, m_settings.tileSize );
+ 						std::string result;
+ 						if ( !m_settings.deleteTiles || info.index[( x + subX - info.minX ) + ( y + subY - info.minY ) * ( info.maxX - info.minX )].size == 1 ) {
+ 							if ( m_settings.reduceColors )

diff --git a/sci-geosciences/monav/files/monav-0.3-qmake.patch b/sci-geosciences/monav/files/monav-0.3-qmake.patch
new file mode 100644
index 0000000..5822da1
--- /dev/null
+++ b/sci-geosciences/monav/files/monav-0.3-qmake.patch
@@ -0,0 +1,11 @@
+--- a/client/client.pro	2011-07-28 21:18:24.330394388 +0200
++++ b/client/client.pro	2011-07-28 21:06:19.223851824 +0200
+@@ -91,7 +91,7 @@
+ LIBS += -L../bin/plugins_client -lmapnikrendererclient -lcontractionhierarchiesclient -lgpsgridclient -losmrendererclient -lunicodetournamenttrieclient -lqtilerendererclient
+ 
+ #required by osmrendererclient
+-QT += network
++QT += network mobility
+ CONFIG += mobility
+ MOBILITY += location
+ 

diff --git a/sci-geosciences/monav/metadata.xml b/sci-geosciences/monav/metadata.xml
new file mode 100644
index 0000000..5c1c54d
--- /dev/null
+++ b/sci-geosciences/monav/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>kde</herd>
+<maintainer>
+  <email>devurandom@×××.net</email>
+</maintainer>
+<use>
+  <flag name='client'>Build the monav client</flag>
+  <flag name='preprocessor'>Build the monav preprocessor to turn OSM maps into monav maps</flag>
+  <flag name='preprocessor-gui'>Build the GUI for the monav preprocessor</flag>
+</use>
+</pkgmetadata>

diff --git a/sci-geosciences/monav/monav-0.3-r1.ebuild b/sci-geosciences/monav/monav-0.3-r1.ebuild
new file mode 100644
index 0000000..bfcb1e1
--- /dev/null
+++ b/sci-geosciences/monav/monav-0.3-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+EAPI=4
+
+inherit qt4-r2
+
+DESCRIPTION="State-of-the-art fast and exact routing with OpenStreetMap Data"
+HOMEPAGE="http://code.google.com/p/monav/"
+SRC_URI="http://monav.googlecode.com/files/monav-${PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="client +preprocessor preprocessor-gui"
+
+REQUIRED_USE="preprocessor? ( preprocessor-gui )"
+
+DEPEND="x11-libs/qt-core:4
+	preprocessor-gui? ( client? ( x11-libs/qt-gui:4 )
+		x11-libs/qt-mobility[location] )
+	preprocessor? (	dev-libs/libxml2
+		app-arch/bzip2
+		sci-geosciences/mapnik
+		dev-libs/protobuf )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-qmake.patch \
+		"${FILESDIR}"/${P}-mapnik2.patch
+}
+
+src_configure() {
+	eqmake4 "${S}"/monavroutingdaemon.pro CONFIG+=nogui -o "${S}"/Makefile.routingdaemon
+
+	if use preprocessor ; then
+		eqmake4 "${S}"/monavpreprocessor.pro CONFIG+=nogui -o "${S}"/Makefile.preprocessor
+	fi
+
+	if use preprocessor-gui ; then
+		eqmake4 "${S}"/monavpreprocessor-gui.pro -o	"${S}"/Makefile.preprocessor-gui
+	fi
+
+	if use client ; then
+		eqmake4 "${S}"/monavclient.pro -o "${S}"/Makefile.client
+	fi
+}
+
+src_compile() {
+	emake -f "${S}"/Makefile.routingdaemon
+
+	if use preprocessor ; then
+		emake -f "${S}"/Makefile.preprocessor
+	fi
+
+	if use preprocessor-gui ; then
+		emake -f "${S}"/Makefile.preprocessor-gui
+	fi
+
+	if use client ; then
+		emake -f "${S}"/Makefile.client
+	fi
+}
+
+src_install() {
+	dobin bin/daemon-test
+	dobin bin/monav-daemon
+
+	if use preprocessor ; then
+		dobin bin/monav-preprocessor
+	fi
+
+	if use preprocessor-gui ; then
+		dobin bin/monav-preprocessor-gui
+	fi
+
+	if use client ; then
+		dobin bin/monav
+	fi
+}