commit upm for openSUSE:Factory

24 Aug 2017

Hello community,

here is the log from the commit of package upm for openSUSE:Factory checked in at 2017-08-24 18:44:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/upm (Old)
 and      /work/SRC/openSUSE:Factory/.upm.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "upm"

Thu Aug 24 18:44:36 2017 rev:3 rq:514216 version:1.3.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/upm/upm.changes	2017-02-03 20:04:13.721783123 +0100
+++ /work/SRC/openSUSE:Factory/.upm.new/upm.changes	2017-08-24 18:45:49.832911575 +0200
@@ -1,0 +2,46 @@
+Thu Aug  3 12:06:09 UTC 2017 - mpluskal@suse.com
+
+- Explicitly remove non free parts
+
+-------------------------------------------------------------------
+Mon Jun  5 07:58:36 UTC 2017 - mpluskal@suse.com
+
+- Update to version 1.3.0:
+  * Finalized all required build system and JAVA binding changes to
+    release the UPM libraries for Android Things targets
+  * Enhanced the modules for lsm303 and tmp006 to support newer
+    variants of the chips
+  * Fixed Node.js detection on Ubuntu when installed with apt using
+    official packages
+  * Minor documentation changes
+  * New sensors: lsm303agr, lsm303d, veml6070, tca9548a, rn2903
+- Changes for version 1.2.0:
+  * Improved JAVA binding compiler compatibility and added JAVA
+    interfaces that match existing C++ interfaces
+  * Ported Bosch drivers to C thus now they can be used on
+    supported MCUs
+  * Completely redesigned C/C++ example handling by cmake to avoid
+    maintaining a list by hand
+  * Fixed several existing drivers, mostly based on static code
+    analysis reports
+  * Added a sensor driver template plus bash script that can be
+    easily used by developers to start writing their own sensor
+    driver
+  * Numerous documentation improvements
+  * New sensors: p9813, abp, rsc, mmc35240, tcs37727, tmp006,
+    mma8x6x, mag3110, hdc1000
+- Changes for version 1.1.0:
+  * Reworked cmake handling of internal and external dependencies
+  * Documentation improvements for sensor names, sensor
+    descriptions, external contributor guides and added new section
+    on installing UPM on a supported OS
+  * Fixed issues with C11 builds on some WRLinux gateways and
+    Debian systems
+  * New examples and functionality for speaker and ads1x15 modules
+  * Modified JAVA builds to ensure the SWIG generated wrappers
+    include all functionality and typemaps
+  * New sensors: mcp2515, max30100, uartat, le910
+- Add upm-ads1x15.patch to fix building with gcc7
+- Use ninja for building
+
+-------------------------------------------------------------------

Old:
----
  upm-1.0.2.tar.gz

New:
----
  upm-1.3.0.tar.gz
  upm-ads1x15.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ upm.spec ++++++
--- /var/tmp/diff_new_pack.yOyHDj/_old	2017-08-24 18:45:50.856767414 +0200
+++ /var/tmp/diff_new_pack.yOyHDj/_new	2017-08-24 18:45:50.876764598 +0200
@@ -18,19 +18,21 @@
 
 %define         sover 1
 Name:           upm
-Version:        1.0.2
+Version:        1.3.0
 Release:        0
 Summary:        High-level repository for sensors that use mraa
 License:        MIT
 Group:          Hardware/Other
 Url:            https://github.com/intel-iot-devkit/UPM
 Source:         https://github.com/intel-iot-devkit/UPM/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Patch0:         upm-ads1x15.patch
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
+BuildRequires:  ninja
 BuildRequires:  pkgconfig
 BuildRequires:  swig
 BuildRequires:  pkgconfig(libjpeg)
-BuildRequires:  pkgconfig(mraa)
+BuildRequires:  pkgconfig(mraa) >= 1.7.0
 BuildRequires:  pkgconfig(python2)
 BuildRequires:  pkgconfig(python3)
 ExclusiveArch:  %{ix86} x86_64 %{arm} aarch64
