Skip to content

Commit f84e14a

Browse files
committed
Revert "Revert "Merge pull request #21 from freedesktop/master""
This reverts commit 782d228.
1 parent 00b1b53 commit f84e14a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+3120
-247
lines changed

.gitlab-ci.yml

Lines changed: 40 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
include:
2+
- local: '.gitlab-ci/libfprint-image-variables.yaml'
23
- local: '.gitlab-ci/libfprint-templates.yaml'
34
- project: 'freedesktop/ci-templates'
45
ref: master
@@ -7,14 +8,15 @@ include:
78

89
variables:
910
extends: .libfprint_common_variables
10-
FDO_DISTRIBUTION_TAG: latest
11+
FDO_DISTRIBUTION_TAG: $LIBFPRINT_IMAGE_TAG
1112
FDO_DISTRIBUTION_VERSION: rawhide
1213
FDO_UPSTREAM_REPO: "libfprint/$CI_PROJECT_NAME"
1314
FEDORA_IMAGE: "$CI_REGISTRY/libfprint/$CI_PROJECT_NAME/fedora/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG"
1415
BUNDLE: "org.freedesktop.libfprint.Demo.flatpak"
1516
LAST_ABI_BREAK: "056ea541ddc97f5806cffbd99a12dc87e4da3546"
1617

1718
stages:
19+
- image-build
1820
- check-source
1921
- build
2022
- test
@@ -69,6 +71,11 @@ test:
6971
- ninja -C _build coverage
7072
- cat _build/meson-logs/coverage.txt
7173
artifacts:
74+
reports:
75+
junit: "_build/meson-logs/testlog.junit.xml"
76+
coverage_report:
77+
coverage_format: cobertura
78+
path: _build/meson-logs/coverage.xml
7279
expose_as: 'Coverage Report'
7380
when: always
7481
paths:
@@ -87,6 +94,8 @@ test_valgrind:
8794
- ninja -C _build
8895
- meson test -C _build --print-errorlogs --no-stdsplit --setup=valgrind
8996
artifacts:
97+
reports:
98+
junit: "_build/meson-logs/testlog.junit.xml"
9099
expose_as: 'Valgrind test logs'
91100
when: always
92101
paths:
@@ -118,7 +127,7 @@ test_indent:
118127
script:
119128
- scripts/uncrustify.sh
120129
- git diff
121-
- "! git status -s | grep -q ."
130+
- git diff-index --name-only --exit-code HEAD
122131

123132
test_unsupported_list:
124133
stage: check-source
@@ -132,7 +141,8 @@ test_unsupported_list:
132141
flatpak:
133142
stage: flatpak
134143
extends: .flatpak
135-
image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:3.36
144+
# From https://gitlab.gnome.org/GNOME/gnome-runtime-images/container_registry
145+
image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:42
136146
variables:
137147
MANIFEST_PATH: "demo/org.freedesktop.libfprint.Demo.json"
138148
FLATPAK_MODULE: "libfprint"
@@ -153,11 +163,12 @@ flatpak:
153163
allow_failure: true
154164

155165
# CONTAINERS creation stage
156-
container_fedora_build:
166+
.container_fedora_build_base:
157167
extends: .fdo.container-build@fedora
168+
stage: image-build
158169
only:
159170
variables:
160-
- $CI_PIPELINE_SOURCE == "schedule" && $CRON_TASK == "BUILD_CI_IMAGES"
171+
- $CI_PIPELINE_SOURCE == "never"
161172
variables:
162173
GIT_STRATEGY: none # no need to pull the whole tree for rebuilding the image
163174
FDO_FORCE_REBUILD: 1
@@ -168,7 +179,27 @@ container_fedora_build:
168179
libpcap-devel
169180
libudev-devel
170181
FDO_DISTRIBUTION_EXEC: |
171-
git clone https://github.com/martinpitt/umockdev.git && \
172-
cd umockdev && \
173-
meson _build --prefix=/usr && \
174-
ninja -C _build && ninja -C _build install
182+
$LIBFPRINT_EXEC
183+
184+
container_fedora_build_schedule:
185+
extends: .container_fedora_build_base
186+
only:
187+
variables:
188+
- $CI_PIPELINE_SOURCE == "schedule" && $CRON_TASK == "BUILD_CI_IMAGES"
189+
190+
container_fedora_build_manual:
191+
extends: .container_fedora_build_base
192+
only:
193+
variables:
194+
- $LIBFPRINT_CI_ACTION == "build-image"
195+
196+
container_fedora_build_on_deps_changed:
197+
extends: .container_fedora_build_base
198+
only:
199+
variables:
200+
- $CI_PROJECT_NAMESPACE == "libfprint" && $CI_PIPELINE_SOURCE != "schedule"
201+
refs:
202+
- branches
203+
- merge_requests
204+
changes:
205+
- .gitlab-ci/libfprint-image-variables.yaml
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
variables:
2+
LIBFPRINT_IMAGE_TAG: v2

