Skip to Content.
Sympa Menu

sm-commit - [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (e83fc0ebccc90b94415896d20e32e70a4c14e75b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
  • Subject: [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (e83fc0ebccc90b94415896d20e32e70a4c14e75b)
  • Date: Thu, 20 Jun 2024 03:18:57 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

crypto/pcsc-lite/BUILD | 15 ++++++++-------
crypto/pcsc-lite/CONFIGURE | 3 +--
crypto/pcsc-lite/DEPENDS | 12 ++++++++----
crypto/pcsc-lite/DETAILS | 5 ++---
crypto/pcsc-lite/HISTORY | 7 -------
5 files changed, 19 insertions(+), 23 deletions(-)

New commits:
commit e83fc0ebccc90b94415896d20e32e70a4c14e75b
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

Revert "pcsc-lite: => 2.2.3" (broken)

Treeve, stop submitting this with a broken systemd dependency.

This reverts commit 3329dbcaf88e94e4faa0d34ed9edee2bc4ce1f2a.

diff --git a/crypto/pcsc-lite/BUILD b/crypto/pcsc-lite/BUILD
index 7bdc683..4965974 100755
--- a/crypto/pcsc-lite/BUILD
+++ b/crypto/pcsc-lite/BUILD
@@ -1,9 +1,10 @@
-LDFLAGS+=" -ldl" &&
-if is_depends_enabled $SPELL systemd;then
- OPTS+=' libsystemd=true'
+if [[ $PCSC_DEVICE_ACCESS != udev ]]; then
+ OPTS="--disable-libudev $OPTS"
+fi &&
+if [[ $PCSC_DEVICE_ACCESS != libusb ]]; then
+ OPTS="--disable-libusb $OPTS"
fi &&
-for DD in $PCSC_DEVICES;do
- OPTS+=" $DD=true"
-done &&

-default_build
+make_single &&
+default_build &&
+make_normal
diff --git a/crypto/pcsc-lite/CONFIGURE b/crypto/pcsc-lite/CONFIGURE
index 5268b06..a1a7ef2 100755
--- a/crypto/pcsc-lite/CONFIGURE
+++ b/crypto/pcsc-lite/CONFIGURE
@@ -1,2 +1 @@
-source $GRIMOIRE/MESON_CONFIGURE
-config_query_list PCSC_DEVICES 'which device types to support' usb serial
+config_query_list PCSC_DEVICE_ACCESS "which library do you want to use to
access devices?" none libusb udev
diff --git a/crypto/pcsc-lite/DEPENDS b/crypto/pcsc-lite/DEPENDS
index 093d3bf..ebbbf9f 100755
--- a/crypto/pcsc-lite/DEPENDS
+++ b/crypto/pcsc-lite/DEPENDS
@@ -1,4 +1,8 @@
-source $GRIMOIRE/MESON_DEPENDS
-optional_depends DEVICE-MANAGER libudev=true libudev=false 'hotplug
detection' &&
-optional_depends policykit polkit=true polkit=false 'PolicyKit support'
-
+depends -sub CXX gcc &&
+if [[ $PCSC_DEVICE_ACCESS == libusb ]]; then
+ depends libusb "--enable-libusb"
+elif [[ $PCSC_DEVICE_ACCESS == udev ]]; then
+ depends DEVICE-MANAGER "--enable-libudev"
+fi &&
+optional_depends policykit '--enable-polkit' '' 'PolicyKit support' &&
+optional_depends systemd '' '--disable-libsystemd' 'SystemD support'
diff --git a/crypto/pcsc-lite/DETAILS b/crypto/pcsc-lite/DETAILS
index ee73b72..fb502fd 100755
--- a/crypto/pcsc-lite/DETAILS
+++ b/crypto/pcsc-lite/DETAILS
@@ -1,8 +1,7 @@
-source $GRIMOIRE/MESON_FUNCTIONS
SPELL=pcsc-lite
- VERSION=2.2.3
+ VERSION=2.0.0
SECURITY_PATCH=1
- SOURCE=$SPELL-$VERSION.tar.xz
+ SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=https://pcsclite.apdu.fr
SOURCE_URL[0]=$WEB_SITE/files/$SOURCE
diff --git a/crypto/pcsc-lite/HISTORY b/crypto/pcsc-lite/HISTORY
index ff8a53f..a53746c 100644
--- a/crypto/pcsc-lite/HISTORY
+++ b/crypto/pcsc-lite/HISTORY
@@ -1,10 +1,3 @@
-2024-06-16 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 2.2.3
-
-2024-05-16 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 2.2.1
- * *: use meson
-
2023-08-01 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 2.0.0



  • [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (e83fc0ebccc90b94415896d20e32e70a4c14e75b), Ismael Luceno, 06/19/2024

Archive powered by MHonArc 2.6.24.

Top of Page