Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/sys-auth/libfprint
diff options
context:
space:
mode:
Diffstat (limited to 'sys-auth/libfprint')
-rw-r--r--sys-auth/libfprint/Manifest2
-rw-r--r--sys-auth/libfprint/files/libfprint-1.94.7-skip-test-dep.patch106
-rw-r--r--sys-auth/libfprint/libfprint-1.94.3.ebuild60
-rw-r--r--sys-auth/libfprint/libfprint-1.94.5.ebuild59
-rw-r--r--sys-auth/libfprint/libfprint-1.94.7.ebuild9
5 files changed, 113 insertions, 123 deletions
diff --git a/sys-auth/libfprint/Manifest b/sys-auth/libfprint/Manifest
index 5a4b54078971..9642a956d20a 100644
--- a/sys-auth/libfprint/Manifest
+++ b/sys-auth/libfprint/Manifest
@@ -1,4 +1,2 @@
-DIST libfprint-1.94.3.tar.gz 10409543 BLAKE2B 33e25715313cfc37f0c05ad47eca6d315a041a067cfc7dfac9d71fcf5231a11f54888dd837c083b8cca03ca2b4b0bced30340e8966ab4c989d4a33c59ceb483e SHA512 22290bd393b54ada75c4655b3e901b6ee25f389a396a9b29bc1e76c0333d9718483b2059c927deb5b8d8e0acf632fecc9c4535b3f161910d5c51fad508d3e7a4
DIST libfprint-1.94.4.tar.gz 10408480 BLAKE2B 492ea10777d223ce7d610f0dca2871c8eae08cb5dd7d30187194d6cc139a60d5350e5908f759434065614c05a72192347be19c1d6fe5641e08a2f6419bdcede7 SHA512 425efdfde373179a237805c4b5561e3531616798c41ccd4358f1c521f1e21af01f8ca61aaf8c959e2c68a69e4dfda23960e696acaaad2228ffef6f999986468e
-DIST libfprint-1.94.5.tar.bz2 8922994 BLAKE2B b79292dc77426d76e5e9cb1cbf8662867224f19ff9cf2434d000689d02e7d4609c9ca94a016185f71500e4a58e9522a7647684e1eaa841c02a40f27e0d22055e SHA512 6a73b3d05bd61b5c74e64d52eba7dab6e97dcf149e32c882e05f15dc7241fd8e78f115957ed52a9657ff0b21642ec633c27cc905cbd4697ed41369508957c989
DIST libfprint-1.94.7.tar.bz2 9066931 BLAKE2B 5df859c4e38a8016b8f91785d8634d85e023cc19b837e928dd2de6392ed77b7a82c26e6c1485df2fa1fb2041421d4dd05441d5df24c2fc5399783dcc174d5afc SHA512 b91a71ef998b03a64b08d9439a1d26027f196f07fd1344bbe45f2dbeb3ace5752af9b7504ee8537eb40d896e43a517e3759a7b3735baded4cc3fb6c0ca3b0ece
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.3.ebuild b/sys-auth/libfprint/libfprint-1.94.3.ebuild
deleted file mode 100644
index e08911022880..000000000000
--- a/sys-auth/libfprint/libfprint-1.94.3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson udev
-
-DESCRIPTION="Library to add support for consumer fingerprint readers"
-HOMEPAGE="https://cgit.freedesktop.org/libfprint/libfprint/ https://github.com/freedesktop/libfprint https://gitlab.freedesktop.org/libfprint/libfprint"
-SRC_URI="https://github.com/freedesktop/libfprint/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
-IUSE="examples gtk-doc +introspection"
-
-RDEPEND="
- dev-libs/glib:2
- dev-libs/libgudev
- dev-libs/libgusb
- dev-libs/nss
- virtual/libusb:1=
- x11-libs/libX11
- x11-libs/libXv
- x11-libs/pixman
- !>=sys-auth/libfprint-1.90:0
- examples? (
- x11-libs/gdk-pixbuf:2
- x11-libs/gtk+:3
- )
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
- virtual/pkgconfig
- gtk-doc? ( dev-util/gtk-doc )
- introspection? (
- dev-libs/gobject-introspection
- dev-libs/libgusb[introspection]
- )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.8.2-fix-implicit-declaration.patch
- "${FILESDIR}"/${PN}-1.94.1-test-timeout.patch
-)
-
-src_configure() {
- local emesonargs=(
- $(meson_use examples gtk-examples)
- $(meson_use gtk-doc doc)
- $(meson_use introspection)
- -Ddrivers=all
- -Dudev_rules=enabled
- -Dudev_rules_dir=$(get_udevdir)/rules.d
- --libdir=/usr/$(get_libdir)
- )
- meson_src_configure
-}
diff --git a/sys-auth/libfprint/libfprint-1.94.5.ebuild b/sys-auth/libfprint/libfprint-1.94.5.ebuild
deleted file mode 100644
index f60ff3e9d76e..000000000000
--- a/sys-auth/libfprint/libfprint-1.94.5.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson udev
-
-MY_P="${PN}-v${PV}"
-
-DESCRIPTION="Library to add support for consumer fingerprint readers"
-HOMEPAGE="https://cgit.freedesktop.org/libfprint/libfprint https://gitlab.freedesktop.org/libfprint/libfprint"
-SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/v${PV}/${MY_P}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="LGPL-2.1+"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
-IUSE="examples gtk-doc +introspection"
-
-RDEPEND="
- dev-libs/glib:2
- dev-libs/libgudev
- dev-libs/nss
- dev-python/pygobject
- dev-libs/libgusb
- x11-libs/pixman
- examples? (
- x11-libs/gdk-pixbuf:2
- x11-libs/gtk+:3
- )
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
- virtual/pkgconfig
- gtk-doc? ( dev-util/gtk-doc )
- introspection? (
- dev-libs/gobject-introspection
- dev-libs/libgusb[introspection]
- )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-1.94.1-test-timeout.patch" )
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
- local emesonargs=(
- $(meson_use examples gtk-examples)
- $(meson_use gtk-doc doc)
- $(meson_use introspection introspection)
- -Ddrivers=all
- -Dudev_rules=enabled
- -Dudev_rules_dir=$(get_udevdir)/rules.d
- --libdir=/usr/$(get_libdir)
- )
-
- meson_src_configure
-}
diff --git a/sys-auth/libfprint/libfprint-1.94.7.ebuild b/sys-auth/libfprint/libfprint-1.94.7.ebuild
index 7ece93fa19d2..f8648ea56acc 100644
--- a/sys-auth/libfprint/libfprint-1.94.7.ebuild
+++ b/sys-auth/libfprint/libfprint-1.94.7.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/v${PV}/${MY_P}.tar
LICENSE="LGPL-2.1+"
SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
IUSE="examples gtk-doc +introspection"
RDEPEND="
@@ -43,11 +43,16 @@ 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}"
src_configure() {
+ # TODO: wire up test deps (cairo, pygobject, etc) for extra tests
+ # currently skipped.
local emesonargs=(
$(meson_use examples gtk-examples)
$(meson_use gtk-doc doc)