diff --git a/common/shlibs b/common/shlibs index 468fe3a63fe..c55d6c02ac8 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1571,7 +1571,7 @@ libtcmalloc.so.4 gperftools-2.1_1 libaio.so.1 libaio-0.3.109_1 libofx.so.7 libofx-0.9.11_1 libsigsegv.so.2 libsigsegv-2.10_2 -libfprint.so.0 libfprint-0.5.1_1 +libfprint-2.so.2 libfprint-1.90.7_1 libwx_baseu_xml-3.0.so.0 wxWidgets-common-3.0.4_1 libwx_baseu-3.0.so.0 wxWidgets-common-3.0.4_1 libwx_gtk2_adv-3.0.so.0 wxWidgets-3.0.0_1 diff --git a/srcpkgs/libfprint-udev-rules b/srcpkgs/libfprint-udev-rules new file mode 120000 index 00000000000..739ca683efa --- /dev/null +++ b/srcpkgs/libfprint-udev-rules @@ -0,0 +1 @@ +libfprint \ No newline at end of file diff --git a/srcpkgs/libfprint/template b/srcpkgs/libfprint/template index ae22b871f3d..9f32d0bea08 100644 --- a/srcpkgs/libfprint/template +++ b/srcpkgs/libfprint/template @@ -1,24 +1,22 @@ # Template file for 'libfprint' pkgname=libfprint -version=1.0 +version=1.90.7 revision=1 -wrksrc="libfprint-V_${version//./_}" +wrksrc=libfprint-v$version build_style=meson +build_helper=gir configure_args="-Dudev_rules=false -Dx11-examples=false -Dgtk-examples=false -Ddoc=false" -hostmakedepends="pkg-config" -makedepends="libusb-devel nss-devel glib-devel gdk-pixbuf-devel pixman-devel" +hostmakedepends="pkg-config glib-devel" +makedepends="libusb-devel nss-devel glib-devel gdk-pixbuf-devel pixman-devel + libgusb-devel libglib-devel" +depends="libfprint-udev-rules>=${version}_${revision}" short_desc="Support for consumer fingerprint reader devices" maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="http://www.freedesktop.org/wiki/Software/fprint/" changelog="https://gitlab.freedesktop.org/libfprint/libfprint/raw/master/NEWS" -distfiles="https://gitlab.freedesktop.org/libfprint/libfprint/-/archive/V_${version//./_}/libfprint-V_${version//./_}.tar.bz2" -checksum=22777a1d202ef912395b94842ae6b531338c8d48a8a813616e846b1bc96c5ad9 - -post_install() { - vmkdir usr/lib/udev/rules.d - vinstall $FILESDIR/60-fprint-autosuspend.rules 644 usr/lib/udev/rules.d -} +distfiles="https://gitlab.freedesktop.org/libfprint/libfprint/-/archive/v$version/libfprint-v$version.tar.bz2" +checksum=d11acf183820812fd6a8cd808d58bbf197554bcc0f9119d4c873092ecd94ee29 libfprint-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" @@ -29,3 +27,12 @@ libfprint-devel_package() { vmove "usr/lib/*.so" } } + +libfprint-udev-rules_package() { + short_desc+=" - udev rules" + conflicts="libfprint<=1.0_1" + pkg_install() { + vmkdir usr/lib/udev/rules.d + vinstall $FILESDIR/60-fprint-autosuspend.rules 644 usr/lib/udev/rules.d + } +} diff --git a/srcpkgs/libfprint/update b/srcpkgs/libfprint/update deleted file mode 100644 index 1f57940e938..00000000000 --- a/srcpkgs/libfprint/update +++ /dev/null @@ -1,2 +0,0 @@ -pattern='/archive/[^/]+/\Q'"$pkgname"'\E-v?_\K[\d\._]+(?=\.tar\.gz")' -ignore='*.99.*'