.gitlab-ci/libfprint-templates.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1+
# Bump image version on .gitlab-ci/libfprint-image-variables.yaml to trigger
2+
# a rebuild on changes to this file
3+
14
.libfprint_common_variables:
25
LIBFPRINT_DEPENDENCIES:
36
doxygen
7+
dnf-plugins-core
48
flatpak-builder
59
gcc
610
gcc-c++
@@ -27,3 +31,17 @@
2731
valgrind
2832
clang-analyzer
2933
diffutils
34+
35+
LIBFPRINT_EXEC: |
36+
dnf debuginfo-install -y \
37+
glib2 \
38+
glibc \
39+
libgusb \
40+
libusb \
41+
nss \
42+
pixman
43+
44+
git clone https://github.com/martinpitt/umockdev.git && \
45+
cd umockdev && \
46+
meson _build --prefix=/usr && \
47+
ninja -C _build && ninja -C _build install

NEWS

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,18 @@
11
This file lists notable changes in each release. For the full history of all
22
changes, see ChangeLog.
33

4+
2022-10-13: v1.94.5 release
5+
6+
Highlights:
7+
* New driver: fpcmoc, supporting various FPC MOC Fingerprint Sensors
8+
* goodixmoc: New PIDs 0x6014, 0x6094, 0x631C, 0x634C, 0x6384, 0x659A.
9+
* goodixmoc: Support resetting device on firmware failure due to corrupted DB.
10+
* elanmoc: New PIDs 0x0c88, 0x0c8c, 0x0c8d.
11+
* synaptics: New PID 0x0104.
12+
* upektc: New PID 0x2017.
13+
* Fixed various memory leaks
14+
* More tests
15+
416
2022-05-24: v1.94.4 release
517

618
Highlights:

README.md

Lines changed: 70 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,86 @@
1-
# libfprint
21

3-
libfprint is part of the fprint project:
4-
https://fprint.freedesktop.org/
2+
3+
<div align="center">
4+
5+
# LibFPrint
6+
7+
*LibFPrint is part of the **[FPrint][Website]** project.*
8+
9+
<br/>
10+
11+
[![Button Website]][Website]
12+
[![Button Documentation]][Documentation]
13+
14+
[![Button Supported]][Supported]
15+
[![Button Unsupported]][Unsupported]
16+
17+
[![Button Contribute]][Contribute]
18+
[![Button Contributors]][Contributors]
19+
20+
</div>
521

622
## History
723

8-
libfprint was originally developed as part of an academic project at the
9-
University of Manchester with the aim of hiding differences between different
10-
consumer fingerprint scanners and providing a single uniform API to application
11-
developers. The ultimate goal of the fprint project is to make fingerprint
12-
scanners widely and easily usable under common Linux environments.
24+
**LibFPrint** was originally developed as part of an
25+
academic project at the **[University Of Manchester]**.
26+
27+
It aimed to hide the differences between consumer
28+
fingerprint scanners and provide a single uniform
29+
API to application developers.
30+
31+
## Goal
1332

14-
The academic university project runs off a codebase maintained separately
15-
from this one, although I try to keep them as similar as possible (I'm not
16-
hiding anything in the academic branch, it's just the open source release
17-
contains some commits excluded from the academic project).
33+
The ultimate goal of the **FPrint** project is to make
34+
fingerprint scanners widely and easily usable under
35+
common Linux environments.
1836

1937
## License
2038

