Skip to contentSkip to conversation

Add Marble package.

PATCH New jeremie.scheer at armadeus.com 2 participants 2 messages Apr 1, 2014 – Jul 12, 2015

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 Add Marble package.

From: Jeremie Scheer <[email protected]>

---
Changes since v1:
- Let Buildroot generate automatically build and configure CMake target
- More explicit and detailed menu
- Clean and merge target install hooks

 package/Config.in        |    3 +-
 package/marble/Config.in |  133 +++++++++++++++++++++++++++++++
 package/marble/marble.mk |  199 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 334 insertions(+), 1 deletion(-)
 create mode 100644 package/marble/Config.in
 create mode 100644 package/marble/marble.mk
package/Config.in +2 -1
index e816603..50dcb6b 100644
@@ -203,8 +203,9 @@ source "package/sdl_sound/Config.in"
 source "package/sdl_ttf/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"
package/marble/Config.in new file +133 -0

133 lines not on this page · raw message

package/marble/marble.mk new file +199 -0

199 lines not on this page · raw message

Signature · 1 line
1.7.9.5
#1 lore raw

PATCH v2 1/1 Add Marble package.

Hello,

package/Config.in source "package/sdl_sound/Config.in" · line 206

Quoted 3 lines · jeremie.scheer at armadeus.com

comment "Other GUIs"

package/Config.in +1 -1
-source "package/efl/Config.in"
+source "package/marble/Config.in"

This is probably not the right place: this place is for graphical libraries, not graphical applications.

Quoted 1 line

+endmenu #Earth maps

#Earth maps -> # Earth maps

and ditto for all other comments.

package/marble/marble.mk line 5

Quoted 11 lines
package/marble/marble.mk new file +5 -0
new file mode 100644
index 0000000..3a73a25
@@ -0,0 +1,199 @@
+#############################################################
+#
+# KDE Marble
+#
+#############################################################

80 # signs are part of our coding style, and the text should just be the name of the package, i.e. 'marble'. Yes rules are meant to be silly :)

package/marble/marble.mk line 7

Quoted 2 lines
package/marble/marble.mk new file +2 -0
+MARBLE_VERSION = 0299004157ce00cf901b6113c4ac14fa0c323c00
+MARBLE_SOURCE = marble-$(MARBLE_VERSION)-source.tar.gz

Having MARBLE_SOURCE defined to a tarball with MARBLE_SITE pointing to a Git repository does not make sense.

package/marble/marble.mk line 8

Quoted 1 line
package/marble/marble.mk new file +1 -0
+MARBLE_SITE = git://anongit.kde.org/marble.git

MARBLE_LICENSE and MARBLE_LICENSE_FILES are required.

package/marble/marble.mk line 13

Quoted 4 lines
package/marble/marble.mk new file +4 -0
+MARBLE_DEPENDENCIES = qt
+
+MARBLE_CONF_OPT += -DQTONLY=ON
+MARBLE_CONF_OPT += -DTILES_AT_COMPILETIME=OFF

The variable is now called <pkg>_CONF_OPTS, and it should be in a single command here:

MARBLE_CONF_OPTS = \
	-DQTONLY=ON \
	-DTILES_AT_COMPILETIME=OFF

package/marble/marble.mk line 15

Quoted 1 line
package/marble/marble.mk new file +1 -0
+MARBLE_INSTALL_STAGING = YES

Why ?

package/marble/marble.mk line 22

