cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 07:28:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

libupm: Update to 1.7.1

Browse Source 
The libmraa update introduced several API changes that broke libupm.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev
2018-11-13 13:50:37 -08:00
parent 07e17bfe4a
commit e8845b49a2
5 changed files with 385 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/libupm/patches/001-version.patch
+9 -7
View File
@@ -1,16 +1,18 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,12 +26,7 @@
include(GNUInstallDirs)
@@ -225,14 +225,7 @@ include(GNUInstallDirs)
set (LIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}" CACHE PATH "Installation path for libraries")
# Make a version file containing the current version from git.
-include (GetGitRevisionDescription)
-git_describe (VERSION "--tags")
-if ("x_${VERSION}" STREQUAL "x_GIT-NOTFOUND")
- message (WARNING " - Install git to compile a production UPM!")
- set (VERSION "v0.4.0-dirty")
-# If git_describe fails, use a dirty version
-if (${VERSION} MATCHES -NOTFOUND)
- set (VERSION "v1.7.1")
- message (WARNING "Failed to retrieve UPM version with 'git describe' (using "
- "${VERSION}). Check that git is installed and this is a valid git repo.")
-endif ()
+set (VERSION "v0.4.0")
+set (VERSION "v1.7.1")
message (INFO " - UPM Version ${VERSION}")
message (STATUS "UPM Version ${VERSION}")
libs/libupm/patches/002-at42qt1070-id.patch
+1 -1
View File
@@ -1,6 +1,6 @@
--- a/src/at42qt1070/at42qt1070.cxx
+++ b/src/at42qt1070/at42qt1070.cxx
@@ -53,7 +53,7 @@
@@ -53,7 +53,7 @@ AT42QT1070::AT42QT1070(int bus, uint8_t address)
return;
}
libs/libupm/patches/003-link-atomic.patch
+8
View File
@@ -0,0 +1,8 @@
--- a/src/nmea_gps/CMakeLists.txt
+++ b/src/nmea_gps/CMakeLists.txt
@@ -6,4 +6,4 @@ upm_mixed_module_init (NAME nmea_gps
CPP_SRC nmea_gps.cxx
FTI_SRC nmea_gps_fti.c
CPP_WRAPS_C
- REQUIRES mraa utilities-c ${CMAKE_THREAD_LIBS_INIT})
+ REQUIRES mraa utilities-c atomic ${CMAKE_THREAD_LIBS_INIT})
libs/libupm/patches/003-lsm303-args.patch
-11
View File
@@ -1,11 +0,0 @@
--- a/src/lsm303/lsm303.h
+++ b/src/lsm303/lsm303.h
@@ -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
/* LSM303 Register definitions */
#define CTRL_REG1_A 0x20