21-
THE UNIVERSITY OF MANCHESTER DOES NOT ENDORSE THIS THIS SOFTWARE RELEASE AND
22-
IS IN NO WAY RESPONSIBLE FOR THE CODE CONTAINED WITHIN, OR ANY DAMAGES CAUSED
23-
BY USING OR DISTRIBUTING THE SOFTWARE. Development does not happen on
24-
university computers and the project is not hosted at the university either.
39+
`Section 6` of the license states that for compiled works that use
40+
this library, such works must include **LibFPrint** copyright notices
41+
alongside the copyright notices for the other parts of the work.
42+
43+
**LibFPrint** includes code from **NIST's** **[NBIS]** software distribution.
44+
45+
We include **Bozorth3** from the **[US Export Controlled]**
46+
distribution, which we have determined to be fine
47+
being shipped in an open source project.
48+
49+
<br/>
50+
51+
<div align="right">
52+
53+
[![Badge License]][License]
54+
55+
</div>
56+
57+
58+
<!----------------------------------------------------------------------------->
59+
60+
[Documentation]: https://fprint.freedesktop.org/libfprint-dev/
61+
[Contributors]: https://gitlab.freedesktop.org/libfprint/libfprint/-/graphs/master
62+
[Unsupported]: https://gitlab.freedesktop.org/libfprint/wiki/-/wikis/Unsupported-Devices
63+
[Supported]: https://fprint.freedesktop.org/supported-devices.html
64+
[Website]: https://fprint.freedesktop.org/
2565

26-
For more information on libfprint, supported devices, API documentation, etc.,
27-
see the homepage:
28-
https://fprint.freedesktop.org/
66+
[Contribute]: ./HACKING.md
67+
[License]: ./COPYING
2968

30-
libfprint is licensed under the GNU LGPL version 2.1. See the COPYING file
31-
for the license text.
69+
[University Of Manchester]: https://www.manchester.ac.uk/
70+
[US Export Controlled]: https://fprint.freedesktop.org/us-export-control.html
71+
[NBIS]: http://fingerprint.nist.gov/NBIS/index.html
3272

33-
Section 6 of the license states that for compiled works that use this
34-
library, such works must include libfprint copyright notices alongside the
35-
copyright notices for the other parts of the work. We have attempted to
36-
make this process slightly easier for you by grouping these all in one place:
37-
the AUTHORS file.
3873

39-
libfprint includes code from NIST's NBIS software distribution:
40-
http://fingerprint.nist.gov/NBIS/index.html
41-
We include bozorth3 from the US export controlled distribution. We have
42-
determined that it is fine to ship bozorth3 in an open source project,
43-
see https://fprint.freedesktop.org/us-export-control.html
74+
<!---------------------------------[ Badges ]---------------------------------->
4475

45-
## Historical links
76+
[Badge License]: https://img.shields.io/badge/License-LGPL2.1-015d93.svg?style=for-the-badge&labelColor=blue
4677

47-
Older versions of libfprint are available at:
48-
https://sourceforge.net/projects/fprint/files/
4978

50-
Historical mailing-list archives:
51-
http://www.reactivated.net/fprint_list_archives/
79+
<!---------------------------------[ Buttons ]--------------------------------->
5280

53-
Historical website:
54-
http://web.archive.org/web/*/https://www.freedesktop.org/wiki/Software/fprint/
81+
[Button Documentation]: https://img.shields.io/badge/Documentation-04ACE6?style=for-the-badge&logoColor=white&logo=BookStack
82+
[Button Contributors]: https://img.shields.io/badge/Contributors-FF4F8B?style=for-the-badge&logoColor=white&logo=ActiGraph
83+
[Button Unsupported]: https://img.shields.io/badge/Unsupported_Devices-EF2D5E?style=for-the-badge&logoColor=white&logo=AdBlock
84+
[Button Contribute]: https://img.shields.io/badge/Contribute-66459B?style=for-the-badge&logoColor=white&logo=Git
85+
[Button Supported]: https://img.shields.io/badge/Supported_Devices-428813?style=for-the-badge&logoColor=white&logo=AdGuard
86+
[Button Website]: https://img.shields.io/badge/Homepage-3B80AE?style=for-the-badge&logoColor=white&logo=freedesktopDotOrg

