Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[sensorfw] use qt5 sensord, lib, qt4 qt-api compat packaging.
Also move hybris to own lib, and package separately.
  • Loading branch information
Lorn Potter committed Aug 28, 2013
1 parent a9889f3 commit 5bd91d6
Show file tree
Hide file tree
Showing 16 changed files with 419 additions and 288 deletions.
2 changes: 1 addition & 1 deletion adaptors/adaptors.pro
Expand Up @@ -27,7 +27,7 @@ SUBDIRS += steaccelerometeradaptor
SUBDIRS += mpu6050accelerometer

contains(CONFIG,hybris) {
SUBDIRS += hybrisaccelerometer
SUBDIRS = hybrisaccelerometer
SUBDIRS += hybrisalsadaptor
SUBDIRS += hybrisgyroscopeadaptor
SUBDIRS += hybrismagnetometeradaptor
Expand Down
1 change: 1 addition & 0 deletions adaptors/hybrisaccelerometer/hybrisaccelerometer.pro
Expand Up @@ -5,5 +5,6 @@ HEADERS += hybrisaccelerometeradaptor.h \

SOURCES += hybrisaccelerometeradaptor.cpp \
hybrisaccelerometeradaptorplugin.cpp
LIBS+= -L../../core -lhybrissensorfw-qt5

include( ../adaptor-config.pri )
1 change: 1 addition & 0 deletions adaptors/hybrisalsadaptor/hybrisalsadaptor.pro
Expand Up @@ -5,5 +5,6 @@ HEADERS += hybrisalsadaptor.h \

SOURCES += hybrisalsadaptor.cpp \
hybrisalsadaptorplugin.cpp
LIBS+= -L../../core -lhybrissensorfw-qt5

include(../adaptor-config.pri )
1 change: 1 addition & 0 deletions adaptors/hybrisgyroscopeadaptor/hybrisgyroscopeadaptor.pro
Expand Up @@ -6,5 +6,6 @@ HEADERS += hybrisgyroscopeadaptor.h \
SOURCES += hybrisgyroscopeadaptor.cpp \
hybrisgyroscopeadaptorplugin.cpp

LIBS+= -L../../core -lhybrissensorfw-qt5

include( ../adaptor-config.pri )
Expand Up @@ -6,5 +6,6 @@ HEADERS += hybrismagnetometeradaptor.h \
SOURCES += hybrismagnetometeradaptor.cpp \
hybrismagnetometeradaptorplugin.cpp

LIBS+= -L../../core -lhybrissensorfw-qt5

include( ../adaptor-config.pri )
17 changes: 0 additions & 17 deletions adaptors/hybrisorientationadaptor/hybrisorientationadaptor.cpp
Expand Up @@ -18,7 +18,6 @@
**
****************************************************************************/

#include <QDebug>
#include "hybrisorientationadaptor.h"
#include "logging.h"
#include "datatypes/utils.h"
Expand Down Expand Up @@ -73,26 +72,13 @@ void HybrisOrientationAdaptor::stopSensor()

void HybrisOrientationAdaptor::processSample(const sensors_event_t& data)
{
qDebug() << Q_FUNC_INFO
<< "sensor:" << data.type
<< "timestamp:" << quint64(data.timestamp * .001)
<< "value:"
<< data.data[0]
<< data.data[1]
<< data.data[2];

TimedXyzData *d = buffer->nextSlot();
d->timestamp_ = quint64(data.timestamp * .001);
// sensorfw wants milli-G'
d->x_ = data.data[0] * 1000; //azimuth
d->y_ = data.data[1] * 1000; //pitch
d->z_ = data.data[2] * 1000; //roll

qDebug() << Q_FUNC_INFO
<< "sensor:" << data.type
<< "timestamp:" << quint64(data.timestamp * .001)
<< "value:" << d->x_<< d->y_ << d->z_;

// qt's sensorfw plugin expects G == 9.81286, but it should be
//9.80665
buffer->commit();
Expand All @@ -101,7 +87,4 @@ void HybrisOrientationAdaptor::processSample(const sensors_event_t& data)

void HybrisOrientationAdaptor::init()
{
// qDebug() << "maxRange" << HybrisAdaptor::maxRange;
// introduceAvailableDataRange(DataRange(-HybrisAdaptor::maxRange, HybrisAdaptor::maxRange , 1));
// introduceAvailableInterval(DataRange(10, 586, 0));
}
Expand Up @@ -6,4 +6,6 @@ HEADERS += hybrisorientationadaptor.h \
SOURCES += hybrisorientationadaptor.cpp \
hybrisorientationadaptorplugin.cpp

LIBS+= -L../../core -lhybrissensorfw-qt5

include( ../adaptor-config.pri )
2 changes: 2 additions & 0 deletions adaptors/hybrisproximityadaptor/hybrisproximityadaptor.pro
Expand Up @@ -6,4 +6,6 @@ HEADERS += hybrisproximityadaptor.h \
SOURCES += hybrisproximityadaptor.cpp \
hybrisproximityadaptorplugin.cpp

LIBS+= -L../../core -lhybrissensorfw-qt5

include( ../adaptor-config.pri )
18 changes: 7 additions & 11 deletions core/core.pro
Expand Up @@ -82,15 +82,11 @@ mce {
}

contains(CONFIG,hybris) {
message("<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>>>>")
SOURCES += hybrisadaptor.cpp
HEADERS += hybrisadaptor.h
LIBS += -L/usr/lib -lhybris-common -lhardware
}

publicheaders.path = $${publicheaders.path}/core
publicheaders.files = $$HEADERS
} else {
publicheaders.path = $${publicheaders.path}/core
publicheaders.files = $$HEADERS

include(../common-install.pri)
target.path = $$SHAREDLIBPATH
INSTALLS += target
include(../common-install.pri)
target.path = $$SHAREDLIBPATH
INSTALLS += target
}
122 changes: 122 additions & 0 deletions rpm/sensorfw-qt5-hybris.spec
@@ -0,0 +1,122 @@
#
# Do NOT Edit the Auto-generated Part!
# Generated by: spectacle version 0.27
#

Name: hybris-libsensorfw-qt5

# >> macros
# << macros

Summary: Sensor Framework Qt5
Version: 0.7.3.3
Release: 0
Group: System/Sensor Framework
License: LGPLv2+
URL: http://gitorious.org/sensorfw
Source0: %{name}-%{version}.tar.bz2
Source100: sensorfw-qt5-hybris.yaml
Requires: qt5-qtcore
Requires: GConf-dbus
Requires: %{name}-configs
Requires: systemd
Requires: sensorfw-qt5
Requires(preun): systemd
Requires(post): /sbin/ldconfig
Requires(post): systemd
Requires(postun): /sbin/ldconfig
Requires(postun): systemd
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5DBus)
BuildRequires: pkgconfig(Qt5Network)
BuildRequires: pkgconfig(Qt5Test)
BuildRequires: pkgconfig(gconf-2.0)

%description
Sensor Framework provides an interface to hardware sensor drivers through logical sensors. This package contains sensor framework daemon and required libraries.

%package devel
Summary: Sensor framework daemon libraries development headers
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: qt5-qtcore-devel
Requires: qt5-qtdbus-devel
Requires: qt5-qtnetwork-devel

%description devel
Development headers for sensor framework daemon and libraries.


%package configs
Summary: Sensorfw configuration files
Group: System/Libraries
BuildArch: noarch
Requires: %{name} = %{version}
Provides: config-hybris

%description configs
Sensorfw configuration files.

%prep
%setup -q -n %{name}-%{version}

# >> setup
# << setup

%build
unset LD_AS_NEEDED
# >> build pre
export LD_RUN_PATH=/usr/lib/sensord/
export QT_SELECT=5
# << build pre

%qmake5 CONFIG+=hybris

make %{?jobs:-j%jobs}

# >> build post
# << build post

%install
rm -rf %{buildroot}
# >> install pre
export QT_SELECT=5
# << install pre
%qmake5_install

# >> install post
# << install post

%preun
if [ "$1" -eq 0 ]; then
systemctl stop sensord.service
fi

%post
/sbin/ldconfig
systemctl daemon-reload
systemctl reload-or-try-restart sensord.service

%postun
/sbin/ldconfig
systemctl daemon-reload

%files
%defattr(-,root,root,-)
# >> files
%{_libdir}/libhybrissensorfw*.so.*
%{_libdir}/libhybrissensorfw*.so
%{_libdir}/sensord-qt5/*.so
# << files

%files devel
%defattr(-,root,root,-)
# >> files devel
%{_includedir}/sensord-qt5/*
# << files devel

%files configs
%defattr(-,root,root,-)
# >> files configs
%config %{_sysconfdir}/sensorfw/sensord-hybris.conf
# << files configs
53 changes: 53 additions & 0 deletions rpm/sensorfw-qt5-hybris.yaml
@@ -0,0 +1,53 @@
Name: sensorfw-qt5
Summary: Sensor Framework Qt5
Version: 0.7.3.3
Release: 0
Group: "System/Sensor Framework"
License: LGPLv2+
URL: http://gitorious.org/sensorfw
Description: |
Sensor Framework provides an interface to hardware sensor drivers through logical sensors. This package contains sensor framework daemon and required libraries.
Sources:
- "%{name}-%{version}.tar.bz2"
Requires:
- qt5-qtcore
- GConf-dbus
- "%{name}-configs"
- sensorfw-qt5
PkgConfigBR:
- Qt5Core
- Qt5DBus
- Qt5Network
- Qt5Test
- gconf-2.0
#PkgBR:
# - doxygen
# - graphviz

Configure: none
Builder: qmake5
UseAsNeeded: no

SubPackages:
- Name: devel
Group: Development/Libraries
Requires:
- qt5-qtcore-devel
- qt5-qtdbus-devel
- qt5-qtnetwork-devel
- sensorfw-qt5-devel
Summary: Sensor framework hybris libraries development headers
Description: |
Development headers for sensor framework hybris library.
- Name: configs
Group: System/Libraries
Summary: Sensorfw configuration files
Description: |
Sensorfw configuration files.
BuildArch: noarch
AutoDepend: no
Requires:
- "%{name} = %{version}"
Provides:
- config-hybris

0 comments on commit 5bd91d6

Please sign in to comment.