Merge pull request #13901 from nxhack/mraa_python

libmraa: update to 2.2.0

libs/libmraa/Makefile

@@ -8,19 +8,19 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libmraa
-PKG_VERSION:=2.1.0
-PKG_RELEASE:=3
+PKG_VERSION:=2.2.0
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/eclipse/mraa/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=5351ce9eb654014d8ea7f43bdb2d17e6d1955536938a2ea0d467f4008e614345
+PKG_HASH:=076669bee8423ffef3065735b293a329020be86630fea457174dbfcc67a0554a
 PKG_BUILD_DIR:=$(BUILD_DIR)/mraa-$(PKG_VERSION)
 
 PKG_MAINTAINER:=John Crispin <blogic@openwrt.org>, Hirokazu MORIKAWA <morikw2@gmail.com>
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=COPYING
 
-PKG_BUILD_DEPENDS:=node swig/host node/host
+PKG_BUILD_DEPENDS:=swig/host node/host PACKAGE_node:node
 CMAKE_INSTALL:=1
 PKG_USE_MIPS16:=0
 PYTHON3_PKG_BUILD:=0
@@ -30,10 +30,9 @@ include $(INCLUDE_DIR)/cmake.mk
 include ../../lang/python/python3-package.mk
 
 CMAKE_OPTIONS=-DENABLEEXAMPLES=0 \
+	-DBUILDSWIGNODE=$(if $(CONFIG_PACKAGE_libmraa-node),ON,OFF) \
 	-DFIRMATA=ON
 
-TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/include/node
-
 define Package/libmraa/Default
   SECTION:=libs
   CATEGORY:=Libraries
@@ -65,7 +64,7 @@ endef
 define Package/libmraa-node
   $(call Package/libmraa/Default)
   TITLE:=Eclipse MRAA lowlevel IO Node.js library
-  DEPENDS:=+libmraa +node
+  DEPENDS:=+libmraa @PACKAGE_node
 endef
 
 define Package/libmraa-node/description

libs/libmraa/patches/010-version.patch

@@ -1,6 +1,6 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -106,12 +106,7 @@ endif()
+@@ -113,12 +113,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.
@@ -8,9 +8,9 @@
 -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.1.0")
+-  set (VERSION "v2.2.0")
 -endif ()
-+set (VERSION "v2.1.0")
++set (VERSION "v2.2.0")
  
  message (STATUS "INFO - libmraa Version ${VERSION}")
  message (STATUS "INFO - cmake Version ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}")