@@ -100,15 +102,19 @@
 
 %prep
 %setup -q
+%patch0 -p1
+# remove CC BY-NC-SA 3.0 licenced images
+rm -rf docs/images
 
 %build
+%define __builder ninja
 %cmake \
   -DCMAKE_SHARED_LINKER_FLAGS="" \
   -DCMAKE_EXE_LINKER_FLAGS="" \
   -DCMAKE_MODULE_LINKER_FLAGS="" \
   -DBUILDSWIGNODE=off \
   -DBUILDFTI=on
-%make_build
+%make_jobs
 
 %install
 %cmake_install
@@ -117,22 +123,18 @@
 %postun -n lib%{name}%{sover} -p /sbin/ldconfig
 
 %files -n lib%{name}%{sover}
-%defattr(-,root,root)
 %doc LICENSE README.md
 %{_libdir}/lib%{name}*.so.%{sover}*
 
 %files devel
-%defattr(-,root,root)
 %{_libdir}/lib%{name}*.so
 %{_includedir}/%{name}
 %{_libdir}/pkgconfig/%{name}*
 
 %files -n python-%{name}
-%defattr(-,root,root)
 %{python_sitearch}/*
 
 %files -n python3-%{name}
-%defattr(-,root,root)
 %{python3_sitearch}/*
 
 %changelog

++++++ upm-1.0.2.tar.gz -> upm-1.3.0.tar.gz ++++++
/work/SRC/openSUSE:Factory/upm/upm-1.0.2.tar.gz /work/SRC/openSUSE:Factory/.upm.new/upm-1.3.0.tar.gz differ: char 13, line 1

++++++ upm-ads1x15.patch ++++++
...
From c64d04d084f47b4cb3e1cdee6e96348fcc6a756e Mon Sep 17 00:00:00 2001
From: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
Date: Tue, 30 May 2017 15:14:09 -0700
Subject: [PATCH] ads1x15: fixed case logic in getThresh() function
Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
---
 src/ads1x15/ads1x15.cxx | 4 ++--
 src/ads1x15/ads1x15.hpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/ads1x15/ads1x15.cxx b/src/ads1x15/ads1x15.cxx
index 357827097..47701b2a4 100644
--- a/src/ads1x15/ads1x15.cxx
+++ b/src/ads1x15/ads1x15.cxx
@@ -116,7 +116,7 @@ ADS1X15::setContinuous(bool mode){
 
 float
 ADS1X15::getThresh(ADSTHRESH reg){
-     if( THRESH_HIGH && THRESH_LOW) return getLastSample(reg);
+     if(reg == THRESH_HIGH || reg == THRESH_LOW) return getLastSample(reg);
      else return 0.0;
 }
 
@@ -137,7 +137,7 @@ ADS1X15::setThresh(ADSTHRESH reg, float value){
      case 2:
      case 3:
           set_value = value / getMultiplier();
-         set_value = set_value << m_bitShift;
+          set_value = set_value << m_bitShift;
           if(i2c->writeWordReg(reg, swapWord(set_value)) != mraa::SUCCESS){
             throw std::runtime_error(std::string(__FUNCTION__) + ": I2c.write() failed");
             return;
diff --git a/src/ads1x15/ads1x15.hpp b/src/ads1x15/ads1x15.hpp
index 7524572da..efd8c8ecd 100644
--- a/src/ads1x15/ads1x15.hpp
+++ b/src/ads1x15/ads1x15.hpp
@@ -390,7 +390,7 @@ namespace upm {
              * @param reg ADSTHRES enum value.
              * Returns 0.0 unless THRESH_HIGH or THRESH_LOW requested.
              */
-            float getThresh(ADSTHRESH reg = THRESH_LOW);
+            float getThresh(ADSTHRESH reg = THRESH_DEFAULT);
 
             /**
              * Sets threshold levels or configures for conversion ready

    

root＠hilbert.suse.de

tags

participants (1)