ccid: update to version 1.8.0

New reader support (GLSolutions NM61, Identiv uTrust FIDO2, Kensington
VeriMark NFC+, several Pol Henarejos Pico devices and more), removes the
16 reader limitation, and fixes crashes and race conditions in the
multi-slot code.

Upstream removes the autotools build system in favour of Meson, so port
the package to meson.mk and drop 010-macos.patch, which patched the now
removed configure.ac. The reader bundle install path is taken from
libpcsclite.pc usbdropdir (/usr/lib/pcsc/drivers, unchanged); udev rules
stay disabled as before.

https://ccid.apdu.fr/files/
Signed-off-by: Daniel Golle <redacted>

diff --git a/utils/ccid/Makefile b/utils/ccid/Makefile
index 5cc5ef5cb152308bdbc2c717e2ab8d7e555fbbc4..966c6e35c260d5bbdcab35bfe56777482ef93fe5 100644 (file)
--- a/utils/ccid/Makefile
+++ b/utils/ccid/Makefile
@@ -8,21 +8,20 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ccid
-PKG_VERSION:=1.7.1
+PKG_VERSION:=1.8.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://ccid.apdu.fr/files/
-PKG_HASH:=32799ab16fe6e493c9452be3823f21810fbe80b884021a6f6f3fa69f26be5c86
+PKG_HASH:=531dc29e7c1b9e22e1918f0767b625d52ce8a98f266eb2144c5cf5dbd29c0f67
 PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
 PKG_LICENSE:=LGPL-2.1-or-later
 PKG_LICENSE_FILES:=COPYING
 
-PKG_FIXUP:=libtool
-PKG_INSTALL:=1
 PKG_BUILD_DEPENDS:=zlib
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/meson.mk
 
 define Package/ccid
   SECTION:=libs
@@ -37,13 +36,10 @@ define Package/ccid/description
   (Integrated Circuit(s) Card Devices).
 endef
 
-TARGET_CFLAGS += $(FPIC)
-
-TARGET_LDFLAGS += "-lpthread"
-
-CONFIGURE_ARGS += \
-       --enable-embedded \
-       --enable-usbdropdir=/usr/lib/pcsc/drivers
+MESON_ARGS += \
+       -Ddefault_library=shared \
+       -Dembedded=true \
+       -Dudev-rules=false
 
 define Package/ccid/install
        $(INSTALL_DIR) $(1)/usr/lib/pcsc

diff --git a/utils/ccid/patches/010-macos.patch b/utils/ccid/patches/010-macos.patch
deleted file mode 100644 (file)
index 114ee44..0000000
--- a/utils/ccid/patches/010-macos.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -82,7 +82,7 @@ AC_CHECK_FUNCS(strlcpy strlcat secure_ge
- # Select OS specific versions of source files.
- AC_SUBST(BUNDLE_HOST)
- AC_SUBST(DYN_LIB_EXT)
--BUNDLE_HOST=`uname | sed -e s,/,_,`
-+BUNDLE_HOST=Linux
- DYN_LIB_EXT="so"
- AS_CASE([$BUNDLE_HOST],
-       [Darwin], [BUNDLE_HOST=MacOS DYN_LIB_EXT="dylib"],