LInkit7688 MARR ad hoc patch

MRAA.patch

diff --git a/libs/libmraa/Makefile b/libs/libmraa/Makefile
index 3e3202a..0ba5522 100644
--- a/feeds/packages/libs/libmraa/Makefile
+++ b/feeds/packages/libs/libmraa/Makefile
@@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libmraa
-PKG_VERSION:=0.8.0
+PKG_VERSION:=0.9.6
 
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/intel-iot-devkit/mraa.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=70600dece4138b0c0dbaff42f57828f1559cd840
+PKG_SOURCE_VERSION:=d8024bb516bf2d895eaff6f92115835d7ef704a2
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_BUILD_DEPENDS:=node python/host swig/host node/host
 CMAKE_INSTALL:=1
diff --git a/libs/libmraa/patches/0001-base.patch b/libs/libmraa/patches/0001-base.patch
index 5094389..03f293b 100644
--- a/feeds/packages/libs/libmraa/patches/0001-base.patch
+++ b/feeds/packages/libs/libmraa/patches/0001-base.patch
@@ -21,11 +21,11 @@ Subject: [PATCH 1/4] base
  # 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")
+-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 "v0.8.0-dirty")
+-  set (VERSION "v0.9.6-dirty")
 -endif ()
-+set (VERSION "v0.8.0")
++set (VERSION "v0.9.6")
  
  message (INFO " - libmraa Version ${VERSION}")
  
@@ -43,10 +43,10 @@ Subject: [PATCH 1/4] base
  if (BUILDSWIGPYTHON)
 --- a/api/mraa/types.h
 +++ b/api/mraa/types.h
-@@ -46,6 +46,7 @@
-     MRAA_BEAGLEBONE = 6,            /**< The different BeagleBone Black Modes B/C */
-     MRAA_BANANA = 7,                /**< Allwinner A20 based Banana Pi and Banana Pro */
-     MRAA_INTEL_NUC5 = 8,            /**< The Intel 5th generations Broadwell NUCs */
+@@ -50,6 +50,7 @@
+     MRAA_INTEL_SOFIA_3GR = 10,      /**< The Intel SoFIA 3GR */
+     MRAA_INTEL_CHERRYHILLS = 11,     /**< The Intel Braswell Cherryhills */
+     MRAA_UP = 12,                    /**< The UP Board */
 +    MRAA_MTK_LINKIT = 9,            /**< Mediatek MT7688 based Linkit (Air) */
  
      // USB platform extenders start at 256
diff --git a/libs/libupm/Makefile b/libs/libupm/Makefile
index 93287c5..caae89f 100644
--- a/feeds/packages/libs/libupm/Makefile
+++ b/feeds/packages/libs/libupm/Makefile
@@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libupm
-PKG_VERSION:=0.4.0
+PKG_VERSION:=0.6.1
 
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/intel-iot-devkit/upm.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=04dc6df4297a7766d6f1a8fef9699d586e7e0d92
+PKG_SOURCE_VERSION:=655ccee9afd259bff1773e9e8aea860f6e06b69f
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 CMAKE_INSTALL:=1
 
diff --git a/libs/libupm/patches/001-version.patch b/libs/libupm/patches/001-version.patch
index 3d4fd6c..cfffefb 100644
--- a/feeds/packages/libs/libupm/patches/001-version.patch
+++ b/feeds/packages/libs/libupm/patches/001-version.patch
@@ -6,11 +6,11 @@
  # Make a version file containing the current version from git.
 -include (GetGitRevisionDescription)
 -git_describe (VERSION "--tags")
--if ("x_${VERSION}" STREQUAL "x_GIT-NOTFOUND")
+-if ("x_${VERSION}" STREQUAL "x_GIT-NOTFOUND" OR "x_${VERSION}" STREQUAL "x_-128-NOTFOUND")
 -  message (WARNING " - Install git to compile a production UPM!")
--  set (VERSION "v0.4.0-dirty")
+-  set (VERSION "v0.6.1-dirty")
 -endif ()
-+set (VERSION "v0.4.0")
++set (VERSION "v0.6.1")
  
  message (INFO " - UPM Version ${VERSION}")
  
diff --git a/libs/libupm/patches/003-lsm303-args.patch b/libs/libupm/patches/003-lsm303-args.patch
index d2b2d0e..091b6bd 100644
--- a/feeds/packages/libs/libupm/patches/003-lsm303-args.patch
+++ b/feeds/packages/libs/libupm/patches/003-lsm303-args.patch
@@ -3,9 +3,9 @@
 @@ -34,7 +34,7 @@
  
  /* LSM303 Address definitions */
- #define LSM303_MAG 0x1E // assuming SA0 grounded
--#define LSM303_ACC 0x18 // assuming SA0 grounded
-+#define LSM303_ACC 0x1E // assuming SA0 grounded
+ #define LSM303_MAG 0x1E
+-#define LSM303_ACC 0x19
++#define LSM303_ACC 0x1E
  
  /* LSM303 Register definitions */
  #define CTRL_REG1_A 0x20