Package updated to 2.2.0.

3 files changed, 53 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0f896c4f3fb6..8d67f01beb9c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,22 @@
 pkgbase = android-x86-pcsclite
 	pkgdesc = PC/SC Architecture smartcard middleware library (Android x86)
-	pkgver = 2.0.3
+	pkgver = 2.2.0
 	pkgrel = 1
 	url = https://pcsclite.apdu.fr/
 	arch = any
 	license = BSD
-	makedepends = android-configure
+	makedepends = android-meson
 	depends = android-ndk
 	options = !strip
 	options = !buildflags
 	options = staticlibs
 	options = !emptydirs
-	source = https://pcsclite.apdu.fr/files/pcsc-lite-2.0.3.tar.bz2
-	source = https://pcsclite.apdu.fr/files/pcsc-lite-2.0.3.tar.bz2.asc
+	source = https://pcsclite.apdu.fr/files/pcsc-lite-2.2.0.tar.xz
+	source = https://pcsclite.apdu.fr/files/pcsc-lite-2.2.0.tar.xz.asc
+	source = 0001-Fix-pcsc-arch.patch
 	validpgpkeys = F5E11B9FFE911146F41D953D78A1B4DFE8F9C57E
-	md5sums = 4167d2d3fa2be3f8e24b2f44e38a35ee
+	md5sums = 9e4006e1f3210ffa7dd0fadbc9083dc2
 	md5sums = SKIP
+	md5sums = 0d862bb58084ec6e7da1ccc764de4ac4
 
 pkgname = android-x86-pcsclite
diff --git a/0001-Fix-pcsc-arch.patch b/0001-Fix-pcsc-arch.patch
new file mode 100644
index 000000000000..d0e0e20e8579
--- /dev/null
+++ b/0001-Fix-pcsc-arch.patch
@@ -0,0 +1,20 @@
+--- a/meson.build
++++ b/meson.build
+@@ -116,16 +116,7 @@
+   features += 'systemd'
+ endif
+ 
+-target_system = target_machine.system()
+-if target_system == 'darwin'
+-  pcscd_dep += dependency('appleframeworks', modules : ['foundation', 'IOKit'])
+-  pcscd_src += files(['src/hotplug_macosx.c', 'src/dyn_macosx.c'])
+-  conf_data.set_quoted('PCSC_ARCH', 'MacOS')
+-elif target_system == 'linux'
+-  conf_data.set_quoted('PCSC_ARCH', 'Linux')
+-elif target_system == 'netbsd'
+-  conf_data.set_quoted('PCSC_ARCH', 'NetBSD')
+-endif
++conf_data.set_quoted('PCSC_ARCH', 'Linux')
+ pcscd_dep += [polkit_dep, systemd_dep]
+ 
+ features +=  conf_data.get_unquoted('PCSC_ARCH')
diff --git a/PKGBUILD b/PKGBUILD
index e309df98f33c..06339fbfd7b9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,43 +7,52 @@
 _android_arch=x86
 
 pkgname=android-${_android_arch}-pcsclite
-pkgver=2.0.3
+pkgver=2.2.0
 pkgrel=1
 arch=('any')
 pkgdesc="PC/SC Architecture smartcard middleware library (Android ${_android_arch})"
 url='https://pcsclite.apdu.fr/'
 license=('BSD')
 depends=('android-ndk')
-makedepends=('android-configure')
+makedepends=('android-meson')
 options=(!strip !buildflags staticlibs !emptydirs)
-source=("https://pcsclite.apdu.fr/files/pcsc-lite-${pkgver}.tar.bz2"{,.asc})
-md5sums=('4167d2d3fa2be3f8e24b2f44e38a35ee'
-         'SKIP')
+source=("https://pcsclite.apdu.fr/files/pcsc-lite-${pkgver}.tar.xz"{,.asc}
+        '0001-Fix-pcsc-arch.patch')
+md5sums=('9e4006e1f3210ffa7dd0fadbc9083dc2'
+         'SKIP'
+         '0d862bb58084ec6e7da1ccc764de4ac4')
 validpgpkeys=('F5E11B9FFE911146F41D953D78A1B4DFE8F9C57E') # Ludovic Rousseau <rousseau@debian.org>
 
+prepare() {
+    cd "${srcdir}/pcsc-lite-$pkgver"
+
+    patch -Np1 -i ../0001-Fix-pcsc-arch.patch
+}
+
 build() {
     cd "${srcdir}/pcsc-lite-$pkgver"
     source android-env ${_android_arch}
 
-    android-${_android_arch}-configure \
-        --sbindir="${ANDROID_PREFIX_BIN}" \
-        --sysconfdir="${ANDROID_PREFIX_ETC}" \
-        --enable-usbdropdir="${ANDROID_PREFIX_LIB}/pcsc/drivers" \
-        --enable-filter \
-        --disable-libsystemd \
-        --disable-libudev \
-        --disable-polkit
-    make $MAKEFLAGS
+    android-${_android_arch}-meson build \
+        -Dlibsystemd=false \
+        -Dlibudev=false \
+        -Dlibusb=false \
+        -Dpolkit=false \
+        -Dusb=false \
+        -Dserial=false \
+        -Dserialconfdir="${ANDROID_PREFIX_ETC}/reader.conf.d" \
+        -Dusbdropdir="${ANDROID_PREFIX_LIB}/pcsc/drivers"
+    ninja -C build
 }
 
 package() {
     cd "${srcdir}/pcsc-lite-$pkgver"
     source android-env ${_android_arch}
 
-    make DESTDIR="$pkgdir" install
+    DESTDIR="${pkgdir}" meson install -C build
+    rm -rf "$pkgdir/bin"
     rm -f "$pkgdir/${ANDROID_PREFIX_BIN}/pcscd"
     rm -rf "$pkgdir/${ANDROID_PREFIX_SHARE}"
-    ${ANDROID_STRIP} -g --strip-unneeded "${pkgdir}"/${ANDROID_PREFIX_LIB}/*.so
-    ${ANDROID_STRIP} -g "$pkgdir"/${ANDROID_PREFIX_LIB}/*.a
+    ${ANDROID_STRIP} -g --strip-unneeded "${pkgdir}/${ANDROID_PREFIX_LIB}"/*.so
 }