Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compilation fix & upgrade to version 0.8.1

Browse source 
Signed-off-by: Archil Pirmisashvili <kulipator@gmail.com>
This commit is contained in:
Archil Pirmisashvili 2019-11-13 22:28:37 +02:00
parent 1b64cb83d6
commit cf4e50ab7b
3 changed files with 4 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libs/libmraa/patches/0001-base.patch
View file

@ -21,11 +21,11 @@ Subject: [PATCH 1/4] base
# Make a version file containing the current version from git. # Make a version file containing the current version from git.
-include (GetGitRevisionDescription) -include (GetGitRevisionDescription)
-git_describe (VERSION "--tags") -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!") - message (WARNING " - Install git to compile a production libmraa!")
- set (VERSION "v0.8.0-dirty") - set (VERSION "v0.8.1-dirty")
-endif () -endif ()
+set (VERSION "v0.8.0") +set (VERSION "v0.8.1")
message (INFO " - libmraa Version ${VERSION}") message (INFO " - libmraa Version ${VERSION}")

2
libs/libmraa/patches/0004-fixes.patch
View file

@ -655,7 +655,7 @@ Subject: [PATCH 4/4] fixes
b->gpio_count++; b->gpio_count++;
--- a/src/gpio/gpio.c --- a/src/gpio/gpio.c
+++ b/src/gpio/gpio.c +++ b/src/gpio/gpio.c
@@ -113,6 +113,8 @@ @@ -114,6 +114,8 @@
close(export); close(export);
} }

47
libs/libmraa/patches/0005-ramips_fixes.patch
View file

@ -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_;