* [gentoo-commits] proj/kde:master commit in: sci-geosciences/monav/files/, sci-geosciences/monav/
@ 2012-06-06 11:02 Dennis Schridde
0 siblings, 0 replies; 3+ messages in thread
From: Dennis Schridde @ 2012-06-06 11:02 UTC (permalink / raw
To: gentoo-commits
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@debian.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@gmx.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
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/kde:master commit in: sci-geosciences/monav/files/, sci-geosciences/monav/
@ 2013-02-17 19:41 Dennis Schridde
0 siblings, 0 replies; 3+ messages in thread
From: Dennis Schridde @ 2013-02-17 19:41 UTC (permalink / raw
To: gentoo-commits
commit: 415a73ac0c4997a8c62dee10597b7484bda7866c
Author: Dennis Schridde <devurandom <AT> gmx <DOT> net>
AuthorDate: Sun Feb 17 19:41:07 2013 +0000
Commit: Dennis Schridde <devurandom <AT> gmx <DOT> net>
CommitDate: Sun Feb 17 19:41:07 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=415a73ac
[sci-geosciences/monav] Add patch for compatibility with sci-geosciences/mapnik-2.1.0
---
....3-mapnik2.patch => monav-0.3-mapnik-2.0.patch} | 0
.../monav/files/monav-0.3-mapnik-2.1.patch | 12 ++++++++++++
.../{monav-0.3-r1.ebuild => monav-0.3-r2.ebuild} | 10 +++++-----
3 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/sci-geosciences/monav/files/monav-0.3-mapnik2.patch b/sci-geosciences/monav/files/monav-0.3-mapnik-2.0.patch
similarity index 100%
rename from sci-geosciences/monav/files/monav-0.3-mapnik2.patch
rename to sci-geosciences/monav/files/monav-0.3-mapnik-2.0.patch
diff --git a/sci-geosciences/monav/files/monav-0.3-mapnik-2.1.patch b/sci-geosciences/monav/files/monav-0.3-mapnik-2.1.patch
new file mode 100644
index 0000000..9204edf
--- /dev/null
+++ b/sci-geosciences/monav/files/monav-0.3-mapnik-2.1.patch
@@ -0,0 +1,12 @@
+--- monav.orig/plugins/osmrenderer/mapnikrenderer.cpp 2013-02-17 20:26:43.070848326 +0100
++++ monav/plugins/osmrenderer/mapnikrenderer.cpp 2013-02-17 20:27:49.242941943 +0100
+@@ -30,6 +30,9 @@
+ #include <mapnik/agg_renderer.hpp>
+ #include <mapnik/image_util.hpp>
+ #include <mapnik/load_map.hpp>
++#include <mapnik/graphics.hpp>
++#include <mapnik/image_view.hpp>
++#include <mapnik/config_error.hpp>
+ #include <omp.h>
+ #include <QFile>
+ #include <QTemporaryFile>
diff --git a/sci-geosciences/monav/monav-0.3-r1.ebuild b/sci-geosciences/monav/monav-0.3-r2.ebuild
similarity index 93%
rename from sci-geosciences/monav/monav-0.3-r1.ebuild
rename to sci-geosciences/monav/monav-0.3-r2.ebuild
index a657d62..d9736f5 100644
--- a/sci-geosciences/monav/monav-0.3-r1.ebuild
+++ b/sci-geosciences/monav/monav-0.3-r2.ebuild
@@ -25,11 +25,11 @@ DEPEND="x11-libs/qt-core:4
dev-libs/protobuf )"
RDEPEND="${DEPEND}"
-src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-qmake.patch \
- "${FILESDIR}"/${P}-mapnik2.patch
-}
+PATCHES=(
+ "${FILESDIR}"/${P}-qmake.patch
+ "${FILESDIR}"/${P}-mapnik-2.0.patch
+ "${FILESDIR}"/${P}-mapnik-2.1.patch
+)
src_configure() {
eqmake4 "${S}"/monavroutingdaemon.pro CONFIG+=nogui -o "${S}"/Makefile.routingdaemon
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/kde:master commit in: sci-geosciences/monav/files/, sci-geosciences/monav/
@ 2013-09-23 13:14 Dennis Schridde
0 siblings, 0 replies; 3+ messages in thread
From: Dennis Schridde @ 2013-09-23 13:14 UTC (permalink / raw
To: gentoo-commits
commit: 022d067dc5433ae9e9350a3feac79843ff66b016
Author: Dennis Schridde <devurandom <AT> gmx <DOT> net>
AuthorDate: Mon Sep 23 13:13:35 2013 +0000
Commit: Dennis Schridde <devurandom <AT> gmx <DOT> net>
CommitDate: Mon Sep 23 13:13:35 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=022d067d
[sci-geosciences/monav] Add patch for compatibility with sci-geosciences/mapnik-2.2.0
---
sci-geosciences/monav/files/monav-0.3-mapnik-2.2.patch | 15 +++++++++++++++
.../monav/{monav-0.3-r2.ebuild => monav-0.3-r3.ebuild} | 1 +
2 files changed, 16 insertions(+)
diff --git a/sci-geosciences/monav/files/monav-0.3-mapnik-2.2.patch b/sci-geosciences/monav/files/monav-0.3-mapnik-2.2.patch
new file mode 100644
index 0000000..dea5bb8
--- /dev/null
+++ b/sci-geosciences/monav/files/monav-0.3-mapnik-2.2.patch
@@ -0,0 +1,15 @@
+--- plugins/osmrenderer/mapnikrenderer.cpp.orig 2013-09-23 15:01:58.219962201 +0200
++++ plugins/osmrenderer/mapnikrenderer.cpp 2013-09-23 15:05:25.059214873 +0200
+@@ -150,10 +150,9 @@
+
+ Timer time;
+
+- mapnik::datasource_cache::instance()->register_datasources( m_settings.plugins.toAscii().constData() );
++ mapnik::datasource_cache::instance().register_datasources( m_settings.plugins.toAscii().constData() );
+ QDir fonts( m_settings.fonts );
+- mapnik::projection projection;
+- projection = mapnik::projection( "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +no_defs +over" );
++ mapnik::projection projection( "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +no_defs +over" );
+ mapnik::freetype_engine::register_font( fonts.filePath( "DejaVuSans.ttf" ).toAscii().constData() );
+ mapnik::freetype_engine::register_font( fonts.filePath( "DejaVuSans-Bold.ttf" ).toAscii().constData() );
+ mapnik::freetype_engine::register_font( fonts.filePath( "DejaVuSans-Oblique.ttf" ).toAscii().constData() );
diff --git a/sci-geosciences/monav/monav-0.3-r2.ebuild b/sci-geosciences/monav/monav-0.3-r3.ebuild
similarity index 97%
rename from sci-geosciences/monav/monav-0.3-r2.ebuild
rename to sci-geosciences/monav/monav-0.3-r3.ebuild
index c95f23a..29f56f8 100644
--- a/sci-geosciences/monav/monav-0.3-r2.ebuild
+++ b/sci-geosciences/monav/monav-0.3-r3.ebuild
@@ -36,6 +36,7 @@ PATCHES=(
"${FILESDIR}"/${P}-qmake.patch
"${FILESDIR}"/${P}-mapnik-2.0.patch
"${FILESDIR}"/${P}-mapnik-2.1.patch
+ "${FILESDIR}"/${P}-mapnik-2.2.patch
)
src_configure() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-09-23 13:14 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-06-06 11:02 [gentoo-commits] proj/kde:master commit in: sci-geosciences/monav/files/, sci-geosciences/monav/ Dennis Schridde
-- strict thread matches above, loose matches on Subject: below --
2013-02-17 19:41 Dennis Schridde
2013-09-23 13:14 Dennis Schridde
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox