mirror of
https://gitlab.freedesktop.org/libfprint/libfprint.git
synced 2025-11-15 07:38:12 +00:00
Compare commits
8 Commits
benzea/imp
...
wip/hadess
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9b3e9d9e8c | ||
|
|
bb0ef04b85 | ||
|
|
0a475196e0 | ||
|
|
1dee7985b9 | ||
|
|
a1a3933191 | ||
|
|
9c8360ad67 | ||
|
|
0c7d2d8ecd | ||
|
|
6209b22e3b |
@@ -1,13 +1,22 @@
|
|||||||
image: registry.freedesktop.org/libfprint/libfprint/master:v1
|
variables:
|
||||||
|
FEDORA_TAG: rawhide
|
||||||
|
FEDORA_VERSION: rawhide
|
||||||
|
FEDORA_IMAGE: "$CI_REGISTRY/libfprint/$CI_PROJECT_NAME/fedora/$FEDORA_VERSION:$FEDORA_TAG"
|
||||||
|
BUNDLE: "org.freedesktop.libfprint.Demo.flatpak"
|
||||||
|
LAST_ABI_BREAK: "056ea541ddc97f5806cffbd99a12dc87e4da3546"
|
||||||
|
|
||||||
|
include:
|
||||||
|
- project: 'wayland/ci-templates'
|
||||||
|
ref: master
|
||||||
|
file: '/templates/fedora.yml'
|
||||||
|
|
||||||
stages:
|
stages:
|
||||||
- check-source
|
- check-source
|
||||||
- build
|
- build
|
||||||
- test
|
- test
|
||||||
- flatpack
|
- flatpack
|
||||||
|
|
||||||
variables:
|
image: "$FEDORA_IMAGE"
|
||||||
BUNDLE: "org.freedesktop.libfprint.Demo.flatpak"
|
|
||||||
LAST_ABI_BREAK: "056ea541ddc97f5806cffbd99a12dc87e4da3546"
|
|
||||||
|
|
||||||
.build_one_driver_template: &build_one_driver
|
.build_one_driver_template: &build_one_driver
|
||||||
script:
|
script:
|
||||||
@@ -29,6 +38,9 @@ variables:
|
|||||||
|
|
||||||
build:
|
build:
|
||||||
stage: build
|
stage: build
|
||||||
|
except:
|
||||||
|
variables:
|
||||||
|
- $CI_PIPELINE_SOURCE == "schedule"
|
||||||
variables:
|
variables:
|
||||||
driver: virtual_image
|
driver: virtual_image
|
||||||
<<: *build_one_driver
|
<<: *build_one_driver
|
||||||
@@ -37,6 +49,9 @@ build:
|
|||||||
|
|
||||||
test:
|
test:
|
||||||
stage: test
|
stage: test
|
||||||
|
except:
|
||||||
|
variables:
|
||||||
|
- $CI_PIPELINE_SOURCE == "schedule"
|
||||||
script:
|
script:
|
||||||
- meson --werror -Ddrivers=all . _build
|
- meson --werror -Ddrivers=all . _build
|
||||||
- ninja -C _build
|
- ninja -C _build
|
||||||
@@ -44,6 +59,9 @@ test:
|
|||||||
|
|
||||||
test_valgrind:
|
test_valgrind:
|
||||||
stage: test
|
stage: test
|
||||||
|
except:
|
||||||
|
variables:
|
||||||
|
- $CI_PIPELINE_SOURCE == "schedule"
|
||||||
script:
|
script:
|
||||||
- meson -Ddrivers=all . _build
|
- meson -Ddrivers=all . _build
|
||||||
- ninja -C _build
|
- ninja -C _build
|
||||||
@@ -51,6 +69,9 @@ test_valgrind:
|
|||||||
|
|
||||||
test_indent:
|
test_indent:
|
||||||
stage: check-source
|
stage: check-source
|
||||||
|
except:
|
||||||
|
variables:
|
||||||
|
- $CI_PIPELINE_SOURCE == "schedule"
|
||||||
script:
|
script:
|
||||||
- scripts/uncrustify.sh --check
|
- scripts/uncrustify.sh --check
|
||||||
|
|
||||||
@@ -80,6 +101,9 @@ test_indent:
|
|||||||
.flatpak_master_template: &flatpak_master
|
.flatpak_master_template: &flatpak_master
|
||||||
image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:3.32
|
image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:3.32
|
||||||
stage: flatpack
|
stage: flatpack
|
||||||
|
except:
|
||||||
|
variables:
|
||||||
|
- $CI_PIPELINE_SOURCE == "schedule"
|
||||||
variables:
|
variables:
|
||||||
MANIFEST_PATH: "demo/org.freedesktop.libfprint.Demo.json"
|
MANIFEST_PATH: "demo/org.freedesktop.libfprint.Demo.json"
|
||||||
# From demo/org.freedesktop.libfprint.Demo.json
|
# From demo/org.freedesktop.libfprint.Demo.json
|
||||||
@@ -101,3 +125,37 @@ flatpak-manual master:
|
|||||||
except:
|
except:
|
||||||
- tags
|
- tags
|
||||||
- master
|
- master
|
||||||
|
|
||||||
|
# CONTAINERS creation stage
|
||||||
|
container_fedora_build:
|
||||||
|
extends: .fedora@container-build
|
||||||
|
only:
|
||||||
|
variables:
|
||||||
|
- $CI_PIPELINE_SOURCE == "schedule" && $CRON_TASK == "BUILD_CI_IMAGES"
|
||||||
|
variables:
|
||||||
|
GIT_STRATEGY: none # no need to pull the whole tree for rebuilding the image
|
||||||
|
# a list of packages to install
|
||||||
|
FEDORA_RPMS:
|
||||||
|
doxygen
|
||||||
|
flatpak-builder
|
||||||
|
gcc
|
||||||
|
gcc-c++
|
||||||
|
git
|
||||||
|
glib2-devel
|
||||||
|
glibc-devel
|
||||||
|
gobject-introspection-devel
|
||||||
|
gtk-doc
|
||||||
|
gtk3-devel
|
||||||
|
libabigail
|
||||||
|
libgusb-devel
|
||||||
|
libX11-devel
|
||||||
|
libXv-devel
|
||||||
|
meson
|
||||||
|
nss-devel
|
||||||
|
pixman-devel
|
||||||
|
python3-cairo
|
||||||
|
python3-gobject
|
||||||
|
systemd
|
||||||
|
umockdev
|
||||||
|
uncrustify
|
||||||
|
valgrind
|
||||||
|
|||||||
@@ -1,36 +0,0 @@
|
|||||||
# Rebuild and push with
|
|
||||||
#
|
|
||||||
# cd .gitlab-ci/
|
|
||||||
# docker build --no-cache -t registry.freedesktop.org/libfprint/libfprint/master:v1 .
|
|
||||||
# docker push registry.freedesktop.org/libfprint/libfprint/master:v1
|
|
||||||
#
|
|
||||||
|
|
||||||
FROM fedora:rawhide
|
|
||||||
|
|
||||||
RUN dnf -y update && dnf -y upgrade && \
|
|
||||||
dnf -y install \
|
|
||||||
doxygen \
|
|
||||||
flatpak-builder \
|
|
||||||
gcc \
|
|
||||||
gcc-c++ \
|
|
||||||
git \
|
|
||||||
glib2-devel \
|
|
||||||
glibc-devel \
|
|
||||||
gobject-introspection-devel \
|
|
||||||
gtk-doc \
|
|
||||||
gtk3-devel \
|
|
||||||
libabigail \
|
|
||||||
libgusb-devel \
|
|
||||||
libX11-devel \
|
|
||||||
libXv-devel \
|
|
||||||
meson \
|
|
||||||
nss-devel \
|
|
||||||
pixman-devel \
|
|
||||||
python3-cairo \
|
|
||||||
python3-gobject \
|
|
||||||
systemd \
|
|
||||||
umockdev \
|
|
||||||
uncrustify \
|
|
||||||
valgrind \
|
|
||||||
&& \
|
|
||||||
dnf clean all
|
|
||||||
@@ -320,6 +320,7 @@ elan_submit_image (FpImageDevice *dev)
|
|||||||
g_slist_foreach (raw_frames, (GFunc) self->process_frame, &frames);
|
g_slist_foreach (raw_frames, (GFunc) self->process_frame, &frames);
|
||||||
fpi_do_movement_estimation (&assembling_ctx, frames);
|
fpi_do_movement_estimation (&assembling_ctx, frames);
|
||||||
img = fpi_assemble_frames (&assembling_ctx, frames);
|
img = fpi_assemble_frames (&assembling_ctx, frames);
|
||||||
|
g_slist_free_full (frames, g_free);
|
||||||
|
|
||||||
fpi_image_device_image_captured (dev, img);
|
fpi_image_device_image_captured (dev, img);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -21,13 +21,13 @@ typedef enum {
|
|||||||
/**
|
/**
|
||||||
* FpiMatchResult:
|
* FpiMatchResult:
|
||||||
* @FPI_MATCH_ERROR: An error occured during matching
|
* @FPI_MATCH_ERROR: An error occured during matching
|
||||||
* @FPI_MATCH_SUCCESS: The prints matched
|
|
||||||
* @FPI_MATCH_FAIL: The prints did not match
|
* @FPI_MATCH_FAIL: The prints did not match
|
||||||
|
* @FPI_MATCH_SUCCESS: The prints matched
|
||||||
*/
|
*/
|
||||||
typedef enum {
|
typedef enum {
|
||||||
FPI_MATCH_ERROR = 0,
|
FPI_MATCH_ERROR = -1, /* -1 for g_task_propagate_int */
|
||||||
FPI_MATCH_SUCCESS,
|
|
||||||
FPI_MATCH_FAIL,
|
FPI_MATCH_FAIL,
|
||||||
|
FPI_MATCH_SUCCESS,
|
||||||
} FpiMatchResult;
|
} FpiMatchResult;
|
||||||
|
|
||||||
void fpi_print_add_print (FpPrint *print,
|
void fpi_print_add_print (FpPrint *print,
|
||||||
|
|||||||
Reference in New Issue
Block a user