From 8c41f637808d2af25aacb065d6ccf58251f8df0c Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Tue, 12 Jun 2018 16:06:40 +0200 Subject: [PATCH 1/5] + libfprint-0.8.1-1 Port to meson, gtk-doc --- .gitignore | 1 + libfprint.spec | 27 +++++++++++++-------------- sources | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 6b23df5..75c2b48 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ libfprint-0.3.0.tar.bz2 /libfprint-0.5.1.tar.xz /libfprint-0.6.0.tar.xz /libfprint-0.7.0.tar.xz +/libfprint-0.8.1.tar.xz diff --git a/libfprint.spec b/libfprint.spec index e2fe33b..b6e3792 100644 --- a/libfprint.spec +++ b/libfprint.spec @@ -1,19 +1,18 @@ Name: libfprint -Version: 0.7.0 -Release: 3%{?dist} +Version: 0.8.1 +Release: 1%{?dist} Summary: Toolkit for fingerprint scanner Group: System Environment/Libraries License: LGPLv2+ URL: http://www.freedesktop.org/wiki/Software/fprint/libfprint -Source0: http://freedesktop.org/~anarsoul/%{name}-%{version}.tar.xz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Source0: https://gitlab.freedesktop.org/libfprint/libfprint/uploads/a6084497941324538aefbdf7b954f1e9/%{name}-%{version}.tar.xz ExcludeArch: s390 s390x BuildRequires: libusb1-devel glib2-devel nss-devel pixman-devel # For the udev.pc to install the rules BuildRequires: systemd -BuildRequires: doxygen autoconf automake libtool +BuildRequires: gtk-doc meson %description libfprint offers support for consumer fingerprint reader devices. @@ -34,16 +33,11 @@ developing applications that use %{name}. %setup -q %build -%configure --disable-silent-rules --disable-static -make %{?_smp_mflags} -pushd doc -make docs -popd +%meson -Dx11-examples=false +%meson_build %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' +%meson_install %clean rm -rf $RPM_BUILD_ROOT @@ -62,12 +56,17 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(-,root,root,-) -%doc HACKING doc/html +%doc HACKING.md %{_includedir}/* %{_libdir}/*.so %{_libdir}/pkgconfig/%{name}.pc +%{_datadir}/gtk-doc/html/libfprint/ %changelog +* Tue Jun 12 2018 Bastien Nocera - 0.8.1-1 ++ libfprint-0.8.1-1 +- Port to meson and gtk-doc + * Thu Aug 03 2017 Fedora Release Engineering - 0.7.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index c7a739b..59dcb84 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libfprint-0.7.0.tar.xz) = 7a5280a34408ebe129256195a1219ed6a8258a2f5a46d92de4e1e18e931b0c15bd3df3898a7ee1aa5ed9b569e77953d12d007f1b7ced8b708d4bf0946e993e16 +SHA512 (libfprint-0.8.1.tar.xz) = 2bd04747589b41175430caf1aca99cc594ada9fd429ccfd774368d2a22d0c86861fe1b1d617e4d361e5b11096d848e98a33cf27039109148a5add5868a34c24d From 05ae4c19c63c1b7fc2f7ac2e0256ed5559981ec2 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Tue, 17 Jul 2018 15:26:02 +0200 Subject: [PATCH 2/5] + libfprint-0.8.2-1 Update to 0.8.2 --- .gitignore | 1 + libfprint.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 75c2b48..49a41ac 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ libfprint-0.3.0.tar.bz2 /libfprint-0.6.0.tar.xz /libfprint-0.7.0.tar.xz /libfprint-0.8.1.tar.xz +/libfprint-0.8.2.tar.xz diff --git a/libfprint.spec b/libfprint.spec index b6e3792..9069686 100644 --- a/libfprint.spec +++ b/libfprint.spec @@ -1,5 +1,5 @@ Name: libfprint -Version: 0.8.1 +Version: 0.8.2 Release: 1%{?dist} Summary: Toolkit for fingerprint scanner @@ -63,6 +63,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/libfprint/ %changelog +* Tue Jul 17 2018 Bastien Nocera - 0.8.2-1 ++ libfprint-0.8.2-1 +- Update to 0.8.2 + * Tue Jun 12 2018 Bastien Nocera - 0.8.1-1 + libfprint-0.8.1-1 - Port to meson and gtk-doc diff --git a/sources b/sources index 59dcb84..0549bb3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libfprint-0.8.1.tar.xz) = 2bd04747589b41175430caf1aca99cc594ada9fd429ccfd774368d2a22d0c86861fe1b1d617e4d361e5b11096d848e98a33cf27039109148a5add5868a34c24d +SHA512 (libfprint-0.8.2.tar.xz) = 4f051bffd8f09a634031f44f1ef8b030cff4300a237a97b824a1894fd5db0e3b13548e0919d0256bfd62658216d37797bd4f4bad43382dd70f5de1aca934ba6d From 4db62b3f8f10e5e39657e5b85b17c7e2116edaf4 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Tue, 17 Jul 2018 15:57:24 +0200 Subject: [PATCH 3/5] Fix missing includes --- ...lude-string.h-in-a-number-of-drivers.patch | 54 +++++++++++++++++++ libfprint.spec | 6 ++- 2 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 0001-drivers-Include-string.h-in-a-number-of-drivers.patch diff --git a/0001-drivers-Include-string.h-in-a-number-of-drivers.patch b/0001-drivers-Include-string.h-in-a-number-of-drivers.patch new file mode 100644 index 0000000..0c0d820 --- /dev/null +++ b/0001-drivers-Include-string.h-in-a-number-of-drivers.patch @@ -0,0 +1,54 @@ +From e67a281d78f91817d7508ce14d6b3bd28da7efaf Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Tue, 17 Jul 2018 15:53:43 +0200 +Subject: [PATCH] drivers: Include in a number of drivers + +To be able to compile on older toolchains like that of Fedora 27. +--- + libfprint/drivers/upeksonly.c | 2 ++ + libfprint/drivers/upektc.c | 2 ++ + libfprint/drivers/upekts.c | 2 ++ + 3 files changed, 6 insertions(+) + +diff --git a/libfprint/drivers/upeksonly.c b/libfprint/drivers/upeksonly.c +index 9cccb86..f6077a1 100644 +--- a/libfprint/drivers/upeksonly.c ++++ b/libfprint/drivers/upeksonly.c +@@ -28,6 +28,8 @@ + #include "drivers_api.h" + #include "upeksonly.h" + ++#include ++ + #define CTRL_TIMEOUT 1000 + #define NUM_BULK_TRANSFERS 24 + #define MAX_ROWS 2048 +diff --git a/libfprint/drivers/upektc.c b/libfprint/drivers/upektc.c +index ffa31f3..0d71e6c 100644 +--- a/libfprint/drivers/upektc.c ++++ b/libfprint/drivers/upektc.c +@@ -23,6 +23,8 @@ + #include "drivers_api.h" + #include "upektc.h" + ++#include ++ + #define UPEKTC_EP_IN (2 | LIBUSB_ENDPOINT_IN) + #define UPEKTC_EP_OUT (3 | LIBUSB_ENDPOINT_OUT) + #define UPEKET_EP_IN (1 | LIBUSB_ENDPOINT_IN) +diff --git a/libfprint/drivers/upekts.c b/libfprint/drivers/upekts.c +index b448e36..9f7f8fd 100644 +--- a/libfprint/drivers/upekts.c ++++ b/libfprint/drivers/upekts.c +@@ -29,6 +29,8 @@ + + #include "drivers_api.h" + ++#include ++ + #define EP_IN (1 | LIBUSB_ENDPOINT_IN) + #define EP_OUT (2 | LIBUSB_ENDPOINT_OUT) + #define TIMEOUT 5000 +-- +2.17.1 + diff --git a/libfprint.spec b/libfprint.spec index 9069686..1b8ae05 100644 --- a/libfprint.spec +++ b/libfprint.spec @@ -12,7 +12,9 @@ ExcludeArch: s390 s390x BuildRequires: libusb1-devel glib2-devel nss-devel pixman-devel # For the udev.pc to install the rules BuildRequires: systemd -BuildRequires: gtk-doc meson +BuildRequires: gtk-doc meson git + +Patch0: 0001-drivers-Include-string.h-in-a-number-of-drivers.patch %description libfprint offers support for consumer fingerprint reader devices. @@ -30,7 +32,7 @@ developing applications that use %{name}. %prep -%setup -q +%autosetup -S git %build %meson -Dx11-examples=false From da52c3aa053c784103950a568594b62ebda4a6b0 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Tue, 17 Jul 2018 16:05:19 +0200 Subject: [PATCH 4/5] More fixing missing includes --- ...lude-string.h-in-a-number-of-drivers.patch | 54 ------------------- ...-Include-string.h-for-drivers-to-use.patch | 25 +++++++++ libfprint.spec | 2 +- 3 files changed, 26 insertions(+), 55 deletions(-) delete mode 100644 0001-drivers-Include-string.h-in-a-number-of-drivers.patch create mode 100644 0001-lib-Include-string.h-for-drivers-to-use.patch diff --git a/0001-drivers-Include-string.h-in-a-number-of-drivers.patch b/0001-drivers-Include-string.h-in-a-number-of-drivers.patch deleted file mode 100644 index 0c0d820..0000000 --- a/0001-drivers-Include-string.h-in-a-number-of-drivers.patch +++ /dev/null @@ -1,54 +0,0 @@ -From e67a281d78f91817d7508ce14d6b3bd28da7efaf Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Tue, 17 Jul 2018 15:53:43 +0200 -Subject: [PATCH] drivers: Include in a number of drivers - -To be able to compile on older toolchains like that of Fedora 27. ---- - libfprint/drivers/upeksonly.c | 2 ++ - libfprint/drivers/upektc.c | 2 ++ - libfprint/drivers/upekts.c | 2 ++ - 3 files changed, 6 insertions(+) - -diff --git a/libfprint/drivers/upeksonly.c b/libfprint/drivers/upeksonly.c -index 9cccb86..f6077a1 100644 ---- a/libfprint/drivers/upeksonly.c -+++ b/libfprint/drivers/upeksonly.c -@@ -28,6 +28,8 @@ - #include "drivers_api.h" - #include "upeksonly.h" - -+#include -+ - #define CTRL_TIMEOUT 1000 - #define NUM_BULK_TRANSFERS 24 - #define MAX_ROWS 2048 -diff --git a/libfprint/drivers/upektc.c b/libfprint/drivers/upektc.c -index ffa31f3..0d71e6c 100644 ---- a/libfprint/drivers/upektc.c -+++ b/libfprint/drivers/upektc.c -@@ -23,6 +23,8 @@ - #include "drivers_api.h" - #include "upektc.h" - -+#include -+ - #define UPEKTC_EP_IN (2 | LIBUSB_ENDPOINT_IN) - #define UPEKTC_EP_OUT (3 | LIBUSB_ENDPOINT_OUT) - #define UPEKET_EP_IN (1 | LIBUSB_ENDPOINT_IN) -diff --git a/libfprint/drivers/upekts.c b/libfprint/drivers/upekts.c -index b448e36..9f7f8fd 100644 ---- a/libfprint/drivers/upekts.c -+++ b/libfprint/drivers/upekts.c -@@ -29,6 +29,8 @@ - - #include "drivers_api.h" - -+#include -+ - #define EP_IN (1 | LIBUSB_ENDPOINT_IN) - #define EP_OUT (2 | LIBUSB_ENDPOINT_OUT) - #define TIMEOUT 5000 --- -2.17.1 - diff --git a/0001-lib-Include-string.h-for-drivers-to-use.patch b/0001-lib-Include-string.h-for-drivers-to-use.patch new file mode 100644 index 0000000..a08267c --- /dev/null +++ b/0001-lib-Include-string.h-for-drivers-to-use.patch @@ -0,0 +1,25 @@ +From f95445e5301945dd6c0427d985a64abd3c686545 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Tue, 17 Jul 2018 16:02:26 +0200 +Subject: [PATCH] lib: Include for drivers to use + +To be able to compile on older toolchains like that of Fedora 27. +--- + libfprint/drivers_api.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libfprint/drivers_api.h b/libfprint/drivers_api.h +index 2679c77..0d99d51 100644 +--- a/libfprint/drivers_api.h ++++ b/libfprint/drivers_api.h +@@ -30,6 +30,7 @@ + + #include + #include ++#include + #include + #include + +-- +2.17.1 + diff --git a/libfprint.spec b/libfprint.spec index 1b8ae05..9deda1c 100644 --- a/libfprint.spec +++ b/libfprint.spec @@ -14,7 +14,7 @@ BuildRequires: libusb1-devel glib2-devel nss-devel pixman-devel BuildRequires: systemd BuildRequires: gtk-doc meson git -Patch0: 0001-drivers-Include-string.h-in-a-number-of-drivers.patch +Patch0: 0001-lib-Include-string.h-for-drivers-to-use.patch %description libfprint offers support for consumer fingerprint reader devices. From 5aa15c54924d463f2e0689994b90538b85ef7cdc Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Tue, 17 Jul 2018 16:15:04 +0200 Subject: [PATCH 5/5] And now stdlib.h is missing --- ...-standard-headers-for-drivers-to-use.patch | 27 +++++++++++++++++++ ...-Include-string.h-for-drivers-to-use.patch | 25 ----------------- libfprint.spec | 2 +- 3 files changed, 28 insertions(+), 26 deletions(-) create mode 100644 0001-lib-Include-more-standard-headers-for-drivers-to-use.patch delete mode 100644 0001-lib-Include-string.h-for-drivers-to-use.patch diff --git a/0001-lib-Include-more-standard-headers-for-drivers-to-use.patch b/0001-lib-Include-more-standard-headers-for-drivers-to-use.patch new file mode 100644 index 0000000..f7e0188 --- /dev/null +++ b/0001-lib-Include-more-standard-headers-for-drivers-to-use.patch @@ -0,0 +1,27 @@ +From 626b0f1a8fbf2e3acf8f3d2de411141bc3f6e913 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Tue, 17 Jul 2018 16:02:26 +0200 +Subject: [PATCH] lib: Include more standard headers for drivers to use + +Such as string.h and stdlib.h, to be able to compile on older +toolchains like that of Fedora 27. +--- + libfprint/drivers_api.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/libfprint/drivers_api.h b/libfprint/drivers_api.h +index 2679c77..cc844cd 100644 +--- a/libfprint/drivers_api.h ++++ b/libfprint/drivers_api.h +@@ -30,6 +30,8 @@ + + #include + #include ++#include ++#include + #include + #include + +-- +2.17.1 + diff --git a/0001-lib-Include-string.h-for-drivers-to-use.patch b/0001-lib-Include-string.h-for-drivers-to-use.patch deleted file mode 100644 index a08267c..0000000 --- a/0001-lib-Include-string.h-for-drivers-to-use.patch +++ /dev/null @@ -1,25 +0,0 @@ -From f95445e5301945dd6c0427d985a64abd3c686545 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Tue, 17 Jul 2018 16:02:26 +0200 -Subject: [PATCH] lib: Include for drivers to use - -To be able to compile on older toolchains like that of Fedora 27. ---- - libfprint/drivers_api.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libfprint/drivers_api.h b/libfprint/drivers_api.h -index 2679c77..0d99d51 100644 ---- a/libfprint/drivers_api.h -+++ b/libfprint/drivers_api.h -@@ -30,6 +30,7 @@ - - #include - #include -+#include - #include - #include - --- -2.17.1 - diff --git a/libfprint.spec b/libfprint.spec index 9deda1c..5be5ece 100644 --- a/libfprint.spec +++ b/libfprint.spec @@ -14,7 +14,7 @@ BuildRequires: libusb1-devel glib2-devel nss-devel pixman-devel BuildRequires: systemd BuildRequires: gtk-doc meson git -Patch0: 0001-lib-Include-string.h-for-drivers-to-use.patch +Patch0: 0001-lib-Include-more-standard-headers-for-drivers-to-use.patch %description libfprint offers support for consumer fingerprint reader devices.