sys-auth/libfprint: add support for vfs0050 scanner (bug 531698).

Package-Manager: portage-2.2.20

diff --git a/sys-auth/libfprint/Manifest b/sys-auth/libfprint/Manifest
index c90b34ebe3ca4ac373d1963d7ff95df9a3764ad8..678dcf82cd42fa04934e9fb29368ff45d34ee9c6 100644 (file)
--- a/sys-auth/libfprint/Manifest
+++ b/sys-auth/libfprint/Manifest
@@ -3,3 +3,5 @@ DIST libfprint-0.5.0.tar.bz2 277118 SHA256 1d4d6832fe61e934a40cbe2b9fe9a92153ddc
 DIST libfprint-0.5.1-add-vfs5011-driver.patch 338763 SHA256 329af64cc7273d46a56c603b8d242a51d3485655d475548ea47c66ef874946dd SHA512 446de6dea67c4b4d257f5427b5981f28ba6ab422dcd022862541e6216c1733f146f86ee5a8ad855c142ce1bc7795c72820112d68d68bb74bd68751a02dd42fb5 WHIRLPOOL d08b0011a0363497079c9a16b35e2eae64976c1a3b840e92560c55b399770e62ed4940278c729d24129e34503269876c8bd54d923b7656785ad1cda3ee6c0e1c
 DIST libfprint-0.5.1.tar.bz2 277342 SHA256 0a2ea0e3bd4115bbe7261a0f43d5091ca32f9eaf8ca3364cca2b89c0f30c7962 SHA512 e1596e28f2730501b5957d2b4365f8eead7c0941434d064ceb6e5321d0e8495e71ab576b214881441bf1abc6ecba2b3ffafe5027f738f80c8c38b4e95866c8c7 WHIRLPOOL 444798713bf7603f7aa2bde104c9a62049566fa1e1e5bcf442d3f6212561dae41c69f579a6c5bc9a8df8efd09a60f12b8eb5b9909d1884413ea7e7caba637a37
 DIST libfprint-0.6.0.tar.bz2 323590 SHA256 4e1787da3367d18d931f189a7fd9c92f6dc01f799d0c03ed4595603c1eceaf5c SHA512 2ab9ceec0c357779c94d3b8e94c11a733825bd735bec0e5c762d215d69bf295da0c5db7fd365e2a7efdcf25747777371f793b5e99d5c98e1bf9dcb1170e10ef9 WHIRLPOOL ecd0d3402cd24245f790a34d796a964f6c211096e906299fdce49d5a2eed0f73717e079749c877680e3000d9b4dd11d534759efb313a133e40e950a1a0c62a03
+DIST libfprint-0.6.0_driver_name.patch 1099 SHA256 6106b755ad5e679736ab280cf4d8b6f40d9892cb90386fff634a5818df86b024 SHA512 3ff3ffc06ec049b74e6c4b5d96e205a158e29f033bf724f4e833ab5f6cfbb327cb3e9f0d66c755c4e5803bde85b8e302ea99c527f9de14995354bd4ab0231774 WHIRLPOOL 877bac1f710297fca509b224b7e91ee5806cde94f6db29c5f5c43b4c0482f1eef0788e72158808facffce7c976e5846ec7f1c656443064893b9033a184699451
+DIST libfprint-0.6.0_vfs0050.patch 79456 SHA256 626bb5d4f7130ccf6a64fda4a7ba9229beb82be312bf6bb41e67a5ce6d00ed65 SHA512 2632e9b1b6caae1a92f6ec81fe6549b72a91a329ba36b08b3e77126a518db004b147577277b41103efc703b9516f7cd772b2ad52ab525657af7f791db7cfb824 WHIRLPOOL b81e2a956fad207322f46a371f09360144281b099dbd061b9eb3c082274f423c3cd48e1156552c278c7a60b7419850ab84bc20b7fb3baf1df98c8e5fe04fb8a7

diff --git a/sys-auth/libfprint/libfprint-0.6.0.ebuild b/sys-auth/libfprint/libfprint-0.6.0.ebuild
index 79ebb65f33fceea62b641755fc14408ed2a826e8..cb31c9d42881af90325a121ac8ed4106f5b8b06d 100644 (file)
--- a/sys-auth/libfprint/libfprint-0.6.0.ebuild
+++ b/sys-auth/libfprint/libfprint-0.6.0.ebuild
@@ -9,12 +9,14 @@ inherit autotools eutils udev vcs-snapshot
 MY_PV="V_${PV//./_}"
 DESCRIPTION="library to add support for consumer fingerprint readers"
 HOMEPAGE="http://cgit.freedesktop.org/libfprint/libfprint/"
-SRC_URI="http://cgit.freedesktop.org/${PN}/${PN}/snapshot/${MY_PV}.tar.bz2 -> ${P}.tar.bz2"
+SRC_URI="http://cgit.freedesktop.org/${PN}/${PN}/snapshot/${MY_PV}.tar.bz2 -> ${P}.tar.bz2
+       https://github.com/zemen/libfprint/commit/23f1ef96dc612f80e5d7c9277b18d5973fc65cf6.patch -> ${P}_vfs0050.patch
+       https://github.com/zemen/libfprint/commit/f1fdd71613a483e054cd11e19bdcfb49c95fa2cb.patch -> ${P}_driver_name.patch"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="debug static-libs"
+IUSE="debug static-libs vanilla"
 
 RDEPEND="virtual/libusb:1
        dev-libs/glib:2
@@ -24,6 +26,13 @@ DEPEND="${RDEPEND}
        virtual/pkgconfig"
 
 src_prepare() {
+       if ! use vanilla ; then
+               epatch "${DISTDIR}"/${P}_driver_name.patch
+               epatch "${DISTDIR}"/${P}_vfs0050.patch
+               # drop area with nested C comment
+               sed -e '341,381d' -i ${PN}/drivers/vfs0050.h
+       fi
+
        # upeke2 and fdu2000 were missing from all_drivers.
        sed -e '/^all_drivers=/s:"$: upeke2 fdu2000":' \
                -i configure.ac || die