From 5f920e16bd3f371a7879a7d86274cc365fd56a5f Mon Sep 17 00:00:00 2001 From: Leo Date: Sat, 10 Aug 2019 11:37:01 -0300 Subject: main/libfprint: upgrade to 1.0 --- main/libfprint/APKBUILD | 53 ++++++++++++++++++----------------------- main/libfprint/fix-stderr.patch | 14 +++++++++++ 2 files changed, 37 insertions(+), 30 deletions(-) create mode 100644 main/libfprint/fix-stderr.patch (limited to 'main/libfprint') diff --git a/main/libfprint/APKBUILD b/main/libfprint/APKBUILD index 5c0ea4ee4b..a271f653f2 100644 --- a/main/libfprint/APKBUILD +++ b/main/libfprint/APKBUILD @@ -1,46 +1,39 @@ # Contributor: Timo Teräs # Maintainer: Timo Teräs pkgname=libfprint -pkgver=0.7.0 -pkgrel=1 +pkgver=1.0 +pkgrel=0 pkgdesc="fingerprint reader and identification library" -url="http://www.freedesktop.org/wiki/Software/fprint/libfprint" +url="https://fprint.freedesktop.org/" arch="all" -license="LGPL-2.1" -depends="" -depends_dev="libusb-dev" -makedepends="$depends_dev nss-dev glib-dev gdk-pixbuf-dev pixman-dev" -install="" +license="LGPL-2.1-or-later" +makedepends=" + meson + glib-dev + libusb-dev + pixman-dev + nss-dev + eudev-dev + " subpackages="$pkgname-dev" -source="https://people.freedesktop.org/~anarsoul/libfprint-$pkgver.tar.xz +source="https://gitlab.freedesktop.org/libfprint/libfprint/uploads/aff93e9921d1cff53d7c070944952ff9/libfprint-$pkgver.tar.xz + fix-stderr.patch " -builddir="$srcdir"/libfprint-$pkgver - -prepare() { - default_prepare - update_config_sub -} - build() { cd "$builddir" - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --localstatedir=/var \ - --disable-dependency-tracking \ - --enable-fast-install \ - --with-pic - make + meson \ + --prefix /usr \ + -Dx11-examples=false \ + -Ddoc=false \ + output + ninja -C output } package() { cd "$builddir" - make DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" ninja -C output install } -sha512sums="7a5280a34408ebe129256195a1219ed6a8258a2f5a46d92de4e1e18e931b0c15bd3df3898a7ee1aa5ed9b569e77953d12d007f1b7ced8b708d4bf0946e993e16 libfprint-0.7.0.tar.xz" +sha512sums="6a38a691d1f2d5fe19b5bbda9b77321d2e34f1a3aa8b61f38109e0095b28e156cdd7be5ade8f3db8ff26045f8556b68e938b3e1378f4b6d84a2106566e7fdb53 libfprint-1.0.tar.xz +9bd5d606ff9f672507775567c7f71428bb0cd62de61d762979f36e91bc98c1d72569c3d405ed013fa3148300919b36c31c654d376d547cf7829cafeede6abea9 fix-stderr.patch" diff --git a/main/libfprint/fix-stderr.patch b/main/libfprint/fix-stderr.patch new file mode 100644 index 0000000000..cde438231e --- /dev/null +++ b/main/libfprint/fix-stderr.patch @@ -0,0 +1,14 @@ +diff --git a/libfprint/nbis/include/bozorth.h b/libfprint/nbis/include/bozorth.h +index 08ec4b1..6d744d9 100644 +--- a/libfprint/nbis/include/bozorth.h ++++ b/libfprint/nbis/include/bozorth.h +@@ -217,8 +217,6 @@ struct xytq_struct { + /**************************************************************************/ + /* Globals supporting command line options */ + extern int verbose_threshold; +-/* Global supporting error reporting */ +-extern FILE *stderr; + + /**************************************************************************/ + /* In: BZ_GBLS.C */ + -- cgit v1.2.3