Changes - SailfishOS Open Build Service

Changes of Revision 5

[-] [+]	Changed	_service:tar_git:libnciplugin.changes
@@ -1,3 +1,16 @@ +* Tue Sep 06 2022 Slava Monich <slava.monich@jolla.com> - 1.1.4 +- [debian] Bumped debhelper compat level to 7 +- [license] Freshened up copyright +- [nciplugin] Relaxed Frame transmission success criteria. JB#58731 + +* Wed Dec 01 2021 Slava Monich <slava.monich@jolla.com> - 1.1.3 +- [debian] Freshened up license +- [rpm] Install license file. JB#55991 + +* Sat Oct 23 2021 Slava Monich <slava.monich@jolla.com> - 1.1.2 +- [nciplugin] Dropped pkgconfig requirement for dev package +- [nciplugin] Fixed adapter mode updates. JB#48413 + * Thu Jun 17 2021 Slava Monich <slava.monich@jolla.com> - 1.1.1 - [nciplugin] Add ability to keep presence checking. JB#51791 - [nciplugin] Fix regress in timeout for ISO-DEP targets.
[-] [+]	Changed	_service:tar_git:libnciplugin.spec ^
@@ -1,6 +1,6 @@ Name: libnciplugin -Version: 1.1.1 +Version: 1.1.4 Release: 0 Summary: Support library for NCI-based nfcd plugins License: BSD @@ -11,11 +11,16 @@ %define libncicore_version 1.1.13 %define libglibutil_version 1.0.31 +BuildRequires: pkgconfig BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(libglibutil) >= %{libglibutil_version} BuildRequires: pkgconfig(libncicore) >= %{libncicore_version} BuildRequires: pkgconfig(nfcd-plugin) >= %{nfcd_version} +# license macro requires rpm >= 4.11 +BuildRequires: pkgconfig(rpm) +%define license_support %(pkg-config --exists 'rpm >= 4.11'; echo $?) + Requires: libglibutil >= %{libglibutil_version} Requires: libncicore >= %{libncicore_version} Requires: nfcd >= %{nfcd_version} @@ -28,7 +33,6 @@ %package devel Summary: Development library for %{name} Requires: %{name} = %{version} -Requires: pkgconfig %description devel This package contains the development library for %{name}. @@ -37,7 +41,7 @@ %setup -q %build -make LIBDIR=%{_libdir} KEEP_SYMBOLS=1 release pkgconfig +make %{_smp_mflags} LIBDIR=%{_libdir} KEEP_SYMBOLS=1 release pkgconfig %install rm -rf %{buildroot} @@ -50,6 +54,9 @@ %files %defattr(-,root,root,-) %{_libdir}/%{name}.so.* +%if %{license_support} == 0 +%license LICENSE +%endif %files devel %defattr(-,root,root,-)
[-] [+]	Changed	_service ^
@@ -2,7 +2,7 @@ <service name="tar_git"> <param name="url">https://github.com/mer-hybris/libnciplugin.git</param> <param name="branch">master</param> - <param name="revision">1.1.1</param> + <param name="revision">1.1.4</param> <param name="token"/> <param name="debian">N</param> <param name="dumb">N</param>
[-] [+]	Changed	_service:tar_git:libnciplugin-1.1.4.tar.bz2/LICENSE ^
@@ -1,5 +1,5 @@ -Copyright (C) 2019-2021 Jolla Ltd. -Copyright (C) 2019-2021 Slava Monich <slava.monich@jolla.com> +Copyright (C) 2019-2022 Jolla Ltd. +Copyright (C) 2019-2022 Slava Monich <slava.monich@jolla.com> Copyright (C) 2020-2021 Open Mobile Platform LLC. You may use this file under the terms of the BSD license as follows:
[-] [+]	Changed	_service:tar_git:libnciplugin-1.1.4.tar.bz2/Makefile ^
@@ -33,7 +33,7 @@ VERSION_MAJOR = 1 VERSION_MINOR = 1 -VERSION_RELEASE = 1 +VERSION_RELEASE = 4 # Version for pkg-config PCVERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_RELEASE)
[-] [+]	Changed	_service:tar_git:libnciplugin-1.1.4.tar.bz2/debian/changelog ^
@@ -1,3 +1,22 @@ +libnciplugin (1.1.4) unstable; urgency=low + + * Relaxed Frame transmission success criteria + + -- Slava Monich <slava.monich@jolla.com> Tue, 06 Sep 2022 17:28:57 +0300 + +libnciplugin (1.1.3) unstable; urgency=low + + * Housekeeping + + -- Slava Monich <slava.monich@jolla.com> Thu, 02 Dec 2021 01:46:28 +0200 + +libnciplugin (1.1.2) unstable; urgency=low + + * Fixed adapter mode updates + * Dropped pkgconfig requirement for dev package + + -- Slava Monich <slava.monich@jolla.com> Sat, 23 Oct 2021 17:28:43 +0300 + libnciplugin (1.1.1) unstable; urgency=low * Fixed ISO-DEP timeout regression
[-] [+]	Changed	_service:tar_git:libnciplugin-1.1.4.tar.bz2/debian/compat ^
@@ -1 +1 @@ -5 +7
[-] [+]	Changed	_service:tar_git:libnciplugin-1.1.4.tar.bz2/debian/copyright ^
@@ -1,6 +1,6 @@ -Copyright (C) 2019-2020 Jolla Ltd. -Copyright (C) 2019-2020 Slava Monich <slava.monich@jolla.com> -Copyright (C) 2020 Open Mobile Platform LLC. +Copyright (C) 2019-2022 Jolla Ltd. +Copyright (C) 2019-2022 Slava Monich <slava.monich@jolla.com> +Copyright (C) 2020-2021 Open Mobile Platform LLC. You may use this file under the terms of the BSD license as follows:
[-] [+]	Changed	_service:tar_git:libnciplugin-1.1.4.tar.bz2/src/nci_adapter.c ^
@@ -393,8 +393,7 @@ NciCore* nci = self->nci; NciAdapterPriv* priv = self->priv; const NFC_MODE mode = (nci->current_state > NCI_RFST_IDLE) ? - ((priv->current_mode == NFC_MODE_NONE) ? priv->desired_mode : - priv->current_mode) : NFC_MODE_NONE; + priv->desired_mode : NFC_MODE_NONE; if (priv->mode_check_id) { g_source_remove(priv->mode_check_id);
[-] [+]	Changed	_service:tar_git:libnciplugin-1.1.4.tar.bz2/src/nci_target.c ^
@@ -1,6 +1,6 @@ /* - * Copyright (C) 2019-2021 Jolla Ltd. - * Copyright (C) 2019-2021 Slava Monich <slava.monich@jolla.com> + * Copyright (C) 2019-2022 Jolla Ltd. + * Copyright (C) 2019-2022 Slava Monich <slava.monich@jolla.com> * * You may use this file under the terms of the BSD license as follows: * @@ -287,8 +287,30 @@ /* * 8.2 Frame RF Interface * 8.2.1.2 Data from RF to the DH + * + * For NFC-A and NFC-B the Data Message SHALL correspond to the + * Payload of the Data and Payload Format defined in [DIGITAL] + * Section 4.4 for NFC-A and 5.4 for NFC-B followed by a Status + * field of 1 octet. + * ... + * If the RF frame was received correctly, the NFCC SHALL set the + * Status field of Data Message to a value of STATUS_OK. If the + * NFCC detected an error when receiving the RF frame, the NFCC + * SHALL set the Status field of the Data Message to a value of + * STATUS_RF_FRAME_CORRUPTED. / - if (status == NCI_STATUS_OK) { + if (status != NCI_STATUS_RF_FRAME_CORRUPTED) { + / + * Since the spec (see above) defines only two valid status + * values, STATUS_OK and STATUS_RF_FRAME_CORRUPTED, let's + * treat anything other than STATUS_RF_FRAME_CORRUPTED as + * a success. In reality we're getting other (undocumented) + * status values on some devices, e.g. 0x14 which doesn't + * seem to be harmful. + */ + if (status != NCI_STATUS_OK) { + GDEBUG("Hmm... transmission status 0x%02x", status); + } nfc_target_transmit_done(target, NFC_TRANSMIT_STATUS_OK, payload, len - 1); return TRUE;