From ca4536b39ffb8dfed0a94687edb11426fb442ae5 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Tue, 13 Nov 2018 14:41:24 -0800 Subject: [PATCH] libmraa: Add several subpackages Also added back the version patch to fix compilation with libupm. Signed-off-by: Rosen Penev --- libs/libmraa/Makefile | 109 +++++++++++++++++++++---- libs/libmraa/patches/010-version.patch | 16 ++++ 2 files changed, 110 insertions(+), 15 deletions(-) create mode 100644 libs/libmraa/patches/010-version.patch diff --git a/libs/libmraa/Makefile b/libs/libmraa/Makefile index c90d7cec5..3d20abeb9 100644 --- a/libs/libmraa/Makefile +++ b/libs/libmraa/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2015 OpenWrt.org +# Copyright (C) 2015-2018 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,41 +9,120 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libmraa PKG_VERSION:=2.0.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/intel-iot-devkit/mraa/tar.gz/v$(PKG_VERSION)? PKG_HASH:=c9f3c3741c6894be5516adecfe6b55a38960b6718b268a9afd645f7955e5a716 PKG_BUILD_DIR:=$(BUILD_DIR)/mraa-$(PKG_VERSION) -PKG_MAINTAINER:=John Crispin -PKG_LICENSE:=LGPL-2.1 +PKG_MAINTAINER:=John Crispin , Hirokazu MORIKAWA +PKG_LICENSE:=MIT +PKG_LICENSE_FILES:=COPYING -PKG_BUILD_DEPENDS:=node python/host swig/host node/host +PKG_BUILD_DEPENDS:=node swig/host node/host CMAKE_INSTALL:=1 +PKG_USE_MIPS16:=0 include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk +include $(TOPDIR)/feeds/packages/lang/python/python-package.mk +include $(TOPDIR)/feeds/packages/lang/python/python3-package.mk -CMAKE_OPTIONS=-DBUILDARCH=$(CONFIG_ARCH) \ - -DENABLEEXAMPLES=0 \ - -DNODE_EXECUTABLE=$(STAGING_DIR_HOSTPKG)/bin/node +CMAKE_OPTIONS=-DENABLEEXAMPLES=0 \ + -DFIRMATA=ON TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/include/node -define Package/libmraa +define Package/libmraa/Default SECTION:=libs CATEGORY:=Libraries - DEPENDS:=+python +libstdcpp +libjson-c + SUBMENU:=IoT TITLE:=Intel IoT lowlevel IO library + URL:=https://github.com/intel-iot-devkit/mraa +endef + +define Package/libmraa/Default/description + Libmraa is a C/C++ library with bindings to Java, Python and JavaScript to interface +with the IO on Galileo, Edison & other platforms, with a structured and sane API where +port names/numbering matches the board that you are on. Use of libmraa does not tie you +to specific hardware with board detection done at runtime you can create portable code +that will work across the supported platforms. +endef + +define Package/libmraa + $(call Package/libmraa/Default) + TITLE:=Intel IoT lowlevel IO C/C++ library + DEPENDS:=+libstdcpp +libjson-c +endef + +define Package/libmraa/description +$(call Package/libmraa/Default/description) + +This package contains the C/C++ libraries. +endef + +define Package/libmraa-node + $(call Package/libmraa/Default) + TITLE:=Intel IoT lowlevel IO Node.js library + DEPENDS:=+libmraa +node +endef + +define Package/libmraa-node/description +$(call Package/libmraa/Default/description) + +This package contains the Node.js libraries. +endef + +define Package/libmraa-python + $(call Package/libmraa/Default) + TITLE:=Intel IoT lowlevel IO Python library + DEPENDS:=+libmraa +python-light +endef + +define Package/libmraa-python/description +$(call Package/libmraa/Default/description) + +This package contains the Python libraries. +endef + +define Package/libmraa-python3 + $(call Package/libmraa/Default) + TITLE:=Intel IoT lowlevel IO Python3 library + DEPENDS:=+libmraa +python3-light +endef + +define Package/libmraa-python3/description +$(call Package/libmraa/Default/description) + +This package contains the Python3 libraries. endef define Package/libmraa/install - $(INSTALL_DIR) $(1)/usr/lib/{node/mraa,python2.7/site-packages} $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libmraa.so* $(1)/usr/lib/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/node_modules/mraa/* $(1)/usr/lib/node/mraa/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/python2.7/site-packages/* $(1)/usr/lib/python2.7/site-packages/ -# $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/mraa/examples/python/blink-io8.py $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmraa.so* $(1)/usr/lib/ + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mraa-* $(1)/usr/bin/ +endef + +define Package/libmraa-node/install + $(INSTALL_DIR) $(1)/usr/lib/node/mraa + $(CP) $(PKG_INSTALL_DIR)/usr/lib/node_modules/mraa/* $(1)/usr/lib/node/mraa/ +endef + +define Package/libmraa-python/install + $(INSTALL_DIR) $(1)/usr/lib/python$(PYTHON_VERSION)/site-packages + $(CP) $(PKG_INSTALL_DIR)/usr/lib/python$(PYTHON_VERSION)/site-packages/* \ + $(1)/usr/lib/python$(PYTHON_VERSION)/site-packages/ +endef + +define Package/libmraa-python3/install + $(INSTALL_DIR) $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages + $(CP) $(PKG_INSTALL_DIR)/usr/lib/python$(PYTHON3_VERSION)/site-packages/* \ + $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages/ endef $(eval $(call BuildPackage,libmraa)) +$(eval $(call BuildPackage,libmraa-node)) +$(eval $(call BuildPackage,libmraa-python)) +$(eval $(call BuildPackage,libmraa-python3)) diff --git a/libs/libmraa/patches/010-version.patch b/libs/libmraa/patches/010-version.patch new file mode 100644 index 000000000..55e06aa05 --- /dev/null +++ b/libs/libmraa/patches/010-version.patch @@ -0,0 +1,16 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -106,12 +106,7 @@ endif() + set (CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH}) + + # Make a version file containing the current version from git. +-include (GetGitRevisionDescription) +-git_describe (VERSION "--tags") +-if ("x_${VERSION}" STREQUAL "x_GIT-NOTFOUND" OR "x_${VERSION}" STREQUAL "x_HEAD-HASH-NOTFOUND" OR "x_${VERSION}" STREQUAL "x_-128-NOTFOUND") +- message (WARNING " - Install git to compile a production libmraa!") +- set (VERSION "v2.0.0") +-endif () ++set (VERSION "v2.0.0") + + message (STATUS "INFO - libmraa Version ${VERSION}") + message (STATUS "INFO - cmake Version ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}")