data/autosuspend.hwdb

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,8 @@ usb:v04F3p0C7D*
147147
usb:v04F3p0C7E*
148148
usb:v04F3p0C82*
149149
usb:v04F3p0C88*
150+
usb:v04F3p0C8C*
151+
usb:v04F3p0C8D*
150152
ID_AUTOSUSPEND=1
151153
ID_PERSIST=0
152154

@@ -155,10 +157,24 @@ usb:v1C7Ap0603*
155157
ID_AUTOSUSPEND=1
156158
ID_PERSIST=0
157159

160+
# Supported by libfprint driver fpcmoc
161+
usb:v10A5pFFE0*
162+
usb:v10A5pA305*
163+
usb:v10A5pDA04*
164+
usb:v10A5pD805*
165+
usb:v10A5pD205*
166+
ID_AUTOSUSPEND=1
167+
ID_PERSIST=0
168+
158169
# Supported by libfprint driver goodixmoc
159170
usb:v27C6p5840*
171+
usb:v27C6p6014*
172+
usb:v27C6p6094*
160173
usb:v27C6p609C*
161174
usb:v27C6p60A2*
175+
usb:v27C6p631C*
176+
usb:v27C6p634C*
177+
usb:v27C6p6384*
162178
usb:v27C6p639C*
163179
usb:v27C6p63AC*
164180
usb:v27C6p63BC*
@@ -168,6 +184,7 @@ usb:v27C6p6584*
168184
usb:v27C6p658C*
169185
usb:v27C6p6592*
170186
usb:v27C6p6594*
187+
usb:v27C6p659A*
171188
usb:v27C6p659C*
172189
usb:v27C6p6A94*
173190
ID_AUTOSUSPEND=1
@@ -192,6 +209,7 @@ usb:v06CBp0126*
192209
usb:v06CBp0129*
193210
usb:v06CBp0168*
194211
usb:v06CBp015F*
212+
usb:v06CBp0104*
195213
ID_AUTOSUSPEND=1
196214
ID_PERSIST=0
197215

@@ -204,6 +222,7 @@ usb:v147Ep1001*
204222

205223
# Supported by libfprint driver upektc
206224
usb:v0483p2015*
225+
usb:v0483p2017*
207226
usb:v147Ep3001*
208227
ID_AUTOSUSPEND=1
209228
ID_PERSIST=0
@@ -265,7 +284,13 @@ usb:v04F3p0C00*
265284
usb:v04F3p0C4C*
266285
usb:v04F3p0C57*
267286
usb:v04F3p0C5E*
287+
usb:v04F3p0C5A*
288+
usb:v04F3p0C70*
289+
usb:v04F3p0C72*
268290
usb:v04F3p2706*
291+
usb:v04F3p3057*
292+
usb:v04F3p3104*
293+
usb:v04F3p310D*
269294
usb:v06CBp0081*
270295
usb:v06CBp0088*
271296
usb:v06CBp008A*
@@ -320,26 +345,32 @@ usb:v1C7Ap0576*
320345
usb:v27C6p5042*
321346
usb:v27C6p5110*
322347
usb:v27C6p5117*
348+
usb:v27C6p5120*
323349
usb:v27C6p5125*
324350
usb:v27C6p5201*
325351
usb:v27C6p521D*
326352
usb:v27C6p5301*
327353
usb:v27C6p530C*
328354
usb:v27C6p532D*
355+
usb:v27C6p5335*
329356
usb:v27C6p533C*
330357
usb:v27C6p5381*
331358
usb:v27C6p5385*
332359
usb:v27C6p538C*
333360
usb:v27C6p538D*
334361
usb:v27C6p5395*
335362
usb:v27C6p5503*
363+
usb:v27C6p550A*
364+
usb:v27C6p550C*
336365
usb:v27C6p5584*
337366
usb:v27C6p55A2*
338367
usb:v27C6p55A4*
339368
usb:v27C6p55B4*
340369
usb:v27C6p5740*
341370
usb:v27C6p5E0A*
371+
usb:v27C6p581A*
342372
usb:v2808p9338*
373+
usb:v2808p93A9*
343374
usb:v298Dp2020*
344375
usb:v298Dp2033*
345376
usb:v3538p0930*

0 commit comments

Comments
 (0)