rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-27 16:54:15 +01:00
Code Issues Releases Activity

LP-30 upgraded google sat version via patch

Browse Source
This commit is contained in:
Philippe Renon 2015-09-29 21:44:20 +02:00
parent 3a5ba9ad58
commit a25b31b743
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
make/3rdparty/marble/googlesat.patch vendored Normal file
View File

@ -0,0 +1,13 @@
diff --git a/googlesat.dgml b/googlesat.dgml
index 6e9fbd3..42f5e72 100644
--- a/googlesat.dgml
+++ b/googlesat.dgml
@@ -26,7 +26,7 @@
<sourcedir format="JPG"> earth/googlesat </sourcedir>
<storageLayout levelZeroColumns="1" levelZeroRows="1" maximumTileLevel="20" mode="Custom" />
<projection name="Mercator" />
- <downloadUrl protocol="http" host="khm.google.com" path="/kh/v=113&amp;hl=de&amp;x={x}&amp;s=&amp;y={y}&amp;z={zoomLevel}&amp;s=Ga" />
+ <downloadUrl protocol="http" host="khm.google.com" path="/kh/v=184&amp;hl=de&amp;x={x}&amp;s=&amp;y={y}&amp;z={zoomLevel}&amp;s=Ga" />
</texture>
<texture name="streets" expire="604800" >
<sourcedir format="PNG"> earth/googlesat/streets </sourcedir>

6
make/3rdparty/marble/marble.mk vendored
View File

@ -68,6 +68,8 @@ MARBLE_INSTALL_DIR := $(BUILD_DIR)/3rdparty/install/$(MARBLE_NAME)
MARBLE_DATA_DIR := $(MARBLE_INSTALL_DIR)/$(MARBLE_DATA_BASE_DIR)
MARBLE_PATCH_FILE := $(ROOT_DIR)/make/3rdparty/marble/marble-$(MARBLE_VERSION).patch
GOOGLE_SAT_PATCH_FILE := $(ROOT_DIR)/make/3rdparty/marble/googlesat.patch
.PHONY: marble
marble:
@$(ECHO) "Building marble $(call toprel, $(MARBLE_SRC_DIR)) into $(call toprel, $(MARBLE_BUILD_DIR))"
@ -141,6 +143,10 @@ clone_marble:
$(V1) ( $(CD) $(MARBLE_SRC_DIR)/googlesat && $(GIT) fetch ; )
@$(ECHO) "Checking out googlesat"
$(V1) ( $(CD) $(MARBLE_SRC_DIR)/googlesat && $(GIT) checkout --quiet --force master ; )
$(V1) if [ -e $(GOOGLE_SAT_PATCH_FILE) ]; then \
$(ECHO) "Patching google sat..." ; \
( $(CD) $(MARBLE_SRC_DIR)/googlesat && $(GIT) apply $(GOOGLE_SAT_PATCH_FILE) ; ) \
fi
.PHONY: clean_marble
clean_marble: