[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-381-gbc5d8d8
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-381-gbc5d8d8
|
From: jscheer <js...@us...> - 2012-06-14 13:16:51
|
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 bc5d8d8b4e90095efdba17a72c5f52d8bcf39e93 (commit)
from bca6bda9f2a410cea4f4aad94c51025ec7137525 (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 bc5d8d8b4e90095efdba17a72c5f52d8bcf39e93
Author: Jeremie Scheer <jer...@ar...>
Date: Thu Jun 14 15:16:19 2012 +0200
[BUILDROOT] Add package Marble to BR 2012.02 in patch 188.
-----------------------------------------------------------------------
Summary of changes:
.../buildroot/2012.02/188-marble-add_package.patch | 88 ++++++++++++++++++++
patches/buildroot/2012.02/cleanup_buildroot.sh | 1 +
2 files changed, 89 insertions(+), 0 deletions(-)
create mode 100644 patches/buildroot/2012.02/188-marble-add_package.patch
diff --git a/patches/buildroot/2012.02/188-marble-add_package.patch b/patches/buildroot/2012.02/188-marble-add_package.patch
new file mode 100644
index 0000000..e56b29c
--- /dev/null
+++ b/patches/buildroot/2012.02/188-marble-add_package.patch
@@ -0,0 +1,88 @@
+Add package Marble to Buildroot.
+
+Signed-off-by: Jérémie Scheer <jer...@ar...>
+
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2012-06-14 15:06:47.000000000 +0200
++++ buildroot/package/Config.in 2012-06-14 15:07:36.000000000 +0200
+@@ -141,6 +141,7 @@
+ source "package/efl/Config.in"
+ source "package/qt/Config.in"
+ source "package/qwt/Config.in"
++source "package/marble/Config.in"
+ source "package/x11r7/Config.in"
+
+ comment "X 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 2012-06-14 15:09:45.000000000 +0200
+@@ -0,0 +1,11 @@
++config BR2_PACKAGE_MARBLE
++ bool "KDE Marble"
++ select BR2_PACKAGE_QT
++ select BR2_PACKAGE_QT_SCRIPT
++ select BR2_PACKAGE_QT_SVG
++ select BR2_PACKAGE_QT_WEBKIT
++ select BR2_PACKAGE_QT_XML
++ help
++ Compile & install KDE Marble for
++ geolocalization applications.
++
+Index: buildroot/package/marble/marble.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/marble/marble.mk 2012-06-14 15:09:31.000000000 +0200
+@@ -0,0 +1,51 @@
++#############################################################
++#
++# KDE Marble
++#
++#############################################################
++MARBLE_VERSION = 0299004157ce00cf901b6113c4ac14fa0c323c00
++MARBLE_SOURCE = marble-$(MARBLE_VERSION)-source.tar.gz
++MARBLE_SITE = git://anongit.kde.org/marble.git
++MARBLE_SITE_METHOD = git
++
++MARBLE_DEPENDENCIES = qt
++
++MARBLE_CONF_OPT += -DQTONLY=ON
++MARBLE_CONF_OPT += -DTILES_AT_COMPILETIME=OFF
++
++define MARBLE_CONFIGURE_CMDS
++ (cd $(@D) && \
++ rm -f CMakeCache.txt && \
++ $(HOST_DIR)/usr/bin/cmake $(@D) \
++ -DCMAKE_TOOLCHAIN_FILE="$(BASE_DIR)/toolchainfile.cmake" \
++ $(MARBLE_CONF_OPT) \
++ )
++endef
++
++define MARBLE_BUILD_CMDS
++ $(MAKE) -C $(@D)
++endef
++
++MARBLE_INSTALL_STAGING = YES
++
++define MARBLE_CLEAN_TARGET_INSTALL
++ rm -rf $(TARGET_DIR)/usr/local/share/marble/*
++ 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
++ 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
++ cp -rf $(STAGING_DIR)/usr/local/share/marble/data/maps/earth/openstreetmap $(TARGET_DIR)/usr/local/share/marble/data/maps/earth
++endef
++
++MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_CLEAN_TARGET_INSTALL
++MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_PUT_NECESSARY_DATA_IN_TARGET
++
++$(eval $(call CMAKETARGETS))
diff --git a/patches/buildroot/2012.02/cleanup_buildroot.sh b/patches/buildroot/2012.02/cleanup_buildroot.sh
index ccd10cf..7949a19 100755
--- a/patches/buildroot/2012.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2012.02/cleanup_buildroot.sh
@@ -73,3 +73,4 @@ rm -rf buildroot/package/multimedia/fsl-mm-codeclib/
rm -rf buildroot/package/linux-firmware/
rm -rf buildroot/package/uboot-tools/
rm -rf buildroot/package/qtcreator/
+rm -rf buildroot/package/marble/
hooks/post-receive
--
armadeus
|
