Backported from upstream support for 147e:2020 devices.

Package-Manager: portage-2.1.11.62/cvs/Linux x86_64
Manifest-Sign-Key: 0xF1989B07

4 files changed, 109 insertions, 5 deletions

diff --git a/sys-auth/libfprint/ChangeLog b/sys-auth/libfprint/ChangeLog
index c26fa0da24bf..da136af1cd30 100644
--- a/sys-auth/libfprint/ChangeLog
+++ b/sys-auth/libfprint/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-auth/libfprint
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/libfprint/ChangeLog,v 1.21 2013/05/07 10:59:41 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/libfprint/ChangeLog,v 1.22 2013/05/07 11:29:07 pva Exp $
+
+*libfprint-0.5.0-r1 (07 May 2013)
+
+  07 May 2013; Peter Volkov <pva@gentoo.org> +libfprint-0.5.0-r1.ebuild,
+  +files/libfprint-0.5.0-support-147e_2020.patch:
+  Backported from upstream support for 147e:2020 devices.
 
   07 May 2013; Peter Volkov <pva@gentoo.org> libfprint-0.5.0.ebuild,
   +files/libfprint-0.5.0-automake-1.13.patch:
diff --git a/sys-auth/libfprint/Manifest b/sys-auth/libfprint/Manifest
index 83d709ac691e..9f1fac0dbc41 100644
--- a/sys-auth/libfprint/Manifest
+++ b/sys-auth/libfprint/Manifest
@@ -2,16 +2,18 @@
 Hash: SHA256
 
 AUX libfprint-0.5.0-automake-1.13.patch 797 SHA256 75d05585c6a9e1080bcee08fdf24c429a5601e1bc545a3c6df8377e90dcf12f4 SHA512 76e059f076348beb720e4f7bf8802b101aaf1d281429cdeb8f54ca67c23a1bf198b0220e4ff67421005cc8797c310f624265d5c91e9160fd78a2a3cf9ef4a39e WHIRLPOOL 2b42f4e7b33ec305feea6008b430bd98c0a1f845cf269c36440d657273043f5051434f4c900375d7e8689ff2ff077fbb6512adfc08d998a852ab56783aeee675
+AUX libfprint-0.5.0-support-147e_2020.patch 1443 SHA256 8e4c6baf2c84398c11221b963aab1a9fefcaee329405e1631808ccd453c01424 SHA512 e8e47563fc09f5ac018a52577db4998c259884a9251b6c7c2709d4e214a1ebe5820b92739da0b1cac88114545d450409454e882591a59fd27ca981172682af9e WHIRLPOOL c2bbfab3d09d312682431ae7f7f38fa21868457b8d567a25537ffbabd8c07362b83d763072b6f342ea2f071b096fedd8fa6f1c3ef486d288904f29132d3d8951
 DIST libfprint-0.4.0.tar.bz2 228518 SHA256 58f4056f498b8ba564a8ba2ee4a59cf2c3edb53c03e5df390fcf77be75ea7117 SHA512 26361101f5b73f722c14109d7e9cb78738968d2cfc6fcb824dc56f0044c8cd866fcb57e7f432e3ec3eeba956d92b2a091b5daed77c992f61d75cb3ed323adc09 WHIRLPOOL 94502f1350c1d6a1f401671f739f0bd42a581aaff97f1f89517c3c76eeebbef7783ec673a0834e43335a5c8d3231eafcf1c23f6b1ad769e909872844b114b650
 DIST libfprint-0.5.0.tar.bz2 277118 SHA256 1d4d6832fe61e934a40cbe2b9fe9a92153ddccb5c874fce10f476f1113c1d76c SHA512 2a5a4d45bd11060964e34c70b2a41e45d220e3b97d07a962c939ec84988a85a4d97898c86b1e7f7c571d85bb7f4333231cf327f62907b40e6a1262cc5b365981 WHIRLPOOL a3c7763ab62d65e2bdf44e93a5230dcbde7065121427063c8b3bb19d597be1f1b5ae58e55e1e635b03eb004f1e08085585958b5ae0d85a5004dff939657190ad
 EBUILD libfprint-0.4.0.ebuild 1227 SHA256 bea2d1b1ce6f15e080476328d518cf7e55e9c475654399c4284b6c0ba7aa2cae SHA512 8785b1d2289c6ab73d9068bf4dc6fe89bf7577ebcdebfa48ba334c4a439be4f857cb67449c254e7d0f3b2137fcded6c10f9196bbdea4a1dae268f8c54095f656 WHIRLPOOL 05436d612c30cad85ad0b15c6321e2e9309983b6d83cc7031640b154391bdf1de1fd29e6ebbb0b3cf6e21b357e1a684395ce4f96a2879e1378d937722a406b81
