diff options
| author | Stefan Wildemann <gta04@metalstrolche.de> | 2017-06-14 15:48:20 +0200 |
|---|---|---|
| committer | Stefan Wildemann <gta04@metalstrolche.de> | 2017-06-21 21:37:36 +0200 |
| commit | 7fa6d1d16982a384328f572acd14feaea72d4887 (patch) | |
| tree | 8aa8c6d27450c9e6e7b1add259a5a2583dbf484e | |
| parent | 7da4b164b5eb99be720217273253e8a5ae9949af (diff) | |
| download | navit-7fa6d1d16982a384328f572acd14feaea72d4887.tar.gz | |
fix: add build deps for newer sdk version.
Add heightlines map
| -rwxr-xr-x | contrib/sailfish/navit-sailfish.spec | 13 | ||||
| -rw-r--r-- | navit/xslt/sailfish_mapset.xslt | 4 |
2 files changed, 15 insertions, 2 deletions
diff --git a/contrib/sailfish/navit-sailfish.spec b/contrib/sailfish/navit-sailfish.spec index 5f28409de..6beb84fab 100755 --- a/contrib/sailfish/navit-sailfish.spec +++ b/contrib/sailfish/navit-sailfish.spec @@ -27,6 +27,17 @@ BuildRequires: qt5-qtdbus-devel BuildRequires: qt5-qtpositioning-devel BuildRequires: qt5-qtxml-devel BuildRequires: qt5-qtsvg-devel +BuildRequires: qt5-qtmultimedia +BuildRequires: qt5-qtmultimedia-devel +BuildRequires: qt5-qtmultimedia-gsttools +BuildRequires: qt5-qtmultimedia-plugin-mediaservice-gstaudiodecoder +BuildRequires: qt5-qtmultimedia-plugin-mediaservice-gstcamerabin +BuildRequires: qt5-qtmultimedia-plugin-mediaservice-gstmediacapture +BuildRequires: qt5-qtmultimedia-plugin-mediaservice-gstmediaplayer +BuildRequires: qt5-qtmultimedia-plugin-resourcepolicy-resourceqt +BuildRequires: qt5-qtmultimedia-plugin-audio-alsa +BuildRequires: qt5-qtmultimedia-plugin-playlistformats-m3u +BuildRequires: qt5-qtmultimedia-plugin-audio-pulseaudio #Requires: glib2 #Requires: gettext-libs @@ -82,7 +93,7 @@ cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr \ -Dvehicle/gpsd_dbus:BOOL=FALSE \ -DUSE_PLUGINS=n \ -DUSE_QWIDGET:BOOL=FALSE \ - -DXSLTS:STRING="sailfish_disable;sailfish_qt5;sailfish_osd;sailfish-cursor;sailfish_mapset;sailfish_svg;sailfish_gui" \ + -DXSLTS:STRING="sailfish_disable;sailfish_qt5;sailfish_osd;sailfish_cursor;sailfish_mapset;sailfish_svg;sailfish_gui" \ %{navit_real_source} %{__make} diff --git a/navit/xslt/sailfish_mapset.xslt b/navit/xslt/sailfish_mapset.xslt index 8c210db63..2febc81f4 100644 --- a/navit/xslt/sailfish_mapset.xslt +++ b/navit/xslt/sailfish_mapset.xslt @@ -15,9 +15,11 @@ <xsl:template match="/config/navit/mapset[1]"> <mapset enabled="yes"> <xsl:text>
 </xsl:text> - <map type="binfile" enabled="no" data="/usr/share/harbour-navit/maps/osm_bbox_11.3,47.9,11.7,48.2.bin"/> + <map type="binfile" enabled="yes" active="no" data="/usr/share/harbour-navit/maps/osm_bbox_11.3,47.9,11.7,48.2.bin"/> <xsl:text>
 </xsl:text> <map type="binfile" enabled="yes" data="~/Maps/map.navit.bin"/> + <xsl:text>
 </xsl:text> + <map type="binfile" enabled="yes" active="no" name="map.navit.heightlines.bin" data="~/Maps/map.navit.heightlines.bin"/> <xsl:text>
 </xsl:text> </mapset> <xsl:text>
 </xsl:text> |