[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-150-g48e4d85
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-150-g48e4d85
|
From: jscheer <js...@us...> - 2014-02-20 15:38:10
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 48e4d8503c853a363a9f6e8a796c1694384fab13 (commit)
from 0c3f4a04ffdad9c89b00d6c636bb0edaa507fc85 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 48e4d8503c853a363a9f6e8a796c1694384fab13
Author: Jeremie Scheer <jer...@ar...>
Date: Thu Feb 20 16:37:52 2014 +0100
[BUILDROOT] Adapt Marble to BR 2013.11 and update to most stable version.
-----------------------------------------------------------------------
Summary of changes:
.../buildroot/2013.11/188-marble-add_package.patch | 366 ++++++++++++++++++--
1 files changed, 345 insertions(+), 21 deletions(-)
diff --git a/patches/buildroot/2013.11/188-marble-add_package.patch b/patches/buildroot/2013.11/188-marble-add_package.patch
index 62eee91..e90148f 100644
--- a/patches/buildroot/2013.11/188-marble-add_package.patch
+++ b/patches/buildroot/2013.11/188-marble-add_package.patch
@@ -4,24 +4,30 @@ Signed-off-by: Jérémie Scheer <jer...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2013-08-25 21:48:05.281080224 +0200
-+++ buildroot/package/Config.in 2013-08-25 21:48:05.445081025 +0200
-@@ -156,6 +156,7 @@
- comment "other GUIs"
- source "package/efl/Config.in"
- source "package/qt/Config.in"
+--- buildroot.orig/package/Config.in 2014-02-19 15:09:12.000000000 +0100
++++ buildroot/package/Config.in 2014-02-20 14:32:01.000000000 +0100
+@@ -214,8 +214,9 @@
+ source "package/sdl_water/Config.in"
+
+ comment "Other GUIs"
+-source "package/efl/Config.in"
+source "package/marble/Config.in"
+ source "package/qt/Config.in"
++source "package/efl/Config.in"
if BR2_PACKAGE_QT
comment "QT libraries and helper libraries"
Index: buildroot/package/marble/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/marble/Config.in 2013-08-25 21:48:05.445081025 +0200
-@@ -0,0 +1,11 @@
-+config BR2_PACKAGE_MARBLE
++++ buildroot/package/marble/Config.in 2014-02-20 14:29:22.000000000 +0100
+@@ -0,0 +1,145 @@
++comment "Marble needs Qt to be installed"
++ depends on !BR2_PACKAGE_QT
++
++menuconfig BR2_PACKAGE_MARBLE
+ bool "KDE Marble"
-+ select BR2_PACKAGE_QT
++ depends on BR2_PACKAGE_QT
+ select BR2_PACKAGE_QT_SCRIPT
+ select BR2_PACKAGE_QT_SVG
+ select BR2_PACKAGE_QT_WEBKIT
@@ -30,17 +36,148 @@ Index: buildroot/package/marble/Config.in
+ Compile & install KDE Marble for
+ geolocalization applications.
+
++if BR2_PACKAGE_MARBLE
++
++config BR2_PACKAGE_MARBLE_BINARY
++ bool "Marble binary"
++ help
++ Install Marble binary on target
++
++config BR2_PACKAGE_MARBLE_AUDIO
++ bool "Audio files"
++ help
++ Install audio files on target
++
++config BR2_PACKAGE_MARBLE_BITMAPS
++ bool "Bitmaps"
++ help
++ Install bitmaps on target
++
++config BR2_PACKAGE_MARBLE_FLAGS
++ bool "Flags"
++ help
++ Install flags on target
++
++menu "Maps"
++
++menu "Earth maps"
++
++config BR2_PACKAGE_MARBLE_BLUEMARBLE
++ bool "Bluemarble"
++ help
++ Install Bluemarble map on target
++
++config BR2_PACKAGE_MARBLE_CITYLIGHTS
++ bool "Citylights"
++ help
++ Install Citylights map on target
++
++config BR2_PACKAGE_MARBLE_CLOUDS
++ bool "Clouds"
++ help
++ Install Clouds map on target
++
++config BR2_PACKAGE_MARBLE_HILLSHADING
++ bool "Hillshading"
++ help
++ Install Hillshading map on target
++
++config BR2_PACKAGE_MARBLE_OPENSTREETMAP
++ bool "OpenStreetMap"
++ help
++ Install Openstreetmap map on target
++
++config BR2_PACKAGE_MARBLE_PLAIN
++ bool "Plain"
++ help
++ Install Plain map on target
++
++config BR2_PACKAGE_MARBLE_PRECIP_DEC
++ bool "December precipitations"
++ help
++ Install December precipitation map on target
++
++config BR2_PACKAGE_MARBLE_PRECIP_JULY
++ bool "July precipitations"
++ help
++ Install July precipitation map on target
++
++config BR2_PACKAGE_MARBLE_SCHAGEN
++ bool "Schagen 1689"
++ help
++ Install Schagen 1689 map on target
++
++config BR2_PACKAGE_MARBLE_SRTM
++ bool "SRTM"
++ help
++ Install SRTM map on target
++
++config BR2_PACKAGE_MARBLE_SRTM2
++ bool "SRTM 2"
++ help
++ Install SRTM 2 map on target
++
++config BR2_PACKAGE_MARBLE_TEMP_DEC
++ bool "December temperatures"
++ help
++ Install December temperature map on target
++
++config BR2_PACKAGE_MARBLE_TEMP_JULY
++ bool "July temperatures"
++ help
++ Install July temperature map on target
++
++endmenu #Earth maps
++
++menu "Moon maps"
++
++config BR2_PACKAGE_MARBLE_CLEMENTINE
++ bool "Clementine"
++ help
++ Install Clementine map on target
++
++endmenu #Moon maps
++
++endmenu #Maps
++
++config BR2_PACKAGE_MARBLE_MWDBII
++ bool "MWDBII files"
++ help
++ Install MWDBII files on target
++
++config BR2_PACKAGE_MARBLE_PLACEMARKS
++ bool "Placemarks"
++ help
++ Install placemarks on target
++
++config BR2_PACKAGE_MARBLE_STARS
++ bool "Stars"
++ help
++ Install star data on target
++
++config BR2_PACKAGE_MARBLE_SVG
++ bool "SVG files"
++ help
++ Install SVG files on target
++
++config BR2_PACKAGE_MARBLE_WEATHER
++ bool "Weather data"
++ help
++ Install weather data on target
++
++endif #BR2_PACKAGE_MARBLE
++
Index: buildroot/package/marble/marble.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/marble/marble.mk 2013-08-25 21:48:05.445081025 +0200
-@@ -0,0 +1,51 @@
++++ buildroot/package/marble/marble.mk 2014-02-20 13:44:28.000000000 +0100
+@@ -0,0 +1,238 @@
+#############################################################
+#
+# KDE Marble
+#
+#############################################################
-+MARBLE_VERSION = 0299004157ce00cf901b6113c4ac14fa0c323c00
++MARBLE_VERSION = 88ba87c90195dede8594375b2f81c9d926db3924
+MARBLE_SOURCE = marble-$(MARBLE_VERSION)-source.tar.gz
+MARBLE_SITE = git://anongit.kde.org/marble.git
+MARBLE_SITE_METHOD = git
@@ -66,23 +203,210 @@ Index: buildroot/package/marble/marble.mk
+MARBLE_INSTALL_STAGING = YES
+
+define MARBLE_CLEAN_TARGET_INSTALL
-+ rm -rf $(TARGET_DIR)/usr/local/share/marble/*
++ rm -rf $(TARGET_DIR)/usr/local/share/marble/data/*
+ rm -rf $(TARGET_DIR)/usr/local/include/marble
+ rm -rf $(TARGET_DIR)/usr/local/bin/marble
+endef
+
-+define MARBLE_PUT_NECESSARY_DATA_IN_TARGET
-+ mkdir -p $(TARGET_DIR)/usr/local/share/marble/data/svg
++define MARBLE_INSTALL_BINARY
++ cp -rf $(STAGING_DIR)/usr/local/bin/marble $(TARGET_DIR)/usr/local/bin
++endef
++
++define MARBLE_INSTALL_AUDIO_FILES
++ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/audio $(TARGET_DIR)/usr/local/share/marble/data
++endef
++
++define MARBLE_INSTALL_BITMAPS
++ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/bitmaps $(TARGET_DIR)/usr/local/share/marble/data
++endef
++
++define MARBLE_INSTALL_FLAGS
++ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/flags $(TARGET_DIR)/usr/local/share/marble/data
++endef
++
++define MARBLE_INSTALL_BLUEMARBLE_MAP
++ mkdir -p $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
++ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/maps/earth/bluemarble $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
++endef
++
++define MARBLE_INSTALL_CITYLIGHTS_MAP
++ mkdir -p $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
++ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/maps/earth/citylights $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
++endef
++
++define MARBLE_INSTALL_CLOUDS_MAP
++ mkdir -p $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
++ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/maps/earth/clouds $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
++endef
++
++define MARBLE_INSTALL_HILLSHADING_MAP
+ mkdir -p $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
-+ cp -rf $(STAGING_DIR)/usr/local/share/marble/cmake $(TARGET_DIR)/usr/local/share/marble
-+ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/svg/lunarmap.svg $(TARGET_DIR)/usr/local/share/marble/data/svg
-+ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/svg/worldmap.svg $(TARGET_DIR)/usr/local/share/marble/data/svg
-+ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/svg/track_turtle.svg $(TARGET_DIR)/usr/local/share/marble/data/svg
+ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/maps/earth/hillshading $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
++endef
++
++define MARBLE_INSTALL_OPENSTREETMAP_MAP
++ mkdir -p $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
+ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/maps/earth/openstreetmap $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
+endef
+
++define MARBLE_INSTALL_PLAIN_MAP
++ mkdir -p $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
++ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/maps/earth/plain $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
++endef
++
++define MARBLE_INSTALL_PRECIP_DEC_MAP
++ mkdir -p $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
++ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/maps/earth/precip-dec $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
++endef
++
++define MARBLE_INSTALL_PRECIP_JULY_MAP
++ mkdir -p $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
++ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/maps/earth/precip-july $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
++endef
++
++define MARBLE_INSTALL_SCHAGEN_MAP
++ mkdir -p $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
++ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/maps/earth/schagen1689 $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
++endef
++
++define MARBLE_INSTALL_SRTM_MAP
++ mkdir -p $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
++ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/maps/earth/srtm $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
++endef
++
++define MARBLE_INSTALL_SRTM2_MAP
++ mkdir -p $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
++ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/maps/earth/srtm2 $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
++endef
++
++define MARBLE_INSTALL_TEMP_DEC_MAP
++ mkdir -p $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
++ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/maps/earth/temp-dec $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
++endef
++
++define MARBLE_INSTALL_TEMP_JULY_MAP
++ mkdir -p $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
++ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/maps/earth/temp-july $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
++endef
++
++define MARBLE_INSTALL_CLEMENTINE_MAP
++ mkdir -p $(TARGET_DIR)/usr/local/share/marble/data/maps/moon
++ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/maps/moon/clementine $(TARGET_DIR)/usr/local/share/marble/data/maps/moon
++endef
++
++define MARBLE_INSTALL_MWDBII_FILES
++ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/mwdbii $(TARGET_DIR)/usr/local/share/marble/data
++endef
++
++define MARBLE_INSTALL_PLACEMARKS
++ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/placemarks $(TARGET_DIR)/usr/local/share/marble/data
++endef
++
++define MARBLE_INSTALL_STARS_DATA
++ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/stars $(TARGET_DIR)/usr/local/share/marble/data
++endef
++
++define MARBLE_INSTALL_SVG
++ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/svg $(TARGET_DIR)/usr/local/share/marble/data
++endef
++
++define MARBLE_INSTALL_WEATHER_DATA
++ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/weather $(TARGET_DIR)/usr/local/share/marble/data
++endef
++
++
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_CLEAN_TARGET_INSTALL
-+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_PUT_NECESSARY_DATA_IN_TARGET
++
++ifeq ($(BR2_PACKAGE_MARBLE_BINARY),y)
++MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_BINARY
++endif
++
++ifeq ($(BR2_PACKAGE_MARBLE_AUDIO),y)
++MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_AUDIO_FILES
++endif
++
++ifeq ($(BR2_PACKAGE_MARBLE_BITMAPS),y)
++MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_BITMAPS
++endif
++
++ifeq ($(BR2_PACKAGE_MARBLE_FLAGS),y)
++MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_FLAGS
++endif
++
++ifeq ($(BR2_PACKAGE_MARBLE_BLUEMARBLE),y)
++MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_BLUEMARBLE_MAP
++endif
++
++ifeq ($(BR2_PACKAGE_MARBLE_CITYLIGHTS),y)
++MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_CITYLIGHTS_MAP
++endif
++
++ifeq ($(BR2_PACKAGE_MARBLE_CLOUDS),y)
++MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_CLOUDS_MAP
++endif
++
++ifeq ($(BR2_PACKAGE_MARBLE_HILLSHADING),y)
++MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_HILLSHADING_MAP
++endif
++
++ifeq ($(BR2_PACKAGE_MARBLE_OPENSTREETMAP),y)
++MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_OPENSTREETMAP_MAP
++endif
++
++ifeq ($(BR2_PACKAGE_MARBLE_PLAIN),y)
++MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_PLAIN_MAP
++endif
++
++ifeq ($(BR2_PACKAGE_MARBLE_PRECIP_DEC),y)
++MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_PRECIP_DEC_MAP
++endif
++
++ifeq ($(BR2_PACKAGE_MARBLE_PRECIP_JULY),y)
++MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_PRECIP_JULY_MAP
++endif
++
++ifeq ($(BR2_PACKAGE_MARBLE_SCHAGEN),y)
++MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_SCHAGEN_MAP
++endif
++
++ifeq ($(BR2_PACKAGE_MARBLE_SRTM),y)
++MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_SRTM_MAP
++endif
++
++ifeq ($(BR2_PACKAGE_MARBLE_SRTM2),y)
++MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_SRTM2_MAP
++endif
++
++ifeq ($(BR2_PACKAGE_MARBLE_TEMP_DEC),y)
++MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_TEMP_DEC_MAP
++endif
++
++ifeq ($(BR2_PACKAGE_MARBLE_TEMP_JULY),y)
++MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_TEMP_JULY_MAP
++endif
++
++ifeq ($(BR2_PACKAGE_MARBLE_CLEMENTINE),y)
++MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_CLEMENTINE_MAP
++endif
++
++ifeq ($(BR2_PACKAGE_MARBLE_MWDBII),y)
++MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_MWDBII_FILES
++endif
++
++ifeq ($(BR2_PACKAGE_MARBLE_PLACEMARKS),y)
++MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_PLACEMARKS
++endif
++
++ifeq ($(BR2_PACKAGE_MARBLE_STARS),y)
++MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_STARS_DATA
++endif
++
++ifeq ($(BR2_PACKAGE_MARBLE_SVG),y)
++MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_SVG
++endif
++
++ifeq ($(BR2_PACKAGE_MARBLE_WEATHER),y)
++MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_WEATHER_DATA
++endif
+
+$(eval $(cmake-package))
hooks/post-receive
--
armadeus
|