+EBUILD libfprint-0.5.0-r1.ebuild 1354 SHA256 12dfd095ab933f57baebb45f23613e3abcab81bcbb64f1190cce0b834a6258b3 SHA512 1fa40104cb6db243be2a62c353d7acf3aff36af4fed920e2412a7072ecf2e8aa75390d90e6ad77798a3ed8c4d32365f7d2f4db5de5bd88c38a09407cf5e13189 WHIRLPOOL 88e7442ba631fead0cc1c2ab1ce1b6428debf01bc10ce5b9967bf6d99f610d87375efb5ca8e3e7199296d57984013262cff9aa5824470d5b2bedff18adb992fd
 EBUILD libfprint-0.5.0.ebuild 1300 SHA256 a6fda9bfe9872da4903b1d4cd0145b4a6ef0bf93d778037fdc7ee810684b68a2 SHA512 ef6753e32118bf4d7f45c9eb096973e5438ec6fe24758513955ab9094c9e827cfa2d135e42aaae405f9fd6df2c06315a0d6fd7ae64b0e36c93e4453c43f6b160 WHIRLPOOL 0ff328a800e7e8842571825e82ac6822e50ae77865bad888eab60f7bee7747261e9c17a80f86edc46e06c60650719e046e6f3e91568ac7ecd2910ef31c6df079
-MISC ChangeLog 3443 SHA256 d922c0506a8ac7573aa0f02c5fc1c780f1d9b195b9e518cca9840318163ac6b1 SHA512 9fa1b00d076dcbe1d1762bc08145aae30640b1bf2f62143b8f162092f475057fd9bd357f28e03ae76fb6ef61c493a7fb81939fd5341c31c8f0a7aebc68de5af7 WHIRLPOOL 620c90e6bb6f0f6d662f3f592bf0fa4456c787f7891aa474613bd439267dd075d8b6348431c604d71e2486988ec1ca34a644379108cfc24dd260a4da3c16285e
+MISC ChangeLog 3660 SHA256 ec6da0b1a134551ee7f751a0c187bf21eb2ce18b9b226486b7b9b646c03b26f6 SHA512 c392f1f95f20eaf119b1b1ca8c5f78dce4f965bda76560a8f3d515cca33e85daf776ae307024ae6faf59883f0c8f2af54cf031273bfe253e3126d939fb1eab99 WHIRLPOOL 730927e8df98a284180b05ceaf64480ecc10cd06a68e7f20b3de70dd8448741d82d7f0c49eaf11c5900eb2f07a9c17247f4e7b25c4958f6bd69598241f20b741
 MISC metadata.xml 334 SHA256 8b59a5c01c78173e118ec45028ea9bda37b4491ebe655efcfef506584a3f8b6d SHA512 477921250d4f9df26969e1daf9a0b461fff202bd9e101dd8ebb2aa16bc87612439a2fc768c0ce86c0d4abdeda2f69a172a5abead7dff96d5d17114e36513a8c8 WHIRLPOOL d08d901374d171fcd48f90722116c091f62b2b66f693fde17db73eb43cc0e5366abb758c0713a8ed1a55e95cd5cb3efb784958fdc74769870e5f7dea49f2c41e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlGI3qYACgkQGrk+8vGYmwd+GQD/RUN0Vr0uBF0g0P3qfWcurHQm
-PeHE/+zdsccE6jwrtJsA/1mcGUCrj5C0j4ixCCJU4c8d2AmTCv9qNAaEJCBJc2Pz
-=nZC8
+iF4EAREIAAYFAlGI5Y0ACgkQGrk+8vGYmwcK+AEA39dQyIL1lleV357vUziJ6MXx
+LkTP7YzsP45OqiiBgYIBAJTxGZquuQ69QG+dV78vgn/7glh6SxJVwjnZu9/Dbd2j
+=y4Xf
 -----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..98f72aed5a0d
--- /dev/null
+++ b/sys-auth/libfprint/files/libfprint-0.5.0-support-147e_2020.patch
@@ -0,0 +1,48 @@
+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.5.0-r1.ebuild b/sys-auth/libfprint/libfprint-0.5.0-r1.ebuild
new file mode 100644
index 000000000000..20f91893113c
--- /dev/null
+++ b/sys-auth/libfprint/libfprint-0.5.0-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/libfprint/libfprint-0.5.0-r1.ebuild,v 1.1 2013/05/07 11:29:08 pva Exp $
+
+EAPI=4
+
+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"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="debug static-libs"
+
+RDEPEND="virtual/libusb:1
+	dev-libs/nss
+	|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] 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=$(udev_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
+}