diff --git a/debian/changelog b/debian/changelog index bce0da84..d6bf1ec7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,12 @@ libfprint (1:0.99.0-1) UNRELEASED; urgency=medium * New upstream release + - d/p/lib-Add-accessor-for-minutia-coordinates.patch, + d/p/fix_ftbfs_meson.patch: Dropped, applied upstream * debian/gbp.conf: Set pristine-tar and upstream-vcs-tag * debian/control: Update Vcs-* fields (Closes: #909256) - -- Laurent Bigonville Fri, 12 Jul 2019 00:08:01 +0200 + -- Laurent Bigonville Fri, 12 Jul 2019 00:13:48 +0200 libfprint (1:0.8.2-3) unstable; urgency=medium diff --git a/debian/patches/fix_ftbfs_meson.patch b/debian/patches/fix_ftbfs_meson.patch deleted file mode 100644 index 0fdb189c..00000000 --- a/debian/patches/fix_ftbfs_meson.patch +++ /dev/null @@ -1,33 +0,0 @@ -From c9abbec48a2c1db5a88a9fb60fc350514af3dcf2 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Fri, 20 Jul 2018 12:22:50 +0200 -Subject: build: Fix build with newer meson - -The gtk-doc meson helper regressed in that it didn't expect the -libfprint.types file to not exist, as earlier versions did. Remove -the --rebuild-types call so that it is not generated, and meson carries -on compiling the rest of the library. - -See https://gitlab.gnome.org/GNOME/gtk-doc/issues/48 -See https://github.com/mesonbuild/meson/issues/3892 -See https://bugzilla.redhat.com/show_bug.cgi?id=1604585 ---- - .gitlab-ci.yml | 2 +- - doc/meson.build | 1 - - 2 files changed, 1 insertion(+), 2 deletions(-) - -diff --git a/doc/meson.build b/doc/meson.build -index 48358c8..c2c1b77 100644 ---- a/doc/meson.build -+++ b/doc/meson.build -@@ -54,7 +54,6 @@ gnome.gtkdoc('libfprint', - content_files: content_files, - expand_content_files: expand_content_files, - scan_args: [ -- '--rebuild-types', - '--ignore-decorators=API_EXPORTED', - '--ignore-headers=' + ' '.join(private_headers), - ], --- -cgit v1.1 - diff --git a/debian/patches/lib-Add-accessor-for-minutia-coordinates.patch b/debian/patches/lib-Add-accessor-for-minutia-coordinates.patch deleted file mode 100644 index 275153f3..00000000 --- a/debian/patches/lib-Add-accessor-for-minutia-coordinates.patch +++ /dev/null @@ -1,75 +0,0 @@ -From: Bastien Nocera -Date: Mon, 8 Oct 2018 16:43:28 +0200 -Subject: lib: Add accessor for minutia coordinates - -Add fp_minutia_get_coords() so that debugging applications can show the -detected minutiae along with the captured image. - -This will also help fix the positively ancient fprint_demo. - -See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=907470 ---- - doc/libfprint-sections.txt | 1 + - libfprint/fprint.h | 1 + - libfprint/img.c | 24 ++++++++++++++++++++++++ - 3 files changed, 26 insertions(+) - -diff --git a/doc/libfprint-sections.txt b/doc/libfprint-sections.txt -index 77cb0c3..67616cc 100644 ---- a/doc/libfprint-sections.txt -+++ b/doc/libfprint-sections.txt -@@ -129,6 +129,7 @@ fp_img_save_to_file - fp_img_standardize - fp_img_binarize - fp_img_get_minutiae -+fp_minutia_get_coords - - -
-diff --git a/libfprint/fprint.h b/libfprint/fprint.h -index be94a54..0efd875 100644 ---- a/libfprint/fprint.h -+++ b/libfprint/fprint.h -@@ -295,6 +295,7 @@ int fp_img_save_to_file(struct fp_img *img, char *path); - void fp_img_standardize(struct fp_img *img); - struct fp_img *fp_img_binarize(struct fp_img *img); - struct fp_minutia **fp_img_get_minutiae(struct fp_img *img, int *nr_minutiae); -+int fp_minutia_get_coords(struct fp_minutia *minutia, int *coord_x, int *coord_y); - void fp_img_free(struct fp_img *img); - - /* Polling and timing */ -diff --git a/libfprint/img.c b/libfprint/img.c -index 2f195af..4b2476f 100644 ---- a/libfprint/img.c -+++ b/libfprint/img.c -@@ -561,6 +561,30 @@ fpi_imgdev_get_dev(struct fp_img_dev *imgdev) - return imgdev->dev; - } - -+/** -+ * fp_minutia_get_coords: -+ * @minutia: a struct #fp_minutia -+ * @x: the return variable for the X coordinate of the minutia -+ * @y: the return variable for the Y coordinate of the minutia -+ * -+ * Sets @x and @y to be the coordinates of the detected minutia, so it -+ * can be presented in a more verbose user interface. This is usually only -+ * used for debugging purposes. -+ * -+ * Returns: 0 on success, -1 on error. -+ */ -+API_EXPORTED int fp_minutia_get_coords(struct fp_minutia *minutia, int *coord_x, int *coord_y) -+{ -+ g_return_val_if_fail (minutia != NULL, -1); -+ g_return_val_if_fail (coord_x != NULL, -1); -+ g_return_val_if_fail (coord_y != NULL, -1); -+ -+ *coord_x = minutia->x; -+ *coord_y = minutia->y; -+ -+ return 0; -+} -+ - enum fp_imgdev_enroll_state - fpi_imgdev_get_action_state(struct fp_img_dev *imgdev) - { diff --git a/debian/patches/series b/debian/patches/series index fa69211f..15f33bb4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,4 @@ # Upstream backports -fix_ftbfs_meson.patch -lib-Add-accessor-for-minutia-coordinates.patch # Debian specifics kFreeBSD_FTBFS_add_ETIME_definition.patch