From f4ab557ef5db13a8c941e4299c69a9d52959218b Mon Sep 17 00:00:00 2001 From: archos Date: Fri, 25 Oct 2024 20:29:00 +0200 Subject: [PATCH] Updated PKGBUILD and .SRCINFO to use libfprint version 1.94.8 for improved kernel support --- .SRCINFO | 55 ++++++++++++++++++++++++++++--------------------------- PKGBUILD | 19 +++++++------------ 2 files changed, 35 insertions(+), 39 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index f6bcacb..3370480 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,30 +1,31 @@ pkgbase = libfprint-fpcmoh-git - pkgdesc = libfprint with proprietary FPC match on host device 10a5:9800 driver - pkgver = 1.94.6 - pkgrel = 1 - url = https://fprint.freedesktop.org/ - arch = x86_64 - groups = fprint - license = LGPL - makedepends = git - makedepends = meson - makedepends = gtk-doc - makedepends = gobject-introspection - makedepends = systemd - makedepends = patchelf - depends = libgusb - depends = pixman - depends = nss - depends = systemd-libs - provides = libfprint=1.94.6 - provides = libfprint-2.so - provides = libfpcbep.so - conflicts = libfprint - source = git+https://gitlab.freedesktop.org/libfprint/libfprint.git#tag=v1.94.6 - source = fpcbep.zip::https://download.lenovo.com/pccbbs/mobiles/r1slm01w.zip - source = https://gitlab.freedesktop.org/libfprint/libfprint/-/merge_requests/396.patch - sha256sums = SKIP - sha256sums = c7290f2a70d48f7bdd09bee985534d3511ec00d091887b07f81cf1e08f74c145 - sha256sums = SKIP + pkgdesc = libfprint with proprietary FPC match on host device 10a5:9800 driver + pkgver = 1.94.8 + pkgrel = 1 + url = https://fprint.freedesktop.org/ + arch = x86_64 + groups = fprint + license = LGPL + makedepends = git + makedepends = meson + makedepends = gtk-doc + makedepends = gobject-introspection + makedepends = systemd + makedepends = patchelf + depends = libgusb + depends = pixman + depends = nss + depends = systemd-libs + provides = libfprint=1.94.8 + provides = libfprint-2.so + provides = libfpcbep.so + conflicts = libfprint + source = git+https://gitlab.freedesktop.org/libfprint/libfprint.git#tag=v1.94.8 + source = fpcbep.zip::https://download.lenovo.com/pccbbs/mobiles/r1slm01w.zip + source = https://gitlab.freedesktop.org/libfprint/libfprint/-/merge_requests/396.patch + sha256sums = SKIP + sha256sums = c7290f2a70d48f7bdd09bee985534d3511ec00d091887b07f81cf1e08f74c145 + sha256sums = SKIP pkgname = libfprint-fpcmoh-git + diff --git a/PKGBUILD b/PKGBUILD index e130e55..dc2799a 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ pkgname=libfprint-fpcmoh-git _pkgname=libfprint +pkgver=1.94.8 # Aktualizováno na novější verzi pkgrel=1 -pkgver=1.94.6 pkgdesc="libfprint with proprietary FPC match on host device 10a5:9800 driver" url="https://fprint.freedesktop.org/" arch=(x86_64) @@ -12,18 +12,15 @@ provides=("libfprint=$pkgver" libfprint-2.so libfpcbep.so) conflicts=(libfprint) groups=(fprint) source=( - "git+https://gitlab.freedesktop.org/libfprint/libfprint.git#tag=v1.94.6" + "git+https://gitlab.freedesktop.org/libfprint/libfprint.git#tag=v1.94.8" # Odkaz na novou verzi "fpcbep.zip::https://download.lenovo.com/pccbbs/mobiles/r1slm01w.zip" - "https://gitlab.freedesktop.org/libfprint/libfprint/-/merge_requests/396.patch") + "https://gitlab.freedesktop.org/libfprint/libfprint/-/merge_requests/396.patch" +) sha256sums=( 'SKIP' 'c7290f2a70d48f7bdd09bee985534d3511ec00d091887b07f81cf1e08f74c145' - 'SKIP') - -#pkgver() { -# cd $_pkgname -# git describe --tags | sed 's/^V_\|^v//;s/_/./g;s/-/.r/;s/-/./' -#} + 'SKIP' +) prepare() { libfpcbep_path=$(find . -name 'libfpcbep.so') @@ -35,14 +32,11 @@ prepare() { sed -ibak "s+find_library[(]'fpcbep', required: true[)]+find_library('fpcbep', required: true, dirs: \'$(pwd)\')+g" ./meson.build } -# We do not perform any checks here as the python scripts can be buggy - build() { arch-meson $_pkgname build meson compile -C build } - package() { DESTDIR="$pkgdir" meson install -C build install -D $srcdir/$_pkgname/libfpcbep.so $pkgdir/usr/lib/libfpcbep.so @@ -52,3 +46,4 @@ package() { libfpcbep_needed=$(ldd libfprint-2.so | grep libfpcbep | sed 's/[(].*[)]//g') patchelf --replace-needed $libfpcbep_needed libfpcbep.so libfprint-2.so } +