Quoted 7 lines
package/marble/marble.mk new file +7 -0
+
+define MARBLE_CLEAN_TARGET_INSTALL
+	rm -rf $(TARGET_DIR)/usr/share/marble/data/*
+	rm -rf $(TARGET_DIR)/usr/include/marble
+	rm -rf $(TARGET_DIR)/usr/bin/marble
+endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_CLEAN_TARGET_INSTALL

Why are you removing everything?

Removing $(TARGET_DIR)/usr/include is not needed, it's already done automatically by Buildroot at the end of the build.

And removing the binary should only be done if
BR2_PACKAGE_MARBLE_BINARY is disabled.

But there's a more general question: why would the user want to *not* install the binary?

package/marble/marble.mk line 29

Quoted 6 lines
package/marble/marble.mk new file +6 -0
+ifeq ($(BR2_PACKAGE_MARBLE_BINARY),y)
+define MARBLE_INSTALL_BINARY
+	cp -rf $(STAGING_DIR)/usr/bin/marble $(TARGET_DIR)/usr/bin
+endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_BINARY
+endif

As suggested above, do the opposite: remove the binary if BR2_PACKAGE_MARBLE_BINARY is disabled.

package/marble/marble.mk line 36

Quoted 7 lines
package/marble/marble.mk new file +7 -0
+
+ifeq ($(BR2_PACKAGE_MARBLE_AUDIO),y)
+define MARBLE_INSTALL_AUDIO_FILES
+	cp -rf $(STAGING_DIR)/usr/share/marble/data/audio $(TARGET_DIR)/usr/share/marble/data
+endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_AUDIO_FILES
+endif

Ditto.

package/marble/marble.mk line 43

Quoted 7 lines
package/marble/marble.mk new file +7 -0
+
+ifeq ($(BR2_PACKAGE_MARBLE_BITMAPS),y)
+define MARBLE_INSTALL_BITMAPS
+	cp -rf $(STAGING_DIR)/usr/share/marble/data/bitmaps $(TARGET_DIR)/usr/share/marble/data
+endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_BITMAPS
+endif

Ditto.

package/marble/marble.mk line 50

Quoted 7 lines
package/marble/marble.mk new file +7 -0
+
+ifeq ($(BR2_PACKAGE_MARBLE_FLAGS),y)
+define MARBLE_INSTALL_FLAGS
+	cp -rf $(STAGING_DIR)/usr/share/marble/data/flags $(TARGET_DIR)/usr/share/marble/data
+endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_FLAGS
+endif

Ditto.

And you can probably factorize that a bit by doing something like:

MARBLE_TO_REMOVE_$(BR2_PACKAGE_MARBLE_BITMAPS) += usr/share/marble/data/bitmaps MARBLE_TO_REMOVE_$(BR2_PACKAGE_MARBLE_FLAGS) += usr/share/marble/data/flags

and then:

	$(if $(MARBLE_TO_REMOVE_),$(RM) -rf $(MARBLE_TO_REMOVE_))
Quoted 136 lines
package/marble/marble.mk new file +136 -0
+ifeq ($(BR2_PACKAGE_MARBLE_BLUEMARBLE),y)
+define MARBLE_INSTALL_BLUEMARBLE_MAP
+	mkdir -p $(TARGET_DIR)/usr/share/marble/data/maps/earth
+	cp -rf $(STAGING_DIR)/usr/share/marble/data/maps/earth/bluemarble $(TARGET_DIR)/usr/share/marble/data/maps/earth
+endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_BLUEMARBLE_MAP
+endif
+
+ifeq ($(BR2_PACKAGE_MARBLE_CITYLIGHTS),y)
+define MARBLE_INSTALL_CITYLIGHTS_MAP
+	mkdir -p $(TARGET_DIR)/usr/share/marble/data/maps/earth
+	cp -rf $(STAGING_DIR)/usr/share/marble/data/maps/earth/citylights $(TARGET_DIR)/usr/share/marble/data/maps/earth
+endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_CITYLIGHTS_MAP
+endif
+
+ifeq ($(BR2_PACKAGE_MARBLE_CLOUDS),y)
+define MARBLE_INSTALL_CLOUDS_MAP
+	mkdir -p $(TARGET_DIR)/usr/share/marble/data/maps/earth
+	cp -rf $(STAGING_DIR)/usr/share/marble/data/maps/earth/clouds $(TARGET_DIR)/usr/share/marble/data/maps/earth
+endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_CLOUDS_MAP
+endif
+
+ifeq ($(BR2_PACKAGE_MARBLE_HILLSHADING),y)
+define MARBLE_INSTALL_HILLSHADING_MAP
+	mkdir -p $(TARGET_DIR)/usr/share/marble/data/maps/earth
+	cp -rf $(STAGING_DIR)/usr/share/marble/data/maps/earth/hillshading $(TARGET_DIR)/usr/share/marble/data/maps/earth
+endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_HILLSHADING_MAP
+endif
+
+ifeq ($(BR2_PACKAGE_MARBLE_OPENSTREETMAP),y)
+define MARBLE_INSTALL_OPENSTREETMAP_MAP
+	mkdir -p $(TARGET_DIR)/usr/share/marble/data/maps/earth
+	cp -rf $(STAGING_DIR)/usr/share/marble/data/maps/earth/openstreetmap $(TARGET_DIR)/usr/share/marble/data/maps/earth
+endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_OPENSTREETMAP_MAP
+endif
+
+ifeq ($(BR2_PACKAGE_MARBLE_PLAIN),y)
+define MARBLE_INSTALL_PLAIN_MAP
+	mkdir -p $(TARGET_DIR)/usr/share/marble/data/maps/earth
+	cp -rf $(STAGING_DIR)/usr/share/marble/data/maps/earth/plain $(TARGET_DIR)/usr/share/marble/data/maps/earth
+endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_PLAIN_MAP
+endif
+
+ifeq ($(BR2_PACKAGE_MARBLE_PRECIP_DEC),y)
+define MARBLE_INSTALL_PRECIP_DEC_MAP
+	mkdir -p $(TARGET_DIR)/usr/share/marble/data/maps/earth
+	cp -rf $(STAGING_DIR)/usr/share/marble/data/maps/earth/precip-dec $(TARGET_DIR)/usr/share/marble/data/maps/earth
+endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_PRECIP_DEC_MAP
+endif
+
+ifeq ($(BR2_PACKAGE_MARBLE_PRECIP_JULY),y)
+define MARBLE_INSTALL_PRECIP_JULY_MAP
+	mkdir -p $(TARGET_DIR)/usr/share/marble/data/maps/earth
+	cp -rf $(STAGING_DIR)/usr/share/marble/data/maps/earth/precip-july $(TARGET_DIR)/usr/share/marble/data/maps/earth
+endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_PRECIP_JULY_MAP
+endif
+
+ifeq ($(BR2_PACKAGE_MARBLE_SCHAGEN),y)
+define MARBLE_INSTALL_SCHAGEN_MAP
+	mkdir -p $(TARGET_DIR)/usr/share/marble/data/maps/earth
+	cp -rf $(STAGING_DIR)/usr/share/marble/data/maps/earth/schagen1689 $(TARGET_DIR)/usr/share/marble/data/maps/earth
+endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_SCHAGEN_MAP
+endif
+
+ifeq ($(BR2_PACKAGE_MARBLE_SRTM),y)
+define MARBLE_INSTALL_SRTM_MAP
+	mkdir -p $(TARGET_DIR)/usr/share/marble/data/maps/earth
+	cp -rf $(STAGING_DIR)/usr/share/marble/data/maps/earth/srtm $(TARGET_DIR)/usr/share/marble/data/maps/earth
+endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_SRTM_MAP
+endif
+
+ifeq ($(BR2_PACKAGE_MARBLE_SRTM2),y)
+define MARBLE_INSTALL_SRTM2_MAP
+	mkdir -p $(TARGET_DIR)/usr/share/marble/data/maps/earth
+	cp -rf $(STAGING_DIR)/usr/share/marble/data/maps/earth/srtm2 $(TARGET_DIR)/usr/share/marble/data/maps/earth
+endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_SRTM2_MAP
+endif
+
+ifeq ($(BR2_PACKAGE_MARBLE_TEMP_DEC),y)
+define MARBLE_INSTALL_TEMP_DEC_MAP
+	mkdir -p $(TARGET_DIR)/usr/share/marble/data/maps/earth
+	cp -rf $(STAGING_DIR)/usr/share/marble/data/maps/earth/temp-dec $(TARGET_DIR)/usr/share/marble/data/maps/earth
+endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_TEMP_DEC_MAP
+endif
+
+ifeq ($(BR2_PACKAGE_MARBLE_TEMP_JULY),y)
+define MARBLE_INSTALL_TEMP_JULY_MAP
+	mkdir -p $(TARGET_DIR)/usr/share/marble/data/maps/earth
+	cp -rf $(STAGING_DIR)/usr/share/marble/data/maps/earth/temp-july $(TARGET_DIR)/usr/share/marble/data/maps/earth
+endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_TEMP_JULY_MAP
+endif
+
+ifeq ($(BR2_PACKAGE_MARBLE_CLEMENTINE),y)
+define MARBLE_INSTALL_CLEMENTINE_MAP
+	mkdir -p $(TARGET_DIR)/usr/share/marble/data/maps/moon
+	cp -rf $(STAGING_DIR)/usr/share/marble/data/maps/moon/clementine $(TARGET_DIR)/usr/share/marble/data/maps/moon
+endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_CLEMENTINE_MAP
+endif
+
+ifeq ($(BR2_PACKAGE_MARBLE_MWDBII),y)
+define MARBLE_INSTALL_MWDBII_FILES
+	cp -rf $(STAGING_DIR)/usr/share/marble/data/mwdbii $(TARGET_DIR)/usr/share/marble/data
+endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_MWDBII_FILES
+endif
+
+ifeq ($(BR2_PACKAGE_MARBLE_PLACEMARKS),y)
+define MARBLE_INSTALL_PLACEMARKS
+	cp -rf $(STAGING_DIR)/usr/share/marble/data/placemarks $(TARGET_DIR)/usr/share/marble/data
+endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_PLACEMARKS
+endif
+
+ifeq ($(BR2_PACKAGE_MARBLE_STARS),y)
+define MARBLE_INSTALL_STARS_DATA
+	cp -rf $(STAGING_DIR)/usr/share/marble/data/stars $(TARGET_DIR)/usr/share/marble/data
+endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_STARS_DATA
+endif
+
+ifeq ($(BR2_PACKAGE_MARBLE_SVG),y)
+define MARBLE_INSTALL_SVG
+	cp -rf $(STAGING_DIR)/usr/share/marble/data/svg $(TARGET_DIR)/usr/share/marble/data

package/marble/marble.mk line 197

Quoted 10 lines
package/marble/marble.mk new file +10 -0
+endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_SVG
+endif
+
+ifeq ($(BR2_PACKAGE_MARBLE_WEATHER),y)
+define MARBLE_INSTALL_WEATHER_DATA
+	cp -rf $(STAGING_DIR)/usr/share/marble/data/weather $(TARGET_DIR)/usr/share/marble/data
+endef
+MARBLE_POST_INSTALL_TARGET_HOOKS += MARBLE_INSTALL_WEATHER_DATA
+endif

Ditto, please factorize that in a smarter way.

Also, can you think of using string option to give the list of things to install (like lists of datasets) rather than having one Config.in option for each element? It seems like each new Marble version will bring new elements to be installed, which would require even more Config.in options to be added.

Care to repost an updated version with those issues fixed?

In the mean time, we'll mark your patch as Changes Requested in patchwork.

Thanks a lot!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com