* [gentoo-commits] repo/gentoo:master commit in: sys-auth/libfprint/, sys-auth/libfprint/files/
@ 2018-09-02 17:07 Mikle Kolyada
0 siblings, 0 replies; 4+ messages in thread
From: Mikle Kolyada @ 2018-09-02 17:07 UTC (permalink / raw
To: gentoo-commits
commit: 18d2c44f33e49a85a85951e3056187a98816391e
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 2 17:06:47 2018 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun Sep 2 17:06:47 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18d2c44f
sys-auth/libfprint: Drop old
Package-Manager: Portage-2.3.40, Repoman-2.3.9
sys-auth/libfprint/Manifest | 4 --
.../files/libfprint-0.5.0-automake-1.13.patch | 24 ----------
.../files/libfprint-0.5.0-support-147e_2020.patch | 48 --------------------
sys-auth/libfprint/libfprint-0.4.0-r1.ebuild | 51 ----------------------
sys-auth/libfprint/libfprint-0.5.0-r2.ebuild | 47 --------------------
sys-auth/libfprint/libfprint-0.5.1-r2.ebuild | 48 --------------------
6 files changed, 222 deletions(-)
diff --git a/sys-auth/libfprint/Manifest b/sys-auth/libfprint/Manifest
index ddc840b3b2e..d0c4bf3655c 100644
--- a/sys-auth/libfprint/Manifest
+++ b/sys-auth/libfprint/Manifest
@@ -1,7 +1,3 @@
-DIST libfprint-0.4.0.tar.bz2 228518 BLAKE2B 6a40eed5c4aa1e6f4365862fbe4abca3c0d220cfd7ed0395020957602d592529a61d0e8aea21a02c50b65897411a9ce69599261a23f5478e41954dfc1ea3368e SHA512 26361101f5b73f722c14109d7e9cb78738968d2cfc6fcb824dc56f0044c8cd866fcb57e7f432e3ec3eeba956d92b2a091b5daed77c992f61d75cb3ed323adc09
-DIST libfprint-0.5.0.tar.bz2 277118 BLAKE2B a90db33daa3be287c2e68edd12547c9a42ce8a557a8cbbb53779b88b7e732b02cd484445d6e48cc2a4bc2c8b8013deafbb4e9c67e4a3955b1ab1c00f6f33679d SHA512 2a5a4d45bd11060964e34c70b2a41e45d220e3b97d07a962c939ec84988a85a4d97898c86b1e7f7c571d85bb7f4333231cf327f62907b40e6a1262cc5b365981
-DIST libfprint-0.5.1-add-vfs5011-driver.patch 338763 BLAKE2B e86e22f76f0a261e6f4bc80e23ef9af8305eb8b9f382016786cdd3ed0e4d0db5f9c1f102d696153f3d2f9730da24f52aabee09133ce2ce54be390454fcf13ae7 SHA512 446de6dea67c4b4d257f5427b5981f28ba6ab422dcd022862541e6216c1733f146f86ee5a8ad855c142ce1bc7795c72820112d68d68bb74bd68751a02dd42fb5
-DIST libfprint-0.5.1.tar.bz2 277342 BLAKE2B ebf653f147d3c75ab9885ffc4a30fb07235ba80cf2fc1dfaa2db6e9b9afa52b20a9c4ec8d73fb15089731d20a6945b1e9920096ffbc7f9dadba88068efa7958e SHA512 e1596e28f2730501b5957d2b4365f8eead7c0941434d064ceb6e5321d0e8495e71ab576b214881441bf1abc6ecba2b3ffafe5027f738f80c8c38b4e95866c8c7
DIST libfprint-0.6.0.tar.bz2 323590 BLAKE2B 8a592241ded8826337db075dd26960a9712e1a01855c6fd2c461b73ea6e2fac5248bce16165144b48271b368d0b2a82963eab00a64a88c27539e19aee54b9ba4 SHA512 2ab9ceec0c357779c94d3b8e94c11a733825bd735bec0e5c762d215d69bf295da0c5db7fd365e2a7efdcf25747777371f793b5e99d5c98e1bf9dcb1170e10ef9
DIST libfprint-0.6.0_vfs0050.patch.gz 9944 BLAKE2B b53a74f64c9691cee7c4e7f2f54afcffe2b00b63914900ed107426a9e42721548caa1ec80e1e39251ee6a0daec6ecf7f80d6704d37bc984dd1ac76320d0b4256 SHA512 658f936c462cf50d4325d33da6c8298768dfbe4bf442933fc197c8f4bebd741ef6878bcfe123606790c3ddcc3e217fd5f97b3755d36b181c5837dc28e146d674
DIST libfprint-0.8.2.tar.gz 418437 BLAKE2B 396fee3b84958f273462fe92553a6a2dbefcadfc54c56531855fcef94613cd03ba68705585802992f86aa8175cb7dda0e80e96931de4a11da973b1f9ce2c4777 SHA512 56f7927adcb40866bfef67624221b921ba3d68e770e707c432f47c0bb1f5e233fd2427bacb448544167257b6ad9edf9008a188f408142288f4dbfee2115e9a8f
diff --git a/sys-auth/libfprint/files/libfprint-0.5.0-automake-1.13.patch b/sys-auth/libfprint/files/libfprint-0.5.0-automake-1.13.patch
deleted file mode 100644
index e82082ab6d6..00000000000
--- a/sys-auth/libfprint/files/libfprint-0.5.0-automake-1.13.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 43eca622cd49b58c87157e1ff1a2fcfdfba0934e Mon Sep 17 00:00:00 2001
-From: Vasily Khoruzhick <anarsoul@gmail.com>
-Date: Sun, 13 Jan 2013 13:42:13 +0000
-Subject: configure.ac: Use AC_CONFIG_HEADERS
-
-AM_CONFIG_HEADER is obsolete, use AC_CONFIG_HEADERS instead of it.
-
-https://bugs.freedesktop.org/show_bug.cgi?id=59320
----
-diff --git a/configure.ac b/configure.ac
-index 6737256..978ef0d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2,7 +2,7 @@ AC_INIT([libfprint], [0.5.0])
- AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz check-news])
- AC_CONFIG_MACRO_DIR([m4])
- AC_CONFIG_SRCDIR([libfprint/core.c])
--AM_CONFIG_HEADER([config.h])
-+AC_CONFIG_HEADERS([config.h])
-
- # Enable silent build when available (Automake 1.11)
- m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
---
-cgit v0.9.0.2-2-gbebe
diff --git a/sys-auth/libfprint/files/libfprint-0.5.0-support-147e_2020.patch b/sys-auth/libfprint/files/libfprint-0.5.0-support-147e_2020.patch
deleted file mode 100644
index 98f72aed5a0..00000000000
--- a/sys-auth/libfprint/files/libfprint-0.5.0-support-147e_2020.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 3b3679c900f6739f7067f8d720e15d548bb39be9 Mon Sep 17 00:00:00 2001
-From: Vasily Khoruzhick <anarsoul@gmail.com>
-Date: Sun, 13 Jan 2013 13:43:38 +0000
-Subject: upeke2: Add support for 147e:2020 ID
-
-https://bugs.freedesktop.org/show_bug.cgi?id=59320
----
-diff --git a/libfprint/drivers/upeke2.c b/libfprint/drivers/upeke2.c
-index ed8f43d..a7db54d 100644
---- a/libfprint/drivers/upeke2.c
-+++ b/libfprint/drivers/upeke2.c
-@@ -46,6 +46,11 @@
- #define MSG_READ_BUF_SIZE 0x40
- #define MAX_DATA_IN_READ_BUF (MSG_READ_BUF_SIZE - 9)
-
-+enum {
-+ UPEKE2_2016,
-+ UPEKE2_2020,
-+};
-+
- struct upeke2_dev {
- gboolean enroll_passed;
- gboolean first_verify_iteration;
-@@ -848,8 +853,10 @@ static struct fpi_ssm *deinitsm_new(struct fp_dev *dev)
-
- static int discover(struct libusb_device_descriptor *dsc, uint32_t *devtype)
- {
-- /* Revision 2 is what we're interested in */
-- if (dsc->bcdDevice == 2)
-+ if (dsc->idProduct == 0x2016 && dsc->bcdDevice == 2)
-+ return 1;
-+
-+ if (dsc->idProduct == 0x2020 && dsc->bcdDevice == 1)
- return 1;
-
- return 0;
-@@ -1453,7 +1460,8 @@ static int verify_stop(struct fp_dev *dev, gboolean iterating)
- }
-
- static const struct usb_id id_table[] = {
-- { .vendor = 0x147e, .product = 0x2016 },
-+ { .vendor = 0x147e, .product = 0x2016, .driver_data = UPEKE2_2016 },
-+ { .vendor = 0x147e, .product = 0x2020, .driver_data = UPEKE2_2020 },
- { 0, 0, 0, }, /* terminating entry */
- };
-
---
-cgit v0.9.0.2-2-gbebe
diff --git a/sys-auth/libfprint/libfprint-0.4.0-r1.ebuild b/sys-auth/libfprint/libfprint-0.4.0-r1.ebuild
deleted file mode 100644
index d6f8ebcf26e..00000000000
--- a/sys-auth/libfprint/libfprint-0.4.0-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools eutils udev
-
-MY_PV="v_${PV//./_}"
-DESCRIPTION="library to add support for consumer fingerprint readers"
-HOMEPAGE="https://cgit.freedesktop.org/libfprint/libfprint/"
-SRC_URI="https://cgit.freedesktop.org/${PN}/${PN}/snapshot/${MY_PV}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
-IUSE="debug static-libs"
-
-RDEPEND="virtual/libusb:1
- dev-libs/nss
- || ( virtual/imagemagick-tools x11-libs/gdk-pixbuf )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_PV}
-
-src_prepare() {
- mkdir m4 || die
- eautoreconf
-}
-
-pkg_setup() {
- einfo
- elog "This version does not support fdu2000 and upektc (yet)."
- einfo
-}
-
-src_configure() {
- econf \
- $(use_enable debug debug-log) \
- $(use_enable static-libs static)
-}
-
-src_install() {
- emake \
- DESTDIR="${D}" \
- udev_rulesdir="$(get_udevdir)/rules.d" \
- install
-
- prune_libtool_files
- dodoc AUTHORS HACKING NEWS README THANKS TODO
-}
diff --git a/sys-auth/libfprint/libfprint-0.5.0-r2.ebuild b/sys-auth/libfprint/libfprint-0.5.0-r2.ebuild
deleted file mode 100644
index 9e1a994e453..00000000000
--- a/sys-auth/libfprint/libfprint-0.5.0-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools eutils udev vcs-snapshot
-
-MY_PV="v_${PV//./_}"
-DESCRIPTION="library to add support for consumer fingerprint readers"
-HOMEPAGE="https://cgit.freedesktop.org/libfprint/libfprint/"
-SRC_URI="https://cgit.freedesktop.org/${PN}/${PN}/snapshot/${MY_PV}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 x86"
-IUSE="debug static-libs"
-
-RDEPEND="virtual/libusb:1
- dev-libs/nss
- || ( virtual/imagemagick-tools x11-libs/gdk-pixbuf )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-src_prepare() {
- epatch "${FILESDIR}/${P}-automake-1.13.patch"
- epatch "${FILESDIR}/${P}-support-147e_2020.patch"
- eautoreconf
-}
-
-src_configure() {
- econf \
- --with-drivers=all \
- $(use_enable debug debug-log) \
- $(use_enable static-libs static) \
- -enable-udev-rules \
- --with-udev-rules-dir=$(get_udevdir)/rules.d
- # --disable-udev-rules fails https://bugs.freedesktop.org/show_bug.cgi?id=59076
- # $(use_enable udev udev-rules) \
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- prune_libtool_files
-
- dodoc AUTHORS HACKING NEWS README THANKS TODO
-}
diff --git a/sys-auth/libfprint/libfprint-0.5.1-r2.ebuild b/sys-auth/libfprint/libfprint-0.5.1-r2.ebuild
deleted file mode 100644
index 4aacb011150..00000000000
--- a/sys-auth/libfprint/libfprint-0.5.1-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils udev vcs-snapshot
-
-MY_PV="v_${PV//./_}"
-DESCRIPTION="library to add support for consumer fingerprint readers"
-HOMEPAGE="https://cgit.freedesktop.org/libfprint/libfprint/"
-SRC_URI="https://cgit.freedesktop.org/${PN}/${PN}/snapshot/${MY_PV}.tar.bz2 -> ${P}.tar.bz2
- https://dev.gentoo.org/~patrick/libfprint-0.5.1-add-vfs5011-driver.patch"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="debug static-libs"
-
-RDEPEND="virtual/libusb:1
- dev-libs/glib:2
- dev-libs/nss
- || ( virtual/imagemagick-tools x11-libs/gdk-pixbuf )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-src_prepare() {
- epatch "${DISTDIR}/${P}-add-vfs5011-driver.patch" || die
- eautoreconf
-}
-
-src_configure() {
- econf \
- --with-drivers=all \
- $(use_enable debug debug-log) \
- $(use_enable static-libs static) \
- -enable-udev-rules \
- --with-udev-rules-dir=$(get_udevdir)/rules.d
- # --disable-udev-rules fails https://bugs.freedesktop.org/show_bug.cgi?id=59076
- # $(use_enable udev udev-rules) \
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- prune_libtool_files
-
- dodoc AUTHORS HACKING NEWS README THANKS TODO
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-auth/libfprint/, sys-auth/libfprint/files/
@ 2022-06-23 5:01 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2022-06-23 5:01 UTC (permalink / raw
To: gentoo-commits
commit: e3aaa3286a6a831276779a3466509f28d7d074b6
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 23 05:00:45 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 23 05:00:45 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3aaa328
sys-auth/libfprint: fix musl build
Closes: https://bugs.gentoo.org/853811
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../libfprint-1.94.4-stderr-redefinition.patch | 24 ++++++++++++++++++++++
sys-auth/libfprint/libfprint-1.94.4.ebuild | 1 +
2 files changed, 25 insertions(+)
diff --git a/sys-auth/libfprint/files/libfprint-1.94.4-stderr-redefinition.patch b/sys-auth/libfprint/files/libfprint-1.94.4-stderr-redefinition.patch
new file mode 100644
index 000000000000..fa7f4aac0986
--- /dev/null
+++ b/sys-auth/libfprint/files/libfprint-1.94.4-stderr-redefinition.patch
@@ -0,0 +1,24 @@
+https://gitlab.freedesktop.org/libfprint/libfprint/-/merge_requests/366
+
+From 2584d440afc87d463cb8dc809d48c660e091c2c4 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Thu, 23 Jun 2022 05:57:46 +0100
+Subject: [PATCH] nbis: fix build on musl
+
+Drop re-definition of stderr. There's no need for this anywhere
+(including glibc). This breaks in particular on musl because
+stderr (and stdin) are both const, and macros unlike in glibc.
+
+Bug: https://bugs.gentoo.org/853811
+--- a/libfprint/nbis/include/bozorth.h
++++ b/libfprint/nbis/include/bozorth.h
+@@ -217,8 +217,6 @@ struct xytq_struct {
+ /**************************************************************************/
+ /* Globals supporting command line options */
+ extern int verbose_threshold;
+-/* Global supporting error reporting */
+-extern FILE *stderr;
+
+ /**************************************************************************/
+ /* In: BZ_GBLS.C */
+GitLab
diff --git a/sys-auth/libfprint/libfprint-1.94.4.ebuild b/sys-auth/libfprint/libfprint-1.94.4.ebuild
index ea51f46bd2c5..5a5defa19e28 100644
--- a/sys-auth/libfprint/libfprint-1.94.4.ebuild
+++ b/sys-auth/libfprint/libfprint-1.94.4.ebuild
@@ -41,6 +41,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-1.94.1-test-timeout.patch
+ "${FILESDIR}"/${PN}-1.94.4-stderr-redefinition.patch
)
src_configure() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-auth/libfprint/, sys-auth/libfprint/files/
@ 2022-12-28 0:56 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2022-12-28 0:56 UTC (permalink / raw
To: gentoo-commits
commit: 0f9453022ee8eee51107033e13e8689405593592
Author: Marco Scardovi <mscardovi <AT> icloud <DOT> com>
AuthorDate: Tue Dec 27 20:22:13 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec 28 00:51:03 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f945302
sys-auth/libfprint: drop 1.0
Signed-off-by: Marco Scardovi <mscardovi <AT> icloud.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-auth/libfprint/Manifest | 1 -
.../libfprint-0.8.2-fix-implicit-declaration.patch | 194 ---------------------
sys-auth/libfprint/libfprint-1.0.ebuild | 44 -----
3 files changed, 239 deletions(-)
diff --git a/sys-auth/libfprint/Manifest b/sys-auth/libfprint/Manifest
index f22c0ee393fe..44e61e5a5915 100644
--- a/sys-auth/libfprint/Manifest
+++ b/sys-auth/libfprint/Manifest
@@ -1,3 +1,2 @@
-DIST libfprint-1.0.tar.gz 475347 BLAKE2B cb560898cec11861c4529c0c37c328f74eaf271c1932ca5126b7bd6c82fafee24aff393c0fe223fef018a34a409647065d5f98a999c00f0e7a879e33bdfcd3cb SHA512 2d7f569368035cce0a579ef3412a1961c28aab254ae6174ce9ad11ce97b3dce824d0c6123adac12718cb074439e4d5b93bf978e5341824f179231d1faa219a26
DIST libfprint-1.94.3.tar.gz 10409543 BLAKE2B 33e25715313cfc37f0c05ad47eca6d315a041a067cfc7dfac9d71fcf5231a11f54888dd837c083b8cca03ca2b4b0bced30340e8966ab4c989d4a33c59ceb483e SHA512 22290bd393b54ada75c4655b3e901b6ee25f389a396a9b29bc1e76c0333d9718483b2059c927deb5b8d8e0acf632fecc9c4535b3f161910d5c51fad508d3e7a4
DIST libfprint-1.94.4.tar.gz 10408480 BLAKE2B 492ea10777d223ce7d610f0dca2871c8eae08cb5dd7d30187194d6cc139a60d5350e5908f759434065614c05a72192347be19c1d6fe5641e08a2f6419bdcede7 SHA512 425efdfde373179a237805c4b5561e3531616798c41ccd4358f1c521f1e21af01f8ca61aaf8c959e2c68a69e4dfda23960e696acaaad2228ffef6f999986468e
diff --git a/sys-auth/libfprint/files/libfprint-0.8.2-fix-implicit-declaration.patch b/sys-auth/libfprint/files/libfprint-0.8.2-fix-implicit-declaration.patch
deleted file mode 100644
index 15b49597238c..000000000000
--- a/sys-auth/libfprint/files/libfprint-0.8.2-fix-implicit-declaration.patch
+++ /dev/null
@@ -1,194 +0,0 @@
-From 17cbe376872d8a0f579a0497942a5d2f19facaf5 Mon Sep 17 00:00:00 2001
-From: Mikle Kolyada <zlogene@gentoo.org>
-Date: Sun, 2 Sep 2018 17:20:03 +0300
-Subject: [PATCH] Fix implicit declaration warnings
-
----
- libfprint/drivers/aes1610.c | 2 ++
- libfprint/drivers/aes2501.c | 2 ++
- libfprint/drivers/aes2550.c | 2 ++
- libfprint/drivers/aesx660.c | 2 ++
- libfprint/drivers/etes603.c | 2 ++
- libfprint/drivers/upeksonly.c | 2 ++
- libfprint/drivers/upektc.c | 2 ++
- libfprint/drivers/upektc_img.c | 2 ++
- libfprint/drivers/upekts.c | 2 ++
- libfprint/drivers/vfs0050.c | 2 ++
- libfprint/drivers/vfs101.c | 3 +++
- libfprint/drivers/vfs301.c | 3 +++
- libfprint/drivers/vfs5011.c | 2 ++
- 13 files changed, 28 insertions(+)
-
-diff --git a/libfprint/drivers/aes1610.c b/libfprint/drivers/aes1610.c
-index f307a3b..9dc3383 100644
---- a/libfprint/drivers/aes1610.c
-+++ b/libfprint/drivers/aes1610.c
-@@ -25,6 +25,8 @@
-
- #define FP_COMPONENT "aes1610"
-
-+#include <string.h>
-+
- #include "drivers_api.h"
- #include "aeslib.h"
-
-diff --git a/libfprint/drivers/aes2501.c b/libfprint/drivers/aes2501.c
-index 87879a4..caaf3ea 100644
---- a/libfprint/drivers/aes2501.c
-+++ b/libfprint/drivers/aes2501.c
-@@ -23,6 +23,8 @@
-
- #define FP_COMPONENT "aes2501"
-
-+#include <string.h>
-+
- #include "drivers_api.h"
- #include "aeslib.h"
- #include "aes2501.h"
-diff --git a/libfprint/drivers/aes2550.c b/libfprint/drivers/aes2550.c
-index ab4acaa..c838e54 100644
---- a/libfprint/drivers/aes2550.c
-+++ b/libfprint/drivers/aes2550.c
-@@ -23,6 +23,8 @@
-
- #define FP_COMPONENT "aes2550"
-
-+#include <string.h>
-+
- #include "drivers_api.h"
- #include "aes2550.h"
- #include "aeslib.h"
-diff --git a/libfprint/drivers/aesx660.c b/libfprint/drivers/aesx660.c
-index e443e21..17c0245 100644
---- a/libfprint/drivers/aesx660.c
-+++ b/libfprint/drivers/aesx660.c
-@@ -23,6 +23,8 @@
-
- #define FP_COMPONENT "aesX660"
-
-+#include <string.h>
-+
- #include "drivers_api.h"
- #include "aeslib.h"
- #include "aesx660.h"
-diff --git a/libfprint/drivers/etes603.c b/libfprint/drivers/etes603.c
-index fdaf7f2..0782f9e 100644
---- a/libfprint/drivers/etes603.c
-+++ b/libfprint/drivers/etes603.c
-@@ -35,6 +35,8 @@
-
- #define FP_COMPONENT "etes603"
-
-+#include <string.h>
-+
- #include "drivers_api.h"
- #include "driver_ids.h"
-
-diff --git a/libfprint/drivers/upeksonly.c b/libfprint/drivers/upeksonly.c
-index 9cccb86..e035408 100644
---- a/libfprint/drivers/upeksonly.c
-+++ b/libfprint/drivers/upeksonly.c
-@@ -25,6 +25,8 @@
-
- #define FP_COMPONENT "upeksonly"
-
-+#include <string.h>
-+
- #include "drivers_api.h"
- #include "upeksonly.h"
-
-diff --git a/libfprint/drivers/upektc.c b/libfprint/drivers/upektc.c
-index ffa31f3..e4d7de5 100644
---- a/libfprint/drivers/upektc.c
-+++ b/libfprint/drivers/upektc.c
-@@ -20,6 +20,8 @@
-
- #define FP_COMPONENT "upektc"
-
-+#include <string.h>
-+
- #include "drivers_api.h"
- #include "upektc.h"
-
-diff --git a/libfprint/drivers/upektc_img.c b/libfprint/drivers/upektc_img.c
-index f0f2f18..a500623 100644
---- a/libfprint/drivers/upektc_img.c
-+++ b/libfprint/drivers/upektc_img.c
-@@ -19,6 +19,8 @@
-
- #define FP_COMPONENT "upektc_img"
-
-+#include <string.h>
-+
- #include "drivers_api.h"
- #include "aeslib.h"
- #include "upektc_img.h"
-diff --git a/libfprint/drivers/upekts.c b/libfprint/drivers/upekts.c
-index b448e36..1094e66 100644
---- a/libfprint/drivers/upekts.c
-+++ b/libfprint/drivers/upekts.c
-@@ -27,6 +27,8 @@
-
- #define FP_COMPONENT "upekts"
-
-+#include <string.h>
-+
- #include "drivers_api.h"
-
- #define EP_IN (1 | LIBUSB_ENDPOINT_IN)
-diff --git a/libfprint/drivers/vfs0050.c b/libfprint/drivers/vfs0050.c
-index dcf5d69..60a720e 100644
---- a/libfprint/drivers/vfs0050.c
-+++ b/libfprint/drivers/vfs0050.c
-@@ -19,6 +19,8 @@
-
- #define FP_COMPONENT "vfs0050"
-
-+#include <string.h>
-+
- #include "drivers_api.h"
- #include "vfs0050.h"
-
-diff --git a/libfprint/drivers/vfs101.c b/libfprint/drivers/vfs101.c
-index 3304b1f..473adf2 100644
---- a/libfprint/drivers/vfs101.c
-+++ b/libfprint/drivers/vfs101.c
-@@ -19,6 +19,9 @@
-
- #define FP_COMPONENT "vfs101"
-
-+#include <stdlib.h>
-+#include <string.h>
-+
- #include "drivers_api.h"
-
- /* Input-Output usb endpoint */
-diff --git a/libfprint/drivers/vfs301.c b/libfprint/drivers/vfs301.c
-index a34ee31..6f52316 100644
---- a/libfprint/drivers/vfs301.c
-+++ b/libfprint/drivers/vfs301.c
-@@ -21,6 +21,9 @@
-
- #define FP_COMPONENT "vfs301"
-
-+#include <stdlib.h>
-+#include <string.h>
-+
- #include "drivers_api.h"
- #include "vfs301_proto.h"
-
-diff --git a/libfprint/drivers/vfs5011.c b/libfprint/drivers/vfs5011.c
-index 8b460ac..1355394 100644
---- a/libfprint/drivers/vfs5011.c
-+++ b/libfprint/drivers/vfs5011.c
-@@ -18,6 +18,8 @@
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-+#include <string.h>
-+
- #include "drivers_api.h"
- #include "vfs5011_proto.h"
-
---
-2.16.4
diff --git a/sys-auth/libfprint/libfprint-1.0.ebuild b/sys-auth/libfprint/libfprint-1.0.ebuild
deleted file mode 100644
index d3873860d2fb..000000000000
--- a/sys-auth/libfprint/libfprint-1.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson udev
-
-DESCRIPTION="library to add support for consumer fingerprint readers"
-HOMEPAGE="https://cgit.freedesktop.org/libfprint/libfprint/ https://github.com/freedesktop/libfprint"
-SRC_URI="https://github.com/freedesktop/libfprint/archive/V_$(ver_rs 0-3 '_').tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
-IUSE="examples"
-
-RDEPEND="dev-libs/glib:2
- dev-libs/nss
- virtual/libusb:1=
- x11-libs/gtk+:3
- x11-libs/pixman
- x11-libs/libX11
- x11-libs/libXv"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="dev-util/gtk-doc
- virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.8.2-fix-implicit-declaration.patch )
-
-S="${WORKDIR}/${PN}-V_$(ver_rs 0-3 '_')"
-
-src_configure() {
- local emesonargs=(
- -Ddoc=false
- -Dx11-examples=$(usex examples true false)
- -Ddrivers=all
- -Dudev_rules=true
- -Dudev_rules_dir=$(get_udevdir)/rules.d
- --libdir=/usr/$(get_libdir)
- )
- meson_src_configure
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-auth/libfprint/, sys-auth/libfprint/files/
@ 2024-06-03 5:53 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2024-06-03 5:53 UTC (permalink / raw
To: gentoo-commits
commit: 7f9db32ef231949c03d8791670cd6bc13b9dd141
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 3 05:39:00 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jun 3 05:39:00 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f9db32e
sys-auth/libfprint: fix skipping tests w/ missing deps
Closes: https://bugs.gentoo.org/898038
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/libfprint-1.94.7-skip-test-dep.patch | 106 +++++++++++++++++++++
sys-auth/libfprint/libfprint-1.94.7.ebuild | 5 +-
2 files changed, 110 insertions(+), 1 deletion(-)
diff --git a/sys-auth/libfprint/files/libfprint-1.94.7-skip-test-dep.patch b/sys-auth/libfprint/files/libfprint-1.94.7-skip-test-dep.patch
new file mode 100644
index 000000000000..7d2d6b20ecff
--- /dev/null
+++ b/sys-auth/libfprint/files/libfprint-1.94.7-skip-test-dep.patch
@@ -0,0 +1,106 @@
+https://gitlab.freedesktop.org/libfprint/libfprint/-/commit/4b72f27de6706a6001e82b477b647ced30cc37b5
+https://gitlab.freedesktop.org/libfprint/libfprint/-/commit/7dbb21e77ace03bf28dc9a6b37b43d551282389f
+
+From 4b72f27de6706a6001e82b477b647ced30cc37b5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
+Date: Tue, 20 Feb 2024 08:22:42 +0100
+Subject: [PATCH] build: Look for sh just once
+
+---
+ meson.build | 1 +
+ tests/meson.build | 10 +++++-----
+ 2 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 435827ce..28ee27a2 100644
+--- a/meson.build
++++ b/meson.build
+@@ -91,6 +91,7 @@ gusb_dep = dependency('gusb', version: '>= 0.2.0')
+ mathlib_dep = cc.find_library('m', required: false)
+
+ # The following dependencies are only used for tests
++sh = find_program('sh', required: true)
+ cairo_dep = dependency('cairo', required: false)
+
+ # introspection scanning and Gio-2.0.gir
+diff --git a/tests/meson.build b/tests/meson.build
+index f68ed406..8c8f5d07 100644
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -151,7 +151,7 @@ if get_option('introspection')
+ endif
+ else
+ test(vdtest,
+- find_program('sh'),
++ sh,
+ args: ['-c', 'exit 77']
+ )
+ endif
+@@ -205,7 +205,7 @@ if get_option('introspection')
+ endif
+ else
+ test(driver_test,
+- find_program('sh'),
++ sh,
+ args: ['-c', 'exit 77']
+ )
+ endif
+@@ -224,13 +224,13 @@ if get_option('introspection')
+ else
+ warning('Skipping all driver tests as introspection bindings are missing')
+ test('virtual-image',
+- find_program('sh'),
++ sh,
+ args: ['-c', 'exit 77']
+ )
+
+ foreach driver_test: drivers_tests
+ test(driver_test,
+- find_program('sh'),
++ sh,
+ args: ['-c', 'exit 77']
+ )
+ endforeach
+@@ -273,7 +273,7 @@ foreach test_name: unit_tests
+ # Create a dummy test that always skips instead
+ warning('Test @0@ cannot be compiled due to missing dependencies'.format(test_name))
+ test(test_name,
+- find_program('sh'),
++ sh,
+ suite: ['unit-tests'],
+ args: ['-c', 'exit 77'],
+ )
+--
+GitLab
+
+From 7dbb21e77ace03bf28dc9a6b37b43d551282389f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
+Date: Tue, 20 Feb 2024 08:24:12 +0100
+Subject: [PATCH] build/tests: Skip a test if the test requires it during
+ inspection
+
+In case we don't have dependencies, we should skip the test, otherwise
+we can just fail at test time
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -100,11 +100,17 @@ if get_option('introspection')
+ base_args = files(vdtest + '.py')
+ suite = ['virtual-driver']
+
+- r = run_command(unittest_inspector, files(vdtest + '.py'), check: true)
++ r = run_command(unittest_inspector, files(vdtest + '.py'), check: false)
+ unit_tests = r.stdout().strip().split('\n')
+
+ if r.returncode() == 0 and unit_tests.length() > 0
+ suite += vdtest
++ elif r.returncode() == 77
++ test(vdtest,
++ sh,
++ args: ['-c', 'exit 77']
++ )
++ continue
+ else
+ unit_tests = [vdtest]
+ endif
+--
+GitLab
diff --git a/sys-auth/libfprint/libfprint-1.94.7.ebuild b/sys-auth/libfprint/libfprint-1.94.7.ebuild
index 7ece93fa19d2..dcb5fc427c56 100644
--- a/sys-auth/libfprint/libfprint-1.94.7.ebuild
+++ b/sys-auth/libfprint/libfprint-1.94.7.ebuild
@@ -43,7 +43,10 @@ BDEPEND="
)
"
-PATCHES=( "${FILESDIR}/${PN}-1.94.1-test-timeout.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-1.94.1-test-timeout.patch"
+ "${FILESDIR}/${PN}-1.94.7-skip-test-dep.patch"
+)
S="${WORKDIR}/${MY_P}"
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-06-03 5:53 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-06-23 5:01 [gentoo-commits] repo/gentoo:master commit in: sys-auth/libfprint/, sys-auth/libfprint/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-06-03 5:53 Sam James
2022-12-28 0:56 Sam James
2018-09-02 17:07 Mikle Kolyada
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox