summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
authorArchil Pirmisashvili <kulipator@gmail.com>2019-11-13 22:28:37 +0200
committerArchil Pirmisashvili <kulipator@gmail.com>2019-11-13 22:30:33 +0200
commitcf4e50ab7b09137f112e34aa37c33bb4d09369b5 (patch)
treea9ff8adea6a8d7b547e13659491328a14abd04c2 /libs
parent1b64cb83d69e1128044cdda361f7376421b48cd9 (diff)
Compilation fix & upgrade to version 0.8.1
Signed-off-by: Archil Pirmisashvili <kulipator@gmail.com>
Diffstat (limited to 'libs')
-rw-r--r--libs/libmraa/patches/0001-base.patch6
-rw-r--r--libs/libmraa/patches/0004-fixes.patch2
-rw-r--r--libs/libmraa/patches/0005-ramips_fixes.patch47
3 files changed, 4 insertions, 51 deletions
diff --git a/libs/libmraa/patches/0001-base.patch b/libs/libmraa/patches/0001-base.patch
index 5094389f4..d790296bb 100644
--- a/libs/libmraa/patches/0001-base.patch
+++ b/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.8.1-dirty")
-endif ()
-+set (VERSION "v0.8.0")
++set (VERSION "v0.8.1")
message (INFO " - libmraa Version ${VERSION}")
diff --git a/libs/libmraa/patches/0004-fixes.patch b/libs/libmraa/patches/0004-fixes.patch
index 40e5930ee..7acdea789 100644
--- a/libs/libmraa/patches/0004-fixes.patch
+++ b/libs/libmraa/patches/0004-fixes.patch
@@ -655,7 +655,7 @@ Subject: [PATCH 4/4] fixes
b->gpio_count++;
--- a/src/gpio/gpio.c
+++ b/src/gpio/gpio.c
-@@ -113,6 +113,8 @@
+@@ -114,6 +114,8 @@
close(export);
}
diff --git a/libs/libmraa/patches/0005-ramips_fixes.patch b/libs/libmraa/patches/0005-ramips_fixes.patch
deleted file mode 100644
index 5aa7069e1..000000000
--- a/libs/libmraa/patches/0005-ramips_fixes.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/src/javascript/mraajs.i
-+++ b/src/javascript/mraajs.i
-@@ -42,7 +42,13 @@ namespace mraa {
- class Spi;
- %typemap(out) uint8_t*
- {
--%#if SWIG_V8_VERSION > 0x032870
-+%#if SWIG_V8_VERSION > 0x040000
-+ v8::MaybeLocal<v8::Object> objret = node::Buffer::Copy(v8::Isolate::GetCurrent(), (char*) result, arg3);
-+ free(result);
-+ if(!objret.ToLocal(&$result)){
-+ SWIG_exception_fail(SWIG_ERROR, "Spi buffer failed");
-+ }
-+%#elif SWIG_V8_VERSION > 0x032870
- $result = node::Buffer::New((char*) $1, arg3);
- %#else
- $result = node::Buffer::New((char*) $1, arg3)->handle_;
-@@ -76,7 +82,13 @@ class Spi;
- SWIG_exception_fail(SWIG_ERROR, "I2c write failed");
- SWIGV8_RETURN(SWIGV8_UNDEFINED());
- }
--%#if SWIG_V8_VERSION > 0x032870
-+%#if SWIG_V8_VERSION > 0x040000
-+ v8::MaybeLocal<v8::Object> objret = node::Buffer::Copy(v8::Isolate::GetCurrent(), (char*) $1, result);
-+ free($1);
-+ if(!objret.ToLocal(&$result)) {
-+ SWIG_exception_fail(SWIG_ERROR, "Uart buffer failed");
-+ }
-+%#elif SWIG_V8_VERSION > 0x032870
- $result = node::Buffer::New((char*) $1, result);
- %#else
- $result = node::Buffer::New((char*) $1, result)->handle_;
-@@ -105,7 +117,13 @@ class Spi;
- SWIG_exception_fail(SWIG_ERROR, "I2c write failed");
- SWIGV8_RETURN(SWIGV8_UNDEFINED());
- }
--%#if SWIG_V8_VERSION > 0x032870
-+%#if SWIG_V8_VERSION > 0x040000
-+ v8::MaybeLocal<v8::Object> objret = node::Buffer::Copy(v8::Isolate::GetCurrent(), (char*) $1, result);
-+ free($1);
-+ if(!objret.ToLocal(&$result)) {
-+ SWIG_exception_fail(SWIG_ERROR, "I2c buffer failed");
-+ }
-+%#elif SWIG_V8_VERSION > 0x032870
- $result = node::Buffer::New((char*) $1, result);
- %#else
- $result = node::Buffer::New((char*) $1, result)